railties 3.1.3 → 3.1.4.rc1

data/CHANGELOG.md

@@ -1,8 +1,20 @@
-## Rails 3.1.3 (unreleased) ##
+## Rails 3.1.4 (unreleased) ##
+
+*   Setting config.force_ssl also marks the session cookie as secure.
+
+    *José Valim*
+
+*   Add therubyrhino to Gemfile in new applications when running under JRuby.
+
+    *Guillermo Iguaran*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
 
 *   New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
 
-## Rails 3.1.2 (unreleased) ##
+
+## Rails 3.1.2 (November 18, 2011) ##
 
 *   Engines: don't blow up if db/seeds.rb is missing.
 
@@ -13,6 +25,7 @@
 
     *José Valim*
 
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
@@ -26,6 +39,8 @@
     Plugins developers need to special case their initializers that are
     meant to be run in the assets group by adding :group => :assets.
 
+    *José Valim*
+
 
 ## Rails 3.1.0 (August 30, 2011) ##
 

data/guides/source/3_1_release_notes.textile

@@ -21,6 +21,113 @@ Rails 3.1 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby ve
 
 TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x jump on 1.9.2 for smooth sailing.
 
+h4. What to update in your apps
+
+The following changes are meant for upgrading your application to Rails 3.1.3, the latest 3.1.x version of Rails.
+
+h5. Gemfile
+
+Make the following changes to your +Gemfile+.
+
+<ruby>
+gem 'rails', '= 3.1.3'
+gem 'mysql2'
+
+# Needed for the new asset pipeline
+group :assets do
+  gem 'sass-rails',   "~> 3.1.5"
+  gem 'coffee-rails', "~> 3.1.1"
+  gem 'uglifier',     ">= 1.0.3"
+end
+
+# jQuery is the default JavaScript library in Rails 3.1
+gem 'jquery-rails'
+</ruby>
+
+h5. config/application.rb
+
+* The asset pipeline requires the following additions:
+
+<ruby>
+config.assets.enabled = true
+config.assets.version = '1.0'
+</ruby>
+
+* If your application is using the "/assets" route for a resource you may want change the prefix used for assets to avoid conflicts:
+
+<ruby>
+# Defaults to '/assets'
+config.assets.prefix = '/asset-files'
+</ruby>
+
+h5. config/environments/development.rb
+
+* Remove the RJS setting <tt>config.action_view.debug_rjs = true</tt>.
+
+* Add the following, if you enable the asset pipeline.
+
+<ruby>
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
+</ruby>
+
+h5. config/environments/production.rb
+
+* Again, most of the changes below are for the asset pipeline. You can read more about these in the "Asset Pipeline":asset_pipeline.html guide.
+
+<ruby>
+# Compress JavaScripts and CSS
+config.assets.compress = true
+
+# Don't fallback to assets pipeline if a precompiled asset is missed
+config.assets.compile = false
+
+# Generate digests for assets URLs
+config.assets.digest = true
+
+# Defaults to Rails.root.join("public/assets")
+# config.assets.manifest = YOUR_PATH
+
+# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+# config.assets.precompile += %w( search.js )
+
+
+# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+# config.force_ssl = true
+
+</ruby>
+
+h5. config/environments/test.rb
+
+<ruby>
+# Configure static asset server for tests with Cache-Control for performance
+config.serve_static_assets = true
+config.static_cache_control = "public, max-age=3600"
+</ruby>
+
+h5. config/initializers/wrap_parameters.rb
+
+* Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+</ruby>
+
 h3. Creating a Rails 3.1 application
 
 <shell>

data/guides/source/active_record_querying.textile

@@ -939,7 +939,7 @@ When a +lambda+ is used for a +scope+, it can take arguments:
 
 <ruby>
 class Post < ActiveRecord::Base
-  scope :1_week_before, lambda { |time| where("created_at < ?", time)
+  scope :1_week_before, lambda { |time| where("created_at < ?", time) }
 end
 </ruby>
 

data/guides/source/asset_pipeline.textile

@@ -369,10 +369,10 @@ It is important that this folder is shared between deployments so that remotely
 
 NOTE. If you are precompiling your assets locally, you can use +bundle install --without assets+ on the server to avoid installing the assets gems (the gems in the assets group in the Gemfile).
 
-The default matcher for compiling files includes +application.js+, +application.css+ and all files that do not end in +js+ or +css+:
+The default matcher for compiling files includes +application.js+, +application.css+ and all non-JS/CSS files (ie. +.coffee+ and +.scss+ files are *not* automatically included as they compile to JS/CSS):
 
 <ruby>
-[ /\w<plus>\.(?!js|css).<plus>/, /application.(css|js)$/ ]
+[ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) }, /application.(css|js)$/ ]
 </ruby>
 
 If you have other manifests or individual stylesheets and JavaScript files to include, you can add them to the +precompile+ array:
@@ -410,10 +410,6 @@ For Apache:
 
 <plain>
 <LocationMatch "^/assets/.*$">
-  # Some browsers still send conditional-GET requests if there's a
-  # Last-Modified header or an ETag header even if they haven't
-  # reached the expiry date sent in the Expires header.
-  Header unset Last-Modified
   Header unset ETag
   FileETag None
   # RFC says only cache for 1 year
@@ -429,10 +425,6 @@ location ~ ^/assets/ {
   expires 1y;
   add_header Cache-Control public;
 
-  # Some browsers still send conditional-GET requests if there's a
-  # Last-Modified header or an ETag header even if they haven't
-  # reached the expiry date sent in the Expires header.
-  add_header Last-Modified "";
   add_header ETag "";
   break;
 }
@@ -577,7 +569,7 @@ TODO: Registering gems on "Tilt":https://github.com/rtomayko/tilt enabling Sproc
 
 h3. Upgrading from Old Versions of Rails
 
-There are two issues when upgrading. The first is moving the files to the new locations. See the section above for guidance on the correct locations for different file types.
+There are two issues when upgrading. The first is moving the files to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types.
 
 The second is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0.
 

data/guides/source/configuring.textile

@@ -181,7 +181,7 @@ h4. Configuring Middleware
 
 Every Rails application comes with a standard set of middleware which it uses in this order in the development environment:
 
