railties 3.2.2 → 3.2.3.rc1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 3.2.3 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.2.2 (March 1, 2012) ##
+
+*   No changes.
+
+
 ## Rails 3.2.1 (January 26, 2012) ##
 
 *   Documentation fixes.
@@ -46,7 +56,19 @@
 *   Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
 
 
-*   Rails 3.1.1
+## Rails 3.1.2 (November 18, 2011) ##
+
+*   Engines: don't blow up if db/seeds.rb is missing.
+
+    *Jeremy Kemper*
+
+*   `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
+    *GH 2564*
+
+    *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*
 
@@ -59,16 +81,6 @@
     Plugins developers need to special case their initializers that are
     meant to be run in the assets group by adding :group => :assets.
 
-## Rails 3.1.2 (unreleased) ##
-
-*   Engines: don't blow up if db/seeds.rb is missing.
-
-    *Jeremy Kemper*
-
-*   `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
-    *GH 2564*
-
-    *José Valim*
 
 ## Rails 3.1.0 (August 30, 2011) ##
 

data/guides/assets/stylesheets/fixes.css

@@ -12,5 +12,5 @@
 .syntaxhighlighter table thead,
 .syntaxhighlighter table caption,
 .syntaxhighlighter textarea {
-  line-height: 1.2em !important;
+  line-height: 1.25em !important;
 }

data/guides/source/active_record_querying.textile

@@ -94,7 +94,7 @@ client = Client.find(10)
 The SQL equivalent of the above is:
 
 <sql>
