railties 3.1.1.rc2 → 3.1.1.rc3

data/CHANGELOG

@@ -2,7 +2,8 @@
 
 * Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. [Santiago Pastorino]
 
-* `rake assets:precompile` loads the application but does not initialize it.
+* Add config.assets.initialize_on_precompile which, when set to false, forces
+  `rake assets:precompile` to load the application but does not initialize it.
 
   To the app developer, this means configuration add in
   config/initializers/* will not be executed.

data/guides/source/asset_pipeline.textile

@@ -346,6 +346,15 @@ The rake task is:
 bundle exec rake assets:precompile
 </plain>
 
+For faster asset precompiles, you can partially load your application by setting
++config.assets.initialize_on_precompile+ to false, though in that case templates
+cannot see application objects or methods. *Heroku requires this to be false.*
+
+WARNING: If you set +config.assets.initialize_on_precompile+ to false, be sure to
+test +rake assets:precompile+ locally before deploying. It may expose bugs where
+your assets reference application objects or methods, since those are still
+in scope in development mode regardless of the value of this flag.
+
 Capistrano (v2.8.0 and above) has a recipe to handle this in deployment. Add the following line to +Capfile+:
 
 <erb>

data/lib/rails/application.rb

@@ -91,7 +91,7 @@ module Rails
       @routes_reloader ||= RoutesReloader.new
     end
 
-    def initialize!(group=nil)
+    def initialize!(group=:default)
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
       @initialized = true

data/lib/rails/application/configuration.rb

@@ -35,19 +35,20 @@ module Rails
         @cache_store                 = [ :file_store, "#{root}/tmp/cache/" ]
 
         @assets = ActiveSupport::OrderedOptions.new
-        @assets.enabled         = false
-        @assets.paths           = []
-        @assets.precompile      = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
-                                    /(?:\/|\\|\A)application\.(css|js)$/ ]
-        @assets.prefix          = "/assets"
-        @assets.version         = ''
-        @assets.debug           = false
-        @assets.compile         = true
-        @assets.digest          = false
-        @assets.manifest        = nil
-        @assets.cache_store     = [ :file_store, "#{root}/tmp/cache/assets/" ]
-        @assets.js_compressor   = nil
-        @assets.css_compressor  = nil
+        @assets.enabled                  = false
+        @assets.paths                    = []
+        @assets.precompile               = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
+                                             /(?:\/|\\|\A)application\.(css|js)$/ ]
+        @assets.prefix                   = "/assets"
+        @assets.version                  = ''
+        @assets.debug                    = false
+        @assets.compile                  = true
+        @assets.digest                   = false
+        @assets.manifest                 = nil
+        @assets.cache_store              = [ :file_store, "#{root}/tmp/cache/assets/" ]
+        @assets.js_compressor            = nil
+        @assets.css_compressor           = nil
+        @assets.initialize_on_precompile = true
       end
 
       def compiled_asset_path

data/lib/rails/engine.rb

@@ -539,7 +539,7 @@ module Rails
       require environment if environment
     end
 
-    initializer :append_assets_path, :group => :assets do |app|
+    initializer :append_assets_path, :group => :all do |app|
       app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
       app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)

data/lib/rails/generators/app_base.rb

@@ -208,8 +208,8 @@ module Rails
           # Gems used only for assets and not required
           # in production environments by default.
           group :assets do
-            gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.0'"}
-            gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.0'"}
+            gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.4'"}
+            gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE

data/lib/rails/initializable.rb

@@ -10,6 +10,7 @@ module Rails
       attr_reader :name, :block
 
       def initialize(name, context, options, &block)
+        options[:group] ||= :default
         @name, @context, @options, @block = name, context, options, block
       end
 
@@ -48,10 +49,10 @@ module Rails
       end
     end
 
-    def run_initializers(group=nil, *args)
+    def run_initializers(group=:default, *args)
       return if instance_variable_defined?(:@ran)
       initializers.tsort.each do |initializer|
-        initializer.run(*args) if group.nil? || initializer.belongs_to?(group)
+        initializer.run(*args) if initializer.belongs_to?(group)
       end
       @ran = true
     end

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 1
     TINY  = 1
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 977940595
+  hash: 977940592
   prerelease: true
   segments: 
   - 3
   - 1
   - 1
-  - rc2
-  version: 3.1.1.rc2
+  - rc3
+  version: 3.1.1.rc3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 -03:00
+date: 2011-10-05 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,13 +90,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940595
+        hash: 977940592
         segments: 
         - 3
         - 1
         - 1
-        - rc2
-        version: 3.1.1.rc2
+        - rc3
+        version: 3.1.1.rc3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -107,13 +107,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 977940595
+        hash: 977940592
         segments: 
         - 3
         - 1
         - 1
-        - rc2
-        version: 3.1.1.rc2
+        - rc3
+        version: 3.1.1.rc3
   type: :runtime
   version_requirements: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."