railties 3.0.0.beta3 → 3.0.0.beta4

data/lib/rails/application/bootstrap.rb

@@ -6,10 +6,12 @@ module Rails
       include Initializable
 
       initializer :load_environment_config do
-        require_environment!
+        environment = config.paths.config.environments.to_a.first
+        require environment if environment
       end
 
-      initializer :load_all_active_support do
+      initializer :load_active_support do
+        require 'active_support/dependencies'
         require "active_support/all" unless config.active_support.bare
       end
 
@@ -17,7 +19,6 @@ module Rails
       # Used by Passenger to ensure everything's loaded before forking and
       # to avoid autoload race conditions in JRuby.
       initializer :preload_frameworks do
-        require 'active_support/dependencies'
         ActiveSupport::Autoload.eager_autoload! if config.preload_frameworks
       end
 
@@ -46,7 +47,7 @@ module Rails
           silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(config.cache_store) }
 
           if RAILS_CACHE.respond_to?(:middleware)
-            config.middleware.insert_after(:"Rack::Lock", RAILS_CACHE.middleware)
+            config.middleware.insert_before("Rack::Runtime", RAILS_CACHE.middleware)
           end
         end
       end
@@ -65,8 +66,8 @@ module Rails
         ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
       end
 
-      initializer :bootstrap_load_path do
-        # This is just an initializer used as hook so all load paths are loaded together
+      initializer :bootstrap_hook do |app|
+        ActiveSupport.run_load_hooks(:before_initialize, app)
       end
     end
   end

data/lib/rails/application/configuration.rb

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+require 'active_support/core_ext/string/encoding'
 require 'rails/engine/configuration'
 
 module Rails
@@ -7,9 +9,10 @@ module Rails
 
       attr_accessor :allow_concurrency, :cache_classes, :cache_store,
                     :encoding, :consider_all_requests_local, :dependency_loading,
-                    :filter_parameters,  :log_level, :logger, :metals,
+                    :filter_parameters,  :log_level, :logger, :middleware,
                     :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
-                    :secret_token, :serve_static_assets, :time_zone, :whiny_nils
+                    :secret_token, :serve_static_assets, :session_options,
+                    :time_zone, :whiny_nils
 
       def initialize(*)
         super
@@ -22,38 +25,39 @@ module Rails
         @session_store = :cookie_store
         @session_options = {}
         @time_zone = "UTC"
+        @middleware = app_middleware
       end
 
       def encoding=(value)
         @encoding = value
-        if defined?(Encoding) && Encoding.respond_to?(:default_external=)
+        if "ruby".encoding_aware?
           Encoding.default_external = value
+          Encoding.default_internal = value
+        else
+          $KCODE = value
+          if $KCODE == "NONE"
+            raise "The value you specified for config.encoding is " \
+                  "invalid. The possible values are UTF8, SJIS, or EUC"
+          end
         end
       end
 
-      def middleware
-        @middleware ||= default_middleware_stack
-      end
-
-      def metal_loader
-        @metal_loader ||= Rails::Application::MetalLoader.new
-      end
-
       def paths
         @paths ||= begin
           paths = super
           paths.app.controllers << builtin_controller if builtin_controller
-          paths.config.database    "config/database.yml"
-          paths.config.environment "config/environments", :glob => "#{Rails.env}.rb"
-          paths.lib.templates      "lib/templates"
-          paths.log                "log/#{Rails.env}.log"
-          paths.tmp                "tmp"
-          paths.tmp.cache          "tmp/cache"
-          paths.vendor             "vendor", :load_path => true
-          paths.vendor.plugins     "vendor/plugins"
+          paths.config.database     "config/database.yml"
+          paths.config.environment  "config/environment.rb"
+          paths.config.environments "config/environments", :glob => "#{Rails.env}.rb"
+          paths.lib.templates       "lib/templates"
+          paths.log                 "log/#{Rails.env}.log"
+          paths.tmp                 "tmp"
+          paths.tmp.cache           "tmp/cache"
+          paths.vendor              "vendor", :load_path => true
+          paths.vendor.plugins      "vendor/plugins"
 
           if File.exists?("#{root}/test/mocks/#{Rails.env}")
