requirejs-rails 0.9.3 → 0.9.4

data/lib/requirejs/rails/config.rb

@@ -17,14 +17,15 @@ module Requirejs::Rails
       self.tmp_dir = application.root + 'tmp'
       self.bin_dir = Pathname.new(__FILE__+'/../../../../bin').cleanpath
 
-      self.source_dir = self.tmp_dir + 'assets'
+      self.source_dir = self.tmp_dir.join("requirejs/src")
+      self.build_dir = self.tmp_dir.join("requirejs/dst")
       self.target_dir = application.root + 'public/assets'
       self.rjs_path   = self.bin_dir+'r.js'
 
       self.loader = :requirejs
 
       self.driver_template_path = Pathname.new(__FILE__+'/../rjs_driver.js.erb').cleanpath
-      self.driver_path = self.tmp_dir + 'rjs_driver.js'
+      self.driver_path = self.tmp_dir.join("requirejs/rjs_driver.js")
 
       self.user_config = {}
 
@@ -142,10 +143,6 @@ module Requirejs::Rails
       end
     end
 
-    def module_path_for(mod)
-      self.target_dir+(module_name_for(mod)+'.js')
-    end
-
     def get_binding
       return binding()
     end

data/lib/requirejs/rails/engine.rb

@@ -20,12 +20,13 @@ module Requirejs
 
         config.assets.precompile += config.requirejs.precompile
 
-        # Check for the existence of the requirejs:precompile:all top-level Rake task and disable asset pipeline
-        # compression to ensure that `r.js` gets uncompressed assets.
+        # 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"
-              config.assets.js_compressor = false
+              # 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
           end
         end if defined?(Rake.application)
 

data/lib/requirejs/rails/rjs_driver.js.erb

@@ -1,46 +1,25 @@
-//Load the requirejs optimizer
-var requirejs = require('<%= rjs_path %>'),
-  //Set up basic config, include config that is
-  //common to all the optimize() calls.
-  baseConfig = <%=
-    modifiedHash = build_config.select {|k, _| k != "modules"}
-    pathsHash = modifiedHash["paths"]
-    modifiedHash["paths"] = pathsHash.select {|_, v| !v.is_a?(Array)} if !pathsHash.nil?
+var requirejs = require(<%= rjs_path.to_s.dump %>)
+var baseConfig = <%=
+cdn_pattern = Regexp.new("\\Ahttps?://")
 
-    JSON.pretty_generate(modifiedHash)
-  %>;
+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]
+  end
+] if !pathsHash.nil?
 
-// Function used to mix in baseConfig to a new config target
-function mix(target) {
-  for (var prop in baseConfig) {
-    if (baseConfig.hasOwnProperty(prop)) {
-      target[prop] = baseConfig[prop];
-    }
-  }
-  return target;
-}
+JSON.pretty_generate(modifiedHash)
+%>;
 
