diff options
| -rw-r--r-- | lib/time.rb | 19 | ||||
| -rw-r--r-- | test/test_time.rb | 10 |
2 files changed, 25 insertions, 4 deletions
diff --git a/lib/time.rb b/lib/time.rb index e227166c47..0d740b25b0 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -245,8 +245,8 @@ class Time end private :apply_offset - def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, now) - if !year && !mon && !day && !hour && !min && !sec && !sec_fraction + def make_time(date, year, yday, mon, day, hour, min, sec, sec_fraction, zone, now) + if !year && !yday && !mon && !day && !hour && !min && !sec && !sec_fraction raise ArgumentError, "no time information in #{date.inspect}" end @@ -256,6 +256,17 @@ class Time off = zone_offset(zone, off_year) if zone end + if yday + mon, day = (yday-1).divmod(31) + mon += 1 + day += 1 + t = make_time(date, year, nil, mon, day, hour, min, sec, sec_fraction, zone, now) + diff = yday - t.yday + return t if diff.zero? + day += diff + return make_time(date, year, nil, mon, day, hour, min, sec, sec_fraction, zone, now) + end + if now if off now = now.getlocal(off) if now.utc_offset != off @@ -363,7 +374,7 @@ class Time d = Date._parse(date, comp) year = d[:year] year = yield(year) if year && !comp - make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) + make_time(date, year, d[:yday], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) end # @@ -441,7 +452,7 @@ class Time else year = d[:year] year = yield(year) if year && block_given? - t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) + t = make_time(date, year, d[:yday], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) end t end diff --git a/test/test_time.rb b/test/test_time.rb index 26a7daaf2a..29fad6fbf4 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -495,6 +495,16 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: assert_equal(true, t.utc?) end + def test_strptime_j + t = Time.strptime("2018-365", "%Y-%j") + assert_equal(2018, t.year) + assert_equal(12, t.mon) + assert_equal(31, t.day) + assert_equal(0, t.hour) + assert_equal(0, t.min) + assert_equal(0, t.sec) + end + def test_nsec assert_equal(123456789, Time.parse("2000-01-01T00:00:00.123456789+00:00").tv_nsec) end |