Fix for empty 'paths' config with digested assets

erickreutz · May 8, 2012 · 859563d · 859563d
1 parent f5a5b95
commit 859563d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/helpers/requirejs_helper.rb b/app/helpers/requirejs_helper.rb
@@ -54,8 +54,10 @@ def requirejs_include_tag(name=nil, &block)
           paths = {}
           modules.each { |m| paths[m] = _javascript_path(m).sub /\.js$/,'' }
 
-          # Add paths for assets specified by full URL (on a CDN)
-          run_config['paths'].each { |k,v| paths[k] = v if v =~ /^https?:/ }
+          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?:/ }
+          end
 
           # Override user paths, whose mappings are only relevant in dev mode
           # and in the build_config.

diff --git a/test/requirejs-rails_test.rb b/test/requirejs-rails_test.rb
@@ -174,7 +174,7 @@ def wrap(tag)
       Rails.application.config.assets.digest = true
       Rails.application.config.requirejs.user_config = { 'modules' => [{'name' => 'foo'}] }
       render :text => wrap(requirejs_include_tag)
-      assert_select "script:first-of-type", :text => %r{var require =.*paths.*http://ajax}
+      assert_select "script:first-of-type", :text => %r[var require =.*"paths":{"foo":"/javascripts/foo"}]
     ensure
       Rails.application.config.assets.digest = saved_digest
     end