-var module_specs = [
-<% build_config['modules'].each do |m| %>
-<%= JSON.pretty_generate(m.merge 'out' => module_path_for(m).to_s ) %>,
+baseConfig.modules = [
+<% build_config["modules"].each do |m| %>
+  <%= JSON.pretty_generate(m) %>,
 <% end %>
 ];
 
-// Error handler invoked in case requirejs compilation fails
-var errback = function(error) {
-  process.stderr.write(error.toString());
-  process.exit(1);
-}
-
-// Do a series of builds of individual files, using the args suggested by:
-// http://requirejs.org/docs/optimization.html#onejs
-//
-// r.js will eventually need a nested call idiom to handle async
-// builds.  Anticipating that need.
-var async_runner = module_specs.reduceRight(function(prev, curr) {
-  return function (buildReportText) {
-    requirejs.optimize(mix(curr), prev, errback);
-  };
-}, function(buildReportText) {} );
-
-async_runner();
+requirejs.optimize(baseConfig);

data/lib/requirejs/rails/version.rb

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

data/lib/tasks/requirejs-rails_tasks.rake

@@ -34,12 +34,12 @@ namespace :requirejs do
 
   requirejs = ActiveSupport::OrderedOptions.new
 
-  task :clean => ["requirejs:setup"] do
+  task clean: ["requirejs:setup"] do
     FileUtils.remove_entry_secure(requirejs.config.source_dir, true)
     FileUtils.remove_entry_secure(requirejs.driver_path, true)
   end
 
-  task :setup => ["assets:environment"] do
+  task setup: ["assets:environment"] do
     unless defined?(Sprockets)
       warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
       exit
@@ -72,41 +72,67 @@ 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:prepare_source",
+               "requirejs:precompile:generate_rjs_driver",
+               "requirejs:precompile:run_rjs",
+               "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: ["requirejs:test_node"] do
       ruby_rake_task "requirejs:precompile:all"
     end
 
-    # copy all assets to tmp/assets
-    task :prepare_source => ["requirejs:setup",
-                             "requirejs:clean"] do
+    # Copy all assets to the temporary staging directory.
+    task prepare_source: ["requirejs:setup",
+                          "requirejs:clean"] do
+      bower_json_pattern = Regexp.new("\\A(.*)/bower\\.json\\z")
+      js_ext = requirejs.env.extension_for_mime_type("application/javascript")
+
       requirejs.config.source_dir.mkpath
+
+      # Save the original JS compressor and cache, which will be restored later.
+
+      original_js_compressor = requirejs.env.js_compressor
+      requirejs.env.js_compressor = false
+
+      original_cache = requirejs.env.cache
+      requirejs.env.cache = nil
+
       requirejs.env.each_logical_path do |logical_path|
-        next unless requirejs.config.asset_allowed?(logical_path)
-        if asset = requirejs.env.find_asset(logical_path)
-          filename = requirejs.config.source_dir + asset.logical_path
+        m = bower_json_pattern.match(logical_path)
+        bower_logical_path = m && "#{m[1]}#{js_ext}"
+
+        next \
+          if !(requirejs.config.asset_allowed?(logical_path) || bower_logical_path)
+
+        asset = requirejs.env.find_asset(logical_path)
+
+        if asset
+          # If a `bower.json` was found, then substitute the logical path with the parsed module name.
+          filename = requirejs.config.source_dir.join(bower_logical_path || asset.logical_path)
           filename.dirname.mkpath
           asset.write_to(filename)
         end
       end
+
+      # Restore the original JS compressor and cache.
+      requirejs.env.js_compressor = original_js_compressor
+      requirejs.env.cache = original_cache
     end
 
-    task :generate_rjs_driver => ["requirejs:setup"] do
+    task generate_rjs_driver: ["requirejs:setup"] do
       requirejs.builder.generate_rjs_driver
     end
 
-    task :run_rjs => ["requirejs:setup",
-                      "requirejs:test_node"] do
+    task run_rjs: ["requirejs:setup",
+                   "requirejs:test_node"] do
+      requirejs.config.build_dir.mkpath
       requirejs.config.target_dir.mkpath
+      requirejs.config.driver_path.dirname.mkpath
 
       result = `node "#{requirejs.config.driver_path}"`
       unless $?.success?
@@ -116,12 +142,16 @@ 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:setup"] do
       requirejs.config.build_config['modules'].each do |m|
         asset_name = "#{requirejs.config.module_name_for(m)}.js"
-        built_asset_path = requirejs.config.target_dir + asset_name
+        built_asset_path = requirejs.config.build_dir.join(asset_name)
         digest_name = asset_name.sub(/\.(\w+)$/) { |ext| "-#{requirejs.builder.digest_for(built_asset_path)}#{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
         FileUtils.cp built_asset_path, digest_asset_path
 

data/requirejs-rails.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ["John Whitley"]
   s.email       = ["whitley@bangpath.org"]
   s.homepage    = "http://github.com/jwhitley/requirejs-rails"
-  s.summary     = "Use RequireJS with the Rails 3 Asset Pipeline"
+  s.summary     = "Use RequireJS with the Rails 3+ Asset Pipeline"
   s.description = "This gem provides RequireJS support for your Rails 3 application."
 
   git_test_files, git_files = `git ls-files`.split("\n").partition { |f| f =~ /^test/ }

data/vendor/assets/javascripts/require.js

@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.11 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.14 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.11',
+        version = '2.1.14',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -180,7 +180,7 @@ var requirejs, require, define;
 
     if (typeof requirejs !== 'undefined') {
         if (isFunction(requirejs)) {
-            //Do not overwrite and existing requirejs instance.
+            //Do not overwrite an existing requirejs instance.
             return;
         }
         cfg = requirejs;
@@ -232,21 +232,20 @@ var requirejs, require, define;
          * @param {Array} ary the array of path segments.
          */
         function trimDots(ary) {
-            var i, part, length = ary.length;
-            for (i = 0; i < length; i++) {
+            var i, part;
+            for (i = 0; i < ary.length; i++) {
                 part = ary[i];
                 if (part === '.') {
                     ary.splice(i, 1);
                     i -= 1;
                 } else if (part === '..') {
-                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
-                        //End of the line. Keep at least one non-dot
-                        //path segment at the front so it can be mapped
-                        //correctly to disk. Otherwise, there is likely
-                        //no path mapping for a path starting with '..'.
-                        //This can still fail, but catches the most reasonable
-                        //uses of ..
-                        break;
+                    // If at the start, or previous value is still ..,
+                    // keep them so that when converted to a path it may
+                    // still work when converted to a path, even though
+                    // as an ID it is less than ideal. In larger point
+                    // releases, may be better to just kick out an error.
+                    if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+                        continue;
                     } else if (i > 0) {
                         ary.splice(i - 1, 2);
                         i -= 2;
@@ -267,43 +266,37 @@ var requirejs, require, define;
          */
         function normalize(name, baseName, applyMap) {
             var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
-                foundMap, foundI, foundStarMap, starI,
-                baseParts = baseName && baseName.split('/'),
-                normalizedBaseParts = baseParts,
+                foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+                baseParts = (baseName && baseName.split('/')),
                 map = config.map,
                 starMap = map && map['*'];
 
             //Adjust any relative paths.
-            if (name && name.charAt(0) === '.') {
-                //If have a base name, try to normalize against it,
-                //otherwise, assume it is a top-level require that will
-                //be relative to baseUrl in the end.
-                if (baseName) {
+            if (name) {
+                name = name.split('/');
+                lastIndex = name.length - 1;
+
+                // If wanting node ID compatibility, strip .js from end
+                // of IDs. Have to do this here, and not in nameToUrl
+                // because node allows either .js or non .js to map
+                // to same file.
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+                }
+
+                // Starts with a '.' so need the baseName
+                if (name[0].charAt(0) === '.' && baseParts) {
                     //Convert baseName to array, and lop off the last part,
                     //so that . matches that 'directory' and not name of the baseName's
                     //module. For instance, baseName of 'one/two/three', maps to
                     //'one/two/three.js', but we want the directory, 'one/two' for
                     //this normalization.
                     normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    name = name.split('/');
-                    lastIndex = name.length - 1;
-
-                    // If wanting node ID compatibility, strip .js from end
-                    // of IDs. Have to do this here, and not in nameToUrl
-                    // because node allows either .js or non .js to map
-                    // to same file.
-                    if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                        name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                    }
-
                     name = normalizedBaseParts.concat(name);
-                    trimDots(name);
-                    name = name.join('/');
-                } else if (name.indexOf('./') === 0) {
-                    // No baseName, so this is ID is resolved relative
-                    // to baseUrl, pull off the leading dot.
-                    name = name.substring(2);
                 }
+
+                trimDots(name);
+                name = name.join('/');
             }
 
             //Apply map config if available.
@@ -379,7 +372,13 @@ var requirejs, require, define;
                 //retry
                 pathConfig.shift();
                 context.require.undef(id);
-                context.require([id]);
+
+                //Custom require that does not do map translation, since
+                //ID is "absolute", already mapped/resolved.
+                context.makeRequire(null, {
+                    skipMap: true
+                })([id]);
+
                 return true;
             }
         }
@@ -445,7 +444,16 @@ var requirejs, require, define;
                             return normalize(name, parentName, applyMap);
                         });
                     } else {
-                        normalizedName = normalize(name, parentName, applyMap);
+                        // If nested plugin references, then do not try to
+                        // normalize, as it will not normalize correctly. This
+                        // places a restriction on resourceIds, and the longer
+                        // term solution is not to normalize until plugins are
+                        // loaded and all normalizations to allow for async
+                        // loading of a loader plugin. But for now, fixes the
+                        // common uses. Details in #1131
+                        normalizedName = name.indexOf('!') === -1 ?
+                                         normalize(name, parentName, applyMap) :
+                                         name;
                     }
                 } else {
                     //A regular module.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - John Whitley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -139,7 +139,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Use RequireJS with the Rails 3 Asset Pipeline
+summary: Use RequireJS with the Rails 3+ Asset Pipeline
 test_files:
 - test/dummy/.rvmrc
 - test/dummy/Rakefile
@@ -176,3 +176,4 @@ test_files:
 - test/dummy/script/rails
 - test/requirejs-rails_test.rb
 - test/test_helper.rb
+has_rdoc: