kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #37882 from kamipo/should_keep_zero_duration_parts

Browse source 
Should keep the original parts for zero duration
This commit is contained in:
Ryuta Kamizono 2019-12-05 07:33:20 +09:00 committed by GitHub
commit 999e0ee93a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activesupport/lib/active_support/duration.rb
View file

@ -186,15 +186,15 @@ module ActiveSupport
end end
parts = {} parts = {}
remainder = value.to_f remainder = value.round(9)
PARTS.each do |part| PARTS.each do |part|
unless part == :seconds unless part == :seconds
part_in_seconds = PARTS_IN_SECONDS[part] part_in_seconds = PARTS_IN_SECONDS[part]
parts[part] = remainder.div(part_in_seconds) parts[part] = remainder.div(part_in_seconds)
remainder = (remainder % part_in_seconds).round(9) remainder %= part_in_seconds
end end
end end unless value == 0
parts[:seconds] = remainder parts[:seconds] = remainder
@ -212,7 +212,7 @@ module ActiveSupport
def initialize(value, parts) #:nodoc: def initialize(value, parts) #:nodoc:
@value, @parts = value, parts.to_h @value, @parts = value, parts.to_h
@parts.default = 0 @parts.default = 0
@parts.reject! { |k, v| v.zero? } @parts.reject! { |k, v| v.zero? } unless value == 0
end end
def coerce(other) #:nodoc: def coerce(other) #:nodoc:

10
activesupport/test/core_ext/duration_test.rb
View file

@ -62,6 +62,7 @@ class DurationTest < ActiveSupport::TestCase
def test_inspect def test_inspect
assert_equal "0 seconds", 0.seconds.inspect assert_equal "0 seconds", 0.seconds.inspect
assert_equal "0 days", 0.days.inspect
assert_equal "1 month", 1.month.inspect assert_equal "1 month", 1.month.inspect
assert_equal "1 month and 1 day", (1.month + 1.day).inspect assert_equal "1 month and 1 day", (1.month + 1.day).inspect
assert_equal "6 months and -2 days", (6.months - 2.days).inspect assert_equal "6 months and -2 days", (6.months - 2.days).inspect
@ -155,20 +156,29 @@ class DurationTest < ActiveSupport::TestCase
assert_instance_of ActiveSupport::Duration, 13.months % 1.year assert_instance_of ActiveSupport::Duration, 13.months % 1.year
end end
def test_date_added_with_zero_days
assert_equal Date.civil(2017, 1, 1), Date.civil(2017, 1, 1) + 0.days
assert_instance_of Date, Date.civil(2017, 1, 1) + 0.days
end
def test_date_added_with_multiplied_duration def test_date_added_with_multiplied_duration
assert_equal Date.civil(2017, 1, 3), Date.civil(2017, 1, 1) + 1.day * 2 assert_equal Date.civil(2017, 1, 3), Date.civil(2017, 1, 1) + 1.day * 2
assert_instance_of Date, Date.civil(2017, 1, 1) + 1.day * 2
end end
def test_date_added_with_multiplied_duration_larger_than_one_month def test_date_added_with_multiplied_duration_larger_than_one_month
assert_equal Date.civil(2017, 2, 15), Date.civil(2017, 1, 1) + 1.day * 45 assert_equal Date.civil(2017, 2, 15), Date.civil(2017, 1, 1) + 1.day * 45
assert_instance_of Date, Date.civil(2017, 1, 1) + 1.day * 45
end end
def test_date_added_with_divided_duration def test_date_added_with_divided_duration
assert_equal Date.civil(2017, 1, 3), Date.civil(2017, 1, 1) + 4.days / 2 assert_equal Date.civil(2017, 1, 3), Date.civil(2017, 1, 1) + 4.days / 2
assert_instance_of Date, Date.civil(2017, 1, 1) + 4.days / 2
end end
def test_date_added_with_divided_duration_larger_than_one_month def test_date_added_with_divided_duration_larger_than_one_month
assert_equal Date.civil(2017, 2, 15), Date.civil(2017, 1, 1) + 90.days / 2 assert_equal Date.civil(2017, 2, 15), Date.civil(2017, 1, 1) + 90.days / 2
assert_instance_of Date, Date.civil(2017, 1, 1) + 90.days / 2
end end
def test_plus_with_time def test_plus_with_time