From dc677f7665e5ec74b5a313ba656bba19dc0f853d Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 22 Dec 2009 17:03:23 -0800
Subject: tests pass with requiring the frameworks in rails.rb

---
 railties/lib/rails.rb             | 42 ++++++----------------------
 railties/lib/rails/application.rb | 58 +++++++++++++++++++++++----------------
 railties/lib/rails/core.rb        | 34 +++++++++++++++++++++++
 3 files changed, 77 insertions(+), 57 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 85aeb4af24..9fb3cd9f94 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -1,33 +1,9 @@
-require "pathname"
-
-require 'active_support'
-require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/logger'
-require 'action_dispatch'
-
-require 'rails/initializable'
-require 'rails/application'
-require 'rails/plugin'
-require 'rails/railties_path'
-require 'rails/version'
-require 'rails/rack'
-require 'rails/paths'
-require 'rails/core'
-require 'rails/configuration'
-require 'rails/deprecation'
-require 'rails/initializer'
-require 'rails/ruby_version_check'
-
-# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
-# multibyte safe operations. Plugin authors supporting other encodings
-# should override this behaviour and set the relevant +default_charset+
-# on ActionController::Base.
-#
-# For Ruby 1.9, UTF-8 is the default internal and external encoding.
-if RUBY_VERSION < '1.9'
-  $KCODE='u'
-else
-  Encoding.default_external = Encoding::UTF_8
-end
-
-RAILS_ENV = (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup unless defined?(RAILS_ENV)
+require "rails/core"
+
+%w(active_model active_record action_controller action_view action_mailer active_resource).each do |framework|
+  begin
+    require framework
+    require "#{framework}/rails"
+  rescue LoadError
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d7a89ba2be..97f72b106b 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,3 +1,5 @@
+require "fileutils"
+
 module Rails
   class Application
     include Initializable
@@ -140,13 +142,13 @@ module Rails
       $LOAD_PATH.uniq!
     end
 
-    # Requires all frameworks specified by the Configuration#frameworks
-    # list. By default, all frameworks (Active Record, Active Support,
-    # Action Pack, Action Mailer, and Active Resource) are loaded.
-    initializer :require_frameworks do
-      require 'active_support/all' unless config.active_support.bare
-      config.frameworks.each { |framework| require(framework.to_s) }
-    end
+    # # Requires all frameworks specified by the Configuration#frameworks
+    # # list. By default, all frameworks (Active Record, Active Support,
+    # # Action Pack, Action Mailer, and Active Resource) are loaded.
+    # initializer :require_frameworks do
+    #   require 'active_support/all' unless config.active_support.bare
+    #   config.frameworks.each { |framework| require(framework.to_s) }
+    # end
 
     # Set the paths from which Rails will automatically load source files, and
     # the load_once paths.
@@ -192,7 +194,7 @@ module Rails
     # this sets the database configuration from Configuration#database_configuration
     # and then establishes the connection.
     initializer :initialize_database do
-      if config.frameworks.include?(:active_record)
+      if defined?(ActiveRecord)
         ActiveRecord::Base.configurations = config.database_configuration
         ActiveRecord::Base.establish_connection
       end
@@ -206,7 +208,7 @@ module Rails
     end
 
     initializer :initialize_middleware_stack do
-      if config.frameworks.include?(:action_controller)
+      if defined?(ActionController)
         config.middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
         config.middleware.use(::Rack::Runtime)
         config.middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
@@ -231,7 +233,7 @@ module Rails
     end
 
     initializer :initialize_framework_caches do
-      if config.frameworks.include?(:action_controller)
+      if defined?(ActionController)
         ActionController::Base.cache_store ||= RAILS_CACHE
       end
     end
@@ -266,8 +268,12 @@ module Rails
     # logger is already set, it is not changed, otherwise it is set to use
     # RAILS_DEFAULT_LOGGER.
     initializer :initialize_framework_logging do
-      for framework in ([ :active_record, :action_controller, :action_mailer ] & config.frameworks)
-        framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
+      for framework in [ :active_record, :action_controller, :action_mailer ]
+        # TODO BEFORE PUSHING: REMOVEZ
+        begin
+          framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
+        rescue Exception
+        end
       end
 
       ActiveSupport::Dependencies.logger ||= Rails.logger
@@ -302,7 +308,7 @@ module Rails
 
         Time.zone_default = zone_default
 
-        if config.frameworks.include?(:active_record)
+        if defined?(ActiveRecord)
           ActiveRecord::Base.time_zone_aware_attributes = true
           ActiveRecord::Base.default_timezone = :utc
         end
@@ -326,10 +332,14 @@ module Rails
     # on each of the corresponding Base classes.
     initializer :initialize_framework_settings do
       config.frameworks.each do |framework|
-        base_class = framework.to_s.camelize.constantize.const_get("Base")
+        # TODO BEFORE PUSHING: This needs to work differently
+        begin
+          base_class = framework.to_s.camelize.constantize.const_get("Base")
 
-        config.send(framework).each do |setting, value|
-          base_class.send("#{setting}=", value)
+          config.send(framework).each do |setting, value|
+            base_class.send("#{setting}=", value)
+          end
+        rescue Exception
         end
       end
     end
@@ -339,16 +349,16 @@ module Rails
     # paths have already been set, it is not changed, otherwise it is
     # set to use Configuration#view_path.
     initializer :initialize_framework_views do
-      if config.frameworks.include?(:action_view)
+      if defined?(ActionView)
         view_path = ActionView::PathSet.type_cast(config.view_path, config.cache_classes)
-        ActionMailer::Base.template_root  = view_path if config.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank?
-        ActionController::Base.view_paths = view_path if config.frameworks.include?(:action_controller) && ActionController::Base.view_paths.blank?
+        
+        ActionMailer::Base.template_root  = view_path if defined?(ActionMailer) && ActionMailer::Base.view_paths.blank?
+        ActionController::Base.view_paths = view_path if defined?(ActionController) && ActionController::Base.view_paths.blank?
       end
     end
 
     initializer :initialize_metal do
-      # TODO: Make Rails and metal work without ActionController
-      if config.frameworks.include?(:action_controller)
+      if defined?(ActionController)
         Rails::Rack::Metal.requested_metals = config.metals
 
         config.middleware.insert_before(
@@ -375,8 +385,8 @@ module Rails
 
     # # Setup database middleware after initializers have run
     initializer :initialize_database_middleware do
-      if configuration.frameworks.include?(:active_record)
-        if configuration.frameworks.include?(:action_controller) && ActionController::Base.session_store &&
+      if defined?(ActiveRecord)
+        if defined?(ActionController) && ActionController::Base.session_store &&
             ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
@@ -422,7 +432,7 @@ module Rails
     #
     # # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
     initializer :load_observers do
-      if configuration.frameworks.include?(:active_record)
+      if defined?(ActiveRecord)
         ActiveRecord::Base.instantiate_observers
       end
     end
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
index a5e51ad04a..da16c5816c 100644
--- a/railties/lib/rails/core.rb
+++ b/railties/lib/rails/core.rb
@@ -1,3 +1,37 @@
+require "pathname"
+
+require 'active_support'
+require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/logger'
+require 'action_dispatch'
+
+require 'rails/initializable'
+require 'rails/application'
+require 'rails/plugin'
+require 'rails/railties_path'
+require 'rails/version'
+require 'rails/rack'
+require 'rails/paths'
+require 'rails/core'
+require 'rails/configuration'
+require 'rails/deprecation'
+require 'rails/initializer'
+require 'rails/ruby_version_check'
+
+# For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
+# multibyte safe operations. Plugin authors supporting other encodings
+# should override this behaviour and set the relevant +default_charset+
+# on ActionController::Base.
+#
+# For Ruby 1.9, UTF-8 is the default internal and external encoding.
+if RUBY_VERSION < '1.9'
+  $KCODE='u'
+else
+  Encoding.default_external = Encoding::UTF_8
+end
+
+RAILS_ENV = (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup unless defined?(RAILS_ENV)
+
 module Rails
   # Needs to be duplicated from Active Support since its needed before Active
   # Support is available. Here both Options and Hash are namespaced to prevent
-- 
cgit v1.2.3


From fa8dfc7d014f6768599077b79a874894e13d317f Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 23 Dec 2009 13:45:55 -0800
Subject: Raise an exception if an initializer is defined without a block

---
 railties/lib/rails/initializable.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index add10bd207..8fcb254590 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -93,6 +93,7 @@ module Rails
       end
 
       def initializer(name, opts = {}, &blk)
+        raise ArgumentError, "A block must be passed when defining an initializer" unless blk
         @initializers ||= []
         @initializers << Initializer.new(name, nil, opts, &blk)
       end
-- 
cgit v1.2.3


From 38aeb1528c376f7a058beea6db0a328720b85f01 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 23 Dec 2009 14:55:12 -0800
Subject: Moving out some framework specific initializers into the framework
 libraries.

---
 railties/lib/rails/application.rb   | 66 ++++---------------------------------
 railties/lib/rails/configuration.rb | 25 +++++++-------
 railties/lib/rails/plugin.rb        |  8 +++--
 3 files changed, 26 insertions(+), 73 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 97f72b106b..9a5656fb1d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -21,11 +21,7 @@ module Rails
       end
 
       def config
-        @config ||= begin
-          config = Configuration.new
-          Plugin.plugins.each { |p| config.merge(p.config) }
-          config
-        end
+        @config ||= Configuration.new(Plugin::Configuration.default)
       end
 
       # TODO: change the plugin loader to use config
@@ -122,10 +118,11 @@ module Rails
       initializers
     end
 
+    # TODO: Fix this method
     def plugins
       @plugins ||= begin
         plugin_names = config.plugins || [:all]
-        Plugin.plugins.select { |p| plugin_names.include?(p.plugin_name) } +
+        Plugin.plugins.select { |p| plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) } +
         Plugin::Vendored.all(config.plugins || [:all], config.paths.vendor.plugins)
       end
     end
@@ -189,20 +186,9 @@ module Rails
       end
     end
 
-    # This initialization routine does nothing unless <tt>:active_record</tt>
-    # is one of the frameworks to load (Configuration#frameworks). If it is,
-    # this sets the database configuration from Configuration#database_configuration
-    # and then establishes the connection.
-    initializer :initialize_database do
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.configurations = config.database_configuration
-        ActiveRecord::Base.establish_connection
-      end
-    end
-
     # Include middleware to serve up static assets
     initializer :initialize_static_server do
-      if config.frameworks.include?(:action_controller) && config.serve_static_assets
+      if defined?(ActionController) && config.serve_static_assets
         config.middleware.use(ActionDispatch::Static, Rails.public_path)
       end
     end
@@ -268,7 +254,7 @@ module Rails
     # logger is already set, it is not changed, otherwise it is set to use
     # RAILS_DEFAULT_LOGGER.
     initializer :initialize_framework_logging do
-      for framework in [ :active_record, :action_controller, :action_mailer ]
+      for framework in [ :action_controller, :action_mailer ]
         # TODO BEFORE PUSHING: REMOVEZ
         begin
           framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
@@ -293,7 +279,7 @@ module Rails
       require('active_support/whiny_nil') if config.whiny_nils
     end
 
-    # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
+    # Sets the default value for Time.zone
     # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     initializer :initialize_time_zone do
       if config.time_zone
@@ -307,11 +293,6 @@ module Rails
         end
 
         Time.zone_default = zone_default
-
-        if defined?(ActiveRecord)
-          ActiveRecord::Base.time_zone_aware_attributes = true
-          ActiveRecord::Base.default_timezone = :utc
-        end
       end
     end
 
@@ -331,7 +312,7 @@ module Rails
     # (Configuration#frameworks). The available settings map to the accessors
     # on each of the corresponding Base classes.
     initializer :initialize_framework_settings do
-      config.frameworks.each do |framework|
+      (config.frameworks - [:active_record, :action_controller]).each do |framework|
         # TODO BEFORE PUSHING: This needs to work differently
         begin
           base_class = framework.to_s.camelize.constantize.const_get("Base")
@@ -383,20 +364,6 @@ module Rails
       end
     end
 
-    # # Setup database middleware after initializers have run
-    initializer :initialize_database_middleware do
-      if defined?(ActiveRecord)
-        if defined?(ActionController) && ActionController::Base.session_store &&
-            ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
-        else
-          configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.use ActiveRecord::QueryCache
-        end
-      end
-    end
-
     # TODO: Make a DSL way to limit an initializer to a particular framework
 
     # # Prepare dispatcher callbacks and run 'prepare' callbacks
@@ -418,25 +385,6 @@ module Rails
       end
     end
 
-    # Routing must be initialized after plugins to allow the former to extend the routes
-    # ---
-    # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
-    # this does nothing. Otherwise, it loads the routing definitions and sets up
-    # loading module used to lazily load controllers (Configuration#controller_paths).
-    initializer :initialize_routing do
-      next unless configuration.frameworks.include?(:action_controller)
-      route_configuration_files << configuration.routes_configuration_file
-      route_configuration_files << configuration.builtin_routes_configuration_file
-      reload_routes!
-    end
-    #
-    # # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
-    initializer :load_observers do
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.instantiate_observers
-      end
-    end
-
     # Eager load application classes
     initializer :load_application_classes do
       next if $rails_rake_task
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index bf5b9478cc..086f67a419 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -5,22 +5,26 @@ module Rails
   # configuration class while this bit is being cleaned up.
   class Plugin::Configuration
 
-    def initialize
-      @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
+    def self.default
+      @default ||= new
     end
 
-    def middleware
-      @middleware ||= ActionDispatch::MiddlewareStack.new
+    attr_reader :middleware
+
+    def initialize(base = nil)
+      if base
+        @options    = base.options.dup
+        @middleware = base.middleware.dup
+      else
+        @options    = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new }
+        @middleware = ActionDispatch::MiddlewareStack.new
+      end
     end
 
     def respond_to?(name)
       super || name.to_s =~ config_key_regexp
     end
 
-    def merge(config)
-      @options = config.options.merge(@options)
-    end
-
   protected
 
     attr_reader :options
@@ -41,8 +45,7 @@ module Rails
     end
 
     def config_keys
-      ([ :active_support, :active_record, :action_controller,
-         :action_view, :action_mailer, :active_resource ] +
+      ([ :active_support, :action_view, :action_mailer, :active_resource ] +
         Plugin.plugin_names).map { |n| n.to_s }.uniq
     end
   end
@@ -60,7 +63,7 @@ module Rails
                 :log_level, :log_path, :paths, :routes_configuration_file,
                 :view_path
 
-    def initialize
+    def initialize(base = nil)
       super
       @load_once_paths              = []
       @after_initialize_blocks      = []
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 90dc1ad8dd..0699affea7 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -2,8 +2,10 @@ module Rails
   class Plugin
     include Initializable
 
-    def self.plugin_name
-      @plugin_name || name.demodulize.underscore
+    def self.plugin_name(plugin_name = nil)
+      @plugin_name ||= name.demodulize.underscore
+      @plugin_name = plugin_name if plugin_name
+      @plugin_name
     end
 
     def self.inherited(klass)
@@ -20,7 +22,7 @@ module Rails
     end
 
     def self.config
-      @config ||= Configuration.new
+      Configuration.default
     end
 
     class Vendored < Plugin
-- 
cgit v1.2.3


From 94bb3316353ace661a83563f44a9c47baf438f26 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 23 Dec 2009 17:11:17 -0800
Subject: Shift more responsibility from application class to its singleton
 instance. Treat instantiation and boot as separate steps. Use app.config
 rather than app.configuration.

---
 railties/lib/rails/application.rb                  | 123 ++++++++-------------
 railties/lib/rails/commands/server.rb              |  10 +-
 .../rails/generators/rails/app/templates/config.ru |   2 +-
 .../rails/app/templates/script/console.tt          |   2 +-
 .../rails/app/templates/script/dbconsole.tt        |   2 +-
 .../rails/app/templates/script/server.tt           |   2 +-
 6 files changed, 55 insertions(+), 86 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d7a89ba2be..c594b8a31d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,21 +1,17 @@
+require 'active_support/core_ext/module/delegation'
+
 module Rails
   class Application
     include Initializable
 
     class << self
-      # Stub out App initialize
-      def initialize!
-        new
-      end
+      attr_writer :config
+      alias configure class_eval
+      delegate :initialize!, :load_tasks, :to => :instance
 
-      def new
-        @instance ||= begin
-          begin
-            require config.environment_path
-          rescue LoadError
-          end
-          super
-        end
+      private :new
+      def instance
+        @instance ||= new
       end
 
       def config
@@ -26,66 +22,29 @@ module Rails
         end
       end
 
-      # TODO: change the plugin loader to use config
-      alias configuration config
-
-      def config=(config)
-        @config = config
-      end
-
-      def root
-        config.root
-      end
-
-      def load_tasks
-        require "rails/tasks"
-        Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
-        Dir["#{root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-        task :environment do
-          $rails_rake_task = true
-          initialize!
-        end
-      end
-
       def routes
         ActionController::Routing::Routes
       end
-
-      def call(env)
-        new.call(env)
-      end
     end
 
+    delegate :config, :routes, :to => :'self.class'
+    delegate :root, :middleware, :to => :config
     attr_reader :route_configuration_files
 
     def initialize
+      require_environment
       Rails.application ||= self
-
       @route_configuration_files = []
-
-      run_initializers(self)
-    end
-
-    def config
-      self.class.config
-    end
-
-    class << self
-      alias configure class_eval
-    end
-
-    def root
-      config.root
     end
 
-    alias configuration config
-
-    def middleware
-      config.middleware
+    def initialize!
+      run_initializers(self)
+      self
     end
 
-    def routes
-      ActionController::Routing::Routes
+    def require_environment
+      require config.environment_path
+    rescue LoadError
     end
 
     def routes_changed_at
@@ -114,6 +73,16 @@ module Rails
       routes.disable_clear_and_finalize = false
     end
 
+    def load_tasks
+      require "rails/tasks"
+      Dir["#{root}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+      Dir["#{root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+      task :environment do
+        $rails_rake_task = true
+        initialize!
+      end
+    end
+
     def initializers
       initializers = super
       plugins.each { |p| initializers += p.initializers }
@@ -170,7 +139,7 @@ module Rails
     # Create tmp directories
     initializer :ensure_tmp_directories_exist do
       %w(cache pids sessions sockets).each do |dir_to_make|
-        FileUtils.mkdir_p(File.join(config.root, 'tmp', dir_to_make))
+        FileUtils.mkdir_p(File.join(root, 'tmp', dir_to_make))
       end
     end
 
@@ -361,28 +330,28 @@ module Rails
     # # already called abort() unless $gems_rake_task is set
     # return unless gems_dependencies_loaded
     initializer :load_application_initializers do
-      Dir["#{configuration.root}/config/initializers/**/*.rb"].sort.each do |initializer|
+      Dir["#{root}/config/initializers/**/*.rb"].sort.each do |initializer|
         load(initializer)
       end
     end
 
     # Fires the user-supplied after_initialize block (Configuration#after_initialize)
     initializer :after_initialize do
-      configuration.after_initialize_blocks.each do |block|
+      config.after_initialize_blocks.each do |block|
         block.call
       end
     end
 
     # # Setup database middleware after initializers have run
     initializer :initialize_database_middleware do
-      if configuration.frameworks.include?(:active_record)
-        if configuration.frameworks.include?(:action_controller) && ActionController::Base.session_store &&
+      if config.frameworks.include?(:active_record)
+        if config.frameworks.include?(:action_controller) && ActionController::Base.session_store &&
             ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
+          config.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
+          config.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
         else
-          configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-          configuration.middleware.use ActiveRecord::QueryCache
+          config.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+          config.middleware.use ActiveRecord::QueryCache
         end
       end
     end
@@ -391,11 +360,11 @@ module Rails
 
     # # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer :prepare_dispatcher do
-      next unless configuration.frameworks.include?(:action_controller)
+      next unless config.frameworks.include?(:action_controller)
       require 'rails/dispatcher' unless defined?(::Dispatcher)
-      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+      Dispatcher.define_dispatcher_callbacks(config.cache_classes)
 
-      unless configuration.cache_classes
+      unless config.cache_classes
         # Setup dev mode route reloading
         routes_last_modified = routes_changed_at
         reload_routes = lambda do
@@ -414,15 +383,15 @@ module Rails
     # this does nothing. Otherwise, it loads the routing definitions and sets up
     # loading module used to lazily load controllers (Configuration#controller_paths).
     initializer :initialize_routing do
-      next unless configuration.frameworks.include?(:action_controller)
-      route_configuration_files << configuration.routes_configuration_file
-      route_configuration_files << configuration.builtin_routes_configuration_file
+      next unless config.frameworks.include?(:action_controller)
+      route_configuration_files << config.routes_configuration_file
+      route_configuration_files << config.builtin_routes_configuration_file
       reload_routes!
     end
     #
     # # Observers are loaded after plugins in case Observers or observed models are modified by plugins.
     initializer :load_observers do
-      if configuration.frameworks.include?(:active_record)
+      if config.frameworks.include?(:active_record)
         ActiveRecord::Base.instantiate_observers
       end
     end
@@ -431,8 +400,8 @@ module Rails
     initializer :load_application_classes do
       next if $rails_rake_task
 
-      if configuration.cache_classes
-        configuration.eager_load_paths.each do |load_path|
+      if config.cache_classes
+        config.eager_load_paths.each do |load_path|
           matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
           Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
             require_dependency file.sub(matcher, '\1')
@@ -443,7 +412,7 @@ module Rails
 
     # Disable dependency loading during request cycle
     initializer :disable_dependency_loading do
-      if configuration.cache_classes && !configuration.dependency_loading
+      if config.cache_classes && !config.dependency_loading
         ActiveSupport::Dependencies.unhook!
       end
     end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 3687b4460e..57b7c6a49c 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -41,9 +41,9 @@ module Rails
       new(app).start
     end
 
-    def initialize(app_const)
+    def initialize(app)
       super() # Call Rack::Server#initialize without passing any options to use.
-      @app_const = app_const
+      @app = app
     end
 
     def start
@@ -69,7 +69,7 @@ module Rails
     end
 
     def log_path
-      "#{File.expand_path(@app_const.root)}/log/#{options[:environment]}.log"
+      "#{File.expand_path(@app.root)}/log/#{options[:environment]}.log"
     end
 
     def default_options
@@ -77,10 +77,10 @@ module Rails
         :Port        => 3000,
         :Host        => "0.0.0.0",
         :environment => (ENV['RAILS_ENV'] || "development").dup,
-        :rack_file   => "#{@app_const.root}/config.ru",
+        :rack_file   => "#{@app.root}/config.ru",
         :daemonize   => false,
         :debugger    => false,
-        :pid         => "#{@app_const.root}/tmp/pids/server.pid",
+        :pid         => "#{@app.root}/tmp/pids/server.pid",
         :AccessLog   => []
       }
     end
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index f3bf3d6117..acb8435446 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -2,4 +2,4 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 
 # Dispatch the request
-run <%= app_const%>
+run <%= app_const %>.instance
diff --git a/railties/lib/rails/generators/rails/app/templates/script/console.tt b/railties/lib/rails/generators/rails/app/templates/script/console.tt
index 4262439e52..9ddd4cfe62 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/console.tt
+++ b/railties/lib/rails/generators/rails/app/templates/script/console.tt
@@ -1,3 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/console'
-Rails::Console.start(<%= app_const %>)
+Rails::Console.start(<%= app_const %>.instance)
diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
index 9dfa24c378..96e0bc191b 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
+++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
@@ -1,3 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/dbconsole'
-Rails::DBConsole.start(<%= app_const %>)
\ No newline at end of file
+Rails::DBConsole.start(<%= app_const %>.instance)
diff --git a/railties/lib/rails/generators/rails/app/templates/script/server.tt b/railties/lib/rails/generators/rails/app/templates/script/server.tt
index d98f677475..380dc42cb5 100755
--- a/railties/lib/rails/generators/rails/app/templates/script/server.tt
+++ b/railties/lib/rails/generators/rails/app/templates/script/server.tt
@@ -1,3 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/server'
-Rails::Server.start(<%= app_const %>)
+Rails::Server.start(<%= app_const %>.instance)
-- 
cgit v1.2.3


From 1ee50e58f6eb429872dfeabeb0708a8065ff34de Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 23 Dec 2009 17:14:21 -0800
Subject: Fix Rack::Lock middleware condition: use *unless* we allow
 concurrency

---
 railties/lib/rails/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c594b8a31d..e950d72586 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -176,7 +176,7 @@ module Rails
 
     initializer :initialize_middleware_stack do
       if config.frameworks.include?(:action_controller)
-        config.middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
+        config.middleware.use(::Rack::Lock, :if => lambda { !ActionController::Base.allow_concurrency })
         config.middleware.use(::Rack::Runtime)
         config.middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
         config.middleware.use(ActionDispatch::Callbacks, lambda { ActionController::Dispatcher.prepare_each_request })
-- 
cgit v1.2.3


From d2bd71a145ddc5e3e3750edc9a09eab742aaf02a Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 23 Dec 2009 17:01:07 -0800
Subject: Finish moving config.frameworks-dependent code to the framework
 plugin

---
 railties/lib/rails/application.rb | 112 +-------------------------------------
 1 file changed, 1 insertion(+), 111 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 9a5656fb1d..8ba24af793 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -139,14 +139,6 @@ module Rails
       $LOAD_PATH.uniq!
     end
 
-    # # Requires all frameworks specified by the Configuration#frameworks
-    # # list. By default, all frameworks (Active Record, Active Support,
-    # # Action Pack, Action Mailer, and Active Resource) are loaded.
-    # initializer :require_frameworks do
-    #   require 'active_support/all' unless config.active_support.bare
-    #   config.frameworks.each { |framework| require(framework.to_s) }
-    # end
-
     # Set the paths from which Rails will automatically load source files, and
     # the load_once paths.
     initializer :set_autoload_paths do
@@ -177,34 +169,7 @@ module Rails
     # Used by Passenger to ensure everything's loaded before forking and
     # to avoid autoload race conditions in JRuby.
     initializer :preload_frameworks do
-      if config.preload_frameworks
-        config.frameworks.each do |framework|
-          # String#classify and #constantize aren't available yet.
-          toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
-          toplevel.load_all! if toplevel.respond_to?(:load_all!)
-        end
-      end
-    end
-
-    # Include middleware to serve up static assets
-    initializer :initialize_static_server do
-      if defined?(ActionController) && config.serve_static_assets
-        config.middleware.use(ActionDispatch::Static, Rails.public_path)
-      end
-    end
-
-    initializer :initialize_middleware_stack do
-      if defined?(ActionController)
-        config.middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
-        config.middleware.use(::Rack::Runtime)
-        config.middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
-        config.middleware.use(ActionDispatch::Callbacks, lambda { ActionController::Dispatcher.prepare_each_request })
-        config.middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })
-        config.middleware.use(ActionDispatch::ParamsParser)
-        config.middleware.use(::Rack::MethodOverride)
-        config.middleware.use(::Rack::Head)
-        config.middleware.use(ActionDispatch::StringCoercion)
-      end
+      ActiveSupport::Autoload.eager_load! if config.preload_frameworks
     end
 
     initializer :initialize_cache do
@@ -218,12 +183,6 @@ module Rails
       end
     end
 
-    initializer :initialize_framework_caches do
-      if defined?(ActionController)
-        ActionController::Base.cache_store ||= RAILS_CACHE
-      end
-    end
-
     initializer :initialize_logger do
       # if the environment has explicitly defined a logger, use it
       next if Rails.logger
@@ -254,14 +213,6 @@ module Rails
     # logger is already set, it is not changed, otherwise it is set to use
     # RAILS_DEFAULT_LOGGER.
     initializer :initialize_framework_logging do
-      for framework in [ :action_controller, :action_mailer ]
-        # TODO BEFORE PUSHING: REMOVEZ
-        begin
-          framework.to_s.camelize.constantize.const_get("Base").logger ||= Rails.logger
-        rescue Exception
-        end
-      end
-
       ActiveSupport::Dependencies.logger ||= Rails.logger
       Rails.cache.logger ||= Rails.logger
     end
@@ -308,46 +259,6 @@ module Rails
       end
     end
 
-    # Initializes framework-specific settings for each of the loaded frameworks
-    # (Configuration#frameworks). The available settings map to the accessors
-    # on each of the corresponding Base classes.
-    initializer :initialize_framework_settings do
-      (config.frameworks - [:active_record, :action_controller]).each do |framework|
-        # TODO BEFORE PUSHING: This needs to work differently
-        begin
-          base_class = framework.to_s.camelize.constantize.const_get("Base")
-
-          config.send(framework).each do |setting, value|
-            base_class.send("#{setting}=", value)
-          end
-        rescue Exception
-        end
-      end
-    end
-
-    # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
-    # (but only for those frameworks that are to be loaded). If the framework's
-    # paths have already been set, it is not changed, otherwise it is
-    # set to use Configuration#view_path.
-    initializer :initialize_framework_views do
-      if defined?(ActionView)
-        view_path = ActionView::PathSet.type_cast(config.view_path, config.cache_classes)
-        
-        ActionMailer::Base.template_root  = view_path if defined?(ActionMailer) && ActionMailer::Base.view_paths.blank?
-        ActionController::Base.view_paths = view_path if defined?(ActionController) && ActionController::Base.view_paths.blank?
-      end
-    end
-
-    initializer :initialize_metal do
-      if defined?(ActionController)
-        Rails::Rack::Metal.requested_metals = config.metals
-
-        config.middleware.insert_before(
-          :"ActionDispatch::ParamsParser",
-          Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
-      end
-    end
-
     # # bail out if gems are missing - note that check_gem_dependencies will have
     # # already called abort() unless $gems_rake_task is set
     # return unless gems_dependencies_loaded
@@ -364,27 +275,6 @@ module Rails
       end
     end
 
-    # TODO: Make a DSL way to limit an initializer to a particular framework
-
-    # # Prepare dispatcher callbacks and run 'prepare' callbacks
-    initializer :prepare_dispatcher do
-      next unless configuration.frameworks.include?(:action_controller)
-      require 'rails/dispatcher' unless defined?(::Dispatcher)
-      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
-
-      unless configuration.cache_classes
-        # Setup dev mode route reloading
-        routes_last_modified = routes_changed_at
-        reload_routes = lambda do
-          unless routes_changed_at == routes_last_modified
-            routes_last_modified = routes_changed_at
-            reload_routes!
-          end
-        end
-        ActionDispatch::Callbacks.before_dispatch { |callbacks| reload_routes.call }
-      end
-    end
-
     # Eager load application classes
     initializer :load_application_classes do
       next if $rails_rake_task
-- 
cgit v1.2.3


From af5c3c852e43fc95b4c4344f61c9c8fc2210b0ca Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 23 Dec 2009 19:00:20 -0800
Subject: Require active_support/all unless specifically requested to be left
 out.

---
 railties/lib/rails/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8ba24af793..711509738d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -132,6 +132,10 @@ module Rails
       @app.call(env)
     end
 
+    initializer :load_all_active_support do
+      require "active_support/all" unless config.active_support.bare
+    end
+
     # Set the <tt>$LOAD_PATH</tt> based on the value of
     # Configuration#load_paths. Duplicates are removed.
     initializer :set_load_path do
-- 
cgit v1.2.3