Exclude fallback paths when compiling with r.js, as they don't make sense for compilation purposes and cause r.js to choke

Author: carsomyr

Gemfile.lock

@@ -7,88 +7,82 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    atomic (1.1.15)
+    builder (3.1.4)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    execjs (2.0.2)
+    hike (1.2.3)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.7)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.9.0)
+    polyglot (0.3.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    sprockets (2.1.3)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    thor (0.18.1)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby

lib/requirejs/rails/rjs_driver.js.erb

@@ -2,13 +2,19 @@
 var requirejs = require('<%= rjs_path %>'),
   //Set up basic config, include config that is
   //common to all the optimize() calls.
-  basConfig = <%= JSON.pretty_generate(build_config.reject {|k,v| k == 'modules'}) %>;
+  baseConfig = <%=
+    modifiedHash = build_config.select {|k, _| k != "modules"}
+    pathsHash = modifiedHash["paths"]
+    modifiedHash["paths"] = pathsHash.select {|_, v| !v.is_a?(Array)} if !pathsHash.nil?
+
+    JSON.pretty_generate(modifiedHash)
+  %>;
 
 // Function used to mix in baseConfig to a new config target
 function mix(target) {
-  for (var prop in basConfig) {
-    if (basConfig.hasOwnProperty(prop)) {
-      target[prop] = basConfig[prop];
+  for (var prop in baseConfig) {
+    if (baseConfig.hasOwnProperty(prop)) {
+      target[prop] = baseConfig[prop];
     }
   }
   return target;
@@ -32,7 +38,7 @@ var errback = function(error) {
 // 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) { 
+  return function (buildReportText) {
     requirejs.optimize(mix(curr), prev);
     requirejs.optimize(mix(curr), prev, errback);
   };

lib/tasks/requirejs-rails_tasks.rake

@@ -66,7 +66,7 @@ namespace :requirejs do
 Unable to find 'node' on the current path, required for precompilation
 using the requirejs-ruby gem. To install node.js, see http://nodejs.org/
 OS X Homebrew users can use 'brew install node'.
-EOM
+      EOM
       exit 1
     end
   end
@@ -115,9 +115,9 @@ EOM
                       "requirejs:test_node"] do
       requirejs.config.target_dir.mkpath
 
-      `node "#{requirejs.config.driver_path}"`
+      result = `node "#{requirejs.config.driver_path}"`
       unless $?.success?
-        raise RuntimeError, "Asset compilation with node failed."
+        raise RuntimeError, "Asset compilation with node failed with error:\n\n#{result}\n"
       end
     end
 
@@ -133,15 +133,15 @@ EOM
         FileUtils.cp built_asset_path, digest_asset_path
 
         # Create the compressed versions
-        File.open("#{built_asset_path}.gz",'wb') do |f|
+        File.open("#{built_asset_path}.gz", 'wb') do |f|
           zgw = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
           zgw.write built_asset_path.read
           zgw.close
         end
         FileUtils.cp "#{built_asset_path}.gz", "#{digest_asset_path}.gz"
 
         requirejs.config.manifest_path.open('wb') do |f|
-          YAML.dump(requirejs.manifest,f)
+          YAML.dump(requirejs.manifest, f)
         end
       end
     end