-* +Rack::SSL+ Will force every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+.
+* +Rack::SSL+ Will force every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+.  Options passed to this can be configured by using +config.ssl_options+.
 * +ActionDispatch::Static+ is used to serve static assets. Disabled if +config.serve_static_assets+ is +true+.
 * +Rack::Lock+ Will wrap the app in mutex so it can only be called by a single thread at a time. Only enabled if +config.action_controller.allow_concurrency+ is set to +false+, which it is by default.
 * +ActiveSupport::Cache::Strategy::LocalCache+ Serves as a basic memory backed cache. This cache is not thread safe and is intended only for serving as a temporary memory cache for a single thread.
@@ -263,6 +263,8 @@ h4. Configuring Active Record
 
 * +config.active_record.whitelist_attributes+ will create an empty whitelist of attributes available for mass-assignment security for all models in your app.
 
+* +config.active_record.identity_map+ controls whether the identity map is enabled, and is false by default.
+
 The MySQL adapter adds one additional configuration option:
 
 * +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether Active Record will consider all +tinyint(1)+ columns in a MySQL database to be booleans and is true by default.

data/guides/source/i18n.textile

@@ -825,7 +825,7 @@ h5. Active Record Methods
 
 * +ActiveRecord::Errors#generate_message+ (which is used by Active Record validations but may also be used manually) uses +model_name.human+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
 
-*+ ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and which defaults to +' '+).
+* +ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":https://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and which defaults to +' '+).
 
 h5. Active Support Methods
 

data/guides/source/performance_testing.textile

@@ -151,7 +151,7 @@ Performance tests can be run in two modes: Benchmarking and Profiling.
 
 h5. Benchmarking
 
-Benchmarking makes it easy to quickly gather a few metrics about each test tun. By default, each test case is run *4 times* in benchmarking mode.
+Benchmarking makes it easy to quickly gather a few metrics about each test run. By default, each test case is run *4 times* in benchmarking mode.
 
 To run performance tests in benchmarking mode:
 

data/guides/source/routing.textile

@@ -653,7 +653,7 @@ You can use the +:constraints+ option to specify a required format on the implic
 resources :photos, :constraints => {:id => /[A-Z][A-Z][0-9]+/}
 </ruby>
 
-This declaration constraints 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.
+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 apply to a number of routes by using the block form:
 

data/lib/rails/application.rb

@@ -138,6 +138,11 @@ module Rails
       self
     end
 
+    def call(env)
+      env["ORIGINAL_FULLPATH"] = build_original_fullpath(env)
+      super(env)
+    end
+
   protected
 
     alias :build_middleware_stack :app
@@ -151,7 +156,7 @@ module Rails
 
         if config.force_ssl
           require "rack/ssl"
-          middleware.use ::Rack::SSL
+          middleware.use ::Rack::SSL, config.ssl_options
         end
 
         if config.serve_static_assets
@@ -170,6 +175,9 @@ module Rails
         middleware.use ::ActionDispatch::Cookies
 
         if config.session_store
+          if config.force_ssl && !config.session_options.key?(:secure)
+            config.session_options[:secure] = true
+          end
           middleware.use config.session_store, config.session_options
           middleware.use ::ActionDispatch::Flash
         end
@@ -204,5 +212,17 @@ module Rails
       require "rails/console/app"
       require "rails/console/helpers"
     end
+
+    def build_original_fullpath(env)
+      path_info    = env["PATH_INFO"]
+      query_string = env["QUERY_STRING"]
+      script_name  = env["SCRIPT_NAME"]
+
+      if query_string.present?
+        "#{script_name}#{path_info}?#{query_string}"
+      else
+        "#{script_name}#{path_info}"
+      end
+    end
   end
 end

data/lib/rails/application/configuration.rb

@@ -10,7 +10,8 @@ module Rails
                     :dependency_loading, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
-                    :static_cache_control, :session_options, :time_zone, :whiny_nils
+                    :ssl_options, :static_cache_control, :session_options, 
+                    :time_zone, :whiny_nils
 
       attr_writer :log_level
       attr_reader :encoding
@@ -26,6 +27,7 @@ module Rails
         @serve_static_assets         = true
         @static_cache_control        = nil
         @force_ssl                   = false
+        @ssl_options                 = {}
         @session_store               = :cookie_store
         @session_options             = {}
         @time_zone                   = "UTC"

data/lib/rails/generators/app_base.rb

@@ -200,20 +200,34 @@ module Rails
         end
       end
 
-      def javascript_gemfile_entry
-        "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript]
-      end
-
       def assets_gemfile_entry
-        <<-GEMFILE.strip_heredoc
+        return if options[:skip_sprockets]
+        gemfile = <<-GEMFILE.strip_heredoc
           # Gems used only for assets and not required
           # in production environments by default.
           group :assets do
             gem 'sass-rails', #{options.dev? || options.edge? ? "  :git => 'git://github.com/rails/sass-rails.git', :branch => '3-1-stable'" : "  '~> 3.1.5'"}
             gem 'coffee-rails', #{options.dev? || options.edge? ? ":git => 'git://github.com/rails/coffee-rails.git', :branch => '3-1-stable'" : "'~> 3.1.1'"}
+
+            # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+            #{javascript_runtime_gemfile_entry}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE
+
+        gemfile.strip_heredoc.gsub(/^[ \t]*$/, '')
+      end
+
+      def javascript_gemfile_entry
+        "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript]
+      end
+
+      def javascript_runtime_gemfile_entry
+        if defined?(JRUBY_VERSION)
+          "gem 'therubyrhino'\n"
+        else
+          "# gem 'therubyracer'\n"
+        end
       end
 
       def bundle_command(command)

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

@@ -22,9 +22,11 @@
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  <%- unless options.skip_sprockets? -%>
   # Do not compress assets
   config.assets.compress = false
 
   # Expands the lines which load the assets
   config.assets.debug = true
+  <%- end -%>
 end

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -11,6 +11,7 @@
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
+  <%- unless options.skip_sprockets? -%>
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
@@ -22,6 +23,7 @@
 
   # Defaults to Rails.root.join("public/assets")
   # config.assets.manifest = YOUR_PATH
+  <%- end -%>
 
   # Specifies the header that your server uses for sending files
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
@@ -42,8 +44,10 @@
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  <%- unless options.skip_sprockets? -%>
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
+  <%- end -%>
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false

data/lib/rails/tasks/documentation.rake

@@ -61,7 +61,7 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README.rdoc')
 
     gem_path('actionmailer') do |actionmailer|
       %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 3
