RubyGems - railties - Versions diffs - 3.2.0.rc2 → 3.2.0 - Mend

railties 3.2.0.rc2 → 3.2.0

Files changed (31) hide show

data/CHANGELOG.md +1 -1
data/guides/code/getting_started/Gemfile +17 -6
data/guides/code/getting_started/app/assets/javascripts/application.js +9 -3
data/guides/code/getting_started/app/assets/stylesheets/application.css +11 -5
data/guides/code/getting_started/app/views/layouts/application.html.erb +1 -1
data/guides/code/getting_started/config/application.rb +7 -1
data/guides/code/getting_started/config/environments/test.rb +3 -3
data/guides/code/getting_started/config/initializers/inflections.rb +5 -0
data/guides/code/getting_started/config/routes.rb +4 -4
data/guides/code/getting_started/public/500.html +0 -1
data/guides/source/3_1_release_notes.textile +1 -1
data/guides/source/3_2_release_notes.textile +106 -18
data/guides/source/_welcome.html.erb +1 -1
data/guides/source/active_record_querying.textile +11 -0
data/guides/source/asset_pipeline.textile +56 -4
data/guides/source/configuring.textile +1 -0
data/guides/source/contributing_to_ruby_on_rails.textile +2 -0
data/guides/source/documents.yaml +4 -0
data/guides/source/form_helpers.textile +2 -2
data/guides/source/getting_started.textile +18 -12
data/guides/source/layout.html.erb +0 -1
data/lib/rails/application.rb +20 -0
data/lib/rails/application/configuration.rb +1 -0
data/lib/rails/application/route_inspector.rb +1 -1
data/lib/rails/commands/benchmarker.rb +1 -1
data/lib/rails/commands/profiler.rb +1 -1
data/lib/rails/generators/app_base.rb +15 -3
data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +1 -1
data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +1 -1
data/lib/rails/version.rb +1 -1
metadata +65 -119

data/CHANGELOG.md CHANGED

@@ -1,4 +1,4 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 3.2.0 (January 20, 2012) ##
 *   Rails 2.3-style plugins in vendor/plugins are deprecated and will be removed in Rails 4.0. Move them out of vendor/plugins and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb.  *Santiago Pastorino*

data/guides/code/getting_started/Gemfile CHANGED

@@ -1,8 +1,9 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
+gem 'rails', '3.2.0'
-gem 'rails', '3.1.0'
 # Bundle edge Rails instead:
-# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
 gem 'sqlite3'
@@ -10,13 +11,23 @@ gem 'sqlite3'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer'
+  gem 'uglifier', '>= 1.0.3'
 end
 gem 'jquery-rails'
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
 # Use unicorn as the web server
 # gem 'unicorn'

data/guides/code/getting_started/app/assets/javascripts/application.js CHANGED

@@ -1,9 +1,15 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
 //= require jquery
 //= require jquery_ujs
 //= require_tree .

data/guides/code/getting_started/app/assets/stylesheets/application.css CHANGED

@@ -1,7 +1,13 @@
 /*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
  *= require_self
- *= require_tree .
-*/
+ *= require_tree .
+*/

data/guides/code/getting_started/app/views/layouts/application.html.erb CHANGED

@@ -6,7 +6,7 @@
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
-<body style="background: #EEEEEE;">
+<body>
 <%= yield %>

data/guides/code/getting_started/config/application.rb CHANGED

@@ -4,7 +4,7 @@ require 'rails/all'
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -44,6 +44,12 @@ module Blog
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
     # Enable the asset pipeline
     config.assets.enabled = true

data/guides/code/getting_started/config/environments/test.rb CHANGED

@@ -29,9 +29,9 @@ Blog::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end

data/guides/code/getting_started/config/initializers/inflections.rb CHANGED

@@ -8,3 +8,8 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end

data/guides/code/getting_started/config/routes.rb CHANGED

@@ -1,7 +1,7 @@
 Blog::Application.routes.draw do
