groupdate 2.5.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5361eb118741ab6aae412f5463db1813f85fe2
-  data.tar.gz: 0aa40c54eadeb578914db75567bff930fb0dbef8
+  metadata.gz: 1388ce20a1c1a41fdd0fe87d5cda7d28522ad2d2
+  data.tar.gz: 62660c4bb7aabbf6e619274038f2335c0dbed0dd
 SHA512:
-  metadata.gz: e642a4eb6084d4a1d339a193b549dd34e13298d082f42ecc58b02803c37296e62d8f5df7773a5cfbe4e8ba087ece17b7b52c362219d0cc307ab2210e25a88f4e
-  data.tar.gz: f55793c8987b1dd1d49ce7dbba35ddaf8033e5a4b627e983b208df5daf296b150afc4816fcd8c425bfaccc1c3842a83af631cb50e5d21b0fa700d36ef563b5e7
+  metadata.gz: 471f406dd29530940a51bd7b1547a3a19d8399098a6949d50a94e08be5fefb1e256cd3b996f0f964101541858b4744d85e6e85d1eb2c162e35ffc3fec2eb4df5
+  data.tar.gz: d199353fbccd7b4c1aa74609e4c28d187fc19036785c236cd23e4d0559a2c50a380fe3e273fd8a1f324d13b42e9e3b90b9ebc75bea7527a2661083bca1e2f43f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.0.0
+
+Breaking changes
+
+- `Date` objects are now returned for day, week, month, quarter, and year by default. Use `dates: false` for the previous behavior, or change this globally with `Groupdate.dates = false`.
+- Array and hash methods no longer return the entire series by default. Use `series: true` for the previous behavior.
+- The `series: false` option now returns the correct types and order, and plays nicely with other options.
+
 ## 2.5.3
 
 - All tests green with `mysql` gem

data/README.md

@@ -7,7 +7,7 @@ The simplest way to group by:
 - hour of the day
 - and more (complete list below)
 
-:tada: Time zones supported!! **the best part**
+:tada: Time zones - including daylight saving time - supported!! **the best part**
 
 :cake: Get the entire series - **the other best part**
 
@@ -19,14 +19,16 @@ Supports PostgreSQL and MySQL, plus arrays and hashes
 
 :cupid: Goes hand in hand with [Chartkick](http://ankane.github.io/chartkick/)
 
+**Groupdate 3.0 was just released!** See [instructions for upgrading](#30). If you use Chartkick with Groupdate, we recommend Chartkick 2.0 and above.
+
 ## Get Started
 
 ```ruby
 User.group_by_day(:created_at).count
 # {
-#   2013-04-16 00:00:00 UTC => 50,
-#   2013-04-17 00:00:00 UTC => 100,
-#   2013-04-18 00:00:00 UTC => 34
+#   Sat, 28 May 2016 => 50,
+#   Sun, 29 May 2016 => 100,
+#   Mon, 30 May 2016 => 34
 # }
 ```
 
@@ -65,9 +67,9 @@ or
 ```ruby
 User.group_by_week(:created_at, time_zone: "Pacific Time (US & Canada)").count
 # {
-#   2013-03-10 00:00:00 PST => 70,
-#   2013-03-17 00:00:00 PDT => 54,
-#   2013-03-24 00:00:00 PDT => 80
+#   Sun, 06 Mar 2016 => 70,
+#   Sun, 13 Mar 2016 => 54,
+#   Sun, 20 Mar 2016 => 80
 # }
 ```
 
@@ -137,24 +139,7 @@ User.group_by_day(:created_at).order("day desc").count
 
 ### Keys
 
-Keys are returned as time objects for the start of the period.
-
-To get keys as date objects instead, use:
-
-```ruby
-User.group_by_day(:created_at, dates: true).count
-# {
-#   2013-03-10 => 70,
-#   2013-03-17 => 54,
-#   2013-03-24 => 80
-# }
-```
-
-or make this the default with:
-
-```ruby
-Groupdate.dates = true
-```
+Keys are returned as date or time objects for the start of the period.
 
 To get keys in a different format, use:
 
@@ -229,9 +214,19 @@ mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 
 or copy and paste [these statements](https://gist.githubusercontent.com/ankane/1d6b0022173186accbf0/raw/time_zone_support.sql) into a SQL console.
 
-## Upgrading to 2.0
+## Upgrading
+
+### 3.0
+
+Groupdate 3.0 brings a number of improvements.  Here are a few to be aware of:
+
+- `Date` objects are now returned for day, week, month, quarter, and year by default. Use `dates: false` for the previous behavior, or change this globally with `Groupdate.dates = false`.
+- Array and hash methods no longer return the entire series by default. Use `series: true` for the previous behavior.
+- The `series: false` option now returns the correct type and order, and plays nicely with other options.
+
+### 2.0
 
-Groupdate 2.0 brings a number a great improvements.  Here are two things to be aware of:
+Groupdate 2.0 brings a number of improvements.  Here are two things to be aware of:
 
 - the entire series is returned by default
 - `ActiveSupport::TimeWithZone` keys are now returned for every database adapter - adapters previously returned `Time` or `String` keys

data/groupdate.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ankane/groupdate"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/groupdate.rb

@@ -12,7 +12,7 @@ module Groupdate
   mattr_accessor :week_start, :day_start, :time_zone, :dates
   self.week_start = :sun
   self.day_start = 0
-  self.dates = false
+  self.dates = true
 end
 
 require "groupdate/enumerable"

data/lib/groupdate/active_record.rb

@@ -26,7 +26,7 @@ module ActiveRecord
   module Associations
     class CollectionProxy
       if ActiveRecord::VERSION::MAJOR == 3
-        delegate *Groupdate::METHODS, to: :scoped
+        delegate(*Groupdate::METHODS, to: :scoped)
       end
     end
   end

data/lib/groupdate/magic.rb

@@ -15,11 +15,7 @@ module Groupdate
 
     def group_by(enum, &_block)
       group = enum.group_by { |v| v = yield(v); v ? round_time(v) : nil }
-      if options[:series] == false
-        group
-      else
-        series(group, [])
-      end
+      series(group, [], false, false, false)
     end
 
     def relation(column, relation)
@@ -90,22 +86,18 @@ module Groupdate
       end
 
       group = relation.group(Groupdate::OrderHack.new(relation.send(:sanitize_sql_array, query), field, time_zone))
-      if options[:series] == false
-        group
-      else
-        relation =
-          if time_range.is_a?(Range)
-            # doesn't matter whether we include the end of a ... range - it will be excluded later
-            group.where("#{column} >= ? AND #{column} <= ?", time_range.first, time_range.last)
-          else
-            group.where("#{column} IS NOT NULL")
-          end
+      relation =
+        if time_range.is_a?(Range)
+          # doesn't matter whether we include the end of a ... range - it will be excluded later
+          group.where("#{column} >= ? AND #{column} <= ?", time_range.first, time_range.last)
+        else
+          group.where("#{column} IS NOT NULL")
+        end
 
-        # TODO do not change object state
-        @group_index = group.group_values.size - 1
+      # TODO do not change object state
+      @group_index = group.group_values.size - 1
 
-        Groupdate::Series.new(self, relation)
-      end
+      Groupdate::Series.new(self, relation)
     end
 
     def perform(relation, method, *args, &block)
@@ -175,7 +167,7 @@ module Groupdate
       end
     end
 
-    def series(count, default_value, multiple_groups = false, reverse = false)
+    def series(count, default_value, multiple_groups = false, reverse = false, series_default = true)
       reverse = !reverse if options[:reverse]
 
       series =
@@ -238,6 +230,7 @@ module Groupdate
       series = series.to_a.reverse if !multiple_groups && reverse
 
       locale = options[:locale] || I18n.locale
+      use_dates = options.key?(:dates) ? options[:dates] : Groupdate.dates
       key_format =
         if options[:format]
           if options[:format].respond_to?(:call)
@@ -258,12 +251,17 @@ 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)
+        elsif [:day, :week, :month, :quarter, :year].include?(field) && use_dates
           lambda { |k| k.to_date }
         else
           lambda { |k| k }
         end
 
+      use_series = options.key?(:series) ? options[:series] : series_default
+      if use_series == false
+        series = series.select { |k| count[k] }
+      end
+
       value = 0
       Hash[series.map do |k|
         value = count[k] || (@options[:carry_forward] && value) || default_value

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.5.3"
+  VERSION = "3.0.0"
 end

data/test/enumerable_test.rb

@@ -8,13 +8,23 @@ class TestEnumerable < Minitest::Test
     user_a = create_user("2014-01-21")
     user_b = create_user("2014-03-14")
     expected = {
-      utc.parse("2014-01-01") => [user_a],
-      utc.parse("2014-02-01") => [],
-      utc.parse("2014-03-01") => [user_b]
+      Date.parse("2014-01-01") => [user_a],
+      Date.parse("2014-03-01") => [user_b]
     }
     assert_equal expected, [user_a, user_b].group_by_month(&:created_at)
   end
 
+  def test_enumerable_series
+    user_a = create_user("2014-01-21")
+    user_b = create_user("2014-03-14")
+    expected = {
+      Date.parse("2014-01-01") => [user_a],
+      Date.parse("2014-02-01") => [],
+      Date.parse("2014-03-01") => [user_b]
+    }
+    assert_equal expected, [user_a, user_b].group_by_month(series: true, &:created_at)
+  end
+
   def test_no_block
     assert_raises(ArgumentError) { [].group_by_day(:created_at) }
   end

data/test/gemfiles/activerecord50.gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec path: "../../"
 
-gem "activerecord", "~> 5.0.0.beta1"
+gem "activerecord", "~> 5.0.0.rc1"

data/test/test_helper.rb

@@ -51,11 +51,11 @@ end
 
 module TestDatabase
   def test_zeros_previous_scope
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     expected = {
-      utc.parse("2013-05-01 00:00:00 UTC") => 0
+      Date.parse("2013-05-01") => 0
     }
-    assert_equal expected, User.where("id = 0").group_by_day(:created_at, range: Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count
+    assert_equal expected, User.where("id = 0").group_by_day(:created_at, range: Date.parse("2013-05-01")..Date.parse("2013-05-01 23:59:59 UTC")).count
   end
 
   def test_order_hour_of_day
@@ -81,51 +81,51 @@ module TestDatabase
   end
 
   def test_previous_scopes
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     assert_empty User.where("id = 0").group_by_day(:created_at).count
   end
 
   def test_where_after
-    create_user "2013-05-01 00:00:00 UTC"
-    create_user "2013-05-02 00:00:00 UTC"
-    expected = {utc.parse("2013-05-02 00:00:00 UTC") => 1}
-    assert_equal expected, User.group_by_day(:created_at).where("created_at > ?", "2013-05-01 00:00:00 UTC").count
+    create_user "2013-05-01"
+    create_user "2013-05-02"
+    expected = {Date.parse("2013-05-02") => 1}
+    assert_equal expected, User.group_by_day(:created_at).where("created_at > ?", "2013-05-01").count
   end
 
   def test_group_before
-    create_user "2013-05-01 00:00:00 UTC", 1
-    create_user "2013-05-02 00:00:00 UTC", 2
-    create_user "2013-05-03 00:00:00 UTC", 2
+    create_user "2013-05-01", 1
+    create_user "2013-05-02", 2
+    create_user "2013-05-03", 2
     expected = {
-      [1, utc.parse("2013-05-01 00:00:00 UTC")] => 1,
-      [1, utc.parse("2013-05-02 00:00:00 UTC")] => 0,
-      [1, utc.parse("2013-05-03 00:00:00 UTC")] => 0,
-      [2, utc.parse("2013-05-01 00:00:00 UTC")] => 0,
-      [2, utc.parse("2013-05-02 00:00:00 UTC")] => 1,
-      [2, utc.parse("2013-05-03 00:00:00 UTC")] => 1
+      [1, Date.parse("2013-05-01")] => 1,
+      [1, Date.parse("2013-05-02")] => 0,
+      [1, Date.parse("2013-05-03")] => 0,
+      [2, Date.parse("2013-05-01")] => 0,
+      [2, Date.parse("2013-05-02")] => 1,
+      [2, Date.parse("2013-05-03")] => 1
     }
     assert_equal expected, User.group(:score).group_by_day(:created_at).order(:score).count
   end
 
   def test_group_after
-    create_user "2013-05-01 00:00:00 UTC", 1
-    create_user "2013-05-02 00:00:00 UTC", 2
-    create_user "2013-05-03 00:00:00 UTC", 2
+    create_user "2013-05-01", 1
+    create_user "2013-05-02", 2
+    create_user "2013-05-03", 2
     expected = {
-      [utc.parse("2013-05-01 00:00:00 UTC"), 1] => 1,
-      [utc.parse("2013-05-02 00:00:00 UTC"), 1] => 0,
-      [utc.parse("2013-05-03 00:00:00 UTC"), 1] => 0,
-      [utc.parse("2013-05-01 00:00:00 UTC"), 2] => 0,
-      [utc.parse("2013-05-02 00:00:00 UTC"), 2] => 1,
-      [utc.parse("2013-05-03 00:00:00 UTC"), 2] => 1
+      [Date.parse("2013-05-01"), 1] => 1,
+      [Date.parse("2013-05-02"), 1] => 0,
+      [Date.parse("2013-05-03"), 1] => 0,
+      [Date.parse("2013-05-01"), 2] => 0,
+      [Date.parse("2013-05-02"), 2] => 1,
+      [Date.parse("2013-05-03"), 2] => 1
     }
     assert_equal expected, User.group_by_day(:created_at).group(:score).order(:score).count
   end
 
   def test_group_day_of_week
-    create_user "2013-05-01 00:00:00 UTC", 1
-    create_user "2013-05-02 00:00:00 UTC", 2
-    create_user "2013-05-03 00:00:00 UTC", 2
+    create_user "2013-05-01", 1
+    create_user "2013-05-02", 2
+    create_user "2013-05-03", 2
     expected = {
       [1, 0] => 0,
       [1, 1] => 0,
@@ -146,9 +146,9 @@ module TestDatabase
   end
 
   def test_groupdate_multiple
-    create_user "2013-05-01 00:00:00 UTC", 1
+    create_user "2013-05-01", 1
     expected = {
-      [utc.parse("2013-05-01 00:00:00 UTC"), utc.parse("2013-01-01 00:00:00 UTC")] => 1
+      [Date.parse("2013-05-01"), Date.parse("2013-01-01")] => 1
     }
     assert_equal expected, User.group_by_day(:created_at).group_by_year(:created_at).count
   end
@@ -165,10 +165,10 @@ module TestDatabase
   end
 
   def test_not_modified
-    create_user "2013-05-01 00:00:00 UTC"
-    expected = {utc.parse("2013-05-01 00:00:00 UTC") => 1}
+    create_user "2013-05-01"
+    expected = {Date.parse("2013-05-01") => 1}
     relation = User.group_by_day(:created_at)
-    relation.where("created_at > ?", "2013-05-01 00:00:00 UTC")
+    relation.where("created_at > ?", "2013-05-01")
     assert_equal expected, relation.count
   end
 
@@ -185,38 +185,38 @@ module TestDatabase
   end
 
   def test_last
-    create_user "#{this_year - 3}-01-01 00:00:00 UTC"
-    create_user "#{this_year - 1}-01-01 00:00:00 UTC"
+    create_user "#{this_year - 3}-01-01"
+    create_user "#{this_year - 1}-01-01"
     expected = {
-      utc.parse("#{this_year - 2}-01-01 00:00:00 UTC") => 0,
-      utc.parse("#{this_year - 1}-01-01 00:00:00 UTC") => 1,
-      utc.parse("#{this_year}-01-01 00:00:00 UTC") => 0
+      Date.parse("#{this_year - 2}-01-01") => 0,
+      Date.parse("#{this_year - 1}-01-01") => 1,
+      Date.parse("#{this_year}-01-01") => 0
     }
     assert_equal expected, User.group_by_year(:created_at, last: 3).count
   end
 
   def test_current
-    create_user "#{this_year - 3}-01-01 00:00:00 UTC"
-    create_user "#{this_year - 1}-01-01 00:00:00 UTC"
+    create_user "#{this_year - 3}-01-01"
+    create_user "#{this_year - 1}-01-01"
     expected = {
-      utc.parse("#{this_year - 2}-01-01 00:00:00 UTC") => 0,
-      utc.parse("#{this_year - 1}-01-01 00:00:00 UTC") => 1
+      Date.parse("#{this_year - 2}-01-01") => 0,
+      Date.parse("#{this_year - 1}-01-01") => 1
     }
     assert_equal expected, User.group_by_year(:created_at, last: 2, current: false).count
   end
 
   def test_format_locale
-    create_user "2014-10-01 00:00:00 UTC"
+    create_user "2014-10-01"
     assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b", locale: :de).count
   end
 
   def test_format_locale_by_symbol
-    create_user "2014-10-01 00:00:00 UTC"
+    create_user "2014-10-01"
     assert_equal ({"Okt  1, 2014" => 1}), User.group_by_day(:created_at, format: :special, locale: :de).count
   end
 
   def test_format_locale_global
-    create_user "2014-10-01 00:00:00 UTC"
+    create_user "2014-10-01"
     I18n.locale = :de
     assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b").count
   ensure
@@ -224,7 +224,7 @@ module TestDatabase
   end
 
   def test_format_multiple_groups
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_equal ({["Sun", 1] => 1}), User.group_by_week(:created_at, format: "%a").group(:score).count
     assert_equal ({[1, "Sun"] => 1}), User.group(:score).group_by_week(:created_at, format: "%a").count
   end
@@ -258,10 +258,10 @@ module TestDatabase
   # default value
 
   def test_default_value
-    create_user "#{this_year}-01-01 00:00:00 UTC"
+    create_user "#{this_year}-01-01"
     expected = {
-      utc.parse("#{this_year - 1}-01-01 00:00:00 UTC") => nil,
-      utc.parse("#{this_year}-01-01 00:00:00 UTC") => 1
+      Date.parse("#{this_year - 1}-01-01") => nil,
+      Date.parse("#{this_year}-01-01") => 1
     }
     assert_equal expected, User.group_by_year(:created_at, last: 2, default_value: nil).count
   end
@@ -269,10 +269,10 @@ module TestDatabase
   # associations
 
   def test_associations
-    user = create_user("2014-03-01 00:00:00 UTC")
+    user = create_user("2014-03-01")
     user.posts.create!(created_at: "2014-04-01 00:00:00 UTC")
     expected = {
-      utc.parse("2014-04-01 00:00:00 UTC") => 1
+      Date.parse("2014-04-01") => 1
     }
     assert_equal expected, user.posts.group_by_day(:created_at).count
   end
@@ -293,8 +293,8 @@ module TestDatabase
     create_user(brasilia.parse("2014-10-19 02:00:00").utc.to_s)
     create_user(brasilia.parse("2014-10-20 02:00:00").utc.to_s)
     expected = {
-      brasilia.parse("2014-10-19 01:00:00") => 1,
-      brasilia.parse("2014-10-20 00:00:00") => 1
+      Date.parse("2014-10-19") => 1,
+      Date.parse("2014-10-20") => 1
     }
     assert_equal expected, User.group_by_day(:created_at, time_zone: "Brasilia").count
   end
@@ -302,10 +302,10 @@ module TestDatabase
   # carry_forward option
 
   def test_carry_forward
-    create_user "2014-05-01 00:00:00 UTC"
-    create_user "2014-05-01 00:00:00 UTC"
-    create_user "2014-05-03 00:00:00 UTC"
-    assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[utc.parse("2014-05-02 00:00:00 UTC")]
+    create_user "2014-05-01"
+    create_user "2014-05-01"
+    create_user "2014-05-03"
+    assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[Date.parse("2014-05-02")]
   end
 
   # dates
@@ -333,7 +333,7 @@ module TestDatabase
       )
 
     # hack for MySQL adapter
-    user.update_attributes(created_at: nil, created_on: nil) if created_at.nil?
+    # user.update_attributes(created_at: nil, created_on: nil) if created_at.nil?
 
     user
   end
@@ -389,217 +389,217 @@ module TestGroupdate
   # day
 
   def test_day_end_of_day
-    assert_result_time :day, "2013-05-03 00:00:00 UTC", "2013-05-03 23:59:59"
+    assert_result_date :day, "2013-05-03", "2013-05-03 23:59:59"
   end
 
   def test_day_start_of_day
-    assert_result_time :day, "2013-05-04 00:00:00 UTC", "2013-05-04 00:00:00"
+    assert_result_date :day, "2013-05-04", "2013-05-04 00:00:00"
   end
 
   def test_day_end_of_day_with_time_zone
-    assert_result_time :day, "2013-05-02 00:00:00 PDT", "2013-05-03 06:59:59", true
+    assert_result_date :day, "2013-05-02", "2013-05-03 06:59:59", true
   end
 
   def test_day_start_of_day_with_time_zone
-    assert_result_time :day, "2013-05-03 00:00:00 PDT", "2013-05-03 07:00:00", true
+    assert_result_date :day, "2013-05-03", "2013-05-03 07:00:00", true
   end
 
   # day hour starts at 2 am
 
   def test_test_day_end_of_day_day_start_2am
-    assert_result_time :day, "2013-05-03 02:00:00 UTC", "2013-05-04 01:59:59", false, day_start: 2
+    assert_result_date :day, "2013-05-03", "2013-05-04 01:59:59", false, day_start: 2
   end
 
   def test_test_day_start_of_day_day_start_2am
-    assert_result_time :day, "2013-05-03 02:00:00 UTC", "2013-05-03 02:00:00", false, day_start: 2
+    assert_result_date :day, "2013-05-03", "2013-05-03 02:00:00", false, day_start: 2
   end
 
   def test_test_day_end_of_day_with_time_zone_day_start_2am
-    assert_result_time :day, "2013-05-03 02:00:00 PDT", "2013-05-04 07:59:59", true, day_start: 2
+    assert_result_date :day, "2013-05-03", "2013-05-04 07:59:59", true, day_start: 2
   end
 
   def test_test_day_start_of_day_with_time_zone_day_start_2am
-    assert_result_time :day, "2013-05-03 02:00:00 PDT", "2013-05-03 09:00:00", true, day_start: 2
+    assert_result_date :day, "2013-05-03", "2013-05-03 09:00:00", true, day_start: 2
   end
 
   # week
 
   def test_week_end_of_week
-    assert_result_time :week, "2013-03-17 00:00:00 UTC", "2013-03-23 23:59:59"
+    assert_result_date :week, "2013-03-17", "2013-03-23 23:59:59"
   end
 
   def test_week_start_of_week
-    assert_result_time :week, "2013-03-24 00:00:00 UTC", "2013-03-24 00:00:00"
+    assert_result_date :week, "2013-03-24", "2013-03-24 00:00:00"
   end
 
   def test_week_end_of_week_with_time_zone
-    assert_result_time :week, "2013-03-10 00:00:00 PST", "2013-03-17 06:59:59", true
+    assert_result_date :week, "2013-03-10", "2013-03-17 06:59:59", true
   end
 
   def test_week_start_of_week_with_time_zone
-    assert_result_time :week, "2013-03-17 00:00:00 PDT", "2013-03-17 07:00:00", true
+    assert_result_date :week, "2013-03-17", "2013-03-17 07:00:00", true
   end
 
   # week starting on monday
 
   def test_week_end_of_week_mon
-    assert_result_time :week, "2013-03-18 00:00:00 UTC", "2013-03-24 23:59:59", false, week_start: :mon
+    assert_result_date :week, "2013-03-18", "2013-03-24 23:59:59", false, week_start: :mon
   end
 
   def test_week_start_of_week_mon
-    assert_result_time :week, "2013-03-25 00:00:00 UTC", "2013-03-25 00:00:00", false, week_start: :mon
+    assert_result_date :week, "2013-03-25", "2013-03-25 00:00:00", false, week_start: :mon
   end
 
   def test_week_end_of_week_with_time_zone_mon
-    assert_result_time :week, "2013-03-11 00:00:00 PDT", "2013-03-18 06:59:59", true, week_start: :mon
+    assert_result_date :week, "2013-03-11", "2013-03-18 06:59:59", true, week_start: :mon
   end
 
   def test_week_start_of_week_with_time_zone_mon
-    assert_result_time :week, "2013-03-18 00:00:00 PDT", "2013-03-18 07:00:00", true, week_start: :mon
+    assert_result_date :week, "2013-03-18", "2013-03-18 07:00:00", true, week_start: :mon
   end
 
   # week starting on saturday
 
   def test_week_end_of_week_sat
-    assert_result_time :week, "2013-03-16 00:00:00 UTC", "2013-03-22 23:59:59", false, week_start: :sat
+    assert_result_date :week, "2013-03-16", "2013-03-22 23:59:59", false, week_start: :sat
   end
 
   def test_week_start_of_week_sat
-    assert_result_time :week, "2013-03-23 00:00:00 UTC", "2013-03-23 00:00:00", false, week_start: :sat
+    assert_result_date :week, "2013-03-23", "2013-03-23 00:00:00", false, week_start: :sat
   end
 
   def test_week_end_of_week_with_time_zone_sat
-    assert_result_time :week, "2013-03-09 00:00:00 PST", "2013-03-16 06:59:59", true, week_start: :sat
+    assert_result_date :week, "2013-03-09", "2013-03-16 06:59:59", true, week_start: :sat
   end
 
   def test_week_start_of_week_with_time_zone_sat
-    assert_result_time :week, "2013-03-16 00:00:00 PDT", "2013-03-16 07:00:00", true, week_start: :sat
+    assert_result_date :week, "2013-03-16", "2013-03-16 07:00:00", true, week_start: :sat
   end
 
   # week starting at 2am
 
   def test_week_end_of_week_day_start_2am
-    assert_result_time :week, "2013-03-17 02:00:00 UTC", "2013-03-24 01:59:59", false, day_start: 2
+    assert_result_date :week, "2013-03-17", "2013-03-24 01:59:59", false, day_start: 2
   end
 
   def test_week_start_of_week_day_start_2am
-    assert_result_time :week, "2013-03-17 02:00:00 UTC", "2013-03-17 02:00:00", false, day_start: 2
+    assert_result_date :week, "2013-03-17", "2013-03-17 02:00:00", false, day_start: 2
   end
 
   def test_week_end_of_week_day_with_time_zone_start_2am
-    assert_result_time :week, "2013-03-17 02:00:00 PDT", "2013-03-24 08:59:59", true, day_start: 2
+    assert_result_date :week, "2013-03-17", "2013-03-24 08:59:59", true, day_start: 2
   end
 
   def test_week_start_of_week_day_with_time_zone_start_2am
-    assert_result_time :week, "2013-03-17 02:00:00 PDT", "2013-03-17 09:00:00", true, day_start: 2
+    assert_result_date :week, "2013-03-17", "2013-03-17 09:00:00", true, day_start: 2
   end
 
   # month
 
   def test_month_end_of_month
-    assert_result_time :month, "2013-05-01 00:00:00 UTC", "2013-05-31 23:59:59"
+    assert_result_date :month, "2013-05-01", "2013-05-31 23:59:59"
   end
 
   def test_month_start_of_month
-    assert_result_time :month, "2013-06-01 00:00:00 UTC", "2013-06-01 00:00:00"
+    assert_result_date :month, "2013-06-01", "2013-06-01 00:00:00"
   end
 
   def test_month_end_of_month_with_time_zone
-    assert_result_time :month, "2013-05-01 00:00:00 PDT", "2013-06-01 06:59:59", true
+    assert_result_date :month, "2013-05-01", "2013-06-01 06:59:59", true
   end
 
   def test_month_start_of_month_with_time_zone
-    assert_result_time :month, "2013-06-01 00:00:00 PDT", "2013-06-01 07:00:00", true
+    assert_result_date :month, "2013-06-01", "2013-06-01 07:00:00", true
   end
 
   # month starts at 2am
 
   def test_month_end_of_month_day_start_2am
-    assert_result_time :month, "2013-03-01 02:00:00 UTC", "2013-04-01 01:59:59", false, day_start: 2
+    assert_result_date :month, "2013-03-01", "2013-04-01 01:59:59", false, day_start: 2
   end
 
   def test_month_start_of_month_day_start_2am
-    assert_result_time :month, "2013-03-01 02:00:00 UTC", "2013-03-01 02:00:00", false, day_start: 2
+    assert_result_date :month, "2013-03-01", "2013-03-01 02:00:00", false, day_start: 2
   end
 
   def test_month_end_of_month_with_time_zone_day_start_2am
-    assert_result_time :month, "2013-03-01 02:00:00 PST", "2013-04-01 08:59:59", true, day_start: 2
+    assert_result_date :month, "2013-03-01", "2013-04-01 08:59:59", true, day_start: 2
   end
 
   def test_month_start_of_month_with_time_zone_day_start_2am
-    assert_result_time :month, "2013-03-01 02:00:00 PST", "2013-03-01 10:00:00", true, day_start: 2
+    assert_result_date :month, "2013-03-01", "2013-03-01 10:00:00", true, day_start: 2
   end
 
   # quarter
 
   def test_quarter_end_of_quarter
-    assert_result_time :quarter, "2013-04-01 00:00:00 UTC", "2013-06-30 23:59:59"
+    assert_result_date :quarter, "2013-04-01", "2013-06-30 23:59:59"
   end
 
   def test_quarter_start_of_quarter
-    assert_result_time :quarter, "2013-04-01 00:00:00 UTC", "2013-04-01 00:00:00"
+    assert_result_date :quarter, "2013-04-01", "2013-04-01 00:00:00"
   end
 
   def test_quarter_end_of_quarter_with_time_zone
-    assert_result_time :quarter, "2013-04-01 00:00:00 PDT", "2013-07-01 06:59:59", true
+    assert_result_date :quarter, "2013-04-01", "2013-07-01 06:59:59", true
   end
 
   def test_quarter_start_of_quarter_with_time_zone
-    assert_result_time :quarter, "2013-04-01 00:00:00 PDT", "2013-04-01 07:00:00", true
+    assert_result_date :quarter, "2013-04-01", "2013-04-01 07:00:00", true
   end
 
   # quarter starts at 2am
 
   def test_quarter_end_of_quarter_day_start_2am
-    assert_result_time :quarter, "2013-04-01 02:00:00 UTC", "2013-07-01 01:59:59", false, day_start: 2
+    assert_result_date :quarter, "2013-04-01", "2013-07-01 01:59:59", false, day_start: 2
   end
 
   def test_quarter_start_of_quarter_day_start_2am
-    assert_result_time :quarter, "2013-04-01 02:00:00 UTC", "2013-04-01 02:00:00", false, day_start: 2
+    assert_result_date :quarter, "2013-04-01", "2013-04-01 02:00:00", false, day_start: 2
   end
 
   def test_quarter_end_of_quarter_with_time_zone_day_start_2am
-    assert_result_time :quarter, "2013-01-01 02:00:00 PST", "2013-04-01 08:59:59", true, day_start: 2
+    assert_result_date :quarter, "2013-01-01", "2013-04-01 08:59:59", true, day_start: 2
   end
 
   def test_quarter_start_of_quarter_with_time_zone_day_start_2am
-    assert_result_time :quarter, "2013-01-01 02:00:00 PST", "2013-01-01 10:00:00", true, day_start: 2
+    assert_result_date :quarter, "2013-01-01", "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # year
 
   def test_year_end_of_year
-    assert_result_time :year, "2013-01-01 00:00:00 UTC", "2013-12-31 23:59:59"
+    assert_result_date :year, "2013-01-01", "2013-12-31 23:59:59"
   end
 
   def test_year_start_of_year
-    assert_result_time :year, "2014-01-01 00:00:00 UTC", "2014-01-01 00:00:00"
+    assert_result_date :year, "2014-01-01", "2014-01-01 00:00:00"
   end
 
   def test_year_end_of_year_with_time_zone
-    assert_result_time :year, "2013-01-01 00:00:00 PST", "2014-01-01 07:59:59", true
+    assert_result_date :year, "2013-01-01", "2014-01-01 07:59:59", true
   end
 
   def test_year_start_of_year_with_time_zone
-    assert_result_time :year, "2014-01-01 00:00:00 PST", "2014-01-01 08:00:00", true
+    assert_result_date :year, "2014-01-01", "2014-01-01 08:00:00", true
   end
 
   # year starts at 2am
 
   def test_year_end_of_year_day_start_2am
-    assert_result_time :year, "2013-01-01 02:00:00 UTC", "2014-01-01 01:59:59", false, day_start: 2
+    assert_result_date :year, "2013-01-01", "2014-01-01 01:59:59", false, day_start: 2
   end
 
   def test_year_start_of_year_day_start_2am
-    assert_result_time :year, "2013-01-01 02:00:00 UTC", "2013-01-01 02:00:00", false, day_start: 2
+    assert_result_date :year, "2013-01-01", "2013-01-01 02:00:00", false, day_start: 2
   end
 
   def test_year_end_of_year_with_time_zone_day_start_2am
-    assert_result_time :year, "2013-01-01 02:00:00 PST", "2014-01-01 09:59:59", true, day_start: 2
+    assert_result_date :year, "2013-01-01", "2014-01-01 09:59:59", true, day_start: 2
   end
 
   def test_year_start_of_year_with_time_zone_day_start_2am
-    assert_result_time :year, "2013-01-01 02:00:00 PST", "2013-01-01 10:00:00", true, day_start: 2
+    assert_result_date :year, "2013-01-01", "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # hour of day
@@ -765,68 +765,68 @@ module TestGroupdate
   end
 
   def test_zeros_day
-    assert_zeros :day, "2013-05-01 20:00:00 UTC", ["2013-04-30 00:00:00 UTC", "2013-05-01 00:00:00 UTC", "2013-05-02 00:00:00 UTC"], "2013-04-30 00:00:00 UTC", "2013-05-02 23:59:59 UTC"
+    assert_zeros_date :day, "2013-05-01 20:00:00 UTC", ["2013-04-30", "2013-05-01", "2013-05-02"], "2013-04-30 00:00:00 UTC", "2013-05-02 23:59:59 UTC"
   end
 
   def test_zeros_day_time_zone
-    assert_zeros :day, "2013-05-01 20:00:00 PDT", ["2013-04-30 00:00:00 PDT", "2013-05-01 00:00:00 PDT", "2013-05-02 00:00:00 PDT"], "2013-04-30 00:00:00 PDT", "2013-05-02 23:59:59 PDT", true
+    assert_zeros_date :day, "2013-05-01 20:00:00 PDT", ["2013-04-30", "2013-05-01", "2013-05-02"], "2013-04-30 00:00:00 PDT", "2013-05-02 23:59:59 PDT", true
   end
 
   def test_zeros_week
-    assert_zeros :week, "2013-05-01 20:00:00 UTC", ["2013-04-21 00:00:00 UTC", "2013-04-28 00:00:00 UTC", "2013-05-05 00:00:00 UTC"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC"
+    assert_zeros_date :week, "2013-05-01 20:00:00 UTC", ["2013-04-21", "2013-04-28", "2013-05-05"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC"
   end
 
   def test_zeros_week_time_zone
-    assert_zeros :week, "2013-05-01 20:00:00 PDT", ["2013-04-21 00:00:00 PDT", "2013-04-28 00:00:00 PDT", "2013-05-05 00:00:00 PDT"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT", true
+    assert_zeros_date :week, "2013-05-01 20:00:00 PDT", ["2013-04-21", "2013-04-28", "2013-05-05"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT", true
   end
 
   def test_zeros_week_mon
-    assert_zeros :week, "2013-05-01 20:00:00 UTC", ["2013-04-22 00:00:00 UTC", "2013-04-29 00:00:00 UTC", "2013-05-06 00:00:00 UTC"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC", false, week_start: :mon
+    assert_zeros_date :week, "2013-05-01 20:00:00 UTC", ["2013-04-22", "2013-04-29", "2013-05-06"], "2013-04-27 23:59:59 UTC", "2013-05-11 23:59:59 UTC", false, week_start: :mon
   end
 
   def test_zeros_week_time_zone_mon
-    assert_zeros :week, "2013-05-01 20:00:00 PDT", ["2013-04-22 00:00:00 PDT", "2013-04-29 00:00:00 PDT", "2013-05-06 00:00:00 PDT"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT", true, week_start: :mon
+    assert_zeros_date :week, "2013-05-01 20:00:00 PDT", ["2013-04-22", "2013-04-29", "2013-05-06"], "2013-04-27 23:59:59 PDT", "2013-05-11 23:59:59 PDT", true, week_start: :mon
   end
 
   def test_zeros_week_sat
-    assert_zeros :week, "2013-05-01 20:00:00 UTC", ["2013-04-20 00:00:00 UTC", "2013-04-27 00:00:00 UTC", "2013-05-04 00:00:00 UTC"], "2013-04-26 23:59:59 UTC", "2013-05-10 23:59:59 UTC", false, week_start: :sat
+    assert_zeros_date :week, "2013-05-01 20:00:00 UTC", ["2013-04-20", "2013-04-27", "2013-05-04"], "2013-04-26 23:59:59 UTC", "2013-05-10 23:59:59 UTC", false, week_start: :sat
   end
 
   def test_zeros_week_time_zone_sat
-    assert_zeros :week, "2013-05-01 20:00:00 PDT", ["2013-04-20 00:00:00 PDT", "2013-04-27 00:00:00 PDT", "2013-05-04 00:00:00 PDT"], "2013-04-26 23:59:59 PDT", "2013-05-10 23:59:59 PDT", true, week_start: :sat
+    assert_zeros_date :week, "2013-05-01 20:00:00 PDT", ["2013-04-20", "2013-04-27", "2013-05-04"], "2013-04-26 23:59:59 PDT", "2013-05-10 23:59:59 PDT", true, week_start: :sat
   end
 
   def test_zeros_month
-    assert_zeros :month, "2013-04-16 20:00:00 UTC", ["2013-03-01 00:00:00 UTC", "2013-04-01 00:00:00 UTC", "2013-05-01 00:00:00 UTC"], "2013-03-01 00:00:00 UTC", "2013-05-31 23:59:59 UTC"
+    assert_zeros_date :month, "2013-04-16 20:00:00 UTC", ["2013-03-01", "2013-04-01", "2013-05-01"], "2013-03-01", "2013-05-31 23:59:59 UTC"
   end
 
   def test_zeros_month_time_zone
-    assert_zeros :month, "2013-04-16 20:00:00 PDT", ["2013-03-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-05-01 00:00:00 PDT"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT", true
+    assert_zeros_date :month, "2013-04-16 20:00:00 PDT", ["2013-03-01", "2013-04-01", "2013-05-01"], "2013-03-01 00:00:00 PST", "2013-05-31 23:59:59 PDT", true
   end
 
   def test_zeros_quarter
-    assert_zeros :quarter, "2013-04-16 20:00:00 UTC", ["2013-01-01 00:00:00 UTC", "2013-04-01 00:00:00 UTC", "2013-07-01 00:00:00 UTC"], "2013-01-01 00:00:00 UTC", "2013-09-30 23:59:59 UTC"
+    assert_zeros_date :quarter, "2013-04-16 20:00:00 UTC", ["2013-01-01", "2013-04-01", "2013-07-01"], "2013-01-01", "2013-09-30 23:59:59 UTC"
   end
 
   def test_zeros_quarter_time_zone
-    assert_zeros :quarter, "2013-04-16 20:00:00 PDT", ["2013-01-01 00:00:00 PST", "2013-04-01 00:00:00 PDT", "2013-07-01 00:00:00 PDT"], "2013-01-01 00:00:00 PST", "2013-09-30 23:59:59 PDT", true
+    assert_zeros_date :quarter, "2013-04-16 20:00:00 PDT", ["2013-01-01", "2013-04-01", "2013-07-01"], "2013-01-01 00:00:00 PST", "2013-09-30 23:59:59 PDT", true
   end
 
   def test_zeros_year
-    assert_zeros :year, "2013-04-16 20:00:00 UTC", ["2012-01-01 00:00:00 UTC", "2013-01-01 00:00:00 UTC", "2014-01-01 00:00:00 UTC"], "2012-01-01 00:00:00 UTC", "2014-12-31 23:59:59 UTC"
+    assert_zeros_date :year, "2013-04-16 20:00:00 UTC", ["2012-01-01", "2013-01-01", "2014-01-01"], "2012-01-01", "2014-12-31 23:59:59 UTC"
   end
 
   def test_zeros_year_time_zone
-    assert_zeros :year, "2013-04-16 20:00:00 PDT", ["2012-01-01 00:00:00 PST", "2013-01-01 00:00:00 PST", "2014-01-01 00:00:00 PST"], "2012-01-01 00:00:00 PST", "2014-12-31 23:59:59 PST", true
+    assert_zeros_date :year, "2013-04-16 20:00:00 PDT", ["2012-01-01 00:00:00 PST", "2013-01-01 00:00:00 PST", "2014-01-01 00:00:00 PST"], "2012-01-01 00:00:00 PST", "2014-12-31 23:59:59 PST", true
   end
 
   def test_zeros_day_of_week
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     expected = {}
     7.times do |n|
       expected[n] = n == 3 ? 1 : 0
     end
-    assert_equal expected, call_method(:day_of_week, :created_at, {})
+    assert_equal expected, call_method(:day_of_week, :created_at, {series: true})
   end
 
   def test_zeros_hour_of_day
@@ -835,130 +835,130 @@ module TestGroupdate
     24.times do |n|
       expected[n] = n == 20 ? 1 : 0
     end
-    assert_equal expected, call_method(:hour_of_day, :created_at, {})
+    assert_equal expected, call_method(:hour_of_day, :created_at, {series: true})
   end
 
   def test_zeros_day_of_month
-    create_user "1978-12-18 00:00:00 UTC"
+    create_user "1978-12-18"
     expected = {}
     (1..31).each do |n|
       expected[n] = n == 18 ? 1 : 0
     end
-    assert_equal expected, call_method(:day_of_month, :created_at, {})
+    assert_equal expected, call_method(:day_of_month, :created_at, {series: true})
   end
 
   def test_zeros_month_of_year
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     expected = {}
     (1..12).each do |n|
       expected[n] = n == 5 ? 1 : 0
     end
-    assert_equal expected, call_method(:month_of_year, :created_at, {})
+    assert_equal expected, call_method(:month_of_year, :created_at, {series: true})
   end
 
   def test_zeros_excludes_end
-    create_user "2013-05-02 00:00:00 UTC"
+    create_user "2013-05-02"
     expected = {
-      utc.parse("2013-05-01 00:00:00 UTC") => 0
+      Date.parse("2013-05-01") => 0
     }
-    assert_equal expected, call_method(:day, :created_at, range: Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC"))
+    assert_equal expected, call_method(:day, :created_at, range: Date.parse("2013-05-01")...Date.parse("2013-05-02"), series: true)
   end
 
   def test_zeros_datetime
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     expected = {
-      utc.parse("2013-05-01 00:00:00 UTC") => 1
+      Date.parse("2013-05-01") => 1
     }
-    assert_equal expected, call_method(:day, :created_at, range: DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC"))
+    assert_equal expected, call_method(:day, :created_at, range: DateTime.parse("2013-05-01")..DateTime.parse("2013-05-01"), series: true)
   end
 
   def test_zeros_null_value
     create_user nil
-    assert_equal 0, call_method(:hour_of_day, :created_at, range: true)[0]
+    assert_equal 0, call_method(:hour_of_day, :created_at, range: true, series: true)[0]
   end
 
   def test_zeroes_range_true
-    create_user "2013-05-01 00:00:00 UTC"
-    create_user "2013-05-03 00:00:00 UTC"
+    create_user "2013-05-01"
+    create_user "2013-05-03"
     expected = {
-      utc.parse("2013-05-01 00:00:00 UTC") => 1,
-      utc.parse("2013-05-02 00:00:00 UTC") => 0,
-      utc.parse("2013-05-03 00:00:00 UTC") => 1
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => 0,
+      Date.parse("2013-05-03") => 1
     }
-    assert_equal expected, call_method(:day, :created_at, range: true)
+    assert_equal expected, call_method(:day, :created_at, range: true, series: true)
   end
 
   # week_start
 
   def test_week_start
     Groupdate.week_start = :mon
-    assert_result_time :week, "2013-03-18 00:00:00 UTC", "2013-03-24 23:59:59"
+    assert_result_date :week, "2013-03-18", "2013-03-24 23:59:59"
   end
 
   def test_week_start_and_start_option
     Groupdate.week_start = :mon
-    assert_result_time :week, "2013-03-16 00:00:00 UTC", "2013-03-22 23:59:59", false, week_start: :sat
+    assert_result_date :week, "2013-03-16", "2013-03-22 23:59:59", false, week_start: :sat
   end
 
   # misc
 
   def test_order_hour_of_day_reverse_option
-    assert_equal 23, call_method(:hour_of_day, :created_at, reverse: true).keys.first
+    assert_equal 23, call_method(:hour_of_day, :created_at, reverse: true, series: true).keys.first
   end
 
   def test_time_zone
-    create_user "2013-05-01 00:00:00 UTC"
+    create_user "2013-05-01"
     time_zone = "Pacific Time (US & Canada)"
-    assert_equal time_zone, call_method(:day, :created_at, time_zone: time_zone).keys.first.time_zone.name
+    assert_equal time_zone, call_method(:hour, :created_at, time_zone: time_zone).keys.first.time_zone.name
   end
 
   def test_format_day
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :day, "March 1, 2014", "%B %-e, %Y"
   end
 
   def test_format_month
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :month, "March 2014", "%B %Y"
   end
 
   def test_format_quarter
-    create_user "2014-03-05 00:00:00 UTC"
+    create_user "2014-03-05"
     assert_format :quarter, "January 1, 2014", "%B %-e, %Y"
   end
 
   def test_format_year
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :year, "2014", "%Y"
   end
 
   def test_format_hour_of_day
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :hour_of_day, "12 am", "%-l %P"
   end
 
   def test_format_hour_of_day_day_start
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :hour_of_day, "2 am", "%-l %P", day_start: 2
   end
 
   def test_format_day_of_week
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :day_of_week, "Sun", "%a"
   end
 
   def test_format_day_of_week_week_start
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :day_of_week, "Sun", "%a", week_start: :sat
   end
 
   def test_format_day_of_month
-    create_user "2014-03-01 00:00:00 UTC"
+    create_user "2014-03-01"
     assert_format :day_of_month, " 1", "%e"
   end
 
   def test_format_month_of_year
-    create_user "2014-01-01 00:00:00 UTC"
+    create_user "2014-01-01"
     assert_format :month_of_year, "Jan", "%b"
   end
 
@@ -983,17 +983,17 @@ module TestGroupdate
   # day start
 
   def test_day_start_decimal_end_of_day
-    assert_result_time :day, "2013-05-03 02:30:00 UTC", "2013-05-04 02:29:59", false, day_start: 2.5
+    assert_result_date :day, "2013-05-03", "2013-05-04 02:29:59", false, day_start: 2.5
   end
 
   def test_day_start_decimal_start_of_day
-    assert_result_time :day, "2013-05-03 02:30:00 UTC", "2013-05-03 02:30:00", false, day_start: 2.5
+    assert_result_date :day, "2013-05-03", "2013-05-03 02:30:00", false, day_start: 2.5
   end
 
   # helpers
 
   def assert_format(method, expected, format, options = {})
-    assert_equal expected, call_method(method, :created_at, options.merge(format: format)).keys.first
+    assert_equal expected, call_method(method, :created_at, options.merge(format: format, series: true)).keys.first
   end
 
   def assert_result_time(method, expected, time_str, time_zone = false, options = {})
@@ -1001,6 +1001,15 @@ module TestGroupdate
     assert_equal expected, result(method, time_str, time_zone, options)
   end
 
+  def assert_result_date(method, expected_str, time_str, time_zone = false, options = {})
+    create_user time_str
+    expected = {Date.parse(expected_str) => 1}
+    assert_equal expected, call_method(method, :created_at, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil))
+    expected = {(time_zone ? pt : utc).parse(expected_str) + options[:day_start].to_f.hours => 1}
+    assert_equal expected, call_method(method, :created_at, options.merge(dates: false, time_zone: time_zone ? "Pacific Time (US & Canada)" : nil))
+    # assert_equal expected, call_method(method, :created_on, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil))
+  end
+
   def assert_result(method, expected, time_str, time_zone = false, options = {})
     assert_equal 1, result(method, time_str, time_zone, options)[expected]
   end
@@ -1016,7 +1025,16 @@ module TestGroupdate
     keys.each_with_index do |key, i|
       expected[utc.parse(key).in_time_zone(time_zone ? "Pacific Time (US & Canada)" : utc)] = i == 1 ? 1 : 0
     end
-    assert_equal expected, call_method(method, :created_at, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end)))
+    assert_equal expected, call_method(method, :created_at, options.merge(series: true, time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end)))
+  end
+
+  def assert_zeros_date(method, created_at, keys, range_start, range_end, time_zone = nil, options = {})
+    create_user created_at
+    expected = {}
+    keys.each_with_index do |key, i|
+      expected[Date.parse(key)] = i == 1 ? 1 : 0
+    end
+    assert_equal expected, call_method(method, :created_at, options.merge(series: true, time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end)))
   end
 
   def this_year
@@ -1027,6 +1045,10 @@ module TestGroupdate
     ActiveSupport::TimeZone["UTC"]
   end
 
+  def pt
+    ActiveSupport::TimeZone["Pacific Time (US & Canada)"]
+  end
+
   def brasilia
     ActiveSupport::TimeZone["Brasilia"]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport