Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added next_week and made beginning_of_week be a Monday, not a Sunday

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@733 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 25f8a25c3ea107dcd0688307ac0ce19c4306f6b4 1 parent 637642c
@dhh dhh authored
View
12 activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -53,13 +53,19 @@ def months_since(months)
end
end
- # Returns a new Time representing the "start" of this week (sunday, 0:00)
+ # Returns a new Time representing the "start" of this week (Monday, 0:00)
def beginning_of_week
- (self - self.wday.days).midnight
+ (self - self.wday.days).midnight + 1.day
end
- alias :sunday :beginning_of_week
+ alias :monday :beginning_of_week
alias :at_beginning_of_week :beginning_of_week
+ # Returns a new Time representing the start of the given day in next week (default is Monday).
+ def next_week(day = :monday)
+ days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
+ since(1.week).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
+ end
+
# Returns a new Time representing the start of the day (0:00)
def beginning_of_day
self - self.seconds_since_midnight
View
8 activesupport/test/core_ext/time_ext_test.rb
@@ -12,7 +12,7 @@ def test_seconds_since_midnight
end
def test_begining_of_week
- assert_equal Time.local(2005,1,30), Time.local(2005,2,4,10,10,10).beginning_of_week
+ assert_equal Time.local(2005,1,31), Time.local(2005,2,4,10,10,10).beginning_of_week
end
def test_beginning_of_day
@@ -80,4 +80,10 @@ def test_utc_change
assert_equal Time.utc(2005,2,22,16,45), Time.utc(2005,2,22,15,15,10).change(:hour => 16, :min => 45)
assert_equal Time.utc(2005,2,22,15,45), Time.utc(2005,2,22,15,15,10).change(:min => 45)
end
+
+ def test_next_week
+ assert_equal Time.local(2005,2,28), Time.local(2005,2,22,15,15,10).next_week
+ assert_equal Time.local(2005,2,29), Time.local(2005,2,22,15,15,10).next_week(:tuesday)
+ assert_equal Time.local(2005,3,4), Time.local(2005,2,22,15,15,10).next_week(:friday)
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.