RubyGems - railties - Versions diffs - 3.0.0.beta4 → 3.0.0.rc - Mend

railties 3.0.0.beta4 → 3.0.0.rc

Files changed (113) hide show

data/CHANGELOG +24 -6
data/README.rdoc +25 -0
data/guides/assets/javascripts/code_highlighter.js +0 -0
data/guides/assets/javascripts/guides.js +0 -0
data/guides/assets/stylesheets/print.css +0 -0
data/guides/assets/stylesheets/reset.css +0 -0
data/guides/assets/stylesheets/style.css +0 -0
data/guides/source/3_0_release_notes.textile +5 -3
data/guides/source/action_controller_overview.textile +19 -0
data/guides/source/active_record_basics.textile +27 -21
data/guides/source/active_record_querying.textile +39 -37
data/guides/source/{activerecord_validations_callbacks.textile → active_record_validations_callbacks.textile} +30 -29
data/guides/source/active_support_core_extensions.textile +232 -107
data/guides/source/api_documentation_guidelines.textile +187 -0
data/guides/source/association_basics.textile +45 -1
data/guides/source/configuring.textile +7 -7
data/guides/source/contributing_to_rails.textile +42 -15
data/guides/source/form_helpers.textile +1 -1
data/guides/source/generators.textile +37 -37
data/guides/source/getting_started.textile +11 -11
data/guides/source/i18n.textile +1 -1
data/guides/source/index.html.erb +14 -6
data/guides/source/initialization.textile +130 -124
data/guides/source/layout.html.erb +5 -2
data/guides/source/layouts_and_rendering.textile +2 -2
data/guides/source/migrations.textile +4 -3
data/guides/source/plugins.textile +15 -15
data/guides/source/rails_application_templates.textile +2 -2
data/guides/source/routing.textile +83 -62
data/guides/source/security.textile +2 -2
data/guides/w3c_validator.rb +30 -6
data/lib/rails.rb +3 -3
data/lib/rails/application.rb +43 -19
data/lib/rails/application/bootstrap.rb +2 -0
data/lib/rails/application/configuration.rb +3 -3
data/lib/rails/application/finisher.rb +6 -6
data/lib/rails/cli.rb +1 -19
data/lib/rails/commands.rb +5 -5
data/lib/rails/commands/application.rb +1 -1
data/lib/rails/commands/console.rb +1 -4
data/lib/rails/commands/generate.rb +0 -0
data/lib/rails/commands/plugin.rb +57 -52
data/lib/rails/commands/runner.rb +2 -1
data/lib/rails/commands/server.rb +6 -2
data/lib/rails/configuration.rb +2 -3
data/lib/rails/console/app.rb +0 -2
data/lib/rails/engine.rb +14 -15
data/lib/rails/engine/configuration.rb +5 -5
data/lib/rails/generators.rb +2 -3
data/lib/rails/generators/actions.rb +4 -4
data/lib/rails/generators/base.rb +1 -1
data/lib/rails/generators/erb/scaffold/scaffold_generator.rb +1 -6
data/lib/rails/generators/erb/scaffold/templates/_form.html.erb +4 -4
data/lib/rails/generators/erb/scaffold/templates/edit.html.erb +3 -3
data/lib/rails/generators/erb/scaffold/templates/index.html.erb +7 -7
data/lib/rails/generators/erb/scaffold/templates/new.html.erb +2 -2
data/lib/rails/generators/erb/scaffold/templates/show.html.erb +3 -3
data/lib/rails/generators/generated_attribute.rb +2 -1
data/lib/rails/generators/named_base.rb +24 -0
data/lib/rails/generators/rails/app/app_generator.rb +10 -9
data/lib/rails/generators/rails/app/templates/Gemfile +4 -3
data/lib/rails/generators/rails/app/templates/README +6 -31
data/lib/rails/generators/rails/app/templates/Rakefile +1 -1
data/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb +0 -1
data/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory +0 -0
data/lib/rails/generators/rails/app/templates/config/application.rb +11 -11
data/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml +36 -24
data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml +1 -1
data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml +1 -1
data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +3 -0
data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +3 -0
data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +3 -0
data/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb +1 -1
data/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt +2 -2
data/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt +2 -2
data/lib/rails/generators/rails/app/templates/config/routes.rb +1 -1
data/lib/rails/generators/rails/app/templates/public/index.html +0 -17
data/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js +2027 -900
data/lib/rails/generators/rails/app/templates/public/javascripts/rails.js +114 -57
data/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt +1 -1
data/lib/rails/generators/rails/model/USAGE +1 -1
data/lib/rails/generators/rails/resource/resource_generator.rb +4 -14
data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb +0 -2
data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +28 -30
data/lib/rails/generators/resource_helpers.rb +1 -1
data/lib/rails/generators/test_case.rb +25 -11
data/lib/rails/generators/test_unit/model/model_generator.rb +1 -1
data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +0 -1
data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb +13 -15
data/lib/rails/info.rb +1 -2
data/lib/rails/info_routes.rb +1 -1
data/lib/rails/initializable.rb +3 -16
data/lib/rails/paths.rb +31 -36
data/lib/rails/plugin.rb +10 -6
data/lib/rails/rack/logger.rb +11 -13
data/lib/rails/railtie.rb +14 -42
data/lib/rails/ruby_version_check.rb +19 -5
data/lib/rails/script_rails_loader.rb +29 -0
data/lib/rails/tasks/annotations.rake +2 -2
data/lib/rails/tasks/documentation.rake +47 -16
data/lib/rails/tasks/framework.rake +9 -9
data/lib/rails/tasks/middleware.rake +1 -1
data/lib/rails/tasks/misc.rake +5 -5
data/lib/rails/tasks/routes.rake +1 -1
data/lib/rails/tasks/tmp.rake +5 -5
data/lib/rails/test_unit/testing.rake +38 -14
data/lib/rails/version.rb +1 -1
metadata +29 -17
data/README +0 -281
data/lib/rails/application/routes_reloader.rb +0 -46
data/lib/rails/log_subscriber.rb +0 -115
data/lib/rails/log_subscriber/test_helper.rb +0 -97
data/lib/rails/webrick_server.rb +0 -156

