From 859563d30da7865e3a3596f13f4d41160d2f9471 Mon Sep 17 00:00:00 2001 From: John Whitley Date: Tue, 8 May 2012 15:31:12 -0700 Subject: [PATCH] Fix for empty 'paths' config with digested assets --- app/helpers/requirejs_helper.rb | 6 ++++-- test/requirejs-rails_test.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/helpers/requirejs_helper.rb b/app/helpers/requirejs_helper.rb index 78fdbf1c..8de6197e 100644 --- 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 index 83266821..e22f0a8f 100644 --- 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