Permalink
Browse files

Don't pass the block through build_record

  • Loading branch information...
1 parent 686418c commit 641a3068ea11c20e09358d6911404a265da32a9f @jonleighton jonleighton committed Feb 14, 2011
Showing with 8 additions and 10 deletions.
  1. +8 −10 activerecord/lib/active_record/associations/association_collection.rb
@@ -59,21 +59,21 @@ def build(attributes = {}, &block)
if attributes.is_a?(Array)
attributes.collect { |attr| build(attr, &block) }
else
- build_record(attributes) do |record|
- block.call(record) if block_given?
+ add_record_to_target_with_callbacks(build_record(attributes)) do |record|
+ yield(record) if block_given?
set_owner_attributes(record)
end
end
end
- def create(attrs = {})
- if attrs.is_a?(Array)
- attrs.collect { |attr| create(attr) }
+ def create(attributes = {})
+ if attributes.is_a?(Array)
+ attributes.collect { |attr| create(attr) }
else
ensure_owner_is_persisted!
transaction do
- build_record(attrs) do |record|
+ add_record_to_target_with_callbacks(build_record(attributes)) do |record|
yield(record) if block_given?
insert_record(record)
end
@@ -427,10 +427,8 @@ def insert_record(record, validate = true)
raise NotImplementedError
end
- def build_record(attributes, &block)
- attributes = scoped.scope_for_create.merge(attributes)
- record = @reflection.build_association(attributes)
- add_record_to_target_with_callbacks(record, &block)
+ def build_record(attributes)
+ @reflection.build_association(scoped.scope_for_create.merge(attributes))
end
def delete_or_destroy(records, method)

0 comments on commit 641a306

Please sign in to comment.