Merge pull request #192 from remybach/remybach-allow_protocol_relative_urls

Allow protocol relative urls for CDNs within paths

Author: carsomyr

app/helpers/requirejs_helper.rb

@@ -49,7 +49,8 @@ def requirejs_include_tag(name = nil, &block)
           if run_config.has_key? 'paths'
             # Add paths for assets specified by full URL (on a CDN)
             run_config['paths'].each do |k, v|
-              paths[k] = v if v.is_a?(Array) || v =~ /^https?:/
+              paths[k] = v if v.is_a?(Array) || v =~ /^(https?:)?\/\//
+
             end
           end
 

test/requirejs-rails_test.rb

@@ -110,10 +110,10 @@ def setup
     Rails.application.config.requirejs.delete(:build_config)
   end
 
-  def with_cdn
+  def with_cdn(protocol_relative = false)
     Rails.application.config.requirejs.user_config = {
         "paths" => {
-            "jquery" => "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
+            "jquery" => "#{ protocol_relative ? '' : 'http:' }//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
         }
     }
   end
@@ -199,4 +199,13 @@ def wrap(tag)
       Rails.application.config.assets.digest = saved_digest
     end
   end
+
+  test "requirejs_include_tag with protocol relative CDN asset in paths" do
+    with_cdn(true)
+
+    render text: wrap(requirejs_include_tag)
+
+    assert_select "script:last-of-type",
+                  text: Regexp.new("\\Arequire\\.config\\({.*\"paths\":{.*\"//ajax\\..*\".*}.*}\\);\\z")
+  end
 end