-    PRE   = nil
+    TINY  = 4
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  - rc
+  - 1
+  version: 3.1.4.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,13 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +33,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id001
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thor
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +49,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-ssl
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +65,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,39 +80,44 @@ dependencies:
         - 3
         - 4
         version: "3.4"
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424071
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
-  requirement: *id005
+        - 4
+        - rc
+        - 1
+        version: 3.1.4.rc1
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424071
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
-  requirement: *id006
+        - 4
+        - rc
+        - 1
+        version: 3.1.4.rc1
+  type: :runtime
+  version_requirements: *id006
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
 executables: []
@@ -123,572 +129,408 @@ extra_rdoc_files: []
 files: 
 - CHANGELOG.md
 - README.rdoc
-- guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
-- guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
-- guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
-- guides/assets/stylesheets/syntaxhighlighter/shCore.css
-- guides/assets/stylesheets/fixes.css
-- guides/assets/stylesheets/print.css
-- guides/assets/stylesheets/reset.css
-- guides/assets/stylesheets/style.css
-- guides/assets/stylesheets/main.css
-- guides/assets/images/validation_error_messages.png
-- guides/assets/images/grey_bullet.gif
-- guides/assets/images/rails_welcome.png
-- guides/assets/images/has_one_through.png
-- guides/assets/images/rails_guides_logo.gif
-- guides/assets/images/posts_index.png
-- guides/assets/images/header_backdrop.png
-- guides/assets/images/session_fixation.png
+- guides/assets/images/belongs_to.png
+- guides/assets/images/book_icon.gif
+- guides/assets/images/bullet.gif
+- guides/assets/images/challenge.png
+- guides/assets/images/chapters_icon.gif
+- guides/assets/images/check_bullet.gif
+- guides/assets/images/credits_pic_blank.gif
+- guides/assets/images/csrf.png
+- guides/assets/images/customized_error_messages.png
+- guides/assets/images/edge_badge.png
+- guides/assets/images/error_messages.png
 - guides/assets/images/feature_tile.gif
+- guides/assets/images/footer_tile.gif
+- guides/assets/images/fxn.png
+- guides/assets/images/grey_bullet.gif
 - guides/assets/images/habtm.png
-- guides/assets/images/edge_badge.png
-- guides/assets/images/rails_logo_remix.gif
+- guides/assets/images/has_many.png
+- guides/assets/images/has_many_through.png
 - guides/assets/images/has_one.png
-- guides/assets/images/tab_grey.gif
-- guides/assets/images/book_icon.gif
-- guides/assets/images/footer_tile.gif
-- guides/assets/images/jaimeiniesta.jpg
-- guides/assets/images/nav_arrow.gif
-- guides/assets/images/bullet.gif
-- guides/assets/images/icons/warning.png
-- guides/assets/images/icons/caution.png
-- guides/assets/images/icons/tip.png
-- guides/assets/images/icons/important.png
-- guides/assets/images/icons/callouts/3.png
-- guides/assets/images/icons/callouts/4.png
-- guides/assets/images/icons/callouts/8.png
-- guides/assets/images/icons/callouts/7.png
-- guides/assets/images/icons/callouts/6.png
-- guides/assets/images/icons/callouts/10.png
-- guides/assets/images/icons/callouts/2.png
-- guides/assets/images/icons/callouts/15.png
-- guides/assets/images/icons/callouts/14.png
+- guides/assets/images/has_one_through.png
+- guides/assets/images/header_backdrop.png
+- guides/assets/images/header_tile.gif
+- guides/assets/images/i18n/demo_html_safe.png
+- guides/assets/images/i18n/demo_localized_pirate.png
+- guides/assets/images/i18n/demo_translated_en.png
+- guides/assets/images/i18n/demo_translated_pirate.png
+- guides/assets/images/i18n/demo_translation_missing.png
+- guides/assets/images/i18n/demo_untranslated.png
 - guides/assets/images/icons/callouts/1.png
+- guides/assets/images/icons/callouts/10.png
+- guides/assets/images/icons/callouts/11.png
 - guides/assets/images/icons/callouts/12.png
+- guides/assets/images/icons/callouts/13.png
+- guides/assets/images/icons/callouts/14.png
+- guides/assets/images/icons/callouts/15.png
+- guides/assets/images/icons/callouts/2.png
+- guides/assets/images/icons/callouts/3.png
+- guides/assets/images/icons/callouts/4.png
 - guides/assets/images/icons/callouts/5.png
+- guides/assets/images/icons/callouts/6.png
+- guides/assets/images/icons/callouts/7.png
+- guides/assets/images/icons/callouts/8.png
 - guides/assets/images/icons/callouts/9.png
-- guides/assets/images/icons/callouts/13.png
-- guides/assets/images/icons/callouts/11.png
-- guides/assets/images/icons/note.png
+- guides/assets/images/icons/caution.png
+- guides/assets/images/icons/example.png
 - guides/assets/images/icons/home.png
+- guides/assets/images/icons/important.png
+- guides/assets/images/icons/next.png
+- guides/assets/images/icons/note.png
+- guides/assets/images/icons/prev.png
 - guides/assets/images/icons/README
+- guides/assets/images/icons/tip.png
 - guides/assets/images/icons/up.png
-- guides/assets/images/icons/prev.png
-- guides/assets/images/icons/example.png
-- guides/assets/images/icons/next.png
-- guides/assets/images/has_many_through.png
-- guides/assets/images/header_tile.gif
-- guides/assets/images/i18n/demo_translation_missing.png
-- guides/assets/images/i18n/demo_untranslated.png
-- guides/assets/images/i18n/demo_localized_pirate.png
-- guides/assets/images/i18n/demo_translated_pirate.png
-- guides/assets/images/i18n/demo_translated_en.png
-- guides/assets/images/i18n/demo_html_safe.png
+- guides/assets/images/icons/warning.png
+- guides/assets/images/jaimeiniesta.jpg
+- guides/assets/images/nav_arrow.gif
 - guides/assets/images/polymorphic.png
-- guides/assets/images/tab_yellow.png
-- guides/assets/images/fxn.png
+- guides/assets/images/posts_index.png
+- guides/assets/images/radar.png
+- guides/assets/images/rails_guides_logo.gif
+- guides/assets/images/rails_logo_remix.gif
+- guides/assets/images/rails_welcome.png
+- guides/assets/images/session_fixation.png
+- guides/assets/images/tab_grey.gif
+- guides/assets/images/tab_info.gif
 - guides/assets/images/tab_note.gif
