mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #15846 from sgrif/sg-attributes-before-type-cast
Move `attributes_before_type_cast` to `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb activerecord/test/cases/attribute_set_test.rb
This commit is contained in:
commit
e1ad3ed773
3 changed files with 13 additions and 2 deletions
|
@ -57,7 +57,7 @@ module ActiveRecord
|
|||
# task.attributes_before_type_cast
|
||||
# # => {"id"=>nil, "title"=>nil, "is_done"=>true, "completed_on"=>"2012-10-21", "created_at"=>nil, "updated_at"=>nil}
|
||||
def attributes_before_type_cast
|
||||
@attributes.each_with_object({}) { |(k, v), h| h[k] = v.value_before_type_cast }
|
||||
@attributes.values_before_type_cast
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
module ActiveRecord
|
||||
class AttributeSet # :nodoc:
|
||||
delegate :[], :[]=, :fetch, :include?, :keys, :each_with_object, to: :attributes
|
||||
delegate :[], :[]=, :fetch, :include?, :keys, to: :attributes
|
||||
|
||||
def initialize(attributes)
|
||||
@attributes = attributes
|
||||
end
|
||||
|
||||
def values_before_type_cast
|
||||
attributes.each_with_object({}) { |(k, v), h| h[k] = v.value_before_type_cast }
|
||||
end
|
||||
|
||||
def to_hash
|
||||
attributes.each_with_object({}) { |(k, v), h| h[k] = v.value }
|
||||
end
|
||||
|
|
|
@ -61,5 +61,12 @@ module ActiveRecord
|
|||
assert_equal({ foo: 1, bar: 2.2 }, attributes.to_hash)
|
||||
assert_equal({ foo: 1, bar: 2.2 }, attributes.to_h)
|
||||
end
|
||||
|
||||
test "values_before_type_cast" do
|
||||
builder = AttributeSet::Builder.new(foo: Type::Integer.new, bar: Type::Integer.new)
|
||||
attributes = builder.build_from_database(foo: '1.1', bar: '2.2')
|
||||
|
||||
assert_equal({ foo: '1.1', bar: '2.2' }, attributes.values_before_type_cast)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue