summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/time.rb4
-rw-r--r--test/test_time.rb7
2 files changed, 9 insertions, 2 deletions
@@ -134,8 +134,8 @@ class Time
def zone_offset(zone, year=self.now.year)
off = nil
zone = zone.upcase
- if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
- off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
elsif /\A[+-]\d\d\z/ =~ zone
off = zone.to_i * 3600
elsif ZoneOffset.include?(zone)
@@ -343,6 +343,13 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc:
Time.parse("2000-01-01T00:00:00+11:00", nil))
end
def test_parse_leap_second
t = Time.utc(1998,12,31,23,59,59)
assert_equal(t, Time.parse("Thu Dec 31 23:59:59 UTC 1998"))