-- guides/assets/images/error_messages.png
-- guides/assets/images/vijaydev.jpg
-- guides/assets/images/tab_yellow.gif
-- guides/assets/images/challenge.png
-- guides/assets/images/belongs_to.png
-- guides/assets/images/credits_pic_blank.gif
 - guides/assets/images/tab_red.gif
-- guides/assets/images/tab_info.gif
-- guides/assets/images/csrf.png
-- guides/assets/images/chapters_icon.gif
-- guides/assets/images/radar.png
-- guides/assets/images/has_many.png
-- guides/assets/images/customized_error_messages.png
-- guides/assets/images/check_bullet.gif
-- guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+- guides/assets/images/tab_yellow.gif
+- guides/assets/images/tab_yellow.png
+- guides/assets/images/validation_error_messages.png
+- guides/assets/images/vijaydev.jpg
+- guides/assets/javascripts/guides.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
-- guides/assets/javascripts/syntaxhighlighter/shCore.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
-- guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
-- guides/assets/javascripts/guides.js
-- guides/output/3_1_release_notes.html
-- guides/output/association_basics.html
-- guides/output/api_documentation_guidelines.html
-- guides/output/debugging_rails_applications.html
-- guides/output/ruby_on_rails_guides_guidelines.html
-- guides/output/active_record_validations_callbacks.html
-- guides/output/2_3_release_notes.html
-- guides/output/contributing_to_ruby_on_rails.html
-- guides/output/engines.html
-- guides/output/security.html
-- guides/output/action_view_overview.html
-- guides/output/performance_testing.html
-- guides/output/configuring.html
-- guides/output/stylesheets/syntaxhighlighter/shCoreEclipse.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeDefault.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreMidnight.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeEmacs.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreEmacs.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreMDUltra.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeMDUltra.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeMidnight.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeEclipse.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreDjango.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreDefault.css
-- guides/output/stylesheets/syntaxhighlighter/shCoreRDark.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeRDark.css
-- guides/output/stylesheets/syntaxhighlighter/shThemeDjango.css
-- guides/output/stylesheets/syntaxhighlighter/shCore.css
-- guides/output/stylesheets/fixes.css
-- guides/output/stylesheets/print.css
-- guides/output/stylesheets/reset.css
-- guides/output/stylesheets/style.css
-- guides/output/stylesheets/main.css
-- guides/output/routing.html
-- guides/output/generators.html
-- guides/output/layout.html
-- guides/output/action_mailer_basics.html
-- guides/output/active_record_basics.html
-- guides/output/index.html
-- guides/output/action_controller_overview.html
-- guides/output/images/validation_error_messages.png
-- guides/output/images/grey_bullet.gif
-- guides/output/images/rails_welcome.png
-- guides/output/images/has_one_through.png
-- guides/output/images/rails_guides_logo.gif
-- guides/output/images/posts_index.png
-- guides/output/images/header_backdrop.png
-- guides/output/images/session_fixation.png
-- guides/output/images/feature_tile.gif
-- guides/output/images/habtm.png
-- guides/output/images/edge_badge.png
-- guides/output/images/rails_logo_remix.gif
-- guides/output/images/has_one.png
-- guides/output/images/tab_grey.gif
-- guides/output/images/book_icon.gif
-- guides/output/images/footer_tile.gif
-- guides/output/images/jaimeiniesta.jpg
-- guides/output/images/nav_arrow.gif
-- guides/output/images/bullet.gif
-- guides/output/images/icons/warning.png
-- guides/output/images/icons/caution.png
-- guides/output/images/icons/tip.png
-- guides/output/images/icons/important.png
-- guides/output/images/icons/callouts/3.png
-- guides/output/images/icons/callouts/4.png
-- guides/output/images/icons/callouts/8.png
-- guides/output/images/icons/callouts/7.png
-- guides/output/images/icons/callouts/6.png
-- guides/output/images/icons/callouts/10.png
-- guides/output/images/icons/callouts/2.png
-- guides/output/images/icons/callouts/15.png
-- guides/output/images/icons/callouts/14.png
-- guides/output/images/icons/callouts/1.png
-- guides/output/images/icons/callouts/12.png
-- guides/output/images/icons/callouts/5.png
-- guides/output/images/icons/callouts/9.png
-- guides/output/images/icons/callouts/13.png
-- guides/output/images/icons/callouts/11.png
-- guides/output/images/icons/note.png
-- guides/output/images/icons/home.png
-- guides/output/images/icons/README
-- guides/output/images/icons/up.png
-- guides/output/images/icons/prev.png
-- guides/output/images/icons/example.png
-- guides/output/images/icons/next.png
-- guides/output/images/has_many_through.png
-- guides/output/images/header_tile.gif
-- guides/output/images/i18n/demo_translation_missing.png
-- guides/output/images/i18n/demo_untranslated.png
-- guides/output/images/i18n/demo_localized_pirate.png
-- guides/output/images/i18n/demo_translated_pirate.png
-- guides/output/images/i18n/demo_translated_en.png
-- guides/output/images/i18n/demo_html_safe.png
-- guides/output/images/polymorphic.png
-- guides/output/images/tab_yellow.png
-- guides/output/images/fxn.png
-- guides/output/images/tab_note.gif
-- guides/output/images/error_messages.png
-- guides/output/images/vijaydev.jpg
-- guides/output/images/tab_yellow.gif
-- guides/output/images/challenge.png
-- guides/output/images/belongs_to.png
-- guides/output/images/credits_pic_blank.gif
-- guides/output/images/tab_red.gif
-- guides/output/images/tab_info.gif
-- guides/output/images/csrf.png
-- guides/output/images/chapters_icon.gif
-- guides/output/images/radar.png
-- guides/output/images/has_many.png
-- guides/output/images/customized_error_messages.png
-- guides/output/images/check_bullet.gif
-- guides/output/initialization.html
-- guides/output/plugins.html
-- guides/output/caching_with_rails.html
-- guides/output/form_helpers.html
-- guides/output/asset_pipeline.html
-- guides/output/testing.html
-- guides/output/active_record_querying.html
-- guides/output/i18n.html
-- guides/output/migrations.html
-- guides/output/active_resource_basics.html
-- guides/output/credits.html
-- guides/output/rails_on_rack.html
-- guides/output/contribute.html
-- guides/output/rails_application_templates.html
-- guides/output/layouts_and_rendering.html
-- guides/output/javascripts/syntaxhighlighter/shBrushPerl.js
-- guides/output/javascripts/syntaxhighlighter/shBrushCpp.js
-- guides/output/javascripts/syntaxhighlighter/shBrushAS3.js
-- guides/output/javascripts/syntaxhighlighter/shBrushPython.js
-- guides/output/javascripts/syntaxhighlighter/shBrushJavaFX.js
-- guides/output/javascripts/syntaxhighlighter/shBrushDiff.js
-- guides/output/javascripts/syntaxhighlighter/shBrushErlang.js
-- guides/output/javascripts/syntaxhighlighter/shBrushScala.js
-- guides/output/javascripts/syntaxhighlighter/shBrushGroovy.js
-- guides/output/javascripts/syntaxhighlighter/shBrushPhp.js
-- guides/output/javascripts/syntaxhighlighter/shBrushPlain.js
-- guides/output/javascripts/syntaxhighlighter/shBrushXml.js
-- guides/output/javascripts/syntaxhighlighter/shBrushAppleScript.js
-- guides/output/javascripts/syntaxhighlighter/shBrushRuby.js
-- guides/output/javascripts/syntaxhighlighter/shBrushVb.js
-- guides/output/javascripts/syntaxhighlighter/shBrushCSharp.js
-- guides/output/javascripts/syntaxhighlighter/shBrushJava.js
-- guides/output/javascripts/syntaxhighlighter/shBrushBash.js
-- guides/output/javascripts/syntaxhighlighter/shBrushSass.js
-- guides/output/javascripts/syntaxhighlighter/shCore.js
-- guides/output/javascripts/syntaxhighlighter/shBrushPowerShell.js
-- guides/output/javascripts/syntaxhighlighter/shBrushSql.js
-- guides/output/javascripts/syntaxhighlighter/shBrushCss.js
-- guides/output/javascripts/syntaxhighlighter/shBrushColdFusion.js
-- guides/output/javascripts/syntaxhighlighter/shBrushDelphi.js
-- guides/output/javascripts/syntaxhighlighter/shBrushJScript.js
-- guides/output/javascripts/guides.js
-- guides/output/ajax_on_rails.html
-- guides/output/getting_started.html
-- guides/output/command_line.html
-- guides/output/3_0_release_notes.html
-- guides/output/nested_model_forms.html
-- guides/output/active_model_basics.html
-- guides/output/active_support_core_extensions.html
-- guides/output/2_2_release_notes.html
-- guides/rails_guides/indexer.rb
-- guides/rails_guides/textile_extensions.rb
+- guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
+- guides/assets/javascripts/syntaxhighlighter/shCore.js
+- guides/assets/stylesheets/fixes.css
+- guides/assets/stylesheets/main.css
+- guides/assets/stylesheets/print.css
+- guides/assets/stylesheets/reset.css
+- guides/assets/stylesheets/style.css
+- guides/assets/stylesheets/syntaxhighlighter/shCore.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
 - guides/rails_guides/generator.rb