-            ActiveSupport::Deprecation.warn "\"RAILS_ROOT/test/mocks/#{Rails.env}\" won't be added " <<
+            ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " <<
               "automatically to load paths anymore in future releases"
             paths.mocks_path  "test/mocks", :load_path => true, :glob => Rails.env
           end
@@ -127,33 +131,6 @@ module Rails
           @session_options = args.shift || {}
         end
       end
-
-    protected
-
-      def session_options
-        return @session_options unless @session_store == :cookie_store
-        @session_options.merge(:secret => @secret_token)
-      end
-
-      def default_middleware_stack
-        ActionDispatch::MiddlewareStack.new.tap do |middleware|
-          middleware.use('::ActionDispatch::Static', lambda { paths.public.to_a.first }, :if => lambda { serve_static_assets })
-          middleware.use('::Rack::Lock', :if => lambda { !allow_concurrency })
-          middleware.use('::Rack::Runtime')
-          middleware.use('::Rails::Rack::Logger')
-          middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local }, :if => lambda { action_dispatch.show_exceptions })
-          middleware.use("::ActionDispatch::RemoteIp", lambda { action_dispatch.ip_spoofing_check }, lambda { action_dispatch.trusted_proxies })
-          middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header })
-          middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes })
-          middleware.use('::ActionDispatch::Cookies')
-          middleware.use(lambda { session_store }, lambda { session_options })
-          middleware.use('::ActionDispatch::Flash', :if => lambda { session_store })
-          middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? })
-          middleware.use('ActionDispatch::ParamsParser')
-          middleware.use('::Rack::MethodOverride')
-          middleware.use('::ActionDispatch::Head')
-        end
-      end
     end
   end
 end

data/lib/rails/application/finisher.rb

@@ -35,12 +35,17 @@ module Rails
         app
       end
 
-      initializer :after_initialize do
-        config.after_initialize_blocks.each do |block|
-          block.call(self)
+      initializer :eager_load! do
+        if config.cache_classes && !$rails_rake_task
+          ActiveSupport.run_load_hooks(:before_eager_load, self)
+          eager_load!
         end
       end
 
+      initializer :finisher_hook do
+        ActiveSupport.run_load_hooks(:after_initialize, self)
+      end
+
       # Disable dependency loading during request cycle
       initializer :disable_dependency_loading do
         if config.cache_classes && !config.dependency_loading

data/lib/rails/backtrace_cleaner.rb

@@ -2,29 +2,28 @@ require 'active_support/backtrace_cleaner'
 
 module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner
-    ERB_METHOD_SIG = /:in `_run_erb_.*/
-    APP_DIRS = %w( app config lib test )
+    APP_DIRS_PATTERN = /^\/?(app|config|lib|test)/
+    RENDER_TEMPLATE_PATTERN = /:in `_render_template_\w*'/
 
     def initialize
       super
       add_filter   { |line| line.sub("#{Rails.root}/", '') }
-      add_filter   { |line| line.sub(ERB_METHOD_SIG, '') }
+      add_filter   { |line| line.sub(RENDER_TEMPLATE_PATTERN, '') }
       add_filter   { |line| line.sub('./', '/') } # for tests
 
       add_gem_filters
