From 500206ce134bd4ec3cfec1ff27f91ad4af8cd605 Mon Sep 17 00:00:00 2001
From: Matthew Rudy Jacobs <matthewrudyjacobs@gmail.com>
Date: Mon, 29 Dec 2008 17:44:22 +0000
Subject: [PATCH] javascript_include_tag shouldn't automatically append a ".js" onto
 external urls
 eg. javascript_include_tag("http://www.google.com/jsapi")
 because "http://www.google.com/jsapi.js" doesn't exist

---
 .../lib/action_view/helpers/asset_tag_helper.rb    |    6 +++---
 actionpack/test/template/asset_tag_helper_test.rb  |   12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 0633d54..06dd816 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -154,7 +154,7 @@ module ActionView
       #   javascript_path "xmlhr" # => /javascripts/xmlhr.js
       #   javascript_path "dir/xmlhr.js" # => /javascripts/dir/xmlhr.js
       #   javascript_path "/dir/xmlhr" # => /dir/xmlhr.js
-      #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr.js
+      #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr
       #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
       def javascript_path(source)
         JavaScriptTag.new(self, @controller, source).public_path
@@ -183,7 +183,7 @@ module ActionView
       #     <script type="text/javascript" src="/elsewhere/cools.js"></script>
       #
       #   javascript_include_tag "http://www.railsapplication.com/xmlhr" # =>
-      #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js"></script>
+      #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr"></script>
       #
       #   javascript_include_tag "http://www.railsapplication.com/xmlhr.js" # =>
       #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js"></script>
@@ -605,7 +605,7 @@ module ActionView
             end
             
             def missing_extension?(source)
-              extension && File.extname(source).blank?
+              !source.start_with?("http") && extension && File.extname(source).blank?
             end
             
             def file_exists_with_extension?(source)
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 7597927..c9795e9 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -66,18 +66,23 @@ class AssetTagHelperTest < ActionView::TestCase
   JavascriptPathToTag = {
     %(javascript_path("xmlhr")) => %(/javascripts/xmlhr.js),
     %(javascript_path("super/xmlhr")) => %(/javascripts/super/xmlhr.js),
-    %(javascript_path("/super/xmlhr.js")) => %(/super/xmlhr.js)
+    %(javascript_path("/super/xmlhr.js")) => %(/super/xmlhr.js),
+    %(javascript_path("http://example.com/all")) => %(http://example.com/all),
+    %(javascript_path("http://example.com/all.js")) => %(http://example.com/all.js)
   }
 
   PathToJavascriptToTag = {
     %(path_to_javascript("xmlhr")) => %(/javascripts/xmlhr.js),
     %(path_to_javascript("super/xmlhr")) => %(/javascripts/super/xmlhr.js),
-    %(path_to_javascript("/super/xmlhr.js")) => %(/super/xmlhr.js)
+    %(path_to_javascript("/super/xmlhr.js")) => %(/super/xmlhr.js),
+    %(path_to_javascript("http://example.com/all")) => %(http://example.com/all),
+    %(path_to_javascript("http://example.com/all.js")) => %(http://example.com/all.js)
   }
 
   JavascriptIncludeToTag = {
     %(javascript_include_tag("xmlhr")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("xmlhr.js")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
+    %(javascript_include_tag("http://www.google.com/jsapi")) => %(<script src="http://www.google.com/jsapi" type="text/javascript"></script>),
     %(javascript_include_tag("xmlhr", :lang => "vbscript")) => %(<script lang="vbscript" src="/javascripts/xmlhr.js" type="text/javascript"></script>),
     %(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
     %(javascript_include_tag(:defaults)) => %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>),
@@ -111,7 +116,8 @@ class AssetTagHelperTest < ActionView::TestCase
     %(stylesheet_link_tag(:all, :recursive => true)) => %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/subdir/subdir.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag(:all, :media => "all")) => %(<link href="/stylesheets/bank.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="all" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="all" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />)
+    %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />)
   }
 
   ImagePathToTag = {
-- 
1.5.6.3