-- guides/rails_guides/levenshtein.rb
 - guides/rails_guides/helpers.rb
-- guides/w3c_validator.rb
+- guides/rails_guides/indexer.rb
+- guides/rails_guides/levenshtein.rb
+- guides/rails_guides/textile_extensions.rb
 - guides/rails_guides.rb
-- guides/source/caching_with_rails.textile
+- guides/source/2_2_release_notes.textile
 - guides/source/2_3_release_notes.textile
-- guides/source/ruby_on_rails_guides_guidelines.textile
-- guides/source/api_documentation_guidelines.textile
-- guides/source/i18n.textile
 - guides/source/3_0_release_notes.textile
-- guides/source/active_support_core_extensions.textile
-- guides/source/credits.html.erb
-- guides/source/association_basics.textile
+- guides/source/3_1_release_notes.textile
+- guides/source/action_controller_overview.textile
 - guides/source/action_mailer_basics.textile
-- guides/source/debugging_rails_applications.textile
+- guides/source/action_view_overview.textile
 - guides/source/active_record_basics.textile
 - guides/source/active_record_querying.textile
-- guides/source/configuring.textile
-- guides/source/layouts_and_rendering.textile
-- guides/source/index.html.erb
-- guides/source/action_view_overview.textile
-- guides/source/migrations.textile
-- guides/source/getting_started.textile
-- guides/source/generators.textile
-- guides/source/layout.html.erb
-- guides/source/testing.textile
-- guides/source/nested_model_forms.textile
-- guides/source/performance_testing.textile
-- guides/source/asset_pipeline.textile
-- guides/source/ajax_on_rails.textile
-- guides/source/rails_application_templates.textile
 - guides/source/active_record_validations_callbacks.textile
 - guides/source/active_resource_basics.textile
-- guides/source/form_helpers.textile
-- guides/source/action_controller_overview.textile
-- guides/source/rails_on_rack.textile
-- guides/source/contributing_to_ruby_on_rails.textile
-- guides/source/plugins.textile
-- guides/source/security.textile
-- guides/source/initialization.textile
-- guides/source/3_1_release_notes.textile
-- guides/source/2_2_release_notes.textile
+- guides/source/active_support_core_extensions.textile
+- guides/source/ajax_on_rails.textile
+- guides/source/api_documentation_guidelines.textile
+- guides/source/asset_pipeline.textile
+- guides/source/association_basics.textile
+- guides/source/caching_with_rails.textile
 - guides/source/command_line.textile
+- guides/source/configuring.textile
+- guides/source/contributing_to_ruby_on_rails.textile
+- guides/source/credits.html.erb
+- guides/source/debugging_rails_applications.textile
+- guides/source/form_helpers.textile
+- guides/source/generators.textile
+- guides/source/getting_started.textile
+- guides/source/i18n.textile
+- guides/source/index.html.erb
+- guides/source/initialization.textile
+- guides/source/layout.html.erb
+- guides/source/layouts_and_rendering.textile
+- guides/source/migrations.textile
+- guides/source/nested_model_forms.textile
+- guides/source/performance_testing.textile
+- guides/source/plugins.textile
+- guides/source/rails_application_templates.textile
+- guides/source/rails_on_rack.textile
 - guides/source/routing.textile
