railties 3.0.0.beta4 → 3.0.0.rc

data/guides/source/security.textile

@@ -286,7 +286,7 @@ When filtering user input file names, _(highlight)don't try to remove malicious
 
 <ruby>
 def sanitize_filename(filename)
-  returning filename.strip do |name|
+  filename.strip.tap do |name|
     # NOTE: File.basename doesn't work right with Windows paths on Unix
     # get only the filename, not the whole path
     name.sub! /\A.*(\\|\/)/, ''
@@ -670,7 +670,7 @@ Also, the second query renames some columns with the AS statement so that the we
 
 h5(#sql-injection-countermeasures). Countermeasures
 
-Ruby on Rails has a built in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <em class="highlight">Using +Model.find(id)+ or +Model.find_by_some thing(something)+ automatically applies this countermeasure</em>. But in SQL fragments, especially <em class="highlight">in conditions fragments (+:conditions => "..."+), the +connection.execute()+ or +Model.find_by_sql()+ methods, it has to be applied manually</em>.
+Ruby on Rails has a built-in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <em class="highlight">Using +Model.find(id)+ or +Model.find_by_some thing(something)+ automatically applies this countermeasure</em>. But in SQL fragments, especially <em class="highlight">in conditions fragments (+:conditions => "..."+), the +connection.execute()+ or +Model.find_by_sql()+ methods, it has to be applied manually</em>.
 
 Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:
 

data/guides/w3c_validator.rb

@@ -35,23 +35,27 @@ module RailsGuides
     
     def validate
       validator = MarkupValidator.new
+      STDOUT.sync = true
+      errors_on_guides = {}
 
       guides_to_validate.each do |f|  
-        puts "Validating #{f}"
         results = validator.validate_file(f)
 
-        if !results.validity
-          puts "#{f} FAILED W3C validation with #{results.errors.size} error(s):"
-          results.errors.each do |error|
-            puts error.to_s
-          end
+        if results.validity
+          print "."
+        else
+          print "E"
+          errors_on_guides[f] = results.errors
         end
       end
+      
+      show_results(errors_on_guides)
     end
     
     private
     def guides_to_validate
       guides = Dir["./guides/output/*.html"]
+      guides.delete("./guides/output/layout.html")
       ENV.key?('ONLY') ? select_only(guides) : guides
     end
 
@@ -61,6 +65,26 @@ module RailsGuides
         prefixes.any? {|p| guide.start_with?("./guides/output/#{p}")}
       end
     end
+    
+    def show_results(error_list)
+      if error_list.size == 0
+        puts "\n\nAll checked guides validate OK!"
+      else
+        error_summary = error_detail = ""
+        
+        error_list.each_pair do |name, errors|
+          error_summary += "\n  #{name}"
+          error_detail += "\n\n  #{name} has #{errors.size} validation error(s):\n"
+          errors.each do |error|
+            error_detail += "\n    "+error.to_s.gsub("\n", "")
+          end
+        end
+        
+        puts "\n\nThere are #{error_list.size} guides with validation errors:\n" + error_summary
+        puts "\nHere are the detailed errors for each guide:" + error_detail
+      end
+    end
+    
   end
 end
 

data/lib/rails.rb

@@ -1,3 +1,5 @@
+require 'rails/ruby_version_check'
+
 require 'pathname'
 
 require 'active_support'
@@ -7,8 +9,6 @@ require 'active_support/core_ext/logger'
 require 'rails/application'
 require 'rails/version'
 require 'rails/deprecation'
-require 'rails/log_subscriber'
-require 'rails/ruby_version_check'
 
 require 'active_support/railtie'
 require 'action_dispatch/railtie'
@@ -66,7 +66,7 @@ module Rails
 
     def backtrace_cleaner
       @@backtrace_cleaner ||= begin
-        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+        # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
         require 'rails/backtrace_cleaner'
         Rails::BacktraceCleaner.new
       end

data/lib/rails/application.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/file_update_checker'
 require 'fileutils'
 require 'rails/plugin'
 require 'rails/engine'
@@ -7,14 +8,6 @@ module Rails
   # In Rails 3.0, a Rails::Application object was introduced which is nothing more than
   # an Engine but with the responsibility of coordinating the whole boot process.
   #
-  # Opposite to Rails::Engine, you can only have one Rails::Application instance
-  # in your process and both Rails::Application and YourApplication::Application
-  # points to it.
-  #
-  # In other words, Rails::Application is Singleton and whenever you are accessing
-  # Rails::Application.config or YourApplication::Application.config, you are actually
-  # accessing YourApplication::Application.instance.config.
-  #
   # == Initialization
   #
   # Rails::Application is responsible for executing all railties, engines and plugin
@@ -27,7 +20,7 @@ module Rails
   # Besides providing the same configuration as Rails::Engine and Rails::Railtie,
   # the application object has several specific configurations, for example
   # "allow_concurrency", "cache_classes", "consider_all_requests_local", "filter_parameters",
-  # "logger", "reload_engines", "reload_plugins" and so forth.
+  # "logger", "reload_plugins" and so forth.
   #
   # Check Rails::Application::Configuration to see them all.
   #
@@ -46,7 +39,6 @@ module Rails
     autoload :Configuration,  'rails/application/configuration'
     autoload :Finisher,       'rails/application/finisher'
     autoload :Railties,       'rails/application/railties'
-    autoload :RoutesReloader, 'rails/application/routes_reloader'
 
     class << self
       private :new
@@ -57,6 +49,10 @@ module Rails
 
       def instance
         if self == Rails::Application
+          if Rails.application
+            ActiveSupport::Deprecation.warn "Calling a method in Rails::Application is deprecated, " <<
+              "please call it directly in your application constant #{Rails.application.class.name}.", caller
+          end
           Rails.application
         else
           @@instance ||= new
@@ -67,7 +63,7 @@ module Rails
         raise "You cannot have more than one Rails::Application" if Rails.application
         super
         Rails.application = base.instance
-        Rails.application.add_lib_to_load_paths!
+        Rails.application.add_lib_to_load_path!
         ActiveSupport.run_load_hooks(:before_configuration, base.instance)
       end
 
@@ -84,17 +80,30 @@ module Rails
 
     delegate :middleware, :to => :config
 
-    def add_lib_to_load_paths!
+    # This method is called just after an application inherits from Rails::Application,
+    # allowing the developer to load classes in lib and use them during application
+    # configuration.
+    #
+    #   class MyApplication < Rails::Application
+    #     require "my_backend" # in lib/my_backend
+    #     config.i18n.backend = MyBackend
+    #   end
+    #
+    # Notice this method takes into consideration the default root path. So if you
+    # are changing config.root inside your application definition or having a custom
+    # Rails application, you will need to add lib to $LOAD_PATH on your own in case
+    # you need to load files in lib/ during the application configuration as well.
+    def add_lib_to_load_path! #:nodoc:
       path = config.root.join('lib').to_s
       $LOAD_PATH.unshift(path) if File.exists?(path)
     end
 
-    def require_environment!
+    def require_environment! #:nodoc:
       environment = paths.config.environment.to_a.first
       require environment if environment
     end
 
-    def eager_load!
+    def eager_load! #:nodoc:
       railties.all(&:eager_load!)
       super
     end
@@ -108,11 +117,17 @@ module Rails
     end
 
     def routes_reloader
-      @routes_reloader ||= RoutesReloader.new
+      @routes_reloader ||= ActiveSupport::FileUpdateChecker.new([]){ reload_routes! }
     end
 
     def reload_routes!
-      routes_reloader.reload!
+      _routes = self.routes
+      _routes.disable_clear_and_finalize = true
+      _routes.clear!
+      routes_reloader.paths.each { |path| load(path) }
+      ActiveSupport.on_load(:action_controller) { _routes.finalize! }
+    ensure
+      _routes.disable_clear_and_finalize = false
     end
 
     def initialize!
@@ -134,12 +149,20 @@ module Rails
       self
     end
 
+    def load_console(sandbox=false)
+      initialize_console(sandbox)
+      railties.all { |r| r.load_console }
+      super()
+      self
+    end
+
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
         config.middleware.build(routes)
       end
     end
+    alias :build_middleware_stack :app
 
     def call(env)
       app.call(env.reverse_merge!(env_defaults))
@@ -197,9 +220,10 @@ module Rails
       require "rails/generators"
     end
 
-    # Application is always reloadable when config.cache_classes is false.
-    def reloadable?(app)
-      true
+    def initialize_console(sandbox=false)
+      require "rails/console/app"
+      require "rails/console/sandbox" if sandbox
+      require "rails/console/helpers"
     end
   end
 end

data/lib/rails/application/bootstrap.rb

@@ -1,4 +1,5 @@
 require "active_support/notifications"
+require "active_support/descendants_tracker"
 
 module Rails
   class Application
@@ -55,6 +56,7 @@ module Rails
       initializer :set_clear_dependencies_hook do
         unless config.cache_classes
           ActionDispatch::Callbacks.after do
+            ActiveSupport::DescendantsTracker.clear
             ActiveSupport::Dependencies.clear
           end
         end

data/lib/rails/application/configuration.rb

@@ -10,7 +10,7 @@ module Rails
       attr_accessor :allow_concurrency, :cache_classes, :cache_store,
                     :encoding, :consider_all_requests_local, :dependency_loading,
                     :filter_parameters,  :log_level, :logger, :middleware,
-                    :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
+                    :plugins, :preload_frameworks, :reload_plugins,
                     :secret_token, :serve_static_assets, :session_options,
                     :time_zone, :whiny_nils
 
@@ -59,7 +59,7 @@ module Rails
           if File.exists?("#{root}/test/mocks/#{Rails.env}")
             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
+            paths.mocks_path  "test/mocks", :autoload => true, :glob => Rails.env
           end
 
           paths
@@ -110,7 +110,7 @@ module Rails
 
       def colorize_logging=(val)
         @colorize_logging = val
-        Rails::LogSubscriber.colorize_logging = val
+        ActiveSupport::LogSubscriber.colorize_logging = val
         self.generators.colorize_logging = val
       end
 

data/lib/rails/application/finisher.rb

@@ -7,14 +7,14 @@ module Rails
         config.generators.templates.unshift(*paths.lib.templates.to_a)
       end
 
-      initializer :ensure_load_once_paths_as_subset do
-        extra = ActiveSupport::Dependencies.load_once_paths -
-                ActiveSupport::Dependencies.load_paths
+      initializer :ensure_autoload_once_paths_as_subset do
+        extra = ActiveSupport::Dependencies.autoload_once_paths -
+                ActiveSupport::Dependencies.autoload_paths
 
         unless extra.empty?
           abort <<-end_error
-            load_once_paths must be a subset of the load_paths.
-            Extra items in load_once_paths: #{extra * ','}
+            autoload_once_paths must be a subset of the autoload_paths.
+            Extra items in autoload_once_paths: #{extra * ','}
           end_error
         end
       end
@@ -32,7 +32,7 @@ module Rails
       end
 
       initializer :build_middleware_stack do
-        app
+        build_middleware_stack
       end
 
       initializer :eager_load! do

data/lib/rails/cli.rb

@@ -1,23 +1,5 @@
 require 'rbconfig'
-
-module Rails
-  module ScriptRailsLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
-    SCRIPT_RAILS = File.join('script', 'rails')
-
-    def self.exec_script_rails!
-      cwd = Dir.pwd
-      exec RUBY, SCRIPT_RAILS, *ARGV if File.exists?(SCRIPT_RAILS)
-      Dir.chdir("..") do
-        # Recurse in a chdir block: if the search fails we want to be sure
-        # the application is generated in the original working directory.
-        exec_script_rails! unless cwd == Dir.pwd
-      end
-    rescue SystemCallError
-      # could not chdir, no problem just return
-    end
-  end
-end
+require 'rails/script_rails_loader'
 
 Rails::ScriptRailsLoader.exec_script_rails!
 

data/lib/rails/commands.rb

@@ -13,27 +13,27 @@ command = aliases[command] || command
 case command
 when 'generate', 'destroy', 'plugin', 'benchmarker', 'profiler'
   require APP_PATH
-  Rails::Application.require_environment!
+  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)
+  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)
+    Dir.chdir(Rails.application.root)
     server.start
   }
 
 when 'dbconsole'
   require 'rails/commands/dbconsole'
   require APP_PATH