-SELECT * FROM clients WHERE (clients.id = 10)
+SELECT * FROM clients WHERE (clients.id = 10) LIMIT 1
 </sql>
 
 <tt>Model.find(primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception if no matching record is found.
@@ -1109,6 +1109,8 @@ Client.where(:first_name => 'Andy').first_or_create!(:locked => false)
 # => ActiveRecord::RecordInvalid: Validation failed: Orders count can't be blank
 </ruby>
 
+As with +first_or_create+ there is a +find_or_create_by!+ method but the +first_or_create!+ method is preferred for clarity.
+
 h4. +first_or_initialize+
 
 The +first_or_initialize+ method will work just like +first_or_create+ but it will not call +create+ but +new+. This means that a new model instance will be created in memory but won't be saved to the database. Continuing with the +first_or_create+ example, we now want the client named 'Nick':

data/guides/source/asset_pipeline.textile

@@ -128,7 +128,7 @@ For example, these files:
 <plain>
 app/assets/javascripts/home.js
 lib/assets/javascripts/moovinator.js
-vendor/assets/javascript/slider.js
+vendor/assets/javascripts/slider.js
 </plain>
 
 would be referenced in a manifest like this:

data/guides/source/association_basics.textile

@@ -1319,7 +1319,7 @@ If you need to evaluate conditions dynamically at runtime, use a proc:
 <ruby>
 class Customer < ActiveRecord::Base
   has_many :latest_orders, :class_name => "Order",
-    :conditions => proc { ["orders.created_at > ?, 10.hours.ago] }
+    :conditions => proc { ["orders.created_at > ?", 10.hours.ago] }
 end
 </ruby>
 

data/guides/source/configuring.textile

@@ -337,7 +337,7 @@ h4. Configuring Action Dispatch
 
 h4. Configuring Action View
 
-There are only a few configuration options for Action View, starting with four on +ActionView::Base+:
+There are only a few configuration options for Action View, starting with three on +ActionView::Base+:
 
 * +config.action_view.field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is
 
@@ -347,8 +347,6 @@ Proc.new { |html_tag, instance| %Q(<div class="field_with_errors">#{html_tag}</d
 
 * +config.action_view.default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+.
 
-* +config.action_view.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby Logger class, which is then used to log information from Action Mailer. Set to +nil+ to disable logging.
-
 * +config.action_view.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the "ERB documentation":http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/ for more information.
 
 * +config.action_view.javascript_expansions+ is a hash containing expansions that can be used for the JavaScript include tag. By default, this is defined as:
@@ -483,7 +481,7 @@ Rails has 5 initialization events which can be hooked into (listed in the order
 
 * +after_initialize+: Run directly after the initialization of the application, but before the application initializers are run.
 
-To define an event for these hooks, use the block syntax within a +Rails::Aplication+, +Rails::Railtie+ or +Rails::Engine+ subclass:
+To define an event for these hooks, use the block syntax within a +Rails::Application+, +Rails::Railtie+ or +Rails::Engine+ subclass:
 
 <ruby>
 module YourApp

data/guides/source/routing.textile

@@ -235,14 +235,14 @@ end
 
 In addition to the routes for magazines, this declaration will also route ads to an +AdsController+. The ad URLs require a magazine:
 
-|_.HTTP Verb |_.Path                  |_.action |_.used for                                                                 |
-|GET         |/magazines/:id/ads        |index    |display a list of all ads for a specific magazine                          |
-|GET         |/magazines/:id/ads/new    |new      |return an HTML form for creating a new ad belonging to a specific magazine |
-|POST        |/magazines/:id/ads        |create   |create a new ad belonging to a specific magazine                           |
-|GET         |/magazines/:id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
-|GET         |/magazines/:id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
-|PUT         |/magazines/:id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
-|DELETE      |/magazines/:id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
+|_.HTTP Verb |_.Path                               |_.action |_.used for                                                                 |
+|GET         |/magazines/:magazine_id/ads          |index    |display a list of all ads for a specific magazine                          |
+|GET         |/magazines/:magazine_id/ads/new      |new      |return an HTML form for creating a new ad belonging to a specific magazine |
+|POST        |/magazines/:magazine_id/ads          |create   |create a new ad belonging to a specific magazine                           |
+|GET         |/magazines/:magazine_id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
+|GET         |/magazines/:magazine_id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
+|PUT         |/magazines/:magazine_id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
+|DELETE      |/magazines/:magazine_id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
 
 
 This will also create routing helpers such as +magazine_ads_url+ and +edit_magazine_ad_path+. These helpers take an instance of Magazine as the first parameter (+magazine_ads_url(@magazine)+).
@@ -385,7 +385,7 @@ match ':controller/:action/:id/:user_id'
 
 An incoming path of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
 
-NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
+NOTE: You can't use +:namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
 
 <ruby>
 match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/

data/guides/source/security.textile

@@ -374,7 +374,7 @@ end
 Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the +new+ method, or +assign_attributes=+ a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:
 
 <pre>
-"name":http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
+http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
 </pre>
 
 This will set the following parameters in the controller:

data/lib/rails/engine.rb

@@ -245,7 +245,7 @@ module Rails
   #
   # Additionally, an isolated engine will set its name according to namespace, so
   # MyEngine::Engine.engine_name will be "my_engine". It will also set MyEngine.table_name_prefix
-  # to "my_engine_", changing the MyEngine::Article model to use the my_engine_article table.
+  # to "my_engine_", changing the MyEngine::Article model to use the my_engine_articles table.
   #
   # == Using Engine's routes outside Engine
   #

data/lib/rails/generators/app_base.rb

@@ -234,7 +234,7 @@ module Rails
         if defined?(JRUBY_VERSION)
           "gem 'therubyrhino'\n"
         else
-          "# gem 'therubyracer'\n"
+          "# gem 'therubyracer', :platform => :ruby\n"
         end
       end
 

data/lib/rails/generators/rails/app/templates/config/application.rb

@@ -58,7 +58,7 @@ module <%= app_const_base %>
     # 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
+    <%= comment_if :skip_active_record %>config.active_record.whitelist_attributes = true
 
 <% unless options.skip_sprockets? -%>
     # Enable the asset pipeline

data/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb

@@ -8,3 +8,8 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -8,10 +8,31 @@ module TestUnit
 
       check_class_collision :suffix => "ControllerTest"
 
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
       def create_test_files
         template 'functional_test.rb',
                  File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
+
+      private
+
+        def resource_attributes
+          key_value singular_table_name, "{ #{attributes_hash} }"
+        end
+
+        def attributes_hash
+          return if accessible_attributes.empty?
+
+          accessible_attributes.map do |a|
+            name = a.name
+            key_value name, "@#{singular_table_name}.#{name}"
+          end.sort.join(', ')
+        end
+
+        def accessible_attributes
+          attributes.reject(&:reference?)
+        end
     end
   end
 end

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

@@ -19,7 +19,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= resource_attributes %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
@@ -36,7 +36,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= resource_attributes %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 

data/lib/rails/paths.rb

@@ -157,7 +157,25 @@ module Rails
           path = File.expand_path(p, @root.path)
 
           if @glob
-            result.concat Dir[File.join(path, @glob)].sort
+            if File.directory? path
+              result.concat expand_dir(path, @glob)
+            else
+              # FIXME: I think we can remove this branch, but I'm not sure.
+              # Say the filesystem has this file:
+              #
+              #   /tmp/foobar
+              #
+              # and someone adds this path:
+              #
+              #   /tmp/foo
+              #
+              # with a glob of "*", then this function will return
+              #
+              #   /tmp/foobar
+              #
+              # We need to figure out if that is desired behavior.
+              result.concat expand_file(path, @glob)
+            end
           else
             result << path
           end
@@ -177,6 +195,17 @@ module Rails
       end
 
       alias to_a expanded
+
+      private
+      def expand_file(path, glob)
+        Dir[File.join(path, glob)].sort
+      end
+
+      def expand_dir(path, glob)
+        Dir.chdir(path) do
+          Dir.glob(@glob).map { |file| File.join path, file }.sort
+        end
+      end
     end
   end
 end

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    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: 11
-  prerelease: 
+  hash: 15424079
+  prerelease: true
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - rc
+  - 1
+  version: 3.2.3.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,12 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-03-27 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +32,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
+  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +48,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-ssl
+  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: rack-ssl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,40 +79,46 @@ dependencies:
         - 3
         - 4
         version: "3.4"
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15424079
         segments: 
         - 3
         - 2
-        - 2
-        version: 3.2.2
+        - 3
+        - rc
+        - 1
+        version: 3.2.3.rc1
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: activesupport
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15424079
         segments: 
         - 3
         - 2
-        - 2
-        version: 3.2.2
+        - 3
+        - rc
+        - 1
+        version: 3.2.3.rc1
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
+  name: actionpack
+  prerelease: false
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
 executables: 
@@ -613,6 +620,7 @@ 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: []
 
@@ -636,16 +644,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.16
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.