activerecord 3.1.0.beta1 → 3.1.0.rc1

data/CHANGELOG

@@ -1,5 +1,36 @@
 *Rails 3.1.0 (unreleased)*
 
+* Add block setting of attributes to singular associations:
+
+    class User < ActiveRecord::Base
+      has_one :account
+    end
+
+    user.build_account{ |a| a.credit_limit => 100.0 }
+
+  The block is called after the instance has been initialized. [Andrew White]
+
+* Add ActiveRecord::Base.attribute_names to return a list of attribute names. This will return an empty array if the model is abstract or table does not exists. [Prem Sichanugrist]
+
+* CSV Fixtures are deprecated and support will be removed in Rails 3.2.0
+
+* AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes! all accept a second hash as option that allows you
+  to specify which role to consider when assigning attributes. This is built on top of ActiveModel's
+  new mass assignment capabilities:
+
+    class Post < ActiveRecord::Base
+      attr_accessible :title
+      attr_accessible :title, :published_at, :as => :admin
+    end
+
+    Post.new(params[:post], :as => :admin)
+
+  assign_attributes() with similar API was also added and attributes=(params, guard) was deprecated.
+
+  Please note that this changes the method signatures for AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes!. If you have overwritten these methods you should update them accordingly.
+
+  [Josh Kalderimis]
+
 * default_scope can take a block, lambda, or any other object which responds to `call` for lazy
   evaluation:
 
@@ -22,25 +53,7 @@
 
   [Jon Leighton]
 
-* Calling 'default_scope' multiple times in a class (including when a superclass calls
-  'default_scope') is deprecated. The current behavior is that this will merge the default
-  scopes together:
-
-    class Post < ActiveRecord::Base # Rails 3.1
-      default_scope where(:published => true)
-      default_scope where(:hidden => false)
-      # The default scope is now: where(:published => true, :hidden => false)
-    end
-
-  In Rails 3.2, the behavior will be changed to overwrite previous scopes:
-
-    class Post < ActiveRecord::Base # Rails 3.2
-      default_scope where(:published => true)
-      default_scope where(:hidden => false)
-      # The default scope is now: where(:hidden => false)
-    end
-
-  If you wish to merge default scopes in special ways, it is recommended to define your default
+* If you wish to merge default scopes in special ways, it is recommended to define your default
   scope as a class method and use the standard techniques for sharing code (inheritance, mixins,
   etc.):
 
@@ -293,6 +306,84 @@ IrreversibleMigration exception will be raised when going down.
   [Aaron Patterson]
 
 
+*Rails 3.0.7 (April 18, 2011)*
+
+* Destroying records via nested attributes works independent of reject_if LH #6006 [Durran Jordan]
+
+* Delegate any? and many? to Model.scoped for consistency [Andrew White]
+
+* Quote the ORDER BY clause in batched finds - fixes #6620 [Andrew White]
+
+* Change exists? so records are not instantiated - fixes #6127. This prevents after_find
+  and after_initialize callbacks being triggered when checking for record existence.
+  [Andrew White]
+
+* Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
+  cache type-casted values when the column returned from the db contains non-standard chars.
+  [Jon Leighton]
+
+* Fix a performance regression introduced here 86acbf1cc050c8fa8c74a10c735e467fb6fd7df8
+  related to read_attribute method [Stian Grytøyr]
+
+
+*Rails 3.0.6 (April 5, 2011)*
+
+* Un-deprecate reorder method [Sebastian Martinez]
+
+* Extensions are applied when calling +except+ or +only+ on relations.
+  Thanks to Iain Hecker.
+
+* Schemas set in set_table_name are respected by the mysql adapter. LH #5322
+
+* Fixed a bug when empty? was called on a grouped Relation that wasn't loaded.
+  LH #5829
+
+* Reapply extensions when using except and only. Thanks Iain Hecker.
+
+* Binary data is escaped when being inserted to SQLite3 Databases. Thanks
+  Naruse!
+
+
+*Rails 3.0.5 (February 26, 2011)*
+
+* Model.where(:column => 1).where(:column => 2) will always produce an AND
+query.
+
+  [Aaron Patterson]
+
+* Deprecated support for interpolated association conditions in the form of :conditions => 'foo = #{bar}'.
+
+  Instead, you should use a proc, like so:
+
+  Before:
+
+    has_many :things, :conditions => 'foo = #{bar}'
+
+  After:
+
+    has_many :things, :conditions => proc { "foo = #{bar}" }
+
+  Inside the proc, 'self' is the object which is the owner of the association, unless you are
+  eager loading the association, in which case 'self' is the class which the association is within.
+
+  You can have any "normal" conditions inside the proc, so the following will work too:
+
+    has_many :things, :conditions => proc { ["foo = ?", bar] }
+
+  Previously :insert_sql and :delete_sql on has_and_belongs_to_many association allowed you to call
+  'record' to get the record being inserted or deleted. This is now passed as an argument to
+  the proc.
+
+  [Jon Leighton]
+
+
+*Rails 3.0.4 (February 8, 2011)*
+
+* Added deprecation warning for has_and_belongs_to_many associations where the join table has
+  additional attributes other than the keys. Access to these attributes is removed in 3.1.
+  Please use has_many :through instead. [Jon Leighton]
+
+
 *Rails 3.0.3 (November 16, 2010)*
 
 * Support find by class like this: Post.where(:name => Post)
