From 3ea9a88d803d7fd1bb0de649f7237fca0200efe3 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sat, 21 Jun 2014 10:52:19 -0600 Subject: Move `attributes_before_type_cast` to `AttributeSet` --- .../lib/active_record/attribute_methods/before_type_cast.rb | 2 +- activerecord/lib/active_record/attribute_set.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb index d057f0941a..8ca9379bb6 100644 --- a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb +++ b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb @@ -59,7 +59,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 diff --git a/activerecord/lib/active_record/attribute_set.rb b/activerecord/lib/active_record/attribute_set.rb index 102ef17e16..f545fa8a9a 100644 --- a/activerecord/lib/active_record/attribute_set.rb +++ b/activerecord/lib/active_record/attribute_set.rb @@ -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 update(other) attributes.update(other.attributes) end -- cgit v1.2.3