github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

utc_offset returns nil for unknown zones

Browse Source 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Santiago Pastorino
2010-04-15 01:10:04 -03:00
committed by Jeremy Kemper
parent e79193f852
commit a0cc94b32e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
activesupport/lib/active_support/values/time_zone.rb
View File

@@ -1,4 +1,5 @@
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/try'
# The TimeZone class serves as a wrapper around TZInfo::Timezone instances. It allows us to do the following:
#
@@ -205,8 +206,8 @@ module ActiveSupport
if @utc_offset
@utc_offset
else
@current_period ||= tzinfo.current_period
@current_period.utc_offset
@current_period ||= tzinfo.try(:current_period)
@current_period.try(:utc_offset)
end
end

8
activesupport/test/time_zone_test.rb
View File

@@ -274,9 +274,15 @@ class TimeZoneTest < Test::Unit::TestCase
assert_raise(ArgumentError) { ActiveSupport::TimeZone[false] }
end
def test_unknown_zone_shouldnt_have_tzinfo
def test_unknown_zone_shouldnt_have_tzinfo_nor_utc_offset
zone = ActiveSupport::TimeZone.create("bogus")
assert_nil zone.tzinfo
assert_nil zone.utc_offset
end
def test_unknown_zone_with_utc_offset
zone = ActiveSupport::TimeZone.create("bogus", -21_600)
assert_equal -21_600, zone.utc_offset
end
def test_new