TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #18063 from claudiob/remove-as-time-with-zone-since

Browse Source 
Replace AS::TimeWithZone#since with alias to +
This commit is contained in:
Rafael Mendonça França 2014-12-17 19:51:52 -02:00
commit 320f75baaf
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activesupport/lib/active_support/time_with_zone.rb
View File

@ -276,6 +276,7 @@ def +(other)
result.in_time_zone(time_zone) result.in_time_zone(time_zone)
end end
end end
alias_method :since, :+
# Returns a new TimeWithZone object that represents the difference between # Returns a new TimeWithZone object that represents the difference between
# the current object's time and the +other+ time. # the current object's time and the +other+ time.
@ -304,16 +305,6 @@ def -(other)
end end
end end
def since(other)
# If we're adding a Duration of variable length (i.e., years, months, days), move forward from #time,
# otherwise move forward from #utc, for accuracy when moving across DST boundaries
if duration_of_variable_length?(other)
method_missing(:since, other)
else
utc.since(other).in_time_zone(time_zone)
end
end
def ago(other) def ago(other)
since(-other) since(-other)
end end