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

Only call in_time_zone on Time or DateTime instances

Browse source 
Both String and Date now respond to in_time_zone so we need to
check if the value is a Time or a DateTime.
This commit is contained in:
Andrew White 2012-12-11 12:35:30 +00:00
parent f0a9e2f852
commit 4dd5635922
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
activemodel/lib/active_model/serializers/xml.rb
View file

@ -2,6 +2,7 @@ require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/array/conversions'
require 'active_support/core_ext/hash/conversions' require 'active_support/core_ext/hash/conversions'
require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/time/acts_like'
module ActiveModel module ActiveModel
module Serializers module Serializers
@ -20,7 +21,11 @@ module ActiveModel
def initialize(name, serializable, value) def initialize(name, serializable, value)
@name, @serializable = name, serializable @name, @serializable = name, serializable
value = value.in_time_zone if value.respond_to?(:in_time_zone)
if value.acts_like?(:time) && value.respond_to?(:in_time_zone)
value = value.in_time_zone
end
@value = value @value = value
@type = compute_type @type = compute_type
end end