-  Rails::DBConsole.start(Rails::Application)
+  Rails::DBConsole.start(Rails.application)
 
 when 'application', 'runner'
   require "rails/commands/#{command}"

data/lib/rails/commands/application.rb

@@ -4,7 +4,7 @@ if %w(--version -v).include? ARGV.first
   exit(0)
 end
 
-if ARGV.first != "new" || ARGV.empty?
+if ARGV.first != "new"
   ARGV[0] = "--help"
 else
   ARGV.shift

data/lib/rails/commands/console.rb

@@ -23,10 +23,7 @@ module Rails
         opt.parse!(ARGV)
       end
 
-      @app.initialize!
-      require "rails/console/app"
-      require "rails/console/sandbox" if options[:sandbox]
-      require "rails/console/helpers"
+      @app.load_console(options[:sandbox])
 
       if options[:debugger]
         begin

data/lib/rails/commands/plugin.rb

@@ -3,7 +3,7 @@
 # Installing plugins:
 #
 #   $ rails plugin install continuous_builder asset_timestamping
-# 
+#
 # Specifying revisions:
 #
 #   * Subversion revision is a single integer.
@@ -14,12 +14,11 @@
 #              'tag 1.8.0' (equivalent to 'refs/tags/1.8.0')
 #
 #
-# This is Free Software, copyright 2005 by Ryan Tomayko (rtomayko@gmail.com) 
+# This is Free Software, copyright 2005 by Ryan Tomayko (rtomayko@gmail.com)
 # and is licensed MIT: (http://www.opensource.org/licenses/mit-license.php)
 
 $verbose = false
 
