requirejs-rails 0.9.8 → 0.9.9

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.8"
-    LibVersion = "2.1.17"
+    Version = "0.9.9"
+    LibVersion = "2.1.19"
   end
 end

data/lib/tasks/requirejs-rails_tasks.rake

@@ -32,6 +32,7 @@ namespace :requirejs do
   end
 
   requirejs = ActiveSupport::OrderedOptions.new
+  path_extension_pattern = Regexp.new("\\.(\\w+)\\z")
 
   task clean: ["requirejs:setup"] do
     FileUtils.remove_entry_secure(requirejs.config.source_dir, true)
@@ -71,17 +72,14 @@ OS X Homebrew users can use 'brew install node'.
   end
 
   namespace :precompile do
-    task all: ["requirejs:precompile:prepare_source",
-               "requirejs:precompile:generate_rjs_driver",
-               "requirejs:precompile:run_rjs",
-               "requirejs:precompile:digestify_and_compress"]
+    task all: ["requirejs:precompile:digestify_and_compress"]
 
     # Invoke another ruby process if we're called from inside
     # assets:precompile so we don't clobber the environment
     #
     # We depend on test_node here so we'll fail early and hard if node
     # isn't available.
-    task external: ["requirejs:test_node"] do
+    task :external do
       ruby_rake_task "requirejs:precompile:all"
     end
 
@@ -110,7 +108,7 @@ OS X Homebrew users can use 'brew install node'.
             asset.write_to(file)
           end
         else
-          bower_logical_path = Pathname.new(logical_path).dirname.sub_ext(".js").to_s
+          bower_logical_path = "#{Pathname.new(logical_path).dirname.to_s}.js"
           asset = requirejs.env.find_asset(bower_logical_path)
 
           if asset
@@ -131,7 +129,9 @@ OS X Homebrew users can use 'brew install node'.
     end
 
     task run_rjs: ["requirejs:setup",
-                   "requirejs:test_node"] do
+                   "requirejs:test_node",
+                   "requirejs:precompile:prepare_source",
+                   "requirejs:precompile:generate_rjs_driver"] do
       requirejs.config.build_dir.mkpath
       requirejs.config.target_dir.mkpath
       requirejs.config.driver_path.dirname.mkpath
@@ -144,28 +144,34 @@ OS X Homebrew users can use 'brew install node'.
 
     # Copy each built asset, identified by a named module in the
     # build config, to its Sprockets digestified name.
-    task digestify_and_compress: ["requirejs:setup"] do
+    task digestify_and_compress: ["requirejs:precompile:run_rjs"] do
       requirejs.config.build_config["modules"].each do |m|
         module_name = requirejs.config.module_name_for(m)
         paths = requirejs.config.build_config["paths"] || {}
+        module_script_name = "#{module_name}.js"
 
         # Is there a `paths` entry for the module?
         if !paths[module_name]
-          asset_name = Pathname.new(module_name).sub_ext(".js").to_s
+          asset_name = module_script_name
         else
-          asset_name = Pathname.new(paths[module_name]).sub_ext(".js").to_s
+          asset_name = "#{paths[module_name]}.js"
         end
 
         asset = requirejs.env.find_asset(asset_name)
 
         built_asset_path = requirejs.config.build_dir.join(asset_name)
-        digest_name = asset.digest_path
+
+        # Compute the digest based on the contents of the compiled file, *not* on the contents of the RequireJS module.
+        file_digest = ::Rails.application.assets.file_digest(built_asset_path)
+        hex_digest = Sprockets::DigestUtils.pack_hexdigest(file_digest)
+        digest_name = asset.logical_path.gsub(path_extension_pattern) { |ext| "-#{hex_digest}#{ext}" }
+
         digest_asset_path = requirejs.config.target_dir + digest_name
 
         # Ensure that the parent directory `a/b` for modules with names like `a/b/c` exist.
         digest_asset_path.dirname.mkpath
 
-        requirejs.manifest[asset_name] = digest_name
+        requirejs.manifest[module_script_name] = digest_name
         FileUtils.cp built_asset_path, digest_asset_path
 
         # Create the compressed versions

data/vendor/assets/javascripts/require.js

@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.17 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.19 Copyright (c) 2010-2015, 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.17',
+        version = '2.1.19',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -589,7 +589,7 @@ var requirejs, require, define;
                         id: mod.map.id,
                         uri: mod.map.url,
                         config: function () {
-                            return  getOwn(config.config, mod.map.id) || {};
+                            return getOwn(config.config, mod.map.id) || {};
                         },
                         exports: mod.exports || (mod.exports = {})
                     });
@@ -1117,6 +1117,9 @@ var requirejs, require, define;
                         this.depCount += 1;
 
                         on(depMap, 'defined', bind(this, function (depExports) {
+                            if (this.undefed) {
+                                return;
+                            }
                             this.defineDep(i, depExports);
                             this.check();
                         }));
@@ -1233,7 +1236,8 @@ var requirejs, require, define;
             while (defQueue.length) {
                 args = defQueue.shift();
                 if (args[0] === null) {
-                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
+                        args[args.length - 1]));
                 } else {
                     //args are id, deps, factory. Should be normalized by the
                     //define() function.
@@ -1320,7 +1324,7 @@ var requirejs, require, define;
                     each(cfg.packages, function (pkgObj) {
                         var location, name;
 
-                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+                        pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
 
                         name = pkgObj.name;
                         location = pkgObj.location;
@@ -1347,7 +1351,7 @@ var requirejs, require, define;
                     //late to modify them, and ignore unnormalized ones
                     //since they are transient.
                     if (!mod.inited && !mod.map.unnormalized) {
-                        mod.map = makeModuleMap(id);
+                        mod.map = makeModuleMap(id, null, true);
                     }
                 });
 
@@ -1483,6 +1487,7 @@ var requirejs, require, define;
                         var map = makeModuleMap(id, relMap, true),
                             mod = getOwn(registry, id);
 
+                        mod.undefed = true;
                         removeScript(id);
 
                         delete defined[id];
@@ -1493,7 +1498,7 @@ var requirejs, require, define;
                         //in array so that the splices do not
                         //mess up the iteration.
                         eachReverse(defQueue, function(args, i) {
-                            if(args[0] === id) {
+                            if (args[0] === id) {
                                 defQueue.splice(i, 1);
                             }
                         });
@@ -1852,6 +1857,9 @@ var requirejs, require, define;
         if (isBrowser) {
             //In the browser so use a script tag
             node = req.createNode(config, moduleName, url);
+            if (config.onNodeCreated) {
+                config.onNodeCreated(node, config, moduleName, url);
+            }
 
             node.setAttribute('data-requirecontext', context.contextName);
             node.setAttribute('data-requiremodule', moduleName);
@@ -1980,7 +1988,7 @@ var requirejs, require, define;
                 //like a module name.
                 mainScript = mainScript.replace(jsSuffixRegExp, '');
 
-                 //If mainScript is still a path, fall back to dataMain
+                //If mainScript is still a path, fall back to dataMain
                 if (req.jsExtRegExp.test(mainScript)) {
                     mainScript = dataMain;
                 }
@@ -2066,7 +2074,6 @@ var requirejs, require, define;
         jQuery: true
     };
 
-
     /**
      * Executes the text. Normally just uses eval, but can be modified
      * to use a better, environment-specific call. Only used for transpiling

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - John Whitley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties