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

Add before? and after? methods to date and time classes

Equality comparisons between dates and times can take some extra time to
comprehend. I tend to think of a date or time as "before" or "after"
another date or time, but I naturally read `<` and `>` as "less than"
and "greater than." This change seeks to make date/time comparisons more
human readable.
This commit is contained in:
Nick Holden 2018-03-06 20:42:49 -08:00
parent b5aa0266d0
commit 20fa0d92c3
9 changed files with 63 additions and 0 deletions

View file

@ -1,5 +1,10 @@
## Rails 6.0.0.alpha (Unreleased) ##
* Add `before?` and `after?` methods to `Date`, `DateTime`,
`Time`, and `TimeWithZone`.
*Nick Holden*
* Add `:private` option to ActiveSupport's `Module#delegate`
in order to delegate methods as private:

View file

@ -142,4 +142,6 @@ class Date
end
alias_method :compare_without_coercion, :<=>
alias_method :<=>, :compare_with_coercion
alias_method :before?, :<
alias_method :after?, :>
end

View file

@ -208,4 +208,6 @@ class DateTime
super
end
end
alias_method :before?, :<
alias_method :after?, :>
end

View file

@ -302,6 +302,8 @@ class Time
end
alias_method :compare_without_coercion, :<=>
alias_method :<=>, :compare_with_coercion
alias_method :before?, :<
alias_method :after?, :>
# Layers additional behavior on Time#eql? so that ActiveSupport::TimeWithZone instances
# can be eql? to an equivalent Time

View file

@ -225,6 +225,8 @@ module ActiveSupport
def <=>(other)
utc <=> other
end
alias_method :before?, :<
alias_method :after?, :>
# Returns true if the current object's time is within the specified
# +min+ and +max+ time.

View file

@ -360,6 +360,18 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
end
end
def test_before
assert_equal false, Date.new(2017, 3, 6).before?(Date.new(2017, 3, 5))
assert_equal false, Date.new(2017, 3, 6).before?(Date.new(2017, 3, 6))
assert_equal true, Date.new(2017, 3, 6).before?(Date.new(2017, 3, 7))
end
def test_after
assert_equal true, Date.new(2017, 3, 6).after?(Date.new(2017, 3, 5))
assert_equal false, Date.new(2017, 3, 6).after?(Date.new(2017, 3, 6))
assert_equal false, Date.new(2017, 3, 6).after?(Date.new(2017, 3, 7))
end
def test_current_returns_date_today_when_zone_not_set
with_env_tz "US/Central" do
Time.stub(:now, Time.local(1999, 12, 31, 23)) do

View file

@ -285,6 +285,18 @@ class DateTimeExtCalculationsTest < ActiveSupport::TestCase
end
end
def test_before
assert_equal false, DateTime.civil(2017, 3, 6, 12, 0, 0).before?(DateTime.civil(2017, 3, 6, 11, 59, 59))
assert_equal false, DateTime.civil(2017, 3, 6, 12, 0, 0).before?(DateTime.civil(2017, 3, 6, 12, 0, 0))
assert_equal true, DateTime.civil(2017, 3, 6, 12, 0, 0).before?(DateTime.civil(2017, 3, 6, 12, 00, 1))
end
def test_after
assert_equal true, DateTime.civil(2017, 3, 6, 12, 0, 0).after?(DateTime.civil(2017, 3, 6, 11, 59, 59))
assert_equal false, DateTime.civil(2017, 3, 6, 12, 0, 0).after?(DateTime.civil(2017, 3, 6, 12, 0, 0))
assert_equal false, DateTime.civil(2017, 3, 6, 12, 0, 0).after?(DateTime.civil(2017, 3, 6, 12, 00, 1))
end
def test_current_returns_date_today_when_zone_is_not_set
with_env_tz "US/Eastern" do
Time.stub(:now, Time.local(1999, 12, 31, 23, 59, 59)) do

View file

@ -736,6 +736,18 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
end
end
def test_before
assert_equal false, Time.utc(2017, 3, 6, 12, 0, 0).before?(Time.utc(2017, 3, 6, 11, 59, 59))
assert_equal false, Time.utc(2017, 3, 6, 12, 0, 0).before?(Time.utc(2017, 3, 6, 12, 0, 0))
assert_equal true, Time.utc(2017, 3, 6, 12, 0, 0).before?(Time.utc(2017, 3, 6, 12, 00, 1))
end
def test_after
assert_equal true, Time.utc(2017, 3, 6, 12, 0, 0).after?(Time.utc(2017, 3, 6, 11, 59, 59))
assert_equal false, Time.utc(2017, 3, 6, 12, 0, 0).after?(Time.utc(2017, 3, 6, 12, 0, 0))
assert_equal false, Time.utc(2017, 3, 6, 12, 0, 0).after?(Time.utc(2017, 3, 6, 12, 00, 1))
end
def test_acts_like_time
assert_predicate Time.new, :acts_like_time?
end

View file

@ -289,6 +289,20 @@ class TimeWithZoneTest < ActiveSupport::TestCase
end
end
def test_before
twz = ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 0, 0), @time_zone)
assert_equal false, twz.before?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 11, 59, 59), @time_zone))
assert_equal false, twz.before?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 0, 0), @time_zone))
assert_equal true, twz.before?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 00, 1), @time_zone))
end
def test_after
twz = ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 0, 0), @time_zone)
assert_equal true, twz.after?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 11, 59, 59), @time_zone))
assert_equal false, twz.after?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 0, 0), @time_zone))
assert_equal false, twz.after?(ActiveSupport::TimeWithZone.new(Time.utc(2017, 3, 6, 12, 00, 1), @time_zone))
end
def test_eql?
assert_equal true, @twz.eql?(@twz.dup)
assert_equal true, @twz.eql?(Time.utc(2000))