Added dates option to return dates for day, week, month, quarter, and year

Andrew Kane
1 parent 74d20c66
Showing 4 changed files with 15 additions and 1 deletions Show diff stats
CHANGELOG.md
lib/groupdate.rb
lib/groupdate/magic.rb
test/test_helper.rb
+## 2.5.2 [unreleased]
+
+- Added `dates` option to return dates for day, week, month, quarter, and year
+
 ## 2.5.1
 - Added `group_by_quarter`
@@ -9,9 +9,10 @@ module Groupdate
   FIELDS = PERIODS
   METHODS = PERIODS.map { |v| :"group_by_#{v}" }
-  mattr_accessor :week_start, :day_start, :time_zone
+  mattr_accessor :week_start, :day_start, :time_zone, :dates
   self.week_start = :sun
   self.day_start = 0
+  self.dates = false
 end
 require "groupdate/enumerable"
@@ -254,6 +254,8 @@ module Groupdate
               I18n.localize(key, format: options[:format], locale: locale)
             end
           end
+        elsif (options[:dates] || (Groupdate.dates && !options.key?(:dates))) && [:day, :week, :month, :quarter, :year].include?(field)
+          lambda { |k| k.to_date }
         else
           lambda { |k| k }
         end
@@ -906,6 +906,13 @@ module TestGroupdate
     assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[utc.parse("2014-05-02 00:00:00 UTC")]
   end
+  # dates
+
+  def test_dates
+    create_user "2014-03-01 12:00:00 UTC"
+    assert_equal ({Date.parse("2014-03-01") => 1}), User.group_by_day(:created_at, dates: true).count
+  end
+
   # helpers
   def assert_format(method, expected, format, options = {})
		1	+## 2.5.2 [unreleased]
		2	+
		3	+- Added `dates` option to return dates for day, week, month, quarter, and year
		4	+
1	## 2.5.1	5	## 2.5.1
2		6
3	- Added `group_by_quarter`	7	- Added `group_by_quarter`
	@@ -906,6 +906,13 @@ module TestGroupdate		@@ -906,6 +906,13 @@ module TestGroupdate
906	assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[utc.parse("2014-05-02 00:00:00 UTC")]	906	assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[utc.parse("2014-05-02 00:00:00 UTC")]
907	end	907	end
908		908
		909	+ # dates
		910	+
		911	+ def test_dates
		912	+ create_user "2014-03-01 12:00:00 UTC"
		913	+ assert_equal ({Date.parse("2014-03-01") => 1}), User.group_by_day(:created_at, dates: true).count
		914	+ end
		915	+
909	# helpers	916	# helpers
910		917
911	def assert_format(method, expected, format, options = {})	918	def assert_format(method, expected, format, options = {})