-
 require 'open-uri'
 require 'fileutils'
 require 'tempfile'
@@ -40,18 +39,18 @@ class RailsEnvironment
       dir = File.dirname(dir)
     end
   end
-  
+
   def self.default
     @default ||= find
   end
-  
+
   def self.default=(rails_env)
     @default = rails_env
   end
-  
+
   def install(name_uri_or_plugin)
     if name_uri_or_plugin.is_a? String
-      if name_uri_or_plugin =~ /:\/\// 
+      if name_uri_or_plugin =~ /:\/\//
         plugin = Plugin.new(name_uri_or_plugin)
       else
         plugin = Plugins[name_uri_or_plugin]
@@ -65,7 +64,7 @@ class RailsEnvironment
       puts "Plugin not found: #{name_uri_or_plugin}"
     end
   end
- 
+
   def use_svn?
     require 'active_support/core_ext/kernel'
     silence_stderr {`svn --version` rescue nil}
@@ -97,7 +96,7 @@ class RailsEnvironment
     ext = `svn propget svn:externals "#{root}/vendor/plugins"`
     lines = ext.respond_to?(:lines) ? ext.lines : ext
     lines.reject{ |line| line.strip == '' }.map do |line|
-      line.strip.split(/\s+/, 2) 
+      line.strip.split(/\s+/, 2)
     end
   end
 
