requirejs-rails 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6ce0c99c3151a689f1d8c371b6381c38b3e1c6
-  data.tar.gz: f21378b56bb3b4b5424237fa3a685e267bf80b1e
+  metadata.gz: 5e6e1a6b4dcfccf6349e7b4f3f45a21725f3f0b9
+  data.tar.gz: 759a8ae32987c747490a3644fdb1f5ff0dd4032d
 SHA512:
-  metadata.gz: a913d4acffffc68b62b5489fe2edd1b3eec89eae4642444924aeaeff67c505cbb8c0462f724f05f6cab88fafd3ec165762796aba649b315343e09aff95ae5a2a
-  data.tar.gz: ef34cd90ff78e3920b02c6125eb74105a50555b64b555a7c086a302b435b6d914cdb473d0cbbe88714a8ce113b00e300e979732c826f521420df50a6a4e0aeb0
+  metadata.gz: de28293e70d15e53b87a18c46dc3272f874e583edae8e8da4cbece14fd63fd942ccacc80a65311e14d5690bfaf436cabd7a00b88d9e1fcee44a3fc0a4db1bc77
+  data.tar.gz: a160056a3264a6a3630a73d6f0fa4b57f963e622135b7b1464b77fe1310217d9166e5bca56097030e964628fd5d653ab9b5457ece2dea9c432b58140f928fbd8

data/CHANGELOG.md

@@ -1,53 +1,63 @@
-<!--
-Marked Style: GitHub
--->
-# v0.9.4
+<!-- Marked Style: GitHub -->
+
+## requirejs-rails changelog
+
+### v0.9.5
+
+- Update `require.js` and `r.js` to `2.1.15`, and `almond.js` to `0.3.0`.
+- Remove `data-main` attribute generation from `requirejs_include_tag` and replicate its functionality with an explicit
+  `require` call. This paves the way for proper almond support.
+- Instead of disabling JS compression everywhere, only do so when staging `r.js` input files. This enables `require.js`
+  itself to be compiled (or not) by the asset pipeline, like any other asset.
+- Add support for `bower.json` modules.
+
+### v0.9.4
 
 - Restore compression of non-module JS assets if specified, including `require.js` itself.
 - Update `require.js` to `2.1.14`.
 
-# v0.9.3
+### v0.9.3
 
 - Add detection and proper handling of Bower-based modules.
 - Update `require.js` to `2.1.11` and `almond.js` to `0.2.9`.
 
-# v0.9.2
+### v0.9.2
 
 - Update `require.js` to `2.1.10` and `almond.js` to `0.2.5`.
 - Rails 4 support.
 
-# v0.9.1
+### v0.9.1
 
 - Updated to to require.js \ r.js 2.1.2, and almond 0.2.3
 
-# v0.9.0
+### v0.9.0
 
 - **BREAKING CHANGE**: Upgrade RequireJS and r.js to v2.0.0
 - order.js was removed. See the new [RequireJS 2.0 shim config](https://github.com/jrburke/requirejs/wiki/Upgrading-to-RequireJS-2.0#wiki-shim).
 - Build support for `empty:` is now handled by r.js 2.0 natively.
 
-# v0.8.2
+### 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
+### v0.8.0
 
 - Build will now substitute `empty:` for the right-hand side of
   `config/requirejs.yml` paths entries that are URLs.
 - Documented how to configure assets hosted on a CDN.
 
-# v0.7.3
+### v0.7.3
 
 - Upgrade RequireJS and r.js to v1.0.8
 
-# v0.7.2
+### v0.7.2
 
 - Add require.js to config.assets.precompile in all environments.  Closes #45.
   This change allows builds to work in Rails environments other than
   'production', e.g. 'staging'.  Thanks to @hollow for the fix.
 
-# v0.7.1
+### v0.7.1
 
 - Liberalize asset path filtering.  `0.7.0` added filtering on the logical
   asset path which was too aggressive in that only `.js` files were allowed in
@@ -55,7 +65,7 @@ Marked Style: GitHub
   added, which allows `.js`, `.html`, `.txt` files by default and is user
   configurable.
 
-# v0.7.0
+### v0.7.0
 
 - Support for [almond](https://github.com/jrburke/almond) via
   `config.requirejs.loader = :almond` in application.rb.
@@ -66,11 +76,11 @@ Marked Style: GitHub
   leverage the asset pipeline for their needs.  Thanks to @hollow for the
   patch.
 
-# v0.6.1
+### v0.6.1
 
 - Fix regression in production env when `paths` specified in requirejs.yml.
 
-# v0.6.0
+### v0.6.0
 
 **NOTE:** Upgrade to 0.6.1! This was yanked due to a regression.
 
@@ -80,30 +90,30 @@ Marked Style: GitHub
   tag via `requirejs_include_tag`. See [README](README.md) for details. Closes 
   pull request #32; thanks to @hollow for the submission!
 
-# v0.5.6
+### v0.5.6
 
 - Upgrade to RequireJS and r.js 1.0.7
 
-# v0.5.5
+### v0.5.5
 
 - Support for Rails 3.2.x.  Rails 3.1.x is also supported by this release.
 
-# v0.5.4
+### v0.5.4
 
 - Upgrade to RequireJS and r.js 1.0.5
 - Pull request #31, closes #30.  Thanks @karelim!
 
-# v0.5.3
+### v0.5.3
 
 - Upgrade to RequireJS and r.js 1.0.4
 - Pulled #22, fix for asset compliation failure with no config/requirejs.yml.
   Thanks @arehberg!
 
-# v0.5.2
+### v0.5.2
 
 - Upgrade to RequireJS and r.js 1.0.3
 
-# v0.5.1
+### v0.5.1
 
 - This is a quick turn to fix an issue that could trigger an Anonymous mismatched define() error from require.js and/or r.js.
 
@@ -121,21 +131,20 @@ Marked Style: GitHub
 
     Thanks to Andrew de Andrade for the catch.
 
-# v0.5.0
+### v0.5.0
 
 - Precompilation via `rake assets:precompile` is now implemented.
 - gem configuration via application.js is deprecated.
 - Application-specific require.js configuration lives in `config/requirejs.yml`.
 - See [README](README.md) for updated usage details.
 
-# v0.0.2
+### v0.0.2
 
 - Fixed stupid problems with Rails::Engine instantiation.
 - Test improvements
 - Upgrade to RequireJS 1.0.2
 
-# v0.0.1
+### v0.0.1
 
 - Birthday!
 - This gem makes `require.js` and the `order.js` plugin available to the Rails 3 Asset Pipeline.
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.9.4)
+    requirejs-rails (0.9.5)
       railties (>= 3.1.1)
 
 GEM

data/app/helpers/requirejs_helper.rb

@@ -7,36 +7,27 @@ module RequirejsHelper
   mattr_accessor :_priority
   @@_priority = []
 
-  def _requirejs_data(name, &block)
-    {}.tap do |data|
-      if name
-        name += ".js" unless name =~ /\.js$/
-        data['main'] = _javascript_path(name) \
-          .sub(/\.js$/, '') \
-          .sub(base_url(name), '') \
-          .sub(/\A\//, '')
-      end
-
-      data.merge!(yield controller) if block_given?
-    end.map do |k, v|
-      %Q{data-#{k}="#{v}"}
-    end.join(" ")
-  end
-
   def requirejs_include_tag(name=nil, &block)
     requirejs = Rails.application.config.requirejs
 
     if requirejs.loader == :almond
       name = requirejs.module_name_for(requirejs.build_config['modules'][0])
-      return _almond_include_tag(name, &block)
+      return almond_include_tag(name, &block)
     end
 
     html = ""
 
-    _once_guard do
-      html.concat <<-HTML
-      <script #{_requirejs_data(name, &block)} src="#{_javascript_path 'require.js'}"></script>
-      HTML
+    once_guard do
+      rjs_attributes = {
+          src: javascript_path("require")
+      }
+
+      rjs_attributes = rjs_attributes.merge(Hash[block.call(controller).map do |key, value|
+        ["data-#{key}", value]
+      end]) \
+        if block
+
+      html.concat(content_tag(:script, "", rjs_attributes))
 
       unless requirejs.run_config.empty?
         run_config = requirejs.run_config.dup
@@ -52,11 +43,13 @@ module RequirejsHelper
 
           # Generate digestified paths from the modules spec
           paths = {}
-          modules.each { |m| paths[m] = _javascript_path(m).sub /\.js$/, '' }
+          modules.each { |m| paths[m] = javascript_path(m).sub /\.js$/, '' }
 
           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
@@ -65,16 +58,34 @@ module RequirejsHelper
         end
 
         run_config['baseUrl'] = base_url(name)
-        html.concat <<-HTML
-        <script>require.config(#{run_config.to_json});</script>
-        HTML
+
+        html.concat(content_tag(:script) do
+          script = "require.config(#{run_config.to_json});"
+
+          # Pass an array to `require`, since it's a top-level module about to be loaded asynchronously (see
+          # `http://requirejs.org/docs/errors.html#notloaded`).
+          script.concat(" require([#{name.dump}]);") \
+            if name
+
+          script.html_safe
+        end)
       end
 
       html.html_safe
     end
   end
 
-  def _once_guard
+  def javascript_path(name)
+    if defined?(super)
+      super
+    else
+      "/assets/#{name}"
+    end
+  end
+
+  private
+
+  def once_guard
     if defined?(controller) && controller.requirejs_included
       raise Requirejs::MultipleIncludeError, "Only one requirejs_include_tag allowed per page."
     end
@@ -85,16 +96,8 @@ module RequirejsHelper
     retval
   end
 
-  def _almond_include_tag(name, &block)
-    "<script src='#{_javascript_path name}'></script>\n".html_safe
-  end
-
-  def _javascript_path(name)
-    if defined?(javascript_path)
-      javascript_path(name)
-    else
-      "/assets/#{name}"
-    end
+  def almond_include_tag(name, &block)
+    content_tag(:script, "", src: javascript_path(name))
   end
 
   def base_url(js_asset)

data/bin/r.js

@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
 (function (console, args, readFileFunc) {
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
-        version = '2.1.14',
+        version = '2.1.15',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -238,7 +238,7 @@ var requirejs, require, define, xpcUtil;
     }
 
     /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -251,7 +251,7 @@ var requirejs, require, define, xpcUtil;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.14',
+        version = '2.1.15',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -22949,7 +22949,7 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
         //Like traverse, but skips if branches that would not be processed
         //after has application that results in tests of true or false boolean
         //literal values.
-        var key, child, result, i, params, param,
+        var key, child, result, i, params, param, tempObject,
             hasHas = options && options.has;
 
         fnExpScope = fnExpScope || emptyScope;
@@ -22979,23 +22979,23 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
 
             //Build up a "scope" object that informs nested recurse calls if
             //the define call references an identifier that is likely a UMD
-            //wrapped function expresion argument.
+            //wrapped function expression argument.
             if (object.type === 'ExpressionStatement' && object.expression &&
                     object.expression.type === 'CallExpression' && object.expression.callee &&
                     object.expression.callee.type === 'FunctionExpression') {
-                    object = object.expression.callee;
-
-                    if (object.params && object.params.length) {
-                        params = object.params;
-                        fnExpScope = mixin({}, fnExpScope, true);
-                        for (i = 0; i < params.length; i++) {
-                            param = params[i];
-                            if (param.type === 'Identifier') {
-                                fnExpScope[param.name] = true;
-                            }
+                tempObject = object.expression.callee;
+
+                if (tempObject.params && tempObject.params.length) {
+                    params = tempObject.params;
+                    fnExpScope = mixin({}, fnExpScope, true);
+                    for (i = 0; i < params.length; i++) {
+                        param = params[i];
+                        if (param.type === 'Identifier') {
+                            fnExpScope[param.name] = true;
                         }
                     }
                 }
+            }
 
             for (key in object) {
                 if (object.hasOwnProperty(key)) {
@@ -23014,12 +23014,12 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
             //wrapping.
             if (typeof result === 'string') {
                 if (hasProp(fnExpScope, result)) {
-                    //Just a plain return, parsing can continue past this
-                    //point.
-                    return;
+                    //result still in scope, keep jumping out indicating the
+                    //identifier still in use.
+                    return result;
                 }
 
-                return result;
+                return;
             }
         }
     };
@@ -26539,7 +26539,8 @@ define('build', function (require) {
                 "excludeShallow": true,
                 "insertRequire": true,
                 "stubModules": true,
-                "deps": true
+                "deps": true,
+                "mainConfigFile": true
             };
 
         for (i = 0; i < ary.length; i++) {

data/lib/requirejs/rails/engine.rb

@@ -21,14 +21,20 @@ module Requirejs
         config.assets.precompile += config.requirejs.precompile
 
         # Check for the `requirejs:precompile:all` top-level Rake task and run the following initialization code.
-        Rake.application.top_level_tasks.each do |task_name|
-          case task_name
-            when "requirejs:precompile:all"
-              # Enable class reloading so that Sprockets doesn't freeze the assets environment. This allows settings
-              # for JS compression to be changes on a per-file basis.
-              config.cache_classes = false
+        if defined?(Rake.application) && Rake.application.top_level_tasks == ["requirejs:precompile:all"]
+          # Prevent Sprockets from freezing the assets environment, which allows JS compression to be toggled on a per-
+          # file basis. This trick *will* fail if any of the lines linked to below change.
+
+          if ::Rails::VERSION::MAJOR >= 4
+            # For Rails 4 (see
+            # `https://github.com/rails/sprockets-rails/blob/v2.1.2/lib/sprockets/railtie.rb#L119-121`).
+            config.cache_classes = false
+          else
+            # For Rails 3 (see
+            # `https://github.com/rails/rails/blob/v3.2.19/actionpack/lib/sprockets/bootstrap.rb#L32-34`).
+            config.assets.digest = false
           end
-        end if defined?(Rake.application)
+        end
 
         manifest_directory = config.assets.manifest || File.join(::Rails.public_path, config.assets.prefix)
         manifest_path = File.join(manifest_directory, "rjs_manifest.yml")
@@ -44,7 +50,7 @@ module Requirejs
         end
       end
 
-      if ::Rails::VERSION::STRING >= "4.0.0"
+      if ::Rails::VERSION::MAJOR >= 4
         config.after_initialize do |app|
           config = app.config
           rails_manifest_path = File.join(app.root, 'public', config.assets.prefix)

data/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?
 

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.4"
-    LibVersion = "2.1.14"
+    Version = "0.9.5"
+    LibVersion = "2.1.15"
   end
 end

data/test/requirejs-rails_test.rb

@@ -9,7 +9,7 @@ class RequirejsRailsTest < ActiveSupport::TestCase
     assert_kind_of Module, Requirejs::Rails
     assert_kind_of Class, Requirejs::Rails::Engine
   end
-  
+
   test "require.js version" do
     require_js = Pathname.new(__FILE__+'/../../vendor/assets/javascripts/require.js').cleanpath.read
     context = ExecJS.compile(require_js)
@@ -51,13 +51,13 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
 
   test "user_config should reject baseUrl" do
     exc = assert_raises Requirejs::ConfigError do
-      @cfg.user_config = { 'baseUrl' => '/frobnitz' }
+      @cfg.user_config = {'baseUrl' => '/frobnitz'}
     end
     assert_match /baseUrl is not needed/, exc.message
   end
 
   test "run_config should inherit user_config settings" do
-    @cfg.user_config = { 'paths' => { 'jquery' => 'lib/jquery-1.7.2.min' } }
+    @cfg.user_config = {'paths' => {'jquery' => 'lib/jquery-1.7.2.min'}}
     refute_nil @cfg.run_config['paths']
     assert_kind_of Hash, @cfg.run_config['paths']
     assert_equal 'lib/jquery-1.7.2.min', @cfg.run_config['paths']['jquery']
@@ -69,32 +69,32 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
   end
 
   test "build_config should inherit user_config settings" do
-    @cfg.user_config = { 'paths' => { 'jquery' => 'lib/jquery-1.7.2.min' } }
+    @cfg.user_config = {'paths' => {'jquery' => 'lib/jquery-1.7.2.min'}}
     refute_nil @cfg.build_config['paths']
     assert_kind_of Hash, @cfg.build_config['paths']
     assert_equal 'lib/jquery-1.7.2.min', @cfg.build_config['paths']['jquery']
   end
 
   test "run_config should reject irrelevant settings" do
-    @cfg.user_config = { 'optimize' => 'none' }
-    assert_nil @cfg.run_config['optimize'] 
+    @cfg.user_config = {'optimize' => 'none'}
+    assert_nil @cfg.run_config['optimize']
   end
 
   test "build_config should reject irrelevant settings" do
-    @cfg.user_config = { 'priority' => %w{ foo bar baz } }
-    assert_nil @cfg.build_config['priority'] 
+    @cfg.user_config = {'priority' => %w{ foo bar baz }}
+    assert_nil @cfg.build_config['priority']
   end
 
   ## Almond tests
   test "build_config with almond should accept one module" do
     @cfg.loader = :almond
-    @cfg.user_config = { 'modules' => [ { 'name' => 'foo' } ] }
+    @cfg.user_config = {'modules' => [{'name' => 'foo'}]}
     assert_match 'almond', @cfg.build_config['modules'][0]['name']
   end
 
   test "build_config with almond must reject more than one module" do
     @cfg.loader = :almond
-    @cfg.user_config = { 'modules' => [ { 'name' => 'foo' }, { 'name' => 'bar' } ] }
+    @cfg.user_config = {'modules' => [{'name' => 'foo'}, {'name' => 'bar'}]}
     exc = assert_raises Requirejs::ConfigError do
       @cfg.build_config
     end
@@ -103,7 +103,6 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
 end
 
 class RequirejsHelperTest < ActionView::TestCase
-  
   def setup
     controller.requirejs_included = false
     Rails.application.config.requirejs.user_config = {}
@@ -112,49 +111,61 @@ class RequirejsHelperTest < ActionView::TestCase
   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' }
+    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)
     "<html><head>#{tag}</head></html>"
   end
-  
+
   test "requirejs_include_tag" do
-    render :text => wrap(requirejs_include_tag)
-    assert_select "script:first-of-type", :text => /var require =/
-    assert_select "script:last-of-type[src^=/javascripts/require.js]", :count => 1
+    render text: wrap(requirejs_include_tag)
+
+    assert_select "script:first-of-type[src=\"/javascripts/require.js\"]", count: 1
+    assert_select "script:last-of-type", text: "require.config({\"baseUrl\":\"/assets\"});"
   end
-  
+
   test "requirejs_include_tag_with_param" do
-    render :text => wrap(requirejs_include_tag("application"))
-    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=javascripts/application]", :count => 1
+    render text: wrap(requirejs_include_tag("application"))
+
+    assert_select "script:first-of-type[src=\"/javascripts/require.js\"]", count: 1
   end
-  
+
   test "requirejs_include_tag_with_block" do
-    test_block = Proc.new do |controller| 
-      { 'class' => controller.class.to_s.demodulize }
-    end
+    render text: wrap(requirejs_include_tag("application") do
+      {"class" => controller.class.name.demodulize}
+    end)
 
-    render :text => wrap(requirejs_include_tag("application", &test_block))
-    assert_select "script:last-of-type[src^=/javascripts/require.js][data-main^=javascripts/application]", :count => 1
-    assert_select "script:last-of-type[src^=/javascripts/require.js][data-class^=TestController]", :count => 1
+    assert_select "script:first-of-type[src=\"/javascripts/require.js\"]" \
+      "[data-class=\"TestController\"]", count: 1
   end
 
   test "requirejs_include_tag can appear only once" do
     assert_raises Requirejs::MultipleIncludeError do
-      render :text => "#{requirejs_include_tag}\n#{requirejs_include_tag}"
+      requirejs_include_tag
+      requirejs_include_tag
     end
   end
 
-  test "requirejs_include_tag with digested asset paths" do
+  test "requirejs_include_tag with digestified asset paths" do
     begin
+      Rails.application.config.requirejs.user_config = {
+          "modules" => [
+              {"name" => "foo"}
+          ]
+      }
+
       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"}]
+
+      render text: wrap(requirejs_include_tag)
+
+      assert_select "script:last-of-type",
+                    text: Regexp.new("\\Arequire\\.config\\({.*\"paths\":{.*\"foo\":\"/javascripts/foo\".*}.*}\\);\\z")
     ensure
       Rails.application.config.assets.digest = saved_digest
     end
@@ -162,17 +173,24 @@ class RequirejsHelperTest < ActionView::TestCase
 
   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}
+
+    render text: wrap(requirejs_include_tag)
+
+    assert_select "script:last-of-type",
+                  text: Regexp.new("\\Arequire\\.config\\({.*\"paths\":{.*\"http://ajax\\..*\".*}.*}\\);\\z")
   end
 
-  test "requirejs_include_tag with CDN asset and digested asset paths" do
+  test "requirejs_include_tag with CDN asset and digestified 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)
-      assert_select "script:first-of-type", :text => %r{var require =.*paths.*http://ajax}
+
+      render text: wrap(requirejs_include_tag)
+
+      assert_select "script:last-of-type",
+                    text: Regexp.new("\\Arequire\\.config\\({.*\"paths\":{.*\"http://ajax\\..*\".*}.*}\\);\\z")
     ensure
       Rails.application.config.assets.digest = saved_digest
     end

data/vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * @license almond 0.2.9 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * @license almond 0.3.0 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
  */
@@ -150,7 +150,15 @@ var requirejs, require, define;
             //A version of a require function that passes a moduleName
             //value for items that may need to
             //look up paths relative to the moduleName
-            return req.apply(undef, aps.call(arguments, 0).concat([relName, forceSync]));
+            var args = aps.call(arguments, 0);
+
+            //If first arg is not require('string'), and there is only
+            //one arg, it is the array form without a callback. Insert
+            //a null so that the following concat is correct.
+            if (typeof args[0] !== 'string' && args.length === 1) {
+                args.push(null);
+            }
+            return req.apply(undef, args.concat([relName, forceSync]));
         };
     }
 

data/vendor/assets/javascripts/require.js

@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -12,7 +12,7 @@ var requirejs, require, define;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.14',
+        version = '2.1.15',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - John Whitley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties