From 289f9cedef7974e98f4d8a06998f7ebb25653265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 25 May 2011 01:37:55 +0200
Subject: [PATCH] Everyone receives app as argument for consistency.

Conflicts:

	railties/lib/rails/application.rb
---
 activerecord/lib/active_record/railtie.rb |  4 ++--
 railties/lib/rails/application.rb         | 19 ++++++++++---------
 railties/lib/rails/commands/console.rb    |  3 ++-
 railties/lib/rails/engine.rb              |  2 +-
 railties/lib/rails/railtie.rb             | 10 +++++-----
 railties/test/application/console_test.rb |  7 ++++---
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index bae2ded244..47133e77e8 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -29,8 +29,8 @@ module ActiveRecord
     # When loading console, force ActiveRecord::Base to be loaded
     # to avoid cross references when loading a constant for the
     # first time. Also, make it output to STDERR.
-    console do |sandbox|
-      require "active_record/railties/console_sandbox" if sandbox
+    console do |app|
+      require "active_record/railties/console_sandbox" if app.sandbox?
       ActiveRecord::Base.logger = Logger.new(STDERR)
     end
 
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 4a79e68c76..5d6f892374 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -50,7 +50,9 @@ module Rails
       end
     end
 
-    attr_accessor :assets
+    attr_accessor :assets, :sandbox
+    alias_method :sandbox?, :sandbox
+
     delegate :default_url_options, :default_url_options=, :to => :routes
 
     # This method is called just after an application inherits from Rails::Application,
@@ -96,9 +98,9 @@ module Rails
       self
     end
 
-    def load_tasks
+    def load_tasks(app=self)
       initialize_tasks
-      railties.all { |r| r.load_tasks }
+      railties.all { |r| r.load_tasks(app) }
       super
       self
     end
@@ -106,15 +108,14 @@ module Rails
     def load_generators(app=self)
       initialize_generators
       railties.all { |r| r.load_generators(app) }
-
       super
       self
     end
 
-    def load_console(sandbox=false)
-      initialize_console(sandbox)
-      railties.all { |r| r.load_console(sandbox) }
-      super()
+    def load_console(app=self)
+      initialize_console
+      railties.all { |r| r.load_console(app) }
+      super
       self
     end
 
@@ -197,7 +198,7 @@ module Rails
       require "rails/generators"
     end
 
-    def initialize_console(sandbox=false)
+    def initialize_console
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 66dbb5d11e..32e361d421 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -23,7 +23,8 @@ module Rails
         opt.parse!(ARGV)
       end
 
-      @app.load_console(options[:sandbox])
+      @app.sandbox = options[:sandbox]
+      @app.load_console
 
       if options[:debugger]
         begin
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 81a0350724..0d01a818f5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -387,7 +387,7 @@ module Rails
     delegate :middleware, :root, :paths, :to => :config
     delegate :engine_name, :isolated?, :to => "self.class"
 
-    def load_tasks
+    def load_tasks(*)
       super
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 6f0ba5bce8..65c567d72f 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -173,18 +173,18 @@ module Rails
     def eager_load!
     end
 
-    def load_console(sandbox=false)
-      self.class.console.each { |block| block.call(sandbox) }
+    def load_console(app)
+      self.class.console.each { |block| block.call(app) }
     end
 
-    def load_tasks
+    def load_tasks(app)
       extend Rake::DSL if defined? Rake::DSL
-      self.class.rake_tasks.each(&:call)
+      self.class.rake_tasks.each { |block| block.call(app) }
 
       # load also tasks from all superclasses
       klass = self.class.superclass
       while klass.respond_to?(:rake_tasks)
-        klass.rake_tasks.each { |t| self.instance_exec(&t) }
+        klass.rake_tasks.each { |t| self.instance_exec(app, &t) }
         klass = klass.superclass
       end
     end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 5ae6323345..db8f1f2ac6 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -10,7 +10,8 @@ class ConsoleTest < Test::Unit::TestCase
 
   def load_environment(sandbox = false)
     require "#{rails_root}/config/environment"
-    Rails.application.load_console(sandbox)
+    Rails.application.sandbox = sandbox
+    Rails.application.load_console
   end
 
   def test_app_method_should_return_integration_session
@@ -78,8 +79,8 @@ class ConsoleTest < Test::Unit::TestCase
     value = false
 
     Class.new(Rails::Railtie) do
-      console do |sandbox|
-        value = sandbox
+      console do |app|
+        value = app.sandbox?
       end
     end