Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Rename Time#whole_* to Time#all_* [thanks Pratik!]

  • Loading branch information...
commit a6467802ff2be35c6665635f1cdfdcea07aeaa12 1 parent d6cc0e5
@dhh dhh authored
View
2  activesupport/CHANGELOG
@@ -1,6 +1,6 @@
*Rails 3.2.0 (unreleased)*
-* Added Time#whole_day/week/quarter/year as a way of generating ranges (example: Event.where(created_at: Time.now.whole_week)) [DHH]
+* Added Time#all_day/week/quarter/year as a way of generating ranges (example: Event.where(created_at: Time.now.all_week)) [DHH]
* Added instance_accessor: false as an option to Class#cattr_accessor and friends [DHH]
View
10 activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -249,27 +249,27 @@ def tomorrow
end
# Returns a Range representing the whole day of the current time.
- def whole_day
+ def all_day
beginning_of_day..end_of_day
end
# Returns a Range representing the whole week of the current time.
- def whole_week
+ def all_week
beginning_of_week..end_of_week
end
# Returns a Range representing the whole month of the current time.
- def whole_month
+ def all_month
beginning_of_month..end_of_month
end
# Returns a Range representing the whole quarter of the current time.
- def whole_quarter
+ def all_quarter
beginning_of_quarter..end_of_quarter
end
# Returns a Range representing the whole year of the current time.
- def whole_year
+ def all_year
beginning_of_year..end_of_year
end
View
20 activesupport/test/core_ext/time_ext_test.rb
@@ -767,24 +767,24 @@ def test_case_equality
assert_equal false, Time === DateTime.civil(2000)
end
- def test_whole_day
- assert_equal Time.local(2011,6,7,0,0,0)..Time.local(2011,6,7,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).whole_day
+ def test_all_day
+ assert_equal Time.local(2011,6,7,0,0,0)..Time.local(2011,6,7,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_day
end
- def test_whole_week
- assert_equal Time.local(2011,6,6,0,0,0)..Time.local(2011,6,12,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).whole_week
+ def test_all_week
+ assert_equal Time.local(2011,6,6,0,0,0)..Time.local(2011,6,12,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_week
end
- def test_whole_month
- assert_equal Time.local(2011,6,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).whole_month
+ def test_all_month
+ assert_equal Time.local(2011,6,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_month
end
- def test_whole_quarter
- assert_equal Time.local(2011,4,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).whole_quarter
+ def test_all_quarter
+ assert_equal Time.local(2011,4,1,0,0,0)..Time.local(2011,6,30,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_quarter
end
- def test_whole_year
- assert_equal Time.local(2011,1,1,0,0,0)..Time.local(2011,12,31,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).whole_year
+ def test_all_year
+ assert_equal Time.local(2011,1,1,0,0,0)..Time.local(2011,12,31,23,59,59,999999.999), Time.local(2011,6,7,10,10,10).all_year
end
protected

1 comment on commit a646780

@chrislwade

@dhh: Why not include these methods into Date and DateTime as well? It seems perfectly reasonable to me to do some_date.all_month or some_datetime.all_week. In fact, I just backported this to a 3.0 app and applied it to both those classes as well because really helps to show the intent of the code and there are numerous places that I needed to call this on a Date instead of a Time. I'd be glad to send a pull request for this if necessary.

Please sign in to comment.
Something went wrong with that request. Please try again.