Add a dedicated build directory for the optimizer

Author: carsomyr

lib/requirejs/rails/config.rb

@@ -17,14 +17,15 @@ def initialize(application)
       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 = {}
 

lib/requirejs/rails/rjs_driver.js.erb

@@ -5,7 +5,7 @@ var requirejs = require('<%= rjs_path %>'),
   baseConfig = <%=
     modifiedHash = build_config.select {|k, _| k != "modules"}
     pathsHash = modifiedHash["paths"]
-    modifiedHash["dir"] = self.target_dir.to_s
+    modifiedHash["dir"] = build_dir.to_s
     modifiedHash["paths"] = pathsHash.select {|_, v| !v.is_a?(Array)} if !pathsHash.nil?
 
     JSON.pretty_generate(modifiedHash)

lib/tasks/requirejs-rails_tasks.rake

@@ -90,6 +90,9 @@ OS X Homebrew users can use 'brew install node'.
     task :prepare_source => ["requirejs:setup",
                              "requirejs:clean"] do
       requirejs.config.source_dir.mkpath
+      requirejs.config.build_dir.mkpath
+      requirejs.config.driver_path.parent.mkpath
+
       requirejs.env.each_logical_path do |logical_path|
         next unless requirejs.config.asset_allowed?(logical_path)
         if asset = requirejs.env.find_asset(logical_path)
@@ -119,7 +122,7 @@ OS X Homebrew users can use 'brew install node'.
     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
         requirejs.manifest[asset_name] = digest_name