diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-05-11 17:10:44 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-05-11 17:10:44 -0700 |
commit | 8cf4725f640603944bb6e69816807f6541c94d9f (patch) | |
tree | 89d384796f5aa88724bd24df6d6683b7cf844fb8 /activesupport/lib/active_support/core_ext/date | |
parent | f5fcfc2ab61696842659e579c85b955208489665 (diff) | |
parent | 377bd69e295086f72c623e6323698eeb1d8a0a34 (diff) | |
download | rails-8cf4725f640603944bb6e69816807f6541c94d9f.tar.gz rails-8cf4725f640603944bb6e69816807f6541c94d9f.tar.bz2 rails-8cf4725f640603944bb6e69816807f6541c94d9f.zip |
Merge pull request #227 from farski/master
Unnecessary redundancy in Time/Date calculations
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date/calculations.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb index 724e076407..236055d77a 100644 --- a/activesupport/lib/active_support/core_ext/date/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date/calculations.rb @@ -206,7 +206,7 @@ class Date # Returns a new ; DateTime objects will have time set to 0:00DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00) def beginning_of_month - self.acts_like?(:time) ? change(:day => 1,:hour => 0, :min => 0, :sec => 0) : change(:day => 1) + self.acts_like?(:time) ? change(:day => 1, :hour => 0) : change(:day => 1) end alias :at_beginning_of_month :beginning_of_month @@ -231,13 +231,13 @@ class Date # Returns a new Date/DateTime representing the start of the year (1st of january; DateTime objects will have time set to 0:00) def beginning_of_year - self.acts_like?(:time) ? change(:month => 1, :day => 1, :hour => 0, :min => 0, :sec => 0) : change(:month => 1, :day => 1) + self.acts_like?(:time) ? change(:month => 1, :day => 1, :hour => 0) : change(:month => 1, :day => 1) end alias :at_beginning_of_year :beginning_of_year # Returns a new Time representing the end of the year (31st of december; DateTime objects will have time set to 23:59:59) def end_of_year - self.acts_like?(:time) ? change(:month => 12,:day => 31,:hour => 23, :min => 59, :sec => 59) : change(:month => 12, :day => 31) + self.acts_like?(:time) ? change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59) : change(:month => 12, :day => 31) end alias :at_end_of_year :end_of_year |