@@ -329,10 +420,12 @@ IrreversibleMigration exception will be raised when going down.
 
   [Aaron Patterson]
 
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * Introduce a fix for CVE-2010-3993
 
+
 *Rails 3.0.0 (August 29, 2010)*
 
 * Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
@@ -532,12 +625,12 @@ IrreversibleMigration exception will be raised when going down.
 
 * Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran]
 
-	class Book < ActiveRecord::Base
-	  has_one :author
-	  has_many :pages
+  class Book < ActiveRecord::Base
+    has_one :author
+    has_many :pages
 
-	  accepts_nested_attributes_for :author, :pages
-	end
+    accepts_nested_attributes_for :author, :pages
+  end
 
 * Make after_save callbacks fire only if the record was successfully saved.  #1735 [Michael Lovitt]
 
@@ -957,7 +1050,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
   "foo.bar" => "`foo`.`bar`"
 
 * Complete the assimilation of Sexy Migrations from ErrFree [Chris Wanstrath, PJ Hyett]
-	http://errtheblog.com/post/2381
+  http://errtheblog.com/post/2381
 
 * Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 [Jack Danger Canty]
 
@@ -1073,7 +1166,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Improve performance and functionality of the postgresql adapter.  Closes #8049 [roderickvd]
 
-	For more information see: http://dev.rubyonrails.org/ticket/8049
+  For more information see: http://dev.rubyonrails.org/ticket/8049
 
 * Don't clobber includes passed to has_many.count [Jack Danger Canty]
 
@@ -1583,8 +1676,8 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 * Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
 
     assert (Topic.exists?(:author_name => "David"))
- 	  assert (Topic.exists?(:author_name => "Mary", :approved => true))
- 	  assert (Topic.exists?(["parent_id = ?", 1]))
+     assert (Topic.exists?(:author_name => "Mary", :approved => true))
+     assert (Topic.exists?(["parent_id = ?", 1]))
 
 * Schema dumper quotes date :default values. [Dave Thomas]
 
@@ -2040,8 +2133,8 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 * Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
 
     assert (Topic.exists?(:author_name => "David"))
- 	  assert (Topic.exists?(:author_name => "Mary", :approved => true))
- 	  assert (Topic.exists?(["parent_id = ?", 1]))
+     assert (Topic.exists?(:author_name => "Mary", :approved => true))
+     assert (Topic.exists?(["parent_id = ?", 1]))
 
 * Schema dumper quotes date :default values. [Dave Thomas]
 

data/README.rdoc

@@ -84,7 +84,7 @@ A short rundown of some of the major features:
 
    class CommentObserver < ActiveRecord::Observer
      def after_create(comment) # is called just after Comment#save
-       CommentMailer.new_comment_email("david@loudthinking.com", comment)
+       CommentMailer.new_comment_email("david@loudthinking.com", comment).deliver
      end
    end
 
@@ -219,4 +219,4 @@ API documentation is at
 
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 
-* https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets
+* https://github.com/rails/rails/issues

data/lib/active_record/associations.rb

@@ -33,7 +33,7 @@ module ActiveRecord
 
   class HasManyThroughAssociationPointlessSourceTypeError < ActiveRecordError #:nodoc:
     def initialize(owner_class_name, reflection, source_reflection)
-      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' with a :source_type option if the '#{reflection.through_reflection.class_name}##{source_reflection.name}' is not polymorphic.  Try removing :source_type on your association.")
+      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' with a :source_type option if the '#{reflection.through_reflection.class_name}##{source_reflection.name}' is not polymorphic. Try removing :source_type on your association.")
     end
   end
 
@@ -48,7 +48,7 @@ module ActiveRecord
       through_reflection      = reflection.through_reflection
       source_reflection_names = reflection.source_reflection_names
       source_associations     = reflection.through_reflection.klass.reflect_on_all_associations.collect { |a| a.name.inspect }