data/guides/source/layout.html.erb CHANGED

@@ -50,7 +50,7 @@
               <dd><a href="getting_started.html">Getting Started with Rails</a></dd>
               <dt>Models</dt>
               <dd><a href="migrations.html">Rails Database Migrations</a></dd>
-              <dd><a href="activerecord_validations_callbacks.html">Active Record Validations and Callbacks</a></dd>
+              <dd><a href="active_record_validations_callbacks.html">Active Record Validations and Callbacks</a></dd>
               <dd><a href="association_basics.html">Active Record Associations</a></dd>
               <dd><a href="active_record_querying.html">Active Record Query Interface</a></dd>
               <dt>Views</dt>
@@ -71,13 +71,16 @@
               <dd><a href="configuring.html">Configuring Rails Applications</a></dd>
               <dd><a href="command_line.html">Rails Command Line Tools and Rake Tasks</a></dd>
               <dd><a href="caching_with_rails.html">Caching with Rails</a></dd>
-              <dd><a href="contributing_to_rails.html">Contributing to Rails</a></dd>
               <dt>Extending Rails</dt>
               <dd><a href="plugins.html">The Basics of Creating Rails Plugins</a></dd>
               <dd><a href="rails_on_rack.html">Rails on Rack</a></dd>
               <dd><a href="generators.html">Adding a Generator to Your Plugin</a></dd>
+              <dt>Contributing to Rails</dt>
+              <dd><a href="contributing_to_rails.html">Contributing to Rails</a></dd>
+              <dd><a href="api_documentation_guidelines.html">API Documentation Guidelines</a></dd>
               <dt>Release Notes</dt>
               <dd><a href="3_0_release_notes.html">Ruby on Rails 3.0 Release Notes</a></dd>
               <dd><a href="2_3_release_notes.html">Ruby on Rails 2.3 Release Notes</a></dd>

data/guides/source/layouts_and_rendering.textile CHANGED

@@ -2,7 +2,7 @@ h2. Layouts and Rendering in Rails
 This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:
