Skip to content
Browse files

delegate unknown timezones to TZInfo

  • Loading branch information...
1 parent 90e3343 commit 1b742ea9b100278dd818879a4162dab1a2c0e6d4 @spastorino spastorino committed Apr 2, 2010
Showing with 20 additions and 5 deletions.
  1. +12 −5 activesupport/lib/active_support/values/time_zone.rb
  2. +8 −0 activesupport/test/time_zone_test.rb
View
17 activesupport/lib/active_support/values/time_zone.rb
@@ -310,13 +310,15 @@ def period_for_local(time, dst=true)
end
def tzinfo
- @tzinfo ||= find_tzinfo
+ @tzinfo ||= TimeZone.find_tzinfo(name)
end
# TODO: Preload instead of lazy load for thread safety
- def find_tzinfo
+ def self.find_tzinfo(name)
require 'tzinfo' unless defined?(::TZInfo)
- ::TZInfo::Timezone.get(MAPPING[name])
+ ::TZInfo::Timezone.get(MAPPING[name] || name)
+ rescue TZInfo::InvalidTimezoneIdentifier
+ nil
end
unless const_defined?(:ZONES)
@@ -330,7 +332,6 @@ def find_tzinfo
end
ZONES.sort!
ZONES.freeze
- ZONES_MAP.freeze
US_ZONES = ZONES.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
US_ZONES.freeze
@@ -361,7 +362,7 @@ def all
def [](arg)
case arg
when String
- ZONES_MAP[arg]
+ ZONES_MAP[arg] ||= lookup(arg)
when Numeric, ActiveSupport::Duration
arg *= 3600 if arg.abs <= 13
all.find { |z| z.utc_offset == arg.to_i }
@@ -375,6 +376,12 @@ def [](arg)
def us_zones
US_ZONES
end
+
+ private
+
+ def lookup(name)
+ (tzinfo = find_tzinfo(name)) && create(tzinfo.name.freeze)
+ end
end
end
end
View
8 activesupport/test/time_zone_test.rb
@@ -75,6 +75,14 @@ def test_now_enforces_fall_dst_rules
end
end
+ def test_unknown_timezones_delegation_to_tzinfo
+ zone = ActiveSupport::TimeZone['America/Montevideo']
+ assert_equal ActiveSupport::TimeZone, zone.class
+ assert_equal zone.object_id, ActiveSupport::TimeZone['America/Montevideo'].object_id
+ assert_equal Time.utc(2010, 1, 31, 22), zone.utc_to_local(Time.utc(2010, 2)) # daylight saving offset -0200
+ assert_equal Time.utc(2010, 3, 31, 21), zone.utc_to_local(Time.utc(2010, 4)) # standard offset -0300
+ end
+
def test_today
Time.stubs(:now).returns(Time.utc(2000, 1, 1, 4, 59, 59)) # 1 sec before midnight Jan 1 EST
assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today

0 comments on commit 1b742ea

Please sign in to comment.
Something went wrong with that request. Please try again.