Permalink
Browse files

Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; …

…wraps result in TimeZone instance

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9107 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 129d944 commit 59183eec6f8d3e5d1ac5046dbd4f5cefc7041256 @gbuesing gbuesing committed Mar 28, 2008
View
@@ -1,5 +1,7 @@
*SVN*
+* Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps result in TimeZone instance [Geoff Buesing]
+
* TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally [Geoff Buesing]
* TimeWithZone#usec returns 0 instead of error when DateTime is wrapped [Geoff Buesing]
@@ -38,8 +38,15 @@ def use_zone(time_zone)
private
def get_zone(time_zone)
- return time_zone if time_zone.nil? || time_zone.respond_to?(:period_for_local)
- TimeZone[time_zone]
+ return time_zone if time_zone.nil? || time_zone.is_a?(TimeZone)
+ # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone)
+ unless time_zone.respond_to?(:period_for_local)
+ time_zone = TimeZone[time_zone] || TZInfo::Timezone.get(time_zone) rescue nil
+ end
+ # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone
+ if time_zone
+ time_zone.is_a?(TimeZone) ? time_zone : TimeZone.create(time_zone.name, nil, time_zone)
+ end
end
end
@@ -145,15 +145,20 @@ class TimeZone
}
include Comparable
- attr_reader :name, :utc_offset
+ attr_reader :name
# Create a new TimeZone object with the given name and offset. The
# offset is the number of seconds that this time zone is offset from UTC
# (GMT). Seconds were chosen as the offset unit because that is the unit that
# Ruby uses to represent time zone offsets (see Time#utc_offset).
- def initialize(name, utc_offset)
+ def initialize(name, utc_offset, tzinfo = nil)
@name = name
@utc_offset = utc_offset
+ @tzinfo = tzinfo
+ end
+
+ def utc_offset
+ @utc_offset ||= tzinfo.current_period.utc_offset
end
# Returns the offset of this time zone as a formatted string, of the
@@ -483,6 +483,34 @@ def test_time_zone_setter_is_thread_safe
end
end
+ def test_time_zone_setter_with_tzinfo_timezone_object_wraps_in_rails_time_zone
+ silence_warnings do # silence warnings raised by tzinfo gem
+ tzinfo = TZInfo::Timezone.get('America/New_York')
+ Time.zone = tzinfo
+ assert_kind_of TimeZone, Time.zone
+ assert_equal tzinfo, Time.zone.tzinfo
+ assert_equal 'America/New_York', Time.zone.name
+ assert_equal(-18_000, Time.zone.utc_offset)
+ end
+ end
+
+ def test_time_zone_setter_with_tzinfo_timezone_identifier_does_lookup_and_wraps_in_rails_time_zone
+ silence_warnings do # silence warnings raised by tzinfo gem
+ Time.zone = 'America/New_York'
+ assert_kind_of TimeZone, Time.zone
+ assert_equal 'America/New_York', Time.zone.tzinfo.name
+ assert_equal 'America/New_York', Time.zone.name
+ assert_equal(-18_000, Time.zone.utc_offset)
+ end
+ end
+
+ def test_time_zone_setter_with_non_identifying_argument_returns_nil
+ Time.zone = 'foo'
+ assert_equal nil, Time.zone
+ Time.zone = -15.hours
+ assert_equal nil, Time.zone
+ end
+
protected
def with_env_tz(new_tz = 'US/Eastern')
old_tz, ENV['TZ'] = ENV['TZ'], new_tz
@@ -192,6 +192,15 @@ def test_parse_with_incomplete_date
assert_equal Time.utc(1999,12,31,19), twz.time
end
end
+
+ def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
+ silence_warnings do # silence warnings raised by tzinfo gem
+ tzinfo = TZInfo::Timezone.get('America/New_York')
+ zone = TimeZone.create(tzinfo.name, nil, tzinfo)
+ assert_equal nil, zone.instance_variable_get('@utc_offset')
+ assert_equal(-18_000, zone.utc_offset)
+ end
+ end
end
def test_formatted_offset_positive

0 comments on commit 59183ee

Please sign in to comment.