Allow association scoping for built/created records if :conditions is specified as a hash. Closes #11393 [miloops]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9068 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

4 files changed, 36 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 0e07ee4913..aa68a42c44 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -109,7 +109,7 @@ module ActiveRecord
     #
     # == Auto-generated methods
     #
-    # ===Singular associations (one-to-one)
+    # === Singular associations (one-to-one)
     #                                     |            |  belongs_to  |
     #   generated methods                 | belongs_to | :polymorphic | has_one
     #   ----------------------------------+------------+--------------+---------
@@ -639,7 +639,9 @@ module ActiveRecord
       #   from the association name. So <tt>has_many :products</tt> will by default be linked to the +Product+ class, but
       #   if the real class name is +SpecialProduct+, you'll have to specify it with this option.
       # * <tt>:conditions</tt>  - specify the conditions that the associated objects must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>price > 5 AND name LIKE 'B%'</tt>.
+      #   SQL fragment, such as <tt>price > 5 AND name LIKE 'B%'</tt>.  Record creations from the association are scoped if a hash
+      #   is used.  <tt>has_many :posts, :conditions => {:published => true}</tt> will create published posts with <tt>@blog.posts.create</tt>
+      #   or <tt>@blog.posts.build</tt>.
       # * <tt>:order</tt>       - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
       #   such as <tt>last_name, first_name DESC</tt>
       # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
@@ -981,7 +983,9 @@ module ActiveRecord
       #   guessed to be the name of the associated class in lower-case and +_id+ suffixed. So if the associated class is +Project+,
       #   the +has_and_belongs_to_many+ association will use +project_id+ as the default association +foreign_key+.
       # * <tt>:conditions</tt>  - specify the conditions that the associated object must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>authorized = 1</tt>.
+      #   SQL fragment, such as <tt>authorized = 1</tt>.  Record creations from the association are scoped if a hash is used.  
+      #   <tt>has_many :posts, :conditions => {:published => true}</tt> will create published posts with <tt>@blog.posts.create</tt> 
+      #   or <tt>@blog.posts.build</tt>.
       # * <tt>:order</tt> - specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
       #   such as <tt>last_name, first_name DESC</tt>
       # * <tt>:uniq</tt> - if set to +true+, duplicate associated objects will be ignored by accessors and query methods
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 28c257a7e4..beebd72bba 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -202,6 +202,7 @@ module ActiveRecord
       private
 
         def create_record(attrs)
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
           ensure_owner_is_not_new
           record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) { @reflection.klass.new(attrs) }
           if block_given?
@@ -212,6 +213,7 @@ module ActiveRecord
         end
 
         def build_record(attrs)
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
           record = @reflection.klass.new(attrs)
           if block_given?
             add_record_to_target_with_callbacks(record) { |*block_args| yield(*block_args) }
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 768d2b2600..8ae9e5630c 100755
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -1075,6 +1075,18 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, Client.find_all_by_client_of(firm.id).size
   end
 
+  def test_creation_respects_hash_condition
+    ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.build
+    
+    assert        ms_client.save
+    assert_equal  'Microsoft', ms_client.name
+    
+    another_ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.create
+
+    assert        !another_ms_client.new_record?
+    assert_equal  'Microsoft', another_ms_client.name
+  end
+
   def test_dependent_delete_and_destroy_with_belongs_to
     author_address = author_addresses(:david_address)
     assert_equal [], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
@@ -1887,6 +1899,18 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal Developer.find_by_name("Marcel").projects.last, proj2  # prove join table is updated
   end
 
+  def test_creation_respects_hash_condition
+    post = categories(:general).post_with_conditions.build(:body => '')
+    
+    assert        post.save
+    assert_equal  'Yet Another Testing Title', post.title
+    
+    another_post = categories(:general).post_with_conditions.create(:body => '')
+
+    assert        !another_post.new_record?
+    assert_equal  'Yet Another Testing Title', another_post.title
+  end
+
   def test_uniq_after_the_fact
     developers(:jamis).projects << projects(:active_record)
     developers(:jamis).projects << projects(:active_record)
diff --git a/activerecord/test/models/category.rb b/activerecord/test/models/category.rb
index 89d61b7e4e..f1d2e4805a 100644
--- a/activerecord/test/models/category.rb
+++ b/activerecord/test/models/category.rb
@@ -9,6 +9,9 @@ class Category < ActiveRecord::Base
                           :association_foreign_key => 'post_id',
                           :select => 'posts.*, 1 as correctness_marker')
 
+  has_and_belongs_to_many :post_with_conditions,
+                          :class_name => 'Post',
+                          :conditions => { :title => 'Yet Another Testing Title' }
   def self.what_are_you
     'a category...'
   end