railties 3.0.0.rc → 3.0.0.rc2

data/guides/source/layout.html.erb

@@ -62,6 +62,7 @@
             </dl>
             <dl class="R">
               <dt>Digging Deeper</dt>
+              <dd><a href="active_support_core_extensions.html">Active Support Core Extensions</a></dd>
               <dd><a href="i18n.html">Rails Internationalization API</a></dd>
               <dd><a href="action_mailer_basics.html">Action Mailer Basics</a></dd>
               <dd><a href="testing.html">Testing Rails Applications</a></dd>

data/guides/source/layouts_and_rendering.textile

@@ -143,7 +143,7 @@ def update
 end
 </ruby>
 
-If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.  
+If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
 
 If you prefer, you can use a symbol instead of a string to specify the action to render:
 
@@ -200,7 +200,7 @@ render "/u/apps/warehouse_app/current/app/views/products/show"
 Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
 
 <ruby>
-render :file => 
+render :file =>
   "/u/apps/warehouse_app/current/app/views/products/show"
 </ruby>
 
@@ -240,7 +240,7 @@ h5. Using +render+ with +:inline+
 The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
 
 <ruby>
-render :inline => 
+render :inline =>
   "<% products.each do |p| %><p><%= p.name %><p><% end %>"
 </ruby>
 
@@ -249,7 +249,7 @@ WARNING: There is seldom any good reason to use this option. Mixing ERB into you
 By default, inline rendering uses ERb. You can force it to use Builder instead with the +:type+ option:
 
 <ruby>
-render :inline => 
+render :inline =>
   "xml.p {'Horrid coding practice!'}", :type => :builder
 </ruby>
 
@@ -676,7 +676,7 @@ h5. Linking to Feeds with +auto_discovery_link_tag+
 The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
 
 <erb>
-<%= auto_discovery_link_tag(:rss, {:action => "feed"}, 
+<%= auto_discovery_link_tag(:rss, {:action => "feed"},
   {:title => "RSS Feed"}) %>
 </erb>
 
@@ -739,7 +739,7 @@ If you're loading multiple javascript files, you can create a better user experi
 By default, the combined file will be delivered as +javascripts/all.js+. You can specify a location for the cached asset file instead:
 
 <erb>
-<%= javascript_include_tag "main", "columns", 
+<%= javascript_include_tag "main", "columns",
   :cache => 'cache/main/display' %>
 </erb>
 
@@ -798,7 +798,7 @@ If you're loading multiple CSS files, you can create a better user experience by
 By default, the combined file will be delivered as +stylesheets/all.css+. You can specify a location for the cached asset file instead:
 
 <erb>
-<%= stylesheet_link_tag "main", "columns", 
+<%= stylesheet_link_tag "main", "columns",
   :cache => 'cache/main/display' %>
 </erb>
 
@@ -1085,7 +1085,7 @@ Partials are very useful in rendering collections. When you pass a collection to
 <p>Product Name: <%= product.name %></p>
 </erb>
 
-When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered. 
+When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered.
 
 In Rails 3.0 there is also a shorthand for this, assuming +@posts+ is a collection of +post+ instances, you can simply do in the +index.html.erb+:
 
@@ -1132,7 +1132,7 @@ With this change, you can access an instance of the +@products+ collection as th
 You can also pass in arbitrary local variables to any partial you are rendering with the +:locals => {}+ option:
 
 <erb>
-<%= render :partial => 'products', :collection => @products, 
+<%= render :partial => 'products', :collection => @products,
            :as => :item, :locals => {:title => "Products Page"} %>
 </erb>
 

data/guides/source/nested_model_forms.textile

@@ -63,7 +63,7 @@ class Person
   def address
     Address.new
   end
-  
+
   def address_attributes=(attributes)
     # ...
   end
@@ -77,7 +77,7 @@ class Person
   def projects
     [Project.new, Project.new]
   end
-  
+
   def projects_attributes=(attributes)
     # ...
   end
@@ -101,7 +101,7 @@ class PeopleController < ActionController:Base
     @person.built_address
     2.times { @person.projects.build }
   end
-  
+
   def create
     @person = Person.new(params[:person])
     if @person.save
@@ -142,7 +142,7 @@ Now add a nested form for the +address+ association:
 <erb>
 <%= form_for @person do |f| %>
   <%= f.text_field :name %>
-  
+
   <%= f.fields_for :address do |af| %>
     <%= f.text_field :street %>
   <% end %>
@@ -154,7 +154,7 @@ This generates:
 <html>
 <form action="/people" class="new_person" id="new_person" method="post">
   <input id="person_name" name="person[name]" size="30" type="text" />
-  
+
   <input id="person_address_attributes_street" name="person[address_attributes][street]" size="30" type="text" />
 </form>
 </html>
@@ -183,7 +183,7 @@ The form code for an association collection is pretty similar to that of a singl
 <erb>
 <%= form_for @person do |f| %>
   <%= f.text_field :name %>
-  
+
   <%= f.fields_for :projects do |pf| %>
     <%= f.text_field :name %>
   <% end %>
@@ -195,7 +195,7 @@ Which generates:
 <html>
 <form action="/people" class="new_person" id="new_person" method="post">
   <input id="person_name" name="person[name]" size="30" type="text" />
-  
+
   <input id="person_projects_attributes_0_name" name="person[projects_attributes][0][name]" size="30" type="text" />
   <input id="person_projects_attributes_1_name" name="person[projects_attributes][1][name]" size="30" type="text" />
 </form>

data/guides/source/plugins.textile

@@ -323,7 +323,7 @@ Finally, create the +core_ext.rb+ file and add the +to_squawk+ method:
 
 <ruby>
 # vendor/plugins/yaffle/lib/yaffle/core_ext.rb
-  
+
 String.class_eval do
   def to_squawk
     "squawk! #{self}".strip

data/guides/source/rails_application_templates.textile

@@ -79,7 +79,7 @@ plugin 'authentication', :git => 'git://github.com/foor/bar.git'
 You can even install plugins as git submodules :
 
 <ruby>
-plugin 'authentication', :git => 'git://github.com/foor/bar.git', 
+plugin 'authentication', :git => 'git://github.com/foor/bar.git',
                          :submodule => true
 </ruby>
 
@@ -103,7 +103,7 @@ class Object
   def not_nil?
     !nil?
   end
-  
+
   def not_blank?
     !blank?
   end

data/guides/source/routing.textile

@@ -313,7 +313,7 @@ To add a member route, just add a +member+ block into the resource block:
 <ruby>
 resources :photos do
   member do
-    get :preview
+    get 'preview'
   end
 end
 </ruby>
@@ -324,7 +324,7 @@ Within the block of member routes, each route name specifies the HTTP verb that
 
 <ruby>
 resources :photos do
-  get :preview, :on => :member
+  get 'preview', :on => :member
 end
 </ruby>
 
@@ -335,7 +335,7 @@ To add a route to the collection:
 <ruby>
 resources :photos do
   collection do
-    get :search
+    get 'search'
   end
 end
 </ruby>
@@ -346,7 +346,7 @@ Just as with member routes, you can pass +:on+ to a route:
 
 <ruby>
 resources :photos do
-  get :search, :on => :collection
+  get 'search', :on => :collection
 end
 </ruby>
 
@@ -501,7 +501,7 @@ class BlacklistConstraint
 end
 
 TwitterClone::Application.routes.draw do
-  match "*path" => "blacklist#index", 
+  match "*path" => "blacklist#index",
     :constraints => BlacklistConstraint.new
 end
 </ruby>
@@ -516,6 +516,22 @@ match 'photos/*other' => 'photos#unknown'
 
 This route would match +photos/12+ or +/photos/long/path/to/12+, setting +params[:other]+ to +"12"+ or +"long/path/to/12"+.
 
+Wildcard segments do not need to be last in a route. For example
+
+<ruby>
+match 'books/*section/:title' => 'books#show'
+</ruby>
+
+would match +books/some/section/last-words-a-memoir+ with +params[:section]+ equals +"some/section"+, and +params[:title]+ equals +"last-words-a-memoir"+.
+
+Techincally a route can have even more than one wildard segment indeed, the matcher assigns segments to parameters in an intuitive way. For instance
+
+<ruby>
+match '*a/foo/*b' => 'test#index'
+</ruby>
+
+would match +zoo/woo/foo/bar/baz+ with +params[:a]+ equals +"zoo/woo"+, and +params[:b]+ equals +"bar/baz"+.
+
 h4. Redirection
 
 You can redirect any path to another path using the +redirect+ helper in your router:
@@ -762,6 +778,12 @@ formatted_users GET  /users.:format  {:controller=>"users", :action=>"index"}
                 POST /users.:format  {:controller=>"users", :action=>"create"}
 </pre>
 
+You may restrict the listing to the routes that map to a particular controller setting the +CONTROLLER+ environment variable:
+
+<shell>
+$ CONTROLLER=users rake routes
+</shell>
+
 TIP: You'll find that the output from +rake routes+ is much more readable if you widen your terminal window until the output lines don't wrap.
 
 h4. Testing Routes

data/guides/source/security.textile

@@ -371,7 +371,7 @@ The mass-assignment feature may become a problem, as it allows an attacker to se
 
 <ruby>
 def signup
-  params[:user] #=> {:name => “ow3ned”, :admin => true}
+  params[:user] # => {:name => “ow3ned”, :admin => true}
   @user = User.new(params[:user])
 end
 </ruby>
@@ -385,7 +385,7 @@ Mass-assignment saves you much work, because you don't have to set each value in
 This will set the following parameters in the controller:
 
 <ruby>
-params[:user] #=> {:name => “ow3ned”, :admin => true}
+params[:user] # => {:name => “ow3ned”, :admin => true}
 </ruby>
 
 So if you create a new user using mass-assignment, it may be too easy to become an administrator.
@@ -401,7 +401,7 @@ Note that this vulnerability is not restricted to database columns.  Any setter
 
   class Child < ActiveRecord::Base
     belongs_to :person
-  end  
+  end
 </ruby>
 
 As a result, the vulnerability is extended beyond simply exposing column assignment, allowing attackers the ability to create entirely new records in referenced tables (children in this case).
@@ -423,11 +423,11 @@ attr_accessible :name
 If you want to set a protected attribute, you will to have to assign it individually:
 
 <ruby>
-params[:user] #=> {:name => "ow3ned", :admin => true}
+params[:user] # => {:name => "ow3ned", :admin => true}
 @user = User.new(params[:user])
-@user.admin #=> false # not mass-assigned
+@user.admin # => false # not mass-assigned
 @user.admin = true
-@user.admin #=> true
+@user.admin # => true
 </ruby>
 
 A more paranoid technique to protect your whole project would be to enforce that all models whitelist their accessible attributes.  This can be easily achieved with a very simple initializer:

data/guides/w3c_validator.rb

@@ -21,7 +21,7 @@
 #
 #     Separate many using commas:
 #
-#       # validates only 
+#       # validates only
 #       ONLY=assoc,migrations rake validate_guides
 #
 # ---------------------------------------------------------------------------
@@ -32,13 +32,13 @@ include W3CValidators
 
 module RailsGuides
   class Validator
-    
+
     def validate
       validator = MarkupValidator.new
       STDOUT.sync = true
       errors_on_guides = {}
 
-      guides_to_validate.each do |f|  
+      guides_to_validate.each do |f|
         results = validator.validate_file(f)
 
         if results.validity
@@ -48,10 +48,10 @@ module RailsGuides
           errors_on_guides[f] = results.errors
         end
       end
-      
+
       show_results(errors_on_guides)
     end
-    
+
     private
     def guides_to_validate
       guides = Dir["./guides/output/*.html"]
@@ -65,13 +65,13 @@ 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"
@@ -79,12 +79,12 @@ module RailsGuides
             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/application.rb

@@ -205,6 +205,7 @@ module Rails
         middleware.use ::ActionDispatch::ParamsParser
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::Head
+        middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support if config.action_dispatch.best_standards_support
       end
     end
 

data/lib/rails/application/configuration.rb

@@ -16,9 +16,9 @@ module Rails
 
       def initialize(*)
         super
+        self.encoding = "utf-8"
         @allow_concurrency = false
         @consider_all_requests_local = false
-        @encoding = "utf-8"
         @filter_parameters = []
         @dependency_loading = true
         @serve_static_assets = true

data/lib/rails/code_statistics.rb

@@ -12,7 +12,7 @@ class CodeStatistics #:nodoc:
     print_header
     @pairs.each { |pair| print_line(pair.first, @statistics[pair.first]) }
     print_splitter
-  
+
     if @total
       print_line("Total", @total)
       print_splitter
@@ -29,7 +29,7 @@ class CodeStatistics #:nodoc:
     def calculate_directory_statistics(directory, pattern = /.*\.rb$/)
       stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
 
-      Dir.foreach(directory) do |file_name| 
+      Dir.foreach(directory) do |file_name|
         if File.stat(directory + "/" + file_name).directory? and (/^\./ !~ file_name)
           newstats = calculate_directory_statistics(directory + "/" + file_name, pattern)
           stats.each { |k, v| stats[k] += newstats[k] }
@@ -85,10 +85,10 @@ class CodeStatistics #:nodoc:
       start = if TEST_TYPES.include? name
         "| #{name.ljust(20)} "
       else
-        "| #{name.ljust(20)} " 
+        "| #{name.ljust(20)} "
       end
 
-      puts start + 
+      puts start +
            "| #{statistics["lines"].to_s.rjust(5)} " +
            "| #{statistics["codelines"].to_s.rjust(5)} " +
            "| #{statistics["classes"].to_s.rjust(7)} " +

data/lib/rails/commands.rb

@@ -70,4 +70,4 @@ In addition to those, there are:
 
 All commands can be run with -h for more information.
   EOT
-end
+end

data/lib/rails/commands/dbconsole.rb

@@ -42,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 Config::CONFIG['host_os'] =~ /mswin|mingw/
+        commands += commands.map{|cmd| "#{cmd}.exe"} if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
 
         full_path_command = nil
         found = commands.detect do |cmd|

data/lib/rails/commands/plugin.rb

@@ -375,7 +375,7 @@ module Commands
                       "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
         o.on(         "-e", "--export",
                       "Use svn export to grab the plugin.",
-                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates, or add an svn:externals entry.") { |v| @method = :export }
+                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
         o.on(         "-q", "--quiet",
                       "Suppresses the output from installation.",
                       "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }

data/lib/rails/commands/runner.rb

@@ -19,7 +19,7 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stderr.puts opts; exit }
 
-  if Config::CONFIG['host_os'] !~ /mswin|mingw/
+  if RbConfig::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 "-------------------------------------------------------------"