diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/time.rb | 3 | ||||
| -rw-r--r-- | test/test_time.rb | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Oct 7 20:07:20 2013 Tanaka Akira <akr@fsij.org> + + * lib/time.rb (Time.strptime): Use :offset. + Patch by Felipe Contreras. [ruby-core:57694] + Mon Oct 7 16:47:27 2013 Koichi Sasada <ko1@atdot.net> * test/-ext-/debug/test_profile_frames.rb: rename class C to diff --git a/lib/time.rb b/lib/time.rb index 91b5b54fe9..4474f275be 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -393,7 +393,8 @@ class Time d = Date._strptime(date, format) raise ArgumentError, "invalid strptime format - `#{format}'" unless d if seconds = d[:seconds] - Time.at(seconds) + offset = d[:offset] || 0 + Time.at(seconds).localtime(offset) else year = d[:year] year = yield(year) if year && block_given? diff --git a/test/test_time.rb b/test/test_time.rb index 0a4e8a70c3..1c95370df6 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -400,6 +400,8 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: def test_strptime assert_equal(Time.utc(2005, 8, 28, 06, 54, 20), Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z")) assert_equal(Time.at(1).localtime, Time.strptime("1", "%s")) + assert_equal(0, Time.strptime('0', '%s').utc_offset) + assert_equal(3600, Time.strptime('0 +0100', '%s %z').utc_offset) end def test_nsec |