-	resources :posts do
-		resources :comments
-	end
+  resources :posts do
+    resources :comments
+  end
   get "home/index"
@@ -60,5 +60,5 @@ Blog::Application.routes.draw do
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+  # match ':controller(/:action(/:id))(.:format)'
 end

data/guides/code/getting_started/public/500.html CHANGED

@@ -20,7 +20,6 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>

data/guides/source/3_1_release_notes.textile CHANGED

@@ -46,7 +46,7 @@ $ rails new myapp --edge
 If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
 <shell>
-$ ruby /path/to/rails/bin/rails new myapp --dev
+$ ruby /path/to/rails/railties/bin/rails new myapp --dev
 </shell>
 h3. Rails Architectural Changes

data/guides/source/3_2_release_notes.textile CHANGED

@@ -7,19 +7,47 @@ Highlights in Rails 3.2:
 * Automatic Query Explains
 * Tagged Logging
-This release notes cover the major changes, but don't include every little bug fix and change. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/3-2-stable in the main Rails repository on GitHub.
+These release notes cover the major changes, but do not include each bug-fix and changes. If you want to see everything, check out the "list of commits":https://github.com/rails/rails/commits/3-2-stable in the main Rails repository on GitHub.
 endprologue.
 h3. Upgrading to Rails 3.2
-If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3.1 in case you haven't and make sure your application still runs as expected before attempting to update to Rails 3.2. Then take heed of the following changes:
+If you're upgrading an existing application, it's a great idea to have good test coverage before going in. You should also first upgrade to Rails 3.1 in case you haven't and make sure your application still runs as expected before attempting an update to Rails 3.2. Then take heed of the following changes:
 h4. Rails 3.2 requires at least Ruby 1.8.7
 Rails 3.2 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.2 is also compatible with Ruby 1.9.2.