-- lib/rails/configuration.rb
+- guides/source/ruby_on_rails_guides_guidelines.textile
+- guides/source/security.textile
+- guides/source/testing.textile
+- guides/w3c_validator.rb
 - lib/rails/all.rb
-- lib/rails/rack/log_tailer.rb
-- lib/rails/rack/logger.rb
-- lib/rails/rack/debugger.rb
-- lib/rails/engine/configuration.rb
-- lib/rails/engine/railties.rb
-- lib/rails/tasks.rb
-- lib/rails/initializable.rb
-- lib/rails/plugin.rb
+- lib/rails/application/bootstrap.rb
+- lib/rails/application/configuration.rb
+- lib/rails/application/finisher.rb
+- lib/rails/application/railties.rb
+- lib/rails/application/routes_reloader.rb
 - lib/rails/application.rb
-- lib/rails/commands.rb
-- lib/rails/commands/server.rb
-- lib/rails/commands/update.rb
+- lib/rails/backtrace_cleaner.rb
+- lib/rails/cli.rb
+- lib/rails/code_statistics.rb
+- lib/rails/commands/application.rb
 - lib/rails/commands/benchmarker.rb
+- lib/rails/commands/console.rb
+- lib/rails/commands/dbconsole.rb
+- lib/rails/commands/destroy.rb
+- lib/rails/commands/generate.rb
 - lib/rails/commands/plugin.rb
-- lib/rails/commands/application.rb
 - lib/rails/commands/plugin_new.rb
 - lib/rails/commands/profiler.rb
 - lib/rails/commands/runner.rb
-- lib/rails/commands/generate.rb
-- lib/rails/commands/destroy.rb
-- lib/rails/commands/console.rb
-- lib/rails/commands/dbconsole.rb
-- lib/rails/info_controller.rb
+- lib/rails/commands/server.rb
+- lib/rails/commands/update.rb
+- lib/rails/commands.rb
+- lib/rails/configuration.rb
 - lib/rails/console/app.rb
 - lib/rails/console/helpers.rb
-- lib/rails/info.rb
+- lib/rails/engine/configuration.rb
+- lib/rails/engine/railties.rb
 - lib/rails/engine.rb
-- lib/rails/backtrace_cleaner.rb
-- lib/rails/test_help.rb
+- lib/rails/generators/actions.rb
 - lib/rails/generators/active_model.rb
-- lib/rails/generators/migration.rb
-- lib/rails/generators/generated_attribute.rb
 - lib/rails/generators/app_base.rb
-- lib/rails/generators/test_case.rb
-- lib/rails/generators/test_unit.rb
-- lib/rails/generators/erb.rb
-- lib/rails/generators/js/assets/assets_generator.rb
-- lib/rails/generators/js/assets/templates/javascript.js
-- lib/rails/generators/named_base.rb
-- lib/rails/generators/erb/mailer/templates/view.text.erb
+- lib/rails/generators/base.rb
+- lib/rails/generators/css/assets/assets_generator.rb
+- lib/rails/generators/css/assets/templates/stylesheet.css
+- lib/rails/generators/css/scaffold/scaffold_generator.rb
+- lib/rails/generators/erb/controller/controller_generator.rb
+- lib/rails/generators/erb/controller/templates/view.html.erb
 - lib/rails/generators/erb/mailer/mailer_generator.rb
-- lib/rails/generators/erb/scaffold/templates/edit.html.erb
+- lib/rails/generators/erb/mailer/templates/view.text.erb
+- lib/rails/generators/erb/scaffold/scaffold_generator.rb
 - lib/rails/generators/erb/scaffold/templates/_form.html.erb
+- lib/rails/generators/erb/scaffold/templates/edit.html.erb
 - lib/rails/generators/erb/scaffold/templates/index.html.erb
 - lib/rails/generators/erb/scaffold/templates/new.html.erb
 - lib/rails/generators/erb/scaffold/templates/show.html.erb
-- lib/rails/generators/erb/scaffold/scaffold_generator.rb
-- lib/rails/generators/erb/controller/controller_generator.rb
-- lib/rails/generators/erb/controller/templates/view.html.erb
-- lib/rails/generators/actions.rb
-- lib/rails/generators/base.rb
-- lib/rails/generators/rails/performance_test/performance_test_generator.rb
-- lib/rails/generators/rails/performance_test/USAGE
-- lib/rails/generators/rails/integration_test/integration_test_generator.rb
-- lib/rails/generators/rails/integration_test/USAGE
-- lib/rails/generators/rails/session_migration/session_migration_generator.rb
-- lib/rails/generators/rails/session_migration/USAGE
-- lib/rails/generators/rails/assets/assets_generator.rb
-- lib/rails/generators/rails/assets/templates/javascript.js
-- lib/rails/generators/rails/assets/templates/stylesheet.css
-- lib/rails/generators/rails/assets/USAGE
-- lib/rails/generators/rails/helper/templates/helper.rb
-- lib/rails/generators/rails/helper/USAGE
-- lib/rails/generators/rails/helper/helper_generator.rb
-- lib/rails/generators/rails/scaffold_controller/templates/controller.rb
-- lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
-- lib/rails/generators/rails/scaffold_controller/USAGE
-- lib/rails/generators/rails/scaffold/templates/scaffold.css
-- lib/rails/generators/rails/scaffold/scaffold_generator.rb
-- lib/rails/generators/rails/scaffold/USAGE
-- lib/rails/generators/rails/migration/migration_generator.rb
-- lib/rails/generators/rails/migration/USAGE
-- lib/rails/generators/rails/controller/controller_generator.rb
-- lib/rails/generators/rails/controller/templates/controller.rb
-- lib/rails/generators/rails/controller/USAGE
+- lib/rails/generators/erb.rb
+- lib/rails/generators/generated_attribute.rb
+- lib/rails/generators/js/assets/assets_generator.rb
+- lib/rails/generators/js/assets/templates/javascript.js
+- lib/rails/generators/migration.rb
+- lib/rails/generators/named_base.rb
 - lib/rails/generators/rails/app/app_generator.rb
-- lib/rails/generators/rails/app/templates/db/seeds.rb.tt
-- lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
-- lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/assets/images/rails.png
 - lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
+- lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
 - lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb
-- lib/rails/generators/rails/app/templates/README
-- lib/rails/generators/rails/app/templates/gitignore
-- lib/rails/generators/rails/app/templates/config/environment.rb
-- lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
-- lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
-- lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
-- lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
-- lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
-- lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+- lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
 - lib/rails/generators/rails/app/templates/config/application.rb
 - lib/rails/generators/rails/app/templates/config/boot.rb
-- lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
-- lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
-- lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
-- lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
 - lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
-- lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+- lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
-- lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
-- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
-- lib/rails/generators/rails/app/templates/config/routes.rb
+- lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+- lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+- lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+- lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+- lib/rails/generators/rails/app/templates/config/environment.rb
 - lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
-- lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
 - lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+- lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
+- lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
+- lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
+- lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
 - lib/rails/generators/rails/app/templates/config/locales/en.yml
-- lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
-- lib/rails/generators/rails/app/templates/test/test_helper.rb
+- lib/rails/generators/rails/app/templates/config/routes.rb
+- lib/rails/generators/rails/app/templates/config.ru
+- lib/rails/generators/rails/app/templates/db/seeds.rb.tt
+- lib/rails/generators/rails/app/templates/doc/README_FOR_APP
+- lib/rails/generators/rails/app/templates/Gemfile
+- lib/rails/generators/rails/app/templates/gitignore
+- lib/rails/generators/rails/app/templates/public/404.html
 - lib/rails/generators/rails/app/templates/public/422.html
-- lib/rails/generators/rails/app/templates/public/index.html
-- lib/rails/generators/rails/app/templates/public/favicon.ico
 - lib/rails/generators/rails/app/templates/public/500.html
-- lib/rails/generators/rails/app/templates/public/404.html
+- lib/rails/generators/rails/app/templates/public/favicon.ico
+- lib/rails/generators/rails/app/templates/public/index.html
 - lib/rails/generators/rails/app/templates/public/robots.txt
-- lib/rails/generators/rails/app/templates/doc/README_FOR_APP
-- lib/rails/generators/rails/app/templates/config.ru
-- lib/rails/generators/rails/app/templates/script/rails
-- lib/rails/generators/rails/app/templates/Gemfile
 - lib/rails/generators/rails/app/templates/Rakefile
+- lib/rails/generators/rails/app/templates/README
+- lib/rails/generators/rails/app/templates/script/rails
+- lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
+- lib/rails/generators/rails/app/templates/test/test_helper.rb
 - lib/rails/generators/rails/app/USAGE
-- lib/rails/generators/rails/plugin/templates/Rakefile.tt
-- lib/rails/generators/rails/plugin/templates/README.tt
+- lib/rails/generators/rails/assets/assets_generator.rb
+- lib/rails/generators/rails/assets/templates/javascript.js
+- lib/rails/generators/rails/assets/templates/stylesheet.css
+- lib/rails/generators/rails/assets/USAGE
+- lib/rails/generators/rails/controller/controller_generator.rb
+- lib/rails/generators/rails/controller/templates/controller.rb
+- lib/rails/generators/rails/controller/USAGE
+- lib/rails/generators/rails/generator/generator_generator.rb
+- lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
+- lib/rails/generators/rails/generator/templates/USAGE.tt
+- lib/rails/generators/rails/generator/USAGE
+- lib/rails/generators/rails/helper/helper_generator.rb
+- lib/rails/generators/rails/helper/templates/helper.rb
+- lib/rails/generators/rails/helper/USAGE
+- lib/rails/generators/rails/integration_test/integration_test_generator.rb
+- lib/rails/generators/rails/integration_test/USAGE
+- lib/rails/generators/rails/migration/migration_generator.rb
+- lib/rails/generators/rails/migration/USAGE
+- lib/rails/generators/rails/model/model_generator.rb
+- lib/rails/generators/rails/model/USAGE
+- lib/rails/generators/rails/observer/observer_generator.rb
+- lib/rails/generators/rails/observer/USAGE
+- lib/rails/generators/rails/performance_test/performance_test_generator.rb
+- lib/rails/generators/rails/performance_test/USAGE
+- lib/rails/generators/rails/plugin/plugin_generator.rb
+- lib/rails/generators/rails/plugin/templates/init.rb
 - lib/rails/generators/rails/plugin/templates/install.rb
-- lib/rails/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
 - lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt
-- lib/rails/generators/rails/plugin/templates/init.rb
+- lib/rails/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
 - lib/rails/generators/rails/plugin/templates/MIT-LICENSE.tt
+- lib/rails/generators/rails/plugin/templates/Rakefile.tt
+- lib/rails/generators/rails/plugin/templates/README.tt
 - lib/rails/generators/rails/plugin/templates/uninstall.rb
-- lib/rails/generators/rails/plugin/plugin_generator.rb
 - lib/rails/generators/rails/plugin/USAGE
+- lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
 - lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
-- lib/rails/generators/rails/plugin_new/templates/README.rdoc
-- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
 - lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
 - lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
-- lib/rails/generators/rails/plugin_new/templates/gitignore
+- lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
 - lib/rails/generators/rails/plugin_new/templates/config/routes.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb
-- lib/rails/generators/rails/plugin_new/templates/lib/tasks/%name%_tasks.rake
+- lib/rails/generators/rails/plugin_new/templates/Gemfile
+- lib/rails/generators/rails/plugin_new/templates/gitignore
 - lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
 - lib/rails/generators/rails/plugin_new/templates/lib/%name%/version.rb
-- lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
-- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
-- lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
+- lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb
+- lib/rails/generators/rails/plugin_new/templates/lib/tasks/%name%_tasks.rake
 - lib/rails/generators/rails/plugin_new/templates/MIT-LICENSE
-- lib/rails/generators/rails/plugin_new/templates/script/rails.tt
-- lib/rails/generators/rails/plugin_new/templates/Gemfile
 - lib/rails/generators/rails/plugin_new/templates/rails/application.rb
 - lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
 - lib/rails/generators/rails/plugin_new/templates/rails/routes.rb
 - lib/rails/generators/rails/plugin_new/templates/Rakefile
-- lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+- lib/rails/generators/rails/plugin_new/templates/README.rdoc
+- lib/rails/generators/rails/plugin_new/templates/script/rails.tt
+- lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
+- lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
+- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
 - lib/rails/generators/rails/plugin_new/USAGE
-- lib/rails/generators/rails/model/model_generator.rb
-- lib/rails/generators/rails/model/USAGE
 - lib/rails/generators/rails/resource/resource_generator.rb
 - lib/rails/generators/rails/resource/USAGE