-
-      add_silencer { |line| !APP_DIRS.any? { |dir| line =~ /^\/?#{dir}/ } }
+      add_silencer { |line| line !~ APP_DIRS_PATTERN }
     end
 
     private
       def add_gem_filters
-        return unless defined? Gem
-        (Gem.path + [Gem.default_dir]).uniq.each do |path|
-          # http://gist.github.com/30430
-          add_filter { |line|
-            line.sub(%r{(#{path})/gems/([^/]+)-([0-9.]+)/(.*)}, '\2 (\3) \4')
-          }
-        end
+        return unless defined?(Gem)
+
+        gems_paths = (Gem.path + [Gem.default_dir]).uniq.map!{ |p| Regexp.escape(p) }
+        return if gems_paths.empty?
+
+        gems_regexp = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w\.]+)/(.*)}
+        add_filter { |line| line.sub(gems_regexp, '\2 (\3) \4') }
       end
   end
 

data/lib/rails/commands.rb

@@ -1,8 +1,54 @@
-if ARGV.empty?
-  ARGV << '--help'
-end
+ARGV << '--help' if ARGV.empty?
 
-HELP_TEXT = <<-EOT
+aliases = {
+  "g"  => "generate",
+  "c"  => "console",
+  "s"  => "server",
+  "db" => "dbconsole"
+}
+
+command = ARGV.shift
+command = aliases[command] || command
+
+case command
+when 'generate', 'destroy', 'plugin', 'benchmarker', 'profiler'
+  require APP_PATH
+  Rails::Application.require_environment!
+  require "rails/commands/#{command}"
+
+when 'console'
+  require 'rails/commands/console'
+  require APP_PATH
+  Rails::Application.require_environment!
+  Rails::Console.start(Rails::Application)
+
+when 'server'
+  require 'rails/commands/server'
+  Rails::Server.new.tap { |server|
+    require APP_PATH
+    Dir.chdir(Rails::Application.root)
+    server.start
+  }
+
+when 'dbconsole'
+  require 'rails/commands/dbconsole'
+  require APP_PATH
+  Rails::DBConsole.start(Rails::Application)
+
+when 'application', 'runner'
+  require "rails/commands/#{command}"
+
+when 'new'
+  puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n"
+  puts "Type 'rails' for help."
+
+when '--version', '-v'
+  ARGV.unshift '--version'
+  require 'rails/commands/application'
+
+else
+  puts "Error: Command not recognized" unless %w(-h --help).include?(command)
+  puts <<-EOT
 Usage: rails COMMAND [ARGS]
 
 The most common rails commands are:
@@ -11,6 +57,8 @@ The most common rails commands are:
  server      Start the Rails server (short-cut alias: "s")
  dbconsole   Start a console for the database specified in config/database.yml
              (short-cut alias: "db")
+ new         Create a new Rails application. "rails new my_app" creates a
+             new application called MyApp in "./my_app"
 
 In addition to those, there are:
  application  Generate the Rails application code
@@ -21,53 +69,5 @@ In addition to those, there are:
  runner       Run a piece of code in the application environment
 
 All commands can be run with -h for more information.
-EOT
-
-
-case ARGV.shift
-when 'g', 'generate'
-  require ENV_PATH
-  require 'rails/commands/generate'
-when 'c', 'console'
-  require 'rails/commands/console'
-  require ENV_PATH
-  Rails::Console.start(Rails::Application)
-when 's', 'server'
-  require 'rails/commands/server'
-  # Initialize the server first, so environment options are set
-  server = Rails::Server.new
-  require APP_PATH
-
-  Dir.chdir(Rails::Application.root)
-  server.start
-when 'db', 'dbconsole'
-  require 'rails/commands/dbconsole'
-  require APP_PATH
-  Rails::DBConsole.start(Rails::Application)
-
-when 'application'
-  require 'rails/commands/application'
-when 'destroy'
-  require ENV_PATH
-  require 'rails/commands/destroy'
-when 'benchmarker'
-  require ENV_PATH
-  require 'rails/commands/performance/benchmarker'
-when 'profiler'
-  require ENV_PATH
-  require 'rails/commands/performance/profiler'
-when 'plugin'
-  require APP_PATH
-  require 'rails/commands/plugin'
-when 'runner'
-  require 'rails/commands/runner'
-
-when '--help', '-h'
-  puts HELP_TEXT
-when '--version', '-v'
-  ARGV.unshift '--version'
-  require 'rails/commands/application'
-else
-  puts "Error: Command not recognized"
-  puts HELP_TEXT
-end
+  EOT
+end

data/lib/rails/commands/application.rb

@@ -4,10 +4,15 @@ if %w(--version -v).include? ARGV.first
   exit(0)
 end
 
-ARGV << "--help"   if ARGV.empty?
+if ARGV.first != "new" || ARGV.empty?
+  ARGV[0] = "--help"
+else
+  ARGV.shift
+end
+
 require 'rubygems' if ARGV.include?("--dev")
 
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
-Rails::Generators::AppGenerator.start
+Rails::Generators::AppGenerator.start

data/lib/rails/commands/dbconsole.rb

@@ -1,6 +1,7 @@
 require 'erb'
 require 'yaml'
 require 'optparse'
+require 'rbconfig'
 
 module Rails
   class DBConsole
@@ -41,7 +42,7 @@ module Rails
 
       def find_cmd(*commands)
         dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-        commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
+        commands += commands.map{|cmd| "#{cmd}.exe"} if Config::CONFIG['host_os'] =~ /mswin|mingw/
 
         full_path_command = nil
         found = commands.detect do |cmd|
@@ -54,7 +55,7 @@ module Rails
       end
 
       case config["adapter"]
-      when "mysql"
+      when /^mysql/
         args = {
           'host'      => '--host',
           'port'      => '--port',
@@ -113,4 +114,4 @@ end
 # Has to set the RAILS_ENV before config/application is required
 if ARGV.first && !ARGV.first.index("-") && env = ARGV.first
   ENV['RAILS_ENV'] = %w(production development test).find { |e| e.index(env) } || env
-end
+end

data/lib/rails/commands/destroy.rb

@@ -1,4 +1,5 @@
 require 'rails/generators'
+Rails::Generators.configure!
 
 if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'destroy'

data/lib/rails/commands/generate.rb

@@ -1,4 +1,5 @@
 require 'rails/generators'
+Rails::Generators.configure!
 
 if [nil, "-h", "--help"].include?(ARGV.first)
   Rails::Generators.help 'generate'

data/lib/rails/commands/runner.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'rbconfig'
 
 options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
 code_or_file = nil
@@ -18,7 +19,7 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stderr.puts opts; exit }
 
-  if RUBY_PLATFORM !~ /mswin|mingw/
+  if Config::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your scripts like this:"
     opts.separator "-------------------------------------------------------------"
@@ -35,7 +36,8 @@ ARGV.delete(code_or_file)
 
 ENV["RAILS_ENV"] = options[:environment]
 
-require ENV_PATH
+require APP_PATH
+Rails::Application.require_environment!
 
 begin
   if code_or_file.nil?

data/lib/rails/configuration.rb

@@ -1,9 +1,45 @@
+require 'active_support/deprecation'
 require 'active_support/ordered_options'
 require 'rails/paths'
 require 'rails/rack'
 
 module Rails
   module Configuration
+    class MiddlewareStackProxy #:nodoc:
+      def initialize
+        @operations = []
+      end
+
+      def insert_before(*args, &block)
+        @operations << [:insert_before, args, block]
+      end
+
+      alias :insert :insert_before
+
+      def insert_after(*args, &block)
+        @operations << [:insert_after, args, block]
+      end
+
+      def swap(*args, &block)
+        @operations << [:swap, args, block]
+      end
+
+      def use(*args, &block)
+        @operations << [:use, args, block]
+      end
+
+      def delete(*args, &block)
+        @operations << [:delete, args, block]
+      end
+
+      def merge_into(other)
+        @operations.each do |operation, args, block|
+          other.send(operation, *args, &block)
+        end
+        other
+      end
+    end
+
     class Generators #:nodoc:
       attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging