kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

send() will raise an ArgumentError, so we should leverage ruby

Browse source
This commit is contained in:
Aaron Patterson 2011-01-07 14:30:20 -08:00
parent 6e63e7a874
commit 2efd780dcb
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
activerecord/lib/active_record/aggregations.rb
View file

@ -224,14 +224,9 @@ module ActiveRecord
define_method(name) do
if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? {|pair| !read_attribute(pair.first).nil? })
attrs = mapping.collect {|pair| read_attribute(pair.first)}
object = case constructor
when Symbol
class_name.constantize.send(constructor, *attrs)
when Proc, Method
constructor.call(*attrs)
else
raise ArgumentError, 'Constructor must be a symbol denoting the constructor method to call or a Proc to be invoked.'
end
object = constructor.respond_to?(:call) ?
constructor.call(*attrs) :
class_name.constantize.send(constructor, *attrs)
@aggregation_cache[name] = object
end
@aggregation_cache[name]
@ -248,14 +243,9 @@ module ActiveRecord
@aggregation_cache[name] = nil
else
unless part.is_a?(class_name.constantize) || converter.nil?
part = case converter
when Symbol
class_name.constantize.send(converter, part)
when Proc, Method
converter.call(part)
else
raise ArgumentError, 'Converter must be a symbol denoting the converter method to call or a Proc to be invoked.'
end
part = converter.respond_to?(:call) ?
converter.call(part) :
class_name.constantize.send(converter, part)
end
mapping.each { |pair| self[pair.first] = part.send(pair.last) }

2
activerecord/test/models/customer.rb
View file

@ -70,4 +70,4 @@ class Fullname
def to_s
"#{first} #{last.upcase}"
end
end
end