-- lib/rails/generators/rails/observer/observer_generator.rb
-- lib/rails/generators/rails/observer/USAGE
-- lib/rails/generators/rails/generator/templates/USAGE.tt
-- lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
-- lib/rails/generators/rails/generator/USAGE
-- lib/rails/generators/rails/generator/generator_generator.rb
+- lib/rails/generators/rails/scaffold/scaffold_generator.rb
+- lib/rails/generators/rails/scaffold/templates/scaffold.css
+- lib/rails/generators/rails/scaffold/USAGE
+- lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+- lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+- lib/rails/generators/rails/scaffold_controller/USAGE
+- lib/rails/generators/rails/session_migration/session_migration_generator.rb
+- lib/rails/generators/rails/session_migration/USAGE
 - lib/rails/generators/resource_helpers.rb
-- lib/rails/generators/test_unit/mailer/templates/functional_test.rb
-- lib/rails/generators/test_unit/mailer/mailer_generator.rb
-- lib/rails/generators/test_unit/performance/templates/performance_test.rb
-- lib/rails/generators/test_unit/performance/performance_generator.rb
-- lib/rails/generators/test_unit/helper/templates/helper_test.rb
-- lib/rails/generators/test_unit/helper/helper_generator.rb
-- lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
-- lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+- lib/rails/generators/test_case.rb
 - lib/rails/generators/test_unit/controller/controller_generator.rb
 - lib/rails/generators/test_unit/controller/templates/functional_test.rb
-- lib/rails/generators/test_unit/plugin/templates/test_helper.rb
-- lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
-- lib/rails/generators/test_unit/plugin/plugin_generator.rb
+- lib/rails/generators/test_unit/helper/helper_generator.rb
+- lib/rails/generators/test_unit/helper/templates/helper_test.rb
+- lib/rails/generators/test_unit/integration/integration_generator.rb
+- lib/rails/generators/test_unit/integration/templates/integration_test.rb
+- lib/rails/generators/test_unit/mailer/mailer_generator.rb
+- lib/rails/generators/test_unit/mailer/templates/functional_test.rb
 - lib/rails/generators/test_unit/model/model_generator.rb
-- lib/rails/generators/test_unit/model/templates/unit_test.rb
 - lib/rails/generators/test_unit/model/templates/fixtures.yml
-- lib/rails/generators/test_unit/observer/templates/unit_test.rb
+- lib/rails/generators/test_unit/model/templates/unit_test.rb
 - lib/rails/generators/test_unit/observer/observer_generator.rb
-- lib/rails/generators/test_unit/integration/templates/integration_test.rb
-- lib/rails/generators/test_unit/integration/integration_generator.rb
-- lib/rails/generators/css/assets/assets_generator.rb
-- lib/rails/generators/css/assets/templates/stylesheet.css
-- lib/rails/generators/css/scaffold/scaffold_generator.rb
-- lib/rails/application/bootstrap.rb
-- lib/rails/application/configuration.rb
-- lib/rails/application/routes_reloader.rb
-- lib/rails/application/railties.rb
-- lib/rails/application/finisher.rb
-- lib/rails/version.rb
+- lib/rails/generators/test_unit/observer/templates/unit_test.rb
+- lib/rails/generators/test_unit/performance/performance_generator.rb
+- lib/rails/generators/test_unit/performance/templates/performance_test.rb
+- lib/rails/generators/test_unit/plugin/plugin_generator.rb
+- lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
+- lib/rails/generators/test_unit/plugin/templates/test_helper.rb
+- lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+- lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+- lib/rails/generators/test_unit.rb
 - lib/rails/generators.rb
+- lib/rails/info.rb
+- lib/rails/info_controller.rb
+- lib/rails/initializable.rb
+- lib/rails/paths.rb
+- lib/rails/performance_test_help.rb
+- lib/rails/plugin.rb
+- lib/rails/rack/debugger.rb
+- lib/rails/rack/log_tailer.rb
+- lib/rails/rack/logger.rb
+- lib/rails/rack.rb
+- lib/rails/railtie/configurable.rb
+- lib/rails/railtie/configuration.rb
 - lib/rails/railtie.rb
-- lib/rails/rubyprof_ext.rb
 - lib/rails/ruby_version_check.rb
-- lib/rails/code_statistics.rb
-- lib/rails/performance_test_help.rb
-- lib/rails/tasks/documentation.rake
-- lib/rails/tasks/misc.rake
-- lib/rails/tasks/tmp.rake
+- lib/rails/rubyprof_ext.rb
+- lib/rails/script_rails_loader.rb
+- lib/rails/source_annotation_extractor.rb
 - lib/rails/tasks/annotations.rake
-- lib/rails/tasks/routes.rake
+- lib/rails/tasks/documentation.rake
+- lib/rails/tasks/engine.rake
 - lib/rails/tasks/framework.rake
 - lib/rails/tasks/log.rake
 - lib/rails/tasks/middleware.rake
-- lib/rails/tasks/engine.rake
+- lib/rails/tasks/misc.rake
+- lib/rails/tasks/routes.rake
 - lib/rails/tasks/statistics.rake
-- lib/rails/rack.rb
-- lib/rails/script_rails_loader.rb
-- lib/rails/railtie/configuration.rb
-- lib/rails/railtie/configurable.rb
-- lib/rails/source_annotation_extractor.rb
-- lib/rails/cli.rb
-- lib/rails/test_unit/testing.rake
+- lib/rails/tasks/tmp.rake
+- lib/rails/tasks.rb
+- lib/rails/test_help.rb
 - lib/rails/test_unit/railtie.rb
-- lib/rails/paths.rb
+- lib/rails/test_unit/testing.rake
+- lib/rails/version.rb
 - lib/rails.rb
-- lib/rails/generators/rails/app/templates/app/models/.empty_directory
 - lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/app/templates/app/models/.empty_directory
+- lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory
 - lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory
-- lib/rails/generators/rails/app/templates/test/integration/.empty_directory
 - lib/rails/generators/rails/app/templates/test/functional/.empty_directory
+- lib/rails/generators/rails/app/templates/test/integration/.empty_directory
 - lib/rails/generators/rails/app/templates/test/unit/.empty_directory
-- lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory
-- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
-- lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
 - lib/rails/generators/rails/generator/templates/templates/.empty_directory
+- lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -712,16 +554,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.