-      super("Could not find the source association(s) #{source_reflection_names.collect{ |a| a.inspect }.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)} in model #{through_reflection.klass}.  Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'.  Is it one of #{source_associations.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)}?")
+      super("Could not find the source association(s) #{source_reflection_names.collect{ |a| a.inspect }.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)} in model #{through_reflection.klass}. Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'. Is it one of #{source_associations.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)}?")
     end
   end
 
@@ -96,7 +96,7 @@ module ActiveRecord
 
   class ReadOnlyAssociation < ActiveRecordError #:nodoc:
     def initialize(reflection)
-      super("Can not add to a has_many :through association.  Try adding to #{reflection.through_reflection.name.inspect}.")
+      super("Can not add to a has_many :through association. Try adding to #{reflection.through_reflection.name.inspect}.")
     end
   end
 
@@ -457,12 +457,13 @@ module ActiveRecord
     #     has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
     #   end
     #
-    # Some extensions can only be made to work with knowledge of the association proxy's internals.
-    # Extensions can access relevant state using accessors on the association proxy:
+    # Some extensions can only be made to work with knowledge of the association's internals.
+    # Extensions can access relevant state using the following methods (where 'items' is the
+    # name of the association):
     #
-    # * +proxy_owner+ - Returns the object the association is part of.
-    # * +proxy_reflection+ - Returns the reflection object that describes the association.
-    # * +proxy_target+ - Returns the associated object for +belongs_to+ and +has_one+, or
+    # * +record.association(:items).owner+ - Returns the object the association is part of.
+    # * +record.association(:items).reflection+ - Returns the reflection object that describes the association.
+    # * +record.association(:items).target+ - Returns the associated object for +belongs_to+ and +has_one+, or
     #   the collection of associated objects for +has_many+ and +has_and_belongs_to_many+.
     #
     # === Association Join Models
@@ -1379,7 +1380,7 @@ module ActiveRecord
       # [:touch]
       #   If true, the associated object will be touched (the updated_at/on attributes set to now)
       #   when this record is either saved or destroyed. If you specify a symbol, that attribute
-      #   will be updated with the current time instead of the updated_at/on attribute.
+      #   will be updated with the current time in addition to the updated_at/on attribute.
       # [:inverse_of]
       #   Specifies the name of the <tt>has_one</tt> or <tt>has_many</tt> association on the associated
       #   object that is the inverse of this <tt>belongs_to</tt> association.  Does not work in

data/lib/active_record/associations/alias_tracker.rb

@@ -49,8 +49,8 @@ module ActiveRecord
         end
       end
 
-      def pluralize(table_name)
-        ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
+      def pluralize(table_name, base)
+        base.pluralize_table_names ? table_name.to_s.pluralize : table_name.to_s
       end
 
       private

data/lib/active_record/associations/belongs_to_polymorphic_association.rb

@@ -19,7 +19,7 @@ module ActiveRecord
 
         def klass
           type = owner[reflection.foreign_type]
-          type && type.constantize
+          type.presence && type.constantize
         end
 
         def raise_on_type_mismatch(record)

data/lib/active_record/associations/builder/singular_association.rb

@@ -13,19 +13,32 @@ module ActiveRecord::Associations::Builder
 
     private
 
+      def define_readers
+        super
+        name = self.name
+
+        model.redefine_method("#{name}_loaded?") do
+          ActiveSupport::Deprecation.warn(
+            "Calling obj.#{name}_loaded? is deprecated. Please use " \
+            "obj.association(:#{name}).loaded? instead."
+          )
+          association(name).loaded?
+        end
+      end
+
       def define_constructors
         name = self.name
 
-        model.redefine_method("build_#{name}") do |*params|
-          association(name).build(*params)
+        model.redefine_method("build_#{name}") do |*params, &block|
+          association(name).build(*params, &block)
         end
 
-        model.redefine_method("create_#{name}") do |*params|
-          association(name).create(*params)
+        model.redefine_method("create_#{name}") do |*params, &block|
+          association(name).create(*params, &block)
         end
 
-        model.redefine_method("create_#{name}!") do |*params|
-          association(name).create!(*params)
+        model.redefine_method("create_#{name}!") do |*params, &block|
+          association(name).create!(*params, &block)
         end
       end
   end

data/lib/active_record/associations/collection_association.rb

@@ -4,7 +4,7 @@ module ActiveRecord
   module Associations
     # = Active Record Association Collection
     #
-    # AssociationCollection is an abstract class that provides common stuff to
+    # CollectionAssociation is an abstract class that provides common stuff to
     # ease the implementation of association proxies that represent
     # collections. See the class hierarchy in AssociationProxy.
     #
@@ -94,7 +94,13 @@ module ActiveRecord
       end
 
       def build(attributes = {}, options = {}, &block)
-        build_or_create(:build, attributes, options, &block)
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| build(attr, options, &block) }
+        else
+          add_to_target(build_record(attributes, options)) do |record|
+            yield(record) if block_given?
+          end
+        end
       end
 
       def create(attributes = {}, options = {}, &block)
@@ -102,7 +108,16 @@ module ActiveRecord
           raise ActiveRecord::RecordNotSaved, "You cannot call create unless the parent is saved"
         end
 
-        build_or_create(:create, attributes, options, &block)
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| create(attr, options, &block) }
+        else
+          transaction do
+            add_to_target(build_record(attributes, options)) do |record|
+              yield(record) if block_given?
+              insert_record(record)
+            end
+          end
+        end
       end
 
       def create!(attrs = {}, options = {}, &block)
@@ -321,15 +336,7 @@ module ActiveRecord
 
       def load_target
         if find_target?
-          targets = []
-
-          begin
-            targets = find_target
-          rescue ActiveRecord::RecordNotFound
-            reset
-          end
-
-          @target = merge_target_lists(targets, target)
+          @target = merge_target_lists(find_target, target)
         end
 
         loaded!
@@ -337,20 +344,18 @@ module ActiveRecord
       end
 
       def add_to_target(record)
-        transaction do
-          callback(:before_add, record)
-          yield(record) if block_given?
-
-          if options[:uniq] && index = @target.index(record)
-            @target[index] = record
-          else
-            @target << record
-          end
+        callback(:before_add, record)
+        yield(record) if block_given?
 
-          callback(:after_add, record)
-          set_inverse_instance(record)
+        if options[:uniq] && index = @target.index(record)
+          @target[index] = record
+        else
+          @target << record
         end
 
+        callback(:after_add, record)
+        set_inverse_instance(record)
+
         record
       end
 
@@ -374,7 +379,7 @@ module ActiveRecord
             if options[:finder_sql]
               reflection.klass.find_by_sql(custom_finder_sql)
             else
-              find(:all)
+              scoped.all
             end
 
           records = options[:uniq] ? uniq(records) : records
@@ -382,38 +387,35 @@ module ActiveRecord
           records
         end
 
-        def merge_target_lists(loaded, existing)
-          return loaded if existing.empty?
-          return existing if loaded.empty?
-
-          loaded.map do |f|
-            i = existing.index(f)
-            if i
-              existing.delete_at(i).tap do |t|
-                keys = ["id"] + t.changes.keys + (f.attribute_names - t.attribute_names)
-                # FIXME: this call to attributes causes many NoMethodErrors
-                attributes = f.attributes
-                (attributes.keys - keys).each do |k|
-                  t.send("#{k}=", attributes[k])
-                end
+        # We have some records loaded from the database (persisted) and some that are
+        # in-memory (memory). The same record may be represented in the persisted array
+        # and in the memory array.
+        #
+        # So the task of this method is to merge them according to the following rules:
+        #
+        #   * The final array must not have duplicates
+        #   * The order of the persisted array is to be preserved
+        #   * Any changes made to attributes on objects in the memory array are to be preserved
+        #   * Otherwise, attributes should have the value found in the database
+        def merge_target_lists(persisted, memory)
+          return persisted if memory.empty?
+          return memory    if persisted.empty?
+
+          persisted.map! do |record|
+            mem_record = memory.delete(record)
+
+            if mem_record
+              (record.attribute_names - mem_record.changes.keys).each do |name|
+                mem_record[name] = record[name]
               end
-            else
-              f
-            end
-          end + existing
-        end
 
-        def build_or_create(method, attributes, options)
-          records = Array.wrap(attributes).map do |attrs|
-            record = build_record(attrs, options)
-
-            add_to_target(record) do
-              yield(record) if block_given?
-              insert_record(record) if method == :create
+              mem_record
+            else
+              record
             end
           end
 
-          attributes.is_a?(Array) ? records : records.first
+          persisted + memory
         end
 
         # Do the relevant stuff to insert the given record into the association collection.
@@ -421,8 +423,15 @@ module ActiveRecord
           raise NotImplementedError
         end
 
+        def create_scope
+          scoped.scope_for_create.stringify_keys
+        end
+
         def build_record(attributes, options)
-          reflection.build_association(scoped.scope_for_create.merge(attributes), options)
+          record = reflection.build_association(attributes, options)
+          record.assign_attributes(create_scope.except(*record.changed), :without_protection => true)
+          record.assign_attributes(attributes, options)
+          record
         end
 
         def delete_or_destroy(records, method)