Merge pull request #180 from Rakoth/master

Made it possible to use fallbacks for CDN paths

Author: carsomyr

app/helpers/requirejs_helper.rb

@@ -56,7 +56,9 @@ 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 { |k, v| paths[k] = v if v =~ /^https?:/ }
+            run_config['paths'].each do |k, v|
+              paths[k] = v if v.is_a?(Array) || v =~ /^https?:/
+            end
           end
 
           # Override user paths, whose mappings are only relevant in dev mode

lib/requirejs/rails/rjs_driver.js.erb

@@ -5,11 +5,9 @@ cdn_pattern = Regexp.new("\\Ahttps?://")
 modifiedHash = build_config.select { |k, _| k != "modules" }
 pathsHash = modifiedHash["paths"]
 modifiedHash["dir"] = build_dir.to_s
-modifiedHash["paths"] = Hash[pathsHash
-  .select do |_, v|
-    !v.is_a?(Array)
-  end.map do |k, v|
-    [k, if !cdn_pattern.match(v) then v else "empty:" end]
+modifiedHash["paths"] = Hash[
+  pathsHash.map do |k, v|
+    [k, v.is_a?(Array) || cdn_pattern.match(v) ? "empty:" : v]
   end
 ] if !pathsHash.nil?