-* Use the various rendering methods built in to Rails
+* Use the various rendering methods built into Rails
 * Create layouts with multiple content sections
 * Use partials to DRY up your views
 * Use nested layouts (sub-templates)
@@ -1168,7 +1168,7 @@ Suppose you have the following +ApplicationController+ layout:
 <body>
   <div id="top_menu">Top menu items here</div>
   <div id="menu">Menu items here</div>
-  <div id="content"><%= yield(:content) or yield %></div>
+  <div id="content"><%= content_for?(:content) ? yield(:content) : yield %></div>
 </body>
 </html>
 </erb>

data/guides/source/migrations.textile CHANGED

@@ -1,6 +1,6 @@
 h2. Migrations
-Migrations are a convenient way for you to alter your database in a structured and organized manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You'd also have to keep track of which changes need to be run against the production machines next time you deploy.
+Migrations are a convenient way for you to alter your database in a structured and organized manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run them. You'd also have to keep track of which changes need to be run against the production machines next time you deploy.
 Active Record tracks which migrations have already been run so all you have to do is update your source and run +rake db:migrate+. Active Record will work out which migrations should be run. It will also update your +db/schema.rb+ file to match the structure of your database.
@@ -234,7 +234,7 @@ end
 which creates a +products+ table with a column called +name+ (and as discussed below, an implicit +id+ column).
-The object yielded to the block allows you create columns on the table. There are two ways of doing this: The first (traditional) form looks like
+The object yielded to the block allows you to create columns on the table. There are two ways of doing this: The first (traditional) form looks like
 <ruby>
 create_table :products do |t|
@@ -250,7 +250,7 @@ create_table :products do |t|
 end
 </ruby>
-By default +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass +:id => false+. If you need to pass database specific options you can place an SQL fragment in the +:options+ option. For example
+By default +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass +:id => false+. If you need to pass database specific options you can place a SQL fragment in the +:options+ option. For example
 <ruby>
 create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
@@ -592,4 +592,5 @@ h3. Changelog
 "Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/6
+* July 15, 2010: minor typos corrected by "Jaime Iniesta":http://jaimeiniesta.com
 * September 14, 2008: initial version by "Frederick Cheung":credits.html#fcheung

data/guides/source/plugins.textile CHANGED

@@ -205,7 +205,7 @@ def load_schema
   ActiveRecord::Base.establish_connection(config[db_adapter])
   load(File.dirname(__FILE__) + "/schema.rb")
-  require File.dirname(__FILE__) + '/../rails/init.rb'
+  require File.dirname(__FILE__) + '/../rails/init'
 end
 </ruby>
@@ -218,7 +218,7 @@ Once you have these files in place, you can write your first test to ensure that
 <ruby>
 # vendor/plugins/yaffle/test/yaffle_test.rb
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class YaffleTest < Test::Unit::TestCase
   load_schema
@@ -284,7 +284,7 @@ In this example you will add a method to String named +to_squawk+.  To begin, cr
 <ruby>
 # vendor/plugins/yaffle/test/core_ext_test.rb
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class CoreExtTest < Test::Unit::TestCase
   def test_to_squawk_prepends_the_word_squawk
@@ -311,7 +311,7 @@ NoMethodError: undefined method `to_squawk' for "Hello World":String
 Great - now you are ready to start development.
-Then in +lib/yaffle.rb+ require +lib/core_ext.rb+:
+Then in +lib/yaffle.rb+ require +lib/core_ext+:
 <ruby>
 # vendor/plugins/yaffle/lib/yaffle.rb
@@ -380,7 +380,7 @@ To begin, set up your files so that you have:
 * *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class ActsAsYaffleTest < Test::Unit::TestCase
 end
@@ -436,7 +436,7 @@ To start out, write a failing test that shows the behavior you'd like:
 * *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class Hickwall < ActiveRecord::Base
   acts_as_yaffle
@@ -489,7 +489,7 @@ To start out, write a failing test that shows the behavior you'd like:
 * *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class Hickwall < ActiveRecord::Base
   acts_as_yaffle
@@ -579,7 +579,7 @@ As always, start with a test:
 * *vendor/plugins/yaffle/test/woodpecker_test.rb:*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 class WoodpeckerTest < Test::Unit::TestCase
   load_schema
@@ -633,7 +633,7 @@ You can test your plugin's controller as you would test any other controller:
 * *vendor/plugins/yaffle/test/woodpeckers_controller_test.rb:*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 require 'woodpeckers_controller'
 require 'action_controller/test_process'
@@ -693,7 +693,7 @@ You can test your plugin's helper as you would test any other helper:
 * *vendor/plugins/yaffle/test/woodpeckers_helper_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 include WoodpeckersHelper
 class WoodpeckersHelperTest < Test::Unit::TestCase
@@ -816,7 +816,7 @@ This section will describe how to create a simple generator that adds a file.  F
 * *vendor/plugins/yaffle/test/definition_generator_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
@@ -990,7 +990,7 @@ To start, add the following test method:
 * *vendor/plugins/yaffle/test/route_generator_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
 require 'rails_generator/scripts/destroy'
@@ -1205,7 +1205,7 @@ This example will demonstrate how to use one of the built-in generator methods n
 * *vendor/plugins/yaffle/test/yaffle_migration_generator_test.rb*
 <ruby>
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/test_helper'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
@@ -1274,7 +1274,7 @@ class YaffleMigrationGenerator < Rails::Generator::NamedBase
     end
     def yaffle_local_assigns
-      returning(assigns = {}) do
+      {}.tap do |assigns|
         assigns[:migration_action] = "add"
         assigns[:class_name] = "add_yaffle_fields_to_#{custom_file_name}"
         assigns[:table_name] = custom_file_name
@@ -1284,7 +1284,7 @@ class YaffleMigrationGenerator < Rails::Generator::NamedBase
 end
 </ruby>
-The generator creates a new file in 'db/migrate' with a timestamp and an 'add_column' statement.  It reuses the built in rails +migration_template+ method, and reuses the built-in rails migration template.
+The generator creates a new file in 'db/migrate' with a timestamp and an 'add_column' statement.  It reuses the built-in rails +migration_template+ method, and reuses the built-in rails migration template.
 It's courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names.  This way people using your generator won't have to manually change the generated files if they've turned pluralization off.

data/guides/source/rails_application_templates.textile CHANGED

@@ -51,11 +51,11 @@ h4. gem(name, options = {})
 Adds a +config.gem+ entry for the supplied gem to the generated application’s +config/environment.rb+.
-For example, if your application depends on the gems +bj+ and +hpricot+ :
+For example, if your application depends on the gems +bj+ and +nokogiri+ :
 <ruby>
 gem "bj"
-gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+gem "nokogiri"
 </ruby>
 Please note that this will NOT install the gems for you. So you may want to run the +rake gems:install+ task too :

data/guides/source/routing.textile CHANGED

@@ -3,16 +3,16 @@ h2. Rails Routing from the Outside In
 This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:
 * Understand the code in +routes.rb+
-* Construct your own routes, using either the preferred resourceful style or with the @match@ method
+* Construct your own routes, using either the preferred resourceful style or with the <tt>match</tt> method
 * Identify what parameters to expect an action to receive
-* Automatically create URLs using route helpers
+* Automatically create paths and URLs using route helpers
 * Use advanced techniques such as constraints and Rack endpoints
 endprologue.
 h3. The Purpose of the Rails Router
-The Rails router recognizes URLs and dispatches them to a controller's action. It can also generate URLs, avoiding the need to hardcode URL strings in your views.
+The Rails router recognizes URLs and dispatches them to a controller's action. It can also generate paths and URLs, avoiding the need to hardcode strings in your views.
 h4. Connecting URLs to Code
@@ -30,9 +30,9 @@ match "/patients/:id" => "patients#show"
 the request is dispatched to the +patients+ controller's +show+ action with <tt>{ :id => "17" }</tt> in +params+.
-h4. Generating URLs from Code
+h4. Generating Paths and URLs from Code
-You can also generate routes. If your application contains this code:
+You can also generate paths and URLs. If your application contains this code:
 <ruby>
 @patient = Patient.find(17)
@@ -76,7 +76,7 @@ resources :photos
 creates seven different routes in your application, all mapping to the +Photos+ controller:
-|_. Verb |_.URL             |_.action |_.used for|
+|_. Verb |_.Path            |_.action |_.used for|
 |GET     |/photos           |index    |display a list of all photos|
 |GET     |/photos/new       |new      |return an HTML form for creating a new photo|
 |POST    |/photos           |create   |create a new photo|
@@ -85,7 +85,7 @@ creates seven different routes in your application, all mapping to the +Photos+
 |PUT     |/photos/:id       |update   |update a specific photo|
 |DELETE  |/photos/:id       |destroy  |delete a specific photo|
-h4. URLs and Paths
+h4. Paths and URLs
 Creating a resourceful route will also expose a number of helpers to the controllers in your application. In the case of +resources :photos+:
@@ -130,7 +130,7 @@ resource :geocoder
 creates six different routes in your application, all mapping to the +Geocoders+ controller:
-|_. Verb    |_.URL          |_.action |_.used for|
+|_. Verb    |_.Path         |_.action |_.used for|
 |GET        |/geocoder/new  |new      |return an HTML form for creating the geocoder|
 |POST       |/geocoder      |create   |create the new geocoder|
 |GET        |/geocoder      |show     |display the one and only geocoder resource|
@@ -160,7 +160,7 @@ end
 This will create a number of routes for each of the +posts+ and +comments+ controller. For +Admin::PostsController+, Rails will create:
-|_. Verb |_.URL                |_.action |_. helper                  |
+|_. Verb |_.Path               |_.action |_. helper                  |
 |GET     |/admin/photos        |index    | admin_photos_path         |
 |GET     |/admin/photos/new    |new      | new_admin_photos_path     |
 |POST    |/admin/photos        |create   | admin_photos_path         |
@@ -197,16 +197,16 @@ or, for a single case
 resources :posts, :path => "/admin"
 </ruby>
-In each of these cases, the named routes remain the same as if you did not use +scope+. In the last case, the following URLs map to +PostsController+:
+In each of these cases, the named routes remain the same as if you did not use +scope+. In the last case, the following paths map to +PostsController+:
-|_. Verb |_.URL         |_.action |_. helper            |
-|GET     |photos        |index    | photos_path         |
-|GET     |photos/new    |new      | photos_path         |
-|POST    |photos        |create   | photos_path         |
-|GET     |photos/1      |show     | photo_path(id)      |
-|GET     |photos/1/edit |edit     | dmin_photo_path(id) |
-|PUT     |photos/1      |update   | photo_path(id)      |
-|DELETE  |photos/1      |destroy  | photo_path(id)      |
+|_. Verb |_.Path               |_.action |_. helper            |
+|GET     |/admin/photos        |index    | photos_path         |
+|GET     |/admin/photos/new    |new      | photos_path         |
+|POST    |/admin/photos        |create   | photos_path         |
+|GET     |/admin/photos/1      |show     | photo_path(id)      |
+|GET     |/admin/photos/1/edit |edit     | edit_photo_path(id) |
+|PUT     |/admin/photos/1      |update   | photo_path(id)      |
+|DELETE  |/admin/photos/1      |destroy  | photo_path(id)      |
 h4. Nested Resources
@@ -232,7 +232,7 @@ end
 In addition to the routes for magazines, this declaration will also route ads to an +AdsController+. The ad URLs require a magazine:
-|_.Verb |_.URL                    |_.action |_.used for|
+|_.Verb |_.Path                   |_.action |_.used for|
 |GET    |/magazines/1/ads         |index    |display a list of all ads for a specific magazine|
 |GET    |/magazines/1/ads/new     |new      |return an HTML form for creating a new ad belonging to a specific magazine|
 |POST   |/magazines/1/ads         |create   |create a new ad belonging to a specific magazine|
@@ -256,7 +256,7 @@ resources :publishers do
 end
 </ruby>
-Deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize URLs such as
+Deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize paths such as
 <pre>
 /publishers/1/magazines/2/photos/3
@@ -266,9 +266,9 @@ The corresponding route helper would be +publisher_magazine_photo_url+, requirin
 TIP: _Resources should never be nested more than 1 level deep._
-h4. Creating URLs From Objects
+h4. Creating Paths and URLs From Objects
-In addition to using the routing helpers, Rails can also create URLs from an array of parameters. For example, suppose you have this set of routes:
+In addition to using the routing helpers, Rails can also create paths and URLs from an array of parameters. For example, suppose you have this set of routes:
 <ruby>
 resources :magazines do
@@ -308,7 +308,7 @@ You are not limited to the seven routes that RESTful routing creates by default.
 h5. Adding Member Routes
-To add a member route, just add +member+ block into resource block:
+To add a member route, just add a +member+ block into the resource block:
 <ruby>
 resources :photos do
@@ -318,9 +318,9 @@ resources :photos do
 end
 </ruby>
-This will recognize +/photos/1/preview+ with GET, and route to the +preview+ action of  +PhotosController+. It will also create the +preview_photo_url+ and +preview_photo_path+  helpers.
+This will recognize +/photos/1/preview+ with GET, and route to the +preview+ action of  +PhotosController+. It will also create the +preview_photo_url+ and +preview_photo_path+ helpers.
-Within the block of member routes, each route name specifies the HTTP verb that it will recognize. You can use +get+, +put+, +post+, or +delete+ here. If you don't have multiple +member+ routes, you can also passing +:on+ to a route.
+Within the block of member routes, each route name specifies the HTTP verb that it will recognize. You can use +get+, +put+, +post+, or +delete+ here. If you don't have multiple +member+ routes, you can also pass +:on+ to a route, eliminating the block:
 <ruby>
 resources :photos do
@@ -340,9 +340,9 @@ resources :photos do
 end
 </ruby>
-This will enable Rails to recognize URLs such as +/photos/search+ with GET, and route  to the +search+ action of +PhotosController+. It will also create the +search_photos_url+ and +search_photos_path+ route helpers.
+This will enable Rails to recognize paths such as +/photos/search+ with GET, and route to the +search+ action of +PhotosController+. It will also create the +search_photos_url+ and +search_photos_path+ route helpers.
-Just as with member routes, you can pass +:on+ to a route.
+Just as with member routes, you can pass +:on+ to a route:
 <ruby>
 resources :photos do
@@ -380,17 +380,23 @@ You can set up as many dynamic segments within a regular route as you like. Anyt
 match ':controller/:action/:id/:user_id'
 </ruby>
-An incoming URL of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
+An incoming path of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
+NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
+<ruby>
+match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
+</ruby>
 h4. Static Segments
-You can specify static segments when creating a route.
+You can specify static segments when creating a route:
 <ruby>
 match ':controller/:action/:id/with_user/:user_id'
 </ruby>
-This route would respond to URLs such as +/photos/show/1/with_user/2+. In this case, +params+ would be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
+This route would respond to paths such as +/photos/show/1/with_user/2+. In this case, +params+ would be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
 h4. The Query String
@@ -400,7 +406,7 @@ The +params+ will also include any parameters from the query string. For example
 match ':controller/:action/:id'
 </ruby>
-An incoming URL of +/photos/show/1?user_id=2+ will be dispatched to the +show+ action of the +Photos+ controller. +params+ will be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
+An incoming path of +/photos/show/1?user_id=2+ will be dispatched to the +show+ action of the +Photos+ controller. +params+ will be <tt>{ :controller => "photos", :action => "show", :id => "1", :user_id => "2" }</tt>.
 h4. Defining Defaults
@@ -410,7 +416,7 @@ You do not need to explicitly use the +:controller+ and +:action+ symbols within
 match 'photos/:id' => 'photos#show'
 </ruby>
-With this route, Rails will match an incoming URL of +/photos/12+ to the +show+ action of  +PhotosController+.
+With this route, Rails will match an incoming path of +/photos/12+ to the +show+ action of  +PhotosController+.
 You can also define other defaults in a route by supplying a hash for the +:defaults+ option. This even applies to parameters that you do not specify as dynamic segments. For example:
@@ -435,13 +441,28 @@ h4. Segment Constraints
 You can use the +:constraints+ option to enforce a format for a dynamic segment:
 <ruby>
-match 'photo/:id' => 'photos#show', :constraints => { :id => /[A-Z]\d{5}/ }
+match 'photos/:id' => 'photos#show', :constraints => { :id => /[A-Z]\d{5}/ }
+</ruby>
+This route would match paths such as +/photos/A12345+. You can more succinctly express the same route this way:
+<ruby>
+match 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
 </ruby>
-This route would match URLs such as +/photo/A12345+. You can more succinctly express the same route this way:
++:constraints+ takes regular expression. However note that regexp anchors can't be used within constraints. For example following route will not work:
 <ruby>
-match 'photo/:id' => 'photos#show', :id => /[A-Z]\d{5}/
+match '/:id' => 'posts#show', :constraints => {:id => /^\d/}
+</ruby>
+However, note that you don't need to use anchors because all routes are anchored at the start.
+For example, the following routes would allow for +posts+ with +to_param+ values like +1-hello-world+ that always begin with a number and +users+ with +to_param+ values like +david+ that never begin with a number to share the root namespace:
+<ruby>
+match '/:id' => 'posts#show', :constraints => { :id => /\d.+/ }
+match '/:username' => 'users#show'
 </ruby>
 h4. Request-Based Constraints
@@ -451,7 +472,7 @@ You can also constrain a route based on any method on the <a href="action_contro
 You specify a request-based constraint the same way that you specify a segment constraint:
 <ruby>
-match "photo", :constraints => {:subdomain => "admin"}
+match "photos", :constraints => {:subdomain => "admin"}
 </ruby>
 You can also specify constrains in a block form:
@@ -490,10 +511,10 @@ h4. Route Globbing
 Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example
 <ruby>
-match 'photo/*other' => 'photos#unknown'
+match 'photos/*other' => 'photos#unknown'
 </ruby>
-This route would match +photo/12+ or +/photo/long/path/to/12+, setting +params[:other]+ to +"12"+ or +"long/path/to/12"+.
+This route would match +photos/12+ or +/photos/long/path/to/12+, setting +params[:other]+ to +"12"+ or +"long/path/to/12"+.
 h4. Redirection
@@ -552,9 +573,9 @@ The +:controller+ option lets you explicitly specify a controller to use for the
 resources :photos, :controller => "images"
 </ruby>
-will recognize incoming URLs beginning with +/photo+ but route to the +Images+ controller:
+will recognize incoming paths beginning with +/photo+ but route to the +Images+ controller:
-|_. Verb |_.URL          |_.action |
+|_. Verb |_.Path         |_.action |
 |GET     |/photos        |index    |
 |GET     |/photos/new    |new      |
 |POST    |/photos        |create   |
@@ -563,7 +584,7 @@ will recognize incoming URLs beginning with +/photo+ but route to the +Images+ c
 |PUT     |/photos/1      |update   |
 |DELETE  |/photos/1      |destroy  |
-NOTE: Use +photos_path+, +new_photos_path+, etc. to generate URLs for this resource.
+NOTE: Use +photos_path+, +new_photos_path+, etc. to generate paths for this resource.
 h4. Specifying Constraints
@@ -575,7 +596,7 @@ resources :photos, :constraints => {:id => /[A-Z][A-Z][0-9]+/}
 This declaration constrains the +:id+ parameter to match the supplied regular expression. So, in this case, the router would no longer match +/photos/1+ to this route. Instead, +/photos/RR27+ would match.
-You can specify a single constraint to a apply to a number of routes by using the block form:
+You can specify a single constraint to apply to a number of routes by using the block form:
 <ruby>
 constraints(:id => /[A-Z][A-Z][0-9]+/) do
@@ -594,10 +615,10 @@ The +:as+ option lets you override the normal naming for the named route helpers
 resources :photos, :as => "images"
 </ruby>
-will recognize incoming URLs beginning with +/photos+ and route the requests to +PhotosController+:
+will recognize incoming paths beginning with +/photos+ and route the requests to +PhotosController+:
-|_.HTTP verb|_.URL           |_.action |_.named helper   |
-|GET        |/photos         |index    | images_path_    |
+|_.HTTP verb|_.Path          |_.action |_.named helper   |
+|GET        |/photos         |index    | images_path     |
 |GET        |/photos/new     |new      | new_image_path  |
 |POST       |/photos         |create   | images_path     |
 |GET        |/photos/1       |show     | image_path      |
@@ -607,20 +628,20 @@ will recognize incoming URLs beginning with +/photos+ and route the requests to
 h4. Overriding the +new+ and +edit+ Segments
-The +:path_names+ option lets you override the automatically-generated "new" and "edit" segments in URLs:
+The +:path_names+ option lets you override the automatically-generated "new" and "edit" segments in paths:
 <ruby>
 resources :photos, :path_names => { :new => 'make', :edit => 'change' }
 </ruby>
-This would cause the routing to recognize URLs such as
+This would cause the routing to recognize paths such as
 <plain>
 /photos/make
 /photos/1/change
 </plain>
-NOTE: The actual action names aren't changed by this option. The two URLs shown would still route to the new and edit actions.
+NOTE: The actual action names aren't changed by this option. The two paths shown would still route to the +new+ and +edit+ actions.
 TIP: If you find yourself wanting to change this option uniformly for all of your routes, you can use a scope:
@@ -630,13 +651,13 @@ scope :path_names => { :new => "make" } do
 end
 </ruby>
-h4. Overriding the Named Helper Prefix
+h4. Prefixing the Named Route Helpers
-You can use the :name_prefix option to add a prefix to the named route helpers that Rails generates for a route. You can use this option to prevent collisions between routes using a path scope.
+You can use the +:as+ option to prefix the named route helpers that Rails generates for a route. Use this option to prevent name collisions between routes using a path scope.
 <ruby>
 scope "admin" do
-  resources :photos, :name_prefix => "admin"
+  resources :photos, :as => "admin_photos"
 end
 resources :photos
@@ -644,17 +665,17 @@ resources :photos
 This will provide route helpers such as +admin_photos_path+, +new_admin_photo_path+ etc.
-You could specify a name prefix to use for a group of routes in the scope:
+To prefix a group of routes, use +:as+ with +scope+:
 <ruby>
-scope "admin", :name_prefix => "admin" do
+scope "admin", :as => "admin" do
   resources :photos, :accounts
 end
 resources :photos, :accounts
 </ruby>
-NOTE: The +namespace+ scope will automatically add a +:name_prefix+ as well as +:module+ and +:path+ prefixes.
+NOTE: The +namespace+ scope will automatically add +:as+ as well as +:module+ and +:path+ prefixes.
 h4. Restricting the Routes Created
@@ -688,7 +709,7 @@ end
 Rails now creates routes to the +CategoriesControlleR+.
-|_.HTTP verb|_.URL                      |_.action |
+|_.HTTP verb|_.Path                     |_.action |
 |GET        |/kategorien                |index    |
 |GET        |/kategorien/neu            |new      |
 |POST       |/kategorien                |create   |
@@ -699,21 +720,21 @@ Rails now creates routes to the +CategoriesControlleR+.
 h4. Overriding the Singular Form
-If you want to customize the singular name of the route in the named helpers, you can use the +:singular+ option.
+If you want to define the singular form of a resource, you should add additional rules to the +Inflector+.
 <ruby>
-resources :teeth, :singular => "tooth"
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'tooth', 'teeth'
+end
 </ruby>
-TIP: If you want to define the singular form of a word for your entire application, you should add additional rules to the +Inflector+ instead.
-h4(#nested-name-prefix). Using +:name_prefix+ in Nested Resources
+h4(#nested-names). Using +:as+ in Nested Resources
-The +:name_prefix+ option overrides the automatically-generated prefix for the parent resource in nested route helpers. For example,
+The +:as+ option overrides the automatically-generated name for the resource in nested route helpers. For example,
 <ruby>
 resources :magazines do
-  resources :ads, :name_prefix => 'periodical'
+  resources :ads, :as => 'periodical_ads'
 end
 </ruby>