-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. 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 or 1.9.3 for smooth sailing.
+TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition has these fixed since the release of 1.8.7-2010.02. 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 to 1.9.2 or 1.9.3 for smooth sailing.
+h4. What to update in your apps
+* Update your Gemfile to depend on
+** <tt>rails = 3.2.0</tt>
+** <tt>sass-rails ~> 3.2.3</tt>
+** <tt>coffee-rails ~> 3.2.1</tt>
+** <tt>uglifier >= 1.0.3</tt>
+* Rails 3.2 deprecates <tt>vendor/plugins</tt> and Rails 4.0 will remove them completely. You can start replacing these plugins by extracting them as gems and adding them in your Gemfile. If you choose not to make them gems, you can move them into, say, <tt>lib/my_plugin/*</tt> and add an appropriate initializer in <tt>config/initializers/my_plugin.rb</tt>.
+* There are a couple of new configuration changes you'd want to add in <tt>config/environments/development.rb</tt>:
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+# Log the query plan for queries taking more than this (works
+# with SQLite, MySQL, and PostgreSQL)
+config.active_record.auto_explain_threshold_in_seconds = 0.5
+</ruby>
+The <tt>mass_assignment_sanitizer</tt> config also needs to be added in <tt>config/environments/test.rb</tt>:
+<ruby>
+# Raise exception on mass assignment protection for Active Record models
+config.active_record.mass_assignment_sanitizer = :strict
+</ruby>
 h3. Creating a Rails 3.2 application
@@ -33,7 +61,7 @@ h4. Vendoring Gems
 Rails now uses a +Gemfile+ in the application root to determine the gems you require for your application to start. This +Gemfile+ is processed by the "Bundler":https://github.com/carlhuda/bundler gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
-More information: - "bundler homepage":http://gembundler.com
+More information: "Bundler homepage":http://gembundler.com
 h4. Living on the Edge
@@ -46,7 +74,7 @@ $ rails new myapp --edge
 If you have a local checkout of the Rails repository and want to generate an application using that, you can pass the +--dev+ flag:
 <shell>
-$ ruby /path/to/rails/bin/rails new myapp --dev
+$ ruby /path/to/rails/railties/bin/rails new myapp --dev
 </shell>
 h3. Major Features
@@ -63,10 +91,13 @@ Queries that take more than half a second to run are *automatically* explained i
 h4. Tagged Logging
-When running a multi-user, multi-account application, it's a great help to be able to filter the log by who did what. TaggedLogging in Active Support helps in doing exactly that by stamping log lines with subdomains, request ids, and anything else to aid debugging of such applications.
+When running a multi-user, multi-account application, it's a great help to be able to filter the log by who did what. TaggedLogging in Active Support helps in doing exactly that by stamping log lines with subdomains, request ids, and anything else to aid debugging such applications.
-h3. Railties
+h3. Documentation
+From Rails 3.2, the Rails guides are available for the Kindle and free Kindle Reading Apps for the iPad, iPhone, Mac, Android, etc.
+h3. Railties
 * Speed up development by only reloading classes if dependencies files changed. This can be turned off by setting <tt>config.reload_classes_only_on_change</tt> to false.
@@ -86,9 +117,9 @@ config.railties_order = [Blog::Engine, :main_app, :all]
 * Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box.
-* Update Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications
+* Update <tt>Rails::Rack::Logger</tt> middleware to apply any tags set in <tt>config.log_tags</tt> to <tt>ActiveSupport::TaggedLogging</tt>. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications.
-* Default options to +rails new+ can be set in <tt>~/.railsrc</tt>.
+* Default options to +rails new+ can be set in <tt>~/.railsrc</tt>. You can specify extra command-line arguments to be used every time 'rails new' runs in the <tt>.railsrc</tt> configuration file in your home directory.
 * Add an alias +d+ for +destroy+. This works for engines too.
@@ -102,14 +133,22 @@ rails g scaffold Post title:string:index author:uniq price:decimal{7,2}
 will create indexes for +title+ and +author+ with the latter being an unique index. Some types such as decimal accept custom options. In the example, +price+ will be a decimal column with precision and scale set to 7 and 2 respectively.
+* Turn gem has been removed from default Gemfile.
 * Remove old plugin generator +rails generate plugin+ in favor of +rails plugin new+ command.
 * Remove old <tt>config.paths.app.controller</tt> API in favor of <tt>config.paths["app/controller"]</tt>.
-h4. Deprecations
+h4(#railties_deprecations). Deprecations
 * +Rails::Plugin+ is deprecated and will be removed in Rails 4.0. Instead of adding plugins to +vendor/plugins+ use gems or bundler with path or git dependencies.
+h3. Action Mailer
+* Upgraded <tt>mail</tt> version to 2.4.0.
+* Removed the old Action Mailer API which was deprecated since Rails 3.0.
 h3. Action Pack
 h4. Action Controller
@@ -166,7 +205,7 @@ We now no longer write out HTTP_COOKIE and the cookie jar is persistent between
 * Assets should use the request protocol by default or default to relative if no request is available.
-h5. Deprecations
+h5(#actioncontroller_deprecations). Deprecations
 * Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
@@ -181,14 +220,28 @@ end
 In the example above, Posts controller will no longer automatically look up for a posts layout. If you need this functionality you could either remove <tt>layout "application"</tt> from +ApplicationController+ or explicitly set it to +nil+ in +PostsController+.
+* Deprecated <tt>ActionController::UnknownAction</tt> in favour of <tt>AbstractController::ActionNotFound</tt>.
+* Deprecated <tt>ActionController::DoubleRenderError</tt> in favour of <tt>AbstractController::DoubleRenderError</tt>.
+* Deprecated <tt>method_missing</tt> in favour of +action_missing+ for missing actions.
+* Deprecated <tt>ActionController#rescue_action</tt>, <tt>ActionController#initialize_template_class</tt> and <tt>ActionController#assign_shortcuts</tt>.
 h4. Action Dispatch
+* Add <tt>config.action_dispatch.default_charset</tt> to configure default charset for <tt>ActionDispatch::Response</tt>.
 * Added <tt>ActionDispatch::RequestId</tt> middleware that'll make a unique X-Request-Id header available to the response and enables the <tt>ActionDispatch::Request#uuid</tt> method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog.
 * The <tt>ShowExceptions</tt> middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in +env["action_dispatch.exception"]+ and with the <tt>PATH_INFO</tt> rewritten to the status code.
 * Allow rescue responses to be configured through a railtie as in <tt>config.action_dispatch.rescue_responses</tt>.
+h5(#actiondispatch_deprecations). Deprecations
+* Deprecated the ability to set a default charset at the controller level, use the new <tt>config.action_dispatch.default_charset</tt> instead.
 h4. Action View
 * Add +button_tag+ support to <tt>ActionView::Helpers::FormBuilder</tt>. This support mimics the default behavior of +submit_tag+.
@@ -199,7 +252,7 @@ h4. Action View
 <% end %>
 </ruby>
-* Date helpers accept a new option <tt>:use_two_digit_numbers => true</tt>, that renders select boxes for months and days with a leading zero without changing the respective values. For example, this is useful for displaying ISO8601-style dates such as '2011-08-01'.
+* Date helpers accept a new option <tt>:use_two_digit_numbers => true</tt>, that renders select boxes for months and days with a leading zero without changing the respective values. For example, this is useful for displaying ISO 8601-style dates such as '2011-08-01'.
 * You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generated HTML id.
@@ -232,17 +285,25 @@ end
 * Added +font_path+ helper method that computes the path to a font asset in <tt>public/fonts</tt>.
-h5. Deprecations
+h5(#actionview_deprecations). Deprecations
 * Passing formats or handlers to render :template and friends like <tt>render :template => "foo.html.erb"</tt> is deprecated. Instead, you can provide :handlers and :formats directly as an options: <tt> render :template => "foo", :formats => [:html, :js], :handlers => :erb</tt>.
+h4. Sprockets
+* Adds a configuration option <tt>config.assets.logger</tt> to control Sprockets logging. Set it to +false+ to turn off logging and to +nil+ to default to +Rails.logger+.
 h3. Active Record
+* Boolean columns with 'on' and 'ON' values are type casted to true.
+* When the +timestamps+ method creates the +created_at+ and +updated_at+ columns, it makes them non-nullable by default.
 * Implemented <tt>ActiveRecord::Relation#explain</tt>.
 * Implements <tt>AR::Base.silence_auto_explain</tt> which allows the user to selectively disable automatic EXPLAINs within a block.
-* Implements automatic EXPLAIN logging for slow queries. A new configuration parameter +config.active_record.auto_explain_threshold_in_seconds+ determines what's to be considered a slow query. Setting that to nil disables this feature. Defaults are 0.5 in development mode, and nil in test and production modes. As of this writing there's support for SQLite, MySQL (mysql2 adapter), and PostgreSQL.
+* Implements automatic EXPLAIN logging for slow queries. A new configuration parameter +config.active_record.auto_explain_threshold_in_seconds+ determines what's to be considered a slow query. Setting that to nil disables this feature. Defaults are 0.5 in development mode, and nil in test and production modes. Rails 3.2 supports this feature in SQLite, MySQL (mysql2 adapter), and PostgreSQL.
 * Added <tt>ActiveRecord::Base.store</tt> for declaring simple single-column key/value stores.
@@ -311,7 +372,34 @@ has_many :clients, :class_name => :Client # Note that the symbol need to be capi
 User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson")
 </ruby>
-h4. Deprecations
+* Added a <tt>with_lock</tt> method to Active Record objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to +lock!+.
+This makes it possible to write the following:
+<ruby>
+class Order < ActiveRecord::Base
+  def cancel!
+    transaction do
+      lock!
+      # ... cancelling logic
+    end
+  end
+end
+</ruby>
+as:
+<ruby>
+class Order < ActiveRecord::Base
+  def cancel!
+    with_lock do
+      # ... cancelling logic
+    end
+  end
+end
+</ruby>
+h4(#activerecord_deprecations). Deprecations
 * Automatic closure of connections in threads is deprecated. For example the following code is deprecated:
@@ -359,7 +447,7 @@ h3. Active Model
 * Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior.
-h4. Deprecations
+h4(#activemodel_deprecations). Deprecations
 * Deprecated <tt>define_attr_method</tt> in <tt>ActiveModel::AttributeMethods</tt> because this only existed to support methods like +set_table_name+ in Active Record, which are themselves being deprecated.
@@ -419,7 +507,7 @@ Event.where(:created_at => Time.now.all_day)
 * Removed <tt>ActiveSupport::SecureRandom</tt> in favor of <tt>SecureRandom</tt> from the standard library.
-h4. Deprecations
+h4(#activesupport_deprecations). Deprecations
 * +ActiveSupport::Base64+ is deprecated in favor of <tt>::Base64</tt>.
@@ -429,7 +517,7 @@ h4. Deprecations
 * Deprecated <tt>ActiveSupport::MessageEncryptor#encrypt</tt> and <tt>ActiveSupport::MessageEncryptor#decrypt</tt>.
-*  <tt>ActiveSupport::BufferedLogger#silence</tt> is deprecated. If you want to squelch logs for a certain block, change the log level for that block.
+* <tt>ActiveSupport::BufferedLogger#silence</tt> is deprecated. If you want to squelch logs for a certain block, change the log level for that block.
 * <tt>ActiveSupport::BufferedLogger#open_log</tt> is deprecated. This method should not have been public in the first place.

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

@@ -10,7 +10,7 @@
 </p>
 <% else %>
 <p>
-  These are the new guides for Rails 3.1 based on <a href="https://github.com/rails/rails/tree/<%= @version %>"><%= @version %></a>.
+  These are the new guides for Rails 3.2 based on <a href="https://github.com/rails/rails/tree/<%= @version %>"><%= @version %></a>.
   These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together.
 </p>
 <% end %>

data/guides/source/active_record_querying.textile CHANGED

@@ -692,6 +692,17 @@ Item.transaction do
 end
 </ruby>
+If you already have an instance of your model, you can start a transaction and acquire the lock in one go using the following code:
+<ruby>
+item = Item.first
+item.with_lock do
+  # This block is called within a transaction,
+  # item is already locked.
+  item.increment!(:views)
+end
+</ruby>
 h3. Joining Tables
 Active Record provides a finder method called +joins+ for specifying +JOIN+ clauses on the resulting SQL. There are multiple ways to use the +joins+ method.

data/guides/source/asset_pipeline.textile CHANGED

@@ -109,22 +109,74 @@ NOTE: You must have an "ExecJS":https://github.com/sstephenson/execjs#readme sup
 h4. Asset Organization
-Assets that must be precompiled can be placed inside an application in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+.
+Pipeline assets can be placed inside an application in one of three locations: +app/assets+, +lib/assets+ or +vendor/assets+.
 +app/assets+ is for assets that are owned by the application, such as custom images, JavaScript files or stylesheets.
 +lib/assets+ is for your own libraries' code that doesn't really fit into the scope of the application or those libraries which are shared across applications.
-+vendor/assets+ is for assets that are owned by outside entities, such as code for JavaScript plugins.
++vendor/assets+ is for assets that are owned by outside entities, such as code for JavaScript plugins and CSS frameworks.
-All subdirectories that exist within these three locations are added to the search path for Sprockets. You can see this search path by inspecting +Rails.application.config.assets.paths+ in the Rails console. When a client requests an asset, these paths are traversed (in the order that they occur in the search path) to see if they contain an asset matching the name specified. If an asset is found, it's processed by Sprockets and served.
+h5. Search paths
-You can add additional (fully qualified) paths to the pipeline in +config/application.rb+. For example:
+When a file is referenced from a manifest or a helper, Sprockets searches the three default asset locations for it.
+The default locations are: +app/assets/images+ and the subdirectories +javascripts+ and +stylesheets+ in all three asset locations.
+For example, these files:
+<plain>
+app/assets/javascripts/home.js
+lib/assets/javascripts/moovinator.js
+vendor/assets/javascript/slider.js
+</plain>
+would be referenced in a manifest like this:
+<plain>
+//= require home
+//= require moovinator
+//= require slider
+</plain>
+Assets inside subdirectories can also be accessed.
+<plain>
+app/assets/javascripts/sub/something.js
+</plain>
+is referenced as:
+<plain>
+//= require sub/something
+</plain>
+You can view the search path by inspecting +Rails.application.config.assets.paths+ in the Rails console.
+Additional (fully qualified) paths can be added to the pipeline in +config/application.rb+. For example:
 <ruby>
 config.assets.paths << Rails.root.join("app", "assets", "flash")
 </ruby>
+Paths are traversed in the order that they occur in the search path.
+It is important to note that files you want to reference outside a manifest must be added to the precompile array or they will not be available in the production environment.
+h5. Using index files
+Sprockets uses files named +index+ (with the relevant extensions) for a special purpose.
+For example, if you have a jQuery library with many modules, which is stored in +lib/assets/library_name+, the file +lib/assets/library_name/index.js+ serves as the manifest for all files in this library. This file could include a list of all the required files in order, or a simple <tt>require_tree</tt> directive.
+The library as a whole can be accessed in the site's application manifest like so:
+<plain>
+//= require library_name
+</plain>
+This simplifies maintenance and keeps things clean by allowing related code to be grouped before inclusion elsewhere.
 h4. Coding Links to Assets
 Sprockets does not add any new methods to access your assets - you still use the familiar +javascript_include_tag+ and +stylesheet_link_tag+.

data/guides/source/configuring.textile CHANGED

@@ -156,6 +156,7 @@ Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets wit
 * +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production.
+* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+. Setting +config.assets.logger+ to false will turn off served assets logging.
 h4. Configuring Generators

data/guides/source/contributing_to_ruby_on_rails.textile CHANGED

@@ -271,6 +271,8 @@ When working with documentation, please take into account the "API Documentation
 NOTE: As explained earlier, ordinary code patches should have proper documentation coverage. docrails is only used for isolated documentation improvements.
+NOTE: To help our CI servers you can add [ci skip] tag to your documentation commit message to skip build on that commit. Please remember to use it for commits containing only documentation changes.
 WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails. Also, CHANGELOGs should never be edited in docrails.
 h3. Contributing to the Rails Code

data/guides/source/documents.yaml CHANGED

@@ -136,6 +136,10 @@
   name: Release Notes
   documents:
     -
+      name: Ruby on Rails 3.2 Release Notes
+      url: 3_2_release_notes.html
+      description: Release notes for Rails 3.2.
+    -
       name: Ruby on Rails 3.1 Release Notes
       url: 3_1_release_notes.html
       description: Release notes for Rails 3.1.

data/guides/source/form_helpers.textile CHANGED

@@ -630,10 +630,10 @@ action for a Person model, +params[:model]+ would usually be a hash of all the a
 Fundamentally HTML forms don't know about any sort of structured data, all they generate is name–value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.
-TIP: You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example,
+TIP: You may find you can try out examples in this section faster by using the console to directly invoke Racks' parameter parser. For example,
 <ruby>
-ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789"
+Rack::Utils.parse_query "name=fred&phone=0123456789"
 # => {"name"=>"fred", "phone"=>"0123456789"}
 </ruby>

data/guides/source/getting_started.textile CHANGED

@@ -450,7 +450,13 @@ start a web server on your development machine. You can do this by running:
 $ rails server
 </shell>
-TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and the absence of a runtime will give you an +execjs+ error. Usually Mac OS X and Windows come with a JavaScript runtime installed. +therubyracer+ and +therubyrhino+ are the commonly used runtimes for Ruby and JRuby respectively. You can also investigate a list of runtimes at "ExecJS":https://github.com/sstephenson/execjs.
+TIP: Compiling CoffeeScript to JavaScript requires a JavaScript runtime and
+the absence of a runtime will give you an +execjs+ error. Usually Mac OS X
+and Windows come with a JavaScript runtime installed. Rails adds the +therubyracer+ gem
+to Gemfile in a commented line for new apps and you can uncomment if you need it.
++therubyrhino+ is the recommended runtime for JRuby users and is added by default
+to Gemfile in apps generated under JRuby. You can investigate about all the
+supported runtimes at "ExecJS":https://github.com/sstephenson/execjs#readme.
 This will fire up an instance of the WEBrick web server by default (Rails can
 also use several other web servers). To see your application in action, open a
@@ -1011,7 +1017,7 @@ by its id value. After finding the record, Rails displays it by using
 +app/views/posts/show.html.erb+:
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1278,7 +1284,7 @@ So first, we'll wire up the Post show template
 (+/app/views/posts/show.html.erb+) to let us make a new comment:
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1344,7 +1350,7 @@ template. This is where we want the comment to show, so let's add that to the
 +app/views/posts/show.html.erb+.
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1426,7 +1432,7 @@ Then you can change +app/views/posts/show.html.erb+ to look like the
 following:
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1497,7 +1503,7 @@ create a file +app/views/comments/_form.html.erb+ containing:
 Then you make the +app/views/posts/show.html.erb+ look like the following:
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1692,10 +1698,10 @@ class Post < ActiveRecord::Base
 end
 </ruby>
-The +:allow_destroy+ option on the nested attribute declaration tells Rails to
-display a "remove" checkbox on the view that you'll build shortly. The
-+:reject_if+ option prevents saving new tags that do not have any attributes
-filled in.
+The +:allow_destroy+ option tells Rails to enable destroying tags through the
+nested attributes (you'll handle that by displaying a "remove" checkbox on the
+view that you'll build shortly). The +:reject_if+ option prevents saving new
+tags that do not have any attributes filled in.
 We will modify +views/posts/_form.html.erb+ to render a partial to make a tag:
@@ -1768,7 +1774,7 @@ Finally, we will edit the <tt>app/views/posts/show.html.erb</tt> template to
 show our tags.
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>
@@ -1828,7 +1834,7 @@ Now you can edit the view in <tt>app/views/posts/show.html.erb</tt> to look like
 this:
 <erb>
-<p class="notice"><%= notice %></p>
+<p id="notice"><%= notice %></p>
 <p>
   <b>Name:</b>

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

@@ -38,7 +38,6 @@
   <div id="header">
     <div class="wrapper clearfix">
       <h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1>
-      <p class="hide"><a href="#mainCol">Skip navigation</a>.</p>
       <ul class="nav">
         <li><a href="index.html">Home</a></li>
         <li class="index"><a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu">Guides Index</a>

data/lib/rails/application.rb CHANGED

@@ -215,6 +215,11 @@ module Rails
       config.helpers_paths
     end
+    def call(env)
+      env["ORIGINAL_FULLPATH"] = build_original_fullpath(env)
+      super(env)
+    end
   protected
     alias :build_middleware_stack :app
@@ -261,6 +266,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
@@ -291,5 +299,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 CHANGED

@@ -57,6 +57,7 @@ module Rails
         @assets.js_compressor            = nil
         @assets.css_compressor           = nil
         @assets.initialize_on_precompile = true
+        @assets.logger                   = nil
       end
       def compiled_asset_path

data/lib/rails/application/route_inspector.rb CHANGED

@@ -42,7 +42,7 @@ module Rails
         end
         # Skip the route if it's internal info route
-        routes.reject { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+        routes.reject { |r| r[:path] =~ %r{/rails/info/properties|^#{Rails.application.config.assets.prefix}} }
       end
       def collect_engine_routes(name, rack_app)

data/lib/rails/commands/benchmarker.rb CHANGED

@@ -21,7 +21,7 @@ def options
   options
 end
-class BenchmarkerTest < ActionDispatch::PerformanceTest
+class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc:
   self.profile_options = options
   ARGV.each do |expression|

data/lib/rails/commands/profiler.rb CHANGED

@@ -19,7 +19,7 @@ def options
   options
 end
-class ProfilerTest < ActionDispatch::PerformanceTest
+class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc:
   self.profile_options = options
   ARGV.each do |expression|

data/lib/rails/generators/app_base.rb CHANGED

@@ -202,7 +202,9 @@ module Rails
             group :assets do
               gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git',   :branch => '3-2-stable'
               gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable'
-              #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
+              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+              #{javascript_runtime_gemfile_entry}
               gem 'uglifier', '>= 1.0.3'
             end
           GEMFILE
@@ -212,8 +214,10 @@ module Rails
             # in production environments by default.
             group :assets do
               gem 'sass-rails',   '~> 3.2.3'
-              gem 'coffee-rails', '~> 3.2.0'
-              #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
+              gem 'coffee-rails', '~> 3.2.1'
+              # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+              #{javascript_runtime_gemfile_entry}
               gem 'uglifier', '>= 1.0.3'
             end
           GEMFILE
@@ -226,6 +230,14 @@ module Rails
         "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)
         say_status :run, "bundle #{command}"

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

@@ -23,7 +23,7 @@
   config.action_dispatch.best_standards_support = :builtin
   <%- unless options.skip_active_record? -%>
-  # Raise exception on mass assignment protection for ActiveRecord models
+  # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict
   # Log the query plan for queries taking more than this (works

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

@@ -30,7 +30,7 @@
   config.action_mailer.delivery_method = :test
   <%- unless options.skip_active_record? -%>
-  # Raise exception on mass assignment protection for ActiveRecord models
+  # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict
   <%- end -%>

data/lib/rails/version.rb CHANGED

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    PRE   = "rc2"
+    PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata CHANGED

@@ -1,130 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: railties
-version: !ruby/object:Gem::Version
-  hash: 977940591
-  prerelease: true
-  segments:
-  - 3
-  - 2
-  - 0
-  - rc2
-  version: 3.2.0.rc2
+version: !ruby/object:Gem::Version
+  version: 3.2.0
+  prerelease:
 platform: ruby
-authors:
+authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00 -02:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  requirement: &70264961786840 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 49
-        segments:
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  version_requirements: *70264961786840
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70264961786300 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 43
-        segments:
-        - 0
-        - 14
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
-  name: rack-ssl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
+  version_requirements: *70264961786300
+- !ruby/object:Gem::Dependency
+  name: rack-ssl
+  requirement: &70264961806680 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 31
-        segments:
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
+  version_requirements: *70264961806680
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70264961805900 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 15
-        segments:
-        - 3
-        - 4
-        version: "3.4"
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
+  version_requirements: *70264961805900
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70264961805460 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        hash: 977940591
-        segments:
-        - 3
-        - 2
-        - 0
-        - rc2
-        version: 3.2.0.rc2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency
-  name: actionpack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement
+  version_requirements: *70264961805460
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70264961804940 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        hash: 977940591
-        segments:
-        - 3
-        - 2
-        - 0
-        - rc2
-        version: 3.2.0.rc2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id006
-description: "Rails internals: application bootup, plugins, generators, and rake tasks."
+  prerelease: false
+  version_requirements: *70264961804940
+description: ! 'Rails internals: application bootup, plugins, generators, and rake
+  tasks.'
 email: david@loudthinking.com
-executables:
+executables:
 - rails
 extensions: []
 extra_rdoc_files: []
-files:
+files:
 - CHANGELOG.md
 - README.rdoc
 - bin/rails
@@ -617,44 +577,30 @@ files:
 - 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
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 post_install_message:
-rdoc_options:
+rdoc_options:
 - --exclude
 - .
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 57
-      segments:
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      hash: 25
-      segments:
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []