requirejs-rails 0.8.0 → 0.8.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<!--
+Marked Style: GitHub
+-->
+# v0.8.2
+
+- Fix for `requirejs_include_tag` error when `config/requirejs.yml` has no
+  `paths` key.  Thanks to @JustinLove for the issue and failing test!
+
 # v0.8.0
 
 - Build will now substitute `empty:` for the right-hand side of

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.8.0)
+    requirejs-rails (0.8.2)
       railties (>= 3.1.1, < 3.3)
 
 GEM

data/README.md

@@ -1,3 +1,6 @@
+<!--
+Marked Style: GitHub
+-->
 # RequireJS for Rails
 
 Integrates [RequireJS](http://requirejs.org/) into the Rails 3 Asset Pipeline.

data/app/helpers/requirejs_helper.rb

@@ -54,8 +54,10 @@ module RequirejsHelper
           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.

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.8.0"
+    Version = "0.8.2"
     LibVersion = "1.0.8"
   end
 end

data/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 @@ class RequirejsHelperTest < ActionView::TestCase
     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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70259994422520 !ruby/object:Gem::Requirement
+  requirement: &70237504536140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70259994422520
+  version_requirements: *70237504536140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70259994419640 !ruby/object:Gem::Requirement
+  requirement: &70237504534000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *70259994419640
+  version_requirements: *70237504534000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70259994416180 !ruby/object:Gem::Requirement
+  requirement: &70237504532100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,7 +49,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259994416180
+  version_requirements: *70237504532100
 description: This gem provides RequireJS support for your Rails 3 application.
 email:
 - whitley@bangpath.org
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -70510863405532610
+      hash: 2336144338359271813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -70510863405532610
+      hash: 2336144338359271813
 requirements:
 - node.js is required for 'rake assets:precompile', used to run the r.js build
 - If needed, jQuery should be v1.7 or greater (jquery-rails >= 1.0.17).