0
@@ -78,11 +78,14 @@ module ActiveRecord
0
         @loaded = false
0
       end
0
 
0
-      def build(attributes = {})
0
+      def build(attributes = {}, &block)
0
         if attributes.is_a?(Array)
0
-          attributes.collect { |attr| build(attr) }
0
+          attributes.collect { |attr| build(attr, &block) }
0
         else
0
-          build_record(attributes) { |record| set_belongs_to_association_for(record) }
0
+          build_record(attributes) do |record|
0
+            block.call(record) if block_given?
0
+            set_belongs_to_association_for(record)
0
+          end
0
         end
0
       end
0
 

0
@@ -425,6 +425,37 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
0
     assert_equal 2, first_topic.replies.to_ary.size
0
   end
0
 
0
+  def test_build_via_block
0
+    company = companies(:first_firm)
0
+    new_client = assert_no_queries { company.clients_of_firm.build {|client| client.name = "Another Client" } }
0
+    assert !company.clients_of_firm.loaded?
0
+
0
+    assert_equal "Another Client", new_client.name
0
+    assert new_client.new_record?
0
+    assert_equal new_client, company.clients_of_firm.last
0
+    company.name += '-changed'
0
+    assert_queries(2) { assert company.save }
0
+    assert !new_client.new_record?
0
+    assert_equal 2, company.clients_of_firm(true).size
0
+  end
0
+
0
+  def test_build_many_via_block
0
+    company = companies(:first_firm)
0
+    new_clients = assert_no_queries do
0
+      company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) do |client|
0
+        client.name = "changed"
0
+      end
0
+    end
0
+
0
+    assert_equal 2, new_clients.size
0
+    assert_equal "changed", new_clients.first.name
0
+    assert_equal "changed", new_clients.last.name
0
+
0
+    company.name += '-changed'
0
+    assert_queries(3) { assert company.save }
0
+    assert_equal 3, company.clients_of_firm(true).size
0
+  end
0
+
0
   def test_create_without_loading_association
0
     first_firm  = companies(:first_firm)
0
     Firm.column_names