Merge pull request #50 from jwhitley/issue/50

Protect paths config with nil checks

Author: jwhitley

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.

test/requirejs-rails_test.rb

@@ -126,10 +126,15 @@ class RequirejsHelperTest < ActionView::TestCase
 
   def setup
     controller.requirejs_included = false
+    Rails.application.config.requirejs.user_config = {}
+    Rails.application.config.requirejs.delete(:run_config)
+    Rails.application.config.requirejs.delete(:build_config)
+  end
+
+  def with_cdn
     Rails.application.config.requirejs.user_config = { 'paths' => 
       { 'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' }
     }
-
   end
 
   def wrap(tag)
@@ -163,13 +168,27 @@ def wrap(tag)
     end
   end
 
+  test "requirejs_include_tag with digested asset paths" do
+    begin
+      saved_digest = Rails.application.config.assets.digest
+      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":{"foo":"/javascripts/foo"}]
+    ensure
+      Rails.application.config.assets.digest = saved_digest
+    end
+  end
+
   test "requirejs_include_tag with CDN asset in paths" do
+    with_cdn
     render :text => wrap(requirejs_include_tag)
     assert_select "script:first-of-type", :text => %r{var require =.*paths.*http://ajax}
   end
 
   test "requirejs_include_tag with CDN asset and digested asset paths" do
     begin
+      with_cdn
       saved_digest = Rails.application.config.assets.digest
       Rails.application.config.assets.digest = true
       render :text => wrap(requirejs_include_tag)