@@ -111,38 +110,37 @@ class RailsEnvironment
       system("svn propset -q svn:externals -F \"#{file.path}\" \"#{root}/vendor/plugins\"")
     end
   end
-  
 end
 
 class Plugin
   attr_reader :name, :uri
-  
+
   def initialize(uri, name = nil)
     @uri = uri
     guess_name(uri)
   end
-  
+
   def self.find(name)
     new(name)
   end
-  
+
   def to_s
     "#{@name.ljust(30)}#{@uri}"
   end
-  
+
   def svn_url?
     @uri =~ /svn(?:\+ssh)?:\/\/*/
   end
-  
+
   def git_url?
     @uri =~ /^git:\/\// || @uri =~ /\.git$/
   end
-  
+
   def installed?
     File.directory?("#{rails_env.root}/vendor/plugins/#{name}") \
       or rails_env.externals.detect{ |name, repo| self.uri == repo }
   end
-  
+
   def install(method=nil, options = {})
     method ||= rails_env.best_install_method?
     if :http == method
@@ -173,7 +171,7 @@ class Plugin
     if rails_env.use_externals?
       # clean up svn:externals
       externals = rails_env.externals
-      externals.reject!{|n,u| name == n or name == u}
+      externals.reject!{|n, u| name == n or name == u}
       rails_env.externals = externals
     end
   end
@@ -192,7 +190,7 @@ class Plugin
     FileUtils.rm_rf tmp if svn_url?
   end
 
-  private 
+  private
 
     def run_install_hook
       install_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/install.rb"
@@ -207,11 +205,11 @@ class Plugin
     def install_using_export(options = {})
       svn_command :export, options
     end
-    
+
     def install_using_checkout(options = {})
       svn_command :checkout, options
     end
-    
+
     def install_using_externals(options = {})
       externals = rails_env.externals
       externals.push([@name, uri])
@@ -229,7 +227,7 @@ class Plugin
         fetcher.fetch
       end
     end
-    
+
     def install_using_git(options = {})
       root = rails_env.root
       mkdir_p(install_path = "#{root}/vendor/plugins/#{name}")
@@ -268,7 +266,7 @@ class Plugin
       end
       @name.gsub!(/\.git$/, '') if @name =~ /\.git$/
     end
-    
+
     def rails_env
       @rails_env || RailsEnvironment.default
     end
@@ -277,45 +275,44 @@ end
 # load default environment and parse arguments
 require 'optparse'
 module Commands
-
   class Plugin
     attr_reader :environment, :script_name, :sources
     def initialize
       @environment = RailsEnvironment.default
       @rails_root = RailsEnvironment.default.root
-      @script_name = File.basename($0) 
+      @script_name = File.basename($0)
       @sources = []
     end
-    
+
     def environment=(value)
       @environment = value
       RailsEnvironment.default = value
     end
-    
+
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
         o.banner =    "Usage: plugin [OPTIONS] command"
         o.define_head "Rails plugin manager."
-        
-        o.separator ""        
+
+        o.separator ""
         o.separator "GENERAL OPTIONS"
-        
+
         o.on("-r", "--root=DIR", String,
              "Set an explicit rails app directory.",
              "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
         o.on("-s", "--source=URL1,URL2", Array,
              "Use the specified plugin repositories instead of the defaults.") { |sources| @sources = sources}
-        
+
         o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
         o.on("-h", "--help", "Show this help message.") { puts o; exit }
-        
+
         o.separator ""
         o.separator "COMMANDS"
-        
+
         o.separator "  install    Install plugin(s) from known repositories or URLs."
         o.separator "  remove     Uninstall plugins."
-        
+
         o.separator ""
         o.separator "EXAMPLES"
         o.separator "  Install a plugin:"
@@ -328,41 +325,41 @@ module Commands
         o.separator "    #{@script_name} plugin install -x continuous_builder\n"
       end
     end
-    
+
     def parse!(args=ARGV)
       general, sub = split_args(args)
       options.parse!(general)
-      
+
       command = general.shift
       if command =~ /^(install|remove)$/
         command = Commands.const_get(command.capitalize).new(self)
         command.parse!(sub)
       else
-        puts "Unknown command: #{command}"
+        puts "Unknown command: #{command}" unless command.blank?
         puts options
         exit 1
       end
     end
-    
+
     def split_args(args)
       left = []
       left << args.shift while args[0] and args[0] =~ /^-/
       left << args.shift if args[0]
-      return [left, args]
+      [left, args]
     end
-    
+
     def self.parse!(args=ARGV)
       Plugin.new.parse!(args)
     end
   end
-  
+
   class Install
     def initialize(base_command)
       @base_command = base_command
       @method = :http
       @options = { :quiet => false, :revision => nil, :force => false }
     end
-    
+
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
@@ -370,8 +367,8 @@ module Commands
         o.define_head "Install one or more plugins."
         o.separator   ""
         o.separator   "Options:"
-        o.on(         "-x", "--externals", 
-                      "Use svn:externals to grab the plugin.", 
+        o.on(         "-x", "--externals",
+                      "Use svn:externals to grab the plugin.",
                       "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
         o.on(         "-o", "--checkout",
                       "Use svn checkout to grab the plugin.",
@@ -392,7 +389,7 @@ module Commands
         o.separator   "a plugin repository."
       end
     end
-    
+
     def determine_install_method
       best = @base_command.environment.best_install_method
       @method = :http if best == :http and @method == :export
@@ -410,9 +407,13 @@ module Commands
       end
       @method
     end
-    
+
     def parse!(args)
       options.parse!(args)
+      if args.blank?
+        puts options
+        exit 1
+      end
       environment = @base_command.environment
       install_method = determine_install_method
       puts "Plugins will be installed using #{install_method}" if $verbose
@@ -430,7 +431,7 @@ module Commands
     def initialize(base_command)
       @base_command = base_command
     end
-    
+
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
@@ -438,9 +439,13 @@ module Commands
         o.define_head "Remove plugins."
       end
     end
-    
+
     def parse!(args)
       options.parse!(args)
+      if args.blank?
+        puts options
+        exit 1
+      end
       root = @base_command.environment.root
       args.each do |name|
         ::Plugin.new(name).uninstall
@@ -470,7 +475,7 @@ module Commands
     end
   end
 end
- 
+
 class RecursiveHTTPFetcher
   attr_accessor :quiet
   def initialize(urls_to_fetch, level = 1, cwd = ".")
@@ -511,7 +516,7 @@ class RecursiveHTTPFetcher
     end
     links
   end
-  
+
   def download(link)
     puts "+ #{File.join(@cwd, File.basename(link))}" unless @quiet
     open(link) do |stream|
@@ -520,13 +525,13 @@ class RecursiveHTTPFetcher
       end
     end
   end
-  
+
   def fetch(links = @urls_to_fetch)
     links.each do |l|
       (l =~ /\/$/ || links == @urls_to_fetch) ? fetch_dir(l) : download(l)
     end
   end
-  
+
   def fetch_dir(url)
     @level += 1
     push_d(File.basename(url)) if @level > 0