groupdate 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034c6a221a1b829973a2144cc5cd08a8553b004e
-  data.tar.gz: bf9e8fcc113763a0362b1d14e027033f5abca1dc
+  metadata.gz: 2e5361eb118741ab6aae412f5463db1813f85fe2
+  data.tar.gz: 0aa40c54eadeb578914db75567bff930fb0dbef8
 SHA512:
-  metadata.gz: b394b615b8f63f0c5666ea48fa45a4a6260b9c86c928c60d948d1f4b845a92e58fa6015189927a94eae945c3f2c24de43cff49a889b53b0583ab1b313c95753e
-  data.tar.gz: 77468a2939c378c27323a13115f5129d2ff38b35b6f5e34d9be8c67ff0e346981b835adc54ccb000a59b3d842b857bb6094dee2f34631608c83b2462f8f19024
+  metadata.gz: e642a4eb6084d4a1d339a193b549dd34e13298d082f42ecc58b02803c37296e62d8f5df7773a5cfbe4e8ba087ece17b7b52c362219d0cc307ab2210e25a88f4e
+  data.tar.gz: f55793c8987b1dd1d49ce7dbba35ddaf8033e5a4b627e983b208df5daf296b150afc4816fcd8c425bfaccc1c3842a83af631cb50e5d21b0fa700d36ef563b5e7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.5.3
+
+- All tests green with `mysql` gem
+- Added support for decimal day start
+
 ## 2.5.2
 
 - Added `dates` option to return dates for day, week, month, quarter, and year

data/README.md

@@ -21,8 +21,6 @@ Supports PostgreSQL and MySQL, plus arrays and hashes
 
 ## Get Started
 
-Group by day
-
 ```ruby
 User.group_by_day(:created_at).count
 # {
@@ -34,11 +32,12 @@ User.group_by_day(:created_at).count
 
 Results are returned in ascending order by default, so no need to sort.
 
-You can also group by:
+You can group by:
 
 - second
 - minute
 - hour
+- day
 - week
 - month
 - quarter
@@ -72,7 +71,7 @@ User.group_by_week(:created_at, time_zone: "Pacific Time (US & Canada)").count
 # }
 ```
 
-Time zone objects also work.
+Time zone objects also work. To see a list of available time zones in Rails, run `rake time:zones:all`.
 
 ### Week Start
 
@@ -138,7 +137,9 @@ User.group_by_day(:created_at).order("day desc").count
 
 ### Keys
 
-To get keys as date objects instead of time objects, use:
+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

data/lib/groupdate.rb

@@ -16,9 +16,7 @@ module Groupdate
 end
 
 require "groupdate/enumerable"
-begin
-  require "active_record"
-rescue LoadError
-  # do nothing
+
+ActiveSupport.on_load(:active_record) do
+  require "groupdate/active_record"
 end
-require "groupdate/active_record" if defined?(ActiveRecord)

data/lib/groupdate/magic.rb

@@ -36,17 +36,17 @@ module Groupdate
           case field
           when :day_of_week # Sunday = 0, Monday = 1, etc
             # use CONCAT for consistent return type (String)
-            ["DAYOFWEEK(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?)) - 1", time_zone]
+            ["DAYOFWEEK(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?)) - 1", time_zone]
           when :hour_of_day
-            ["(EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)) + 24 - #{day_start}) % 24", time_zone]
+            ["(EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)) + 24 - #{day_start / 3600}) % 24", time_zone]
           when :day_of_month
-            ["DAYOFMONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?))", time_zone]
+            ["DAYOFMONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?))", time_zone]
           when :month_of_year
-            ["MONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?))", time_zone]
+            ["MONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?))", time_zone]
           when :week
-            ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL ((#{7 - week_start} + WEEKDAY(CONVERT_TZ(#{column}, '+00:00', ?) - INTERVAL #{day_start} HOUR)) % 7) DAY) - INTERVAL #{day_start} HOUR, '+00:00', ?), '%Y-%m-%d 00:00:00') + INTERVAL #{day_start} HOUR, ?, '+00:00')", time_zone, time_zone, time_zone]
+            ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL ((#{7 - week_start} + WEEKDAY(CONVERT_TZ(#{column}, '+00:00', ?) - INTERVAL #{day_start} second)) % 7) DAY) - INTERVAL #{day_start} second, '+00:00', ?), '%Y-%m-%d 00:00:00') + INTERVAL #{day_start} second, ?, '+00:00')", time_zone, time_zone, time_zone]
           when :quarter
-            ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(DATE(CONCAT(EXTRACT(YEAR FROM CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?)), '-', LPAD(1 + 3 * (QUARTER(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?)) - 1), 2, '00'), '-01')), '%Y-%m-%d %H:%i:%S'), ?, '+00:00'), INTERVAL #{day_start} HOUR)", time_zone, time_zone, time_zone]
+            ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(DATE(CONCAT(EXTRACT(YEAR FROM CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?)), '-', LPAD(1 + 3 * (QUARTER(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?)) - 1), 2, '00'), '-01')), '%Y-%m-%d %H:%i:%S'), ?, '+00:00'), INTERVAL #{day_start} second)", time_zone, time_zone, time_zone]
           else
             format =
               case field
@@ -64,27 +64,31 @@ module Groupdate
                 "%Y-01-01 00:00:00"
               end
 
-            ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+00:00', ?), '#{format}'), ?, '+00:00'), INTERVAL #{day_start} HOUR)", time_zone, time_zone]
+            ["DATE_ADD(CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?), '#{format}'), ?, '+00:00'), INTERVAL #{day_start} second)", time_zone, time_zone]
           end
         when "PostgreSQL", "PostGIS"
           case field
           when :day_of_week
-            ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::integer", time_zone]
+            ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} second')::integer", time_zone]
           when :hour_of_day
-            ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::integer", time_zone]
+            ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} second')::integer", time_zone]
           when :day_of_month
-            ["EXTRACT(DAY from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::integer", time_zone]
+            ["EXTRACT(DAY from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} second')::integer", time_zone]
           when :month_of_year
-            ["EXTRACT(MONTH from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::integer", time_zone]
+            ["EXTRACT(MONTH from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} second')::integer", time_zone]
           when :week # start on Sunday, not PostgreSQL default Monday
-            ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{week_start} day' - INTERVAL '#{day_start}' hour) AT TIME ZONE ?) + INTERVAL '#{week_start} day' + INTERVAL '#{day_start}' hour) AT TIME ZONE ?", time_zone, time_zone]
+            ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{week_start} day' - INTERVAL '#{day_start} second') AT TIME ZONE ?) + INTERVAL '#{week_start} day' + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
           else
-            ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{day_start} hour') AT TIME ZONE ?) + INTERVAL '#{day_start} hour') AT TIME ZONE ?", time_zone, time_zone]
+            ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{day_start} second') AT TIME ZONE ?) + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
           end
         else
           raise "Connection adapter not supported: #{adapter_name}"
         end
 
+      if adapter_name == "MySQL" && field == :week
+        query[0] = "CAST(#{query[0]} AS DATETIME)"
+      end
+
       group = relation.group(Groupdate::OrderHack.new(relation.send(:sanitize_sql_array, query), field, time_zone))
       if options[:series] == false
         group
@@ -126,7 +130,7 @@ module Groupdate
           lambda { |k| k.to_i }
         else
           utc = ActiveSupport::TimeZone["UTC"]
-          lambda { |k| (k.is_a?(String) ? utc.parse(k) : k.to_time).in_time_zone(time_zone) }
+          lambda { |k| (k.is_a?(String) || !k.respond_to?(:to_time) ? utc.parse(k.to_s) : k.to_time).in_time_zone(time_zone) }
         end
 
       count =
@@ -153,7 +157,7 @@ module Groupdate
     end
 
     def day_start
-      @day_start ||= (options[:day_start] || Groupdate.day_start).to_i
+      @day_start ||= ((options[:day_start] || Groupdate.day_start).to_f * 3600).round
     end
 
     def time_range
@@ -222,7 +226,7 @@ module Groupdate
       series =
         if multiple_groups
           keys = count.keys.map { |k| k[0...@group_index] + k[(@group_index + 1)..-1] }.uniq
-          series = series.reverse if reverse
+          series = series.to_a.reverse if reverse
           keys.flat_map do |k|
             series.map { |s| k[0...@group_index] + [s] + k[@group_index..-1] }
           end
@@ -243,7 +247,7 @@ module Groupdate
             lambda do |key|
               case field
               when :hour_of_day
-                key = sunday + key.hours + day_start.hours
+                key = sunday + key.hours + day_start.seconds
               when :day_of_week
                 key = sunday + key.days
               when :day_of_month
@@ -268,7 +272,7 @@ module Groupdate
     end
 
     def round_time(time)
-      time = time.to_time.in_time_zone(time_zone) - day_start.hours
+      time = time.to_time.in_time_zone(time_zone) - day_start.seconds
 
       time =
         case field
@@ -302,7 +306,7 @@ module Groupdate
           raise "Invalid field"
         end
 
-      time.is_a?(Time) ? time + day_start.hours : time
+      time.is_a?(Time) ? time + day_start.seconds : time
     end
 
     def activerecord42?

data/lib/groupdate/series.rb

@@ -22,5 +22,9 @@ module Groupdate
     def respond_to?(method, include_all = false)
       ActiveRecord::Calculations.method_defined?(method) || relation.respond_to?(method) || super
     end
+
+    def reverse_order_value
+      nil
+    end
   end
 end

data/lib/groupdate/version.rb

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

data/test/enumerable_test.rb

@@ -1,11 +1,12 @@
 require_relative "test_helper"
+require "ostruct"
 
 class TestEnumerable < Minitest::Test
   include TestGroupdate
 
   def test_enumerable
-    user_a = User.new(created_at: utc.parse("2014-01-21"))
-    user_b = User.new(created_at: utc.parse("2014-03-14"))
+    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") => [],
@@ -19,6 +20,31 @@ class TestEnumerable < Minitest::Test
   end
 
   def call_method(method, field, options)
-    Hash[User.all.to_a.group_by_period(method, options) { |u| u.send(field) }.map { |k, v| [k, v.size] }]
+    Hash[@users.group_by_period(method, options) { |u| u.send(field) }.map { |k, v| [k, v.size] }]
+  end
+
+  def create_user(created_at, score = 1)
+    user =
+      OpenStruct.new(
+        name: "Andrew",
+        score: score,
+        created_at: created_at ? utc.parse(created_at) : nil,
+        created_on: created_at ? Date.parse(created_at) : nil
+      )
+    @users << user
+    user
+  end
+
+  def setup
+    super
+    @users = []
+  end
+
+  def teardown
+    # do nothing
+  end
+
+  def enumerable_test?
+    true
   end
 end

data/test/mysql_test.rb

@@ -2,9 +2,14 @@ require_relative "test_helper"
 
 class TestMysql < Minitest::Test
   include TestGroupdate
+  include TestDatabase
 
   def setup
     super
-    User.establish_connection adapter: "mysql2", database: "groupdate_test", username: "root"
+    @@setup ||= begin
+      ActiveRecord::Base.establish_connection adapter: "mysql2", database: "groupdate_test", username: "root"
+      create_tables
+      true
+    end
   end
 end

data/test/postgresql_test.rb

@@ -2,13 +2,14 @@ require_relative "test_helper"
 
 class TestPostgresql < Minitest::Test
   include TestGroupdate
+  include TestDatabase
 
   def setup
     super
-    User.establish_connection adapter: "postgresql", database: "groupdate_test"
-  end
-
-  def test_no_column
-    assert_raises(ArgumentError) { User.group_by_day.first }
+    @@setup ||= begin
+      ActiveRecord::Base.establish_connection adapter: "postgresql", database: "groupdate_test"
+      create_tables
+      true
+    end
   end
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
 require "logger"
+require "active_record"
 
 Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
 
@@ -32,13 +33,14 @@ time: {
 }
 
 # migrations
-%w(postgresql mysql2).each do |adapter|
-  ActiveRecord::Base.establish_connection adapter: adapter, database: "groupdate_test", username: adapter == "mysql2" ? "root" : nil
+def create_tables
+  ActiveRecord::Migration.verbose = false
 
   ActiveRecord::Migration.create_table :users, force: true do |t|
     t.string :name
     t.integer :score
     t.timestamp :created_at
+    t.date :created_on
   end
 
   ActiveRecord::Migration.create_table :posts, force: true do |t|
@@ -47,6 +49,304 @@ time: {
   end
 end
 
+module TestDatabase
+  def test_zeros_previous_scope
+    create_user "2013-05-01 00:00:00 UTC"
+    expected = {
+      utc.parse("2013-05-01 00:00:00 UTC") => 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
+  end
+
+  def test_order_hour_of_day
+    assert_equal 23, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count.keys.first
+  end
+
+  def test_order_hour_of_day_case
+    assert_equal 23, User.group_by_hour_of_day(:created_at).order("hour_of_day DESC").count.keys.first
+  end
+
+  def test_order_hour_of_day_reverse
+    skip if ActiveRecord::VERSION::MAJOR == 5
+    assert_equal 23, User.group_by_hour_of_day(:created_at).reverse_order.count.keys.first
+  end
+
+  def test_order_hour_of_day_order_reverse
+    skip if ActiveRecord::VERSION::MAJOR == 5
+    assert_equal 0, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").reverse_order.count.keys.first
+  end
+
+  def test_table_name
+    assert_empty User.group_by_day("users.created_at").count
+  end
+
+  def test_previous_scopes
+    create_user "2013-05-01 00:00:00 UTC"
+    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
+  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
+    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
+    }
+    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
+    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
+    }
+    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
+    expected = {
+      [1, 0] => 0,
+      [1, 1] => 0,
+      [1, 2] => 0,
+      [1, 3] => 1,
+      [1, 4] => 0,
+      [1, 5] => 0,
+      [1, 6] => 0,
+      [2, 0] => 0,
+      [2, 1] => 0,
+      [2, 2] => 0,
+      [2, 3] => 0,
+      [2, 4] => 1,
+      [2, 5] => 1,
+      [2, 6] => 0
+    }
+    assert_equal expected, User.group(:score).group_by_day_of_week(:created_at).count
+  end
+
+  def test_groupdate_multiple
+    create_user "2013-05-01 00:00:00 UTC", 1
+    expected = {
+      [utc.parse("2013-05-01 00:00:00 UTC"), utc.parse("2013-01-01 00:00:00 UTC")] => 1
+    }
+    assert_equal expected, User.group_by_day(:created_at).group_by_year(:created_at).count
+  end
+
+  def test_groupdate_multiple_hour_of_day_day_of_week
+    create_user "2013-05-01 00:00:00 UTC", 1
+    expected = {}
+    24.times do |i|
+      7.times do |j|
+        expected[[i, j]] = i == 0 && j == 3 ? 1 : 0
+      end
+    end
+    assert_equal expected, User.group_by_hour_of_day(:created_at).group_by_day_of_week(:created_at).count
+  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}
+    relation = User.group_by_day(:created_at)
+    relation.where("created_at > ?", "2013-05-01 00:00:00 UTC")
+    assert_equal expected, relation.count
+  end
+
+  def test_bad_method
+    assert_raises(NoMethodError) { User.group_by_day(:created_at).no_such_method }
+  end
+
+  def test_respond_to_where
+    assert User.group_by_day(:created_at).respond_to?(:order)
+  end
+
+  def test_respond_to_bad_method
+    assert !User.group_by_day(:created_at).respond_to?(:no_such_method)
+  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"
+    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
+    }
+    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"
+    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
+    }
+    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"
+    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"
+    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"
+    I18n.locale = :de
+    assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b").count
+  ensure
+    I18n.locale = :en
+  end
+
+  def test_format_multiple_groups
+    create_user "2014-03-01 00:00:00 UTC"
+    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
+
+  # permit
+
+  def test_permit
+    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w(week)).count }
+  end
+
+  def test_permit_bad_period
+    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:bad_period, :created_at).count }
+  end
+
+  def test_permit_symbol_symbols
+    assert_equal ({}), User.group_by_period(:day, :created_at, permit: [:day]).count
+  end
+
+  def test_permit_string_symbols
+    assert_equal ({}), User.group_by_period("day", :created_at, permit: [:day]).count
+  end
+
+  def test_permit_symbol_strings
+    assert_equal ({}), User.group_by_period(:day, :created_at, permit: %w(day)).count
+  end
+
+  def test_permit_string_strings
+    assert_equal ({}), User.group_by_period("day", :created_at, permit: %w(day)).count
+  end
+
+  # default value
+
+  def test_default_value
+    create_user "#{this_year}-01-01 00:00:00 UTC"
+    expected = {
+      utc.parse("#{this_year - 1}-01-01 00:00:00 UTC") => nil,
+      utc.parse("#{this_year}-01-01 00:00:00 UTC") => 1
+    }
+    assert_equal expected, User.group_by_year(:created_at, last: 2, default_value: nil).count
+  end
+
+  # associations
+
+  def test_associations
+    user = create_user("2014-03-01 00:00:00 UTC")
+    user.posts.create!(created_at: "2014-04-01 00:00:00 UTC")
+    expected = {
+      utc.parse("2014-04-01 00:00:00 UTC") => 1
+    }
+    assert_equal expected, user.posts.group_by_day(:created_at).count
+  end
+
+  # activerecord default_timezone option
+
+  def test_default_timezone_local
+    User.default_timezone = :local
+    assert_raises(RuntimeError) { User.group_by_day(:created_at).count }
+  ensure
+    User.default_timezone = :utc
+  end
+
+  # Brasilia Summer Time
+
+  def test_brasilia_summer_time
+    # must parse and convert to UTC for ActiveRecord 3.1
+    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
+    }
+    assert_equal expected, User.group_by_day(:created_at, time_zone: "Brasilia").count
+  end
+
+  # 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")]
+  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
+
+  def test_no_column
+    assert_raises(ArgumentError) { User.group_by_day.first }
+  end
+
+  def call_method(method, field, options)
+    User.group_by_period(method, field, options).count
+  end
+
+  def create_user(created_at, score = 1)
+    user =
+      User.create!(
+        name: "Andrew",
+        score: score,
+        created_at: created_at ? utc.parse(created_at) : nil,
+        created_on: created_at ? Date.parse(created_at) : nil
+      )
+
+    # hack for MySQL adapter
+    user.update_attributes(created_at: nil, created_on: nil) if created_at.nil?
+
+    user
+  end
+
+  def teardown
+    User.delete_all
+  end
+
+  def enumerable_test?
+    false
+  end
+end
+
 module TestGroupdate
   def setup
     Groupdate.week_start = :sun
@@ -55,7 +355,7 @@ module TestGroupdate
   # second
 
   def test_second_end_of_second
-    if ActiveRecord::Base.connection.adapter_name == "Mysql2" && ActiveRecord::VERSION::STRING.starts_with?("4.2.")
+    if enumerable_test? || (ActiveRecord::Base.connection.adapter_name == "Mysql2" && ActiveRecord::VERSION::STRING.starts_with?("4.2."))
       skip # no millisecond precision
     else
       assert_result_time :second, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:00.999"
@@ -564,14 +864,6 @@ module TestGroupdate
     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"))
   end
 
-  def test_zeros_previous_scope
-    create_user "2013-05-01 00:00:00 UTC"
-    expected = {
-      utc.parse("2013-05-01 00:00:00 UTC") => 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
-  end
-
   def test_zeros_datetime
     create_user "2013-05-01 00:00:00 UTC"
     expected = {
@@ -581,8 +873,7 @@ module TestGroupdate
   end
 
   def test_zeros_null_value
-    user = User.create!(name: "Andrew")
-    user.update_column :created_at, nil
+    create_user nil
     assert_equal 0, call_method(:hour_of_day, :created_at, range: true)[0]
   end
 
@@ -611,152 +902,16 @@ module TestGroupdate
 
   # misc
 
-  def test_order_hour_of_day
-    assert_equal 23, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count.keys.first
-  end
-
-  def test_order_hour_of_day_case
-    assert_equal 23, User.group_by_hour_of_day(:created_at).order("hour_of_day DESC").count.keys.first
-  end
-
-  def test_order_hour_of_day_reverse
-    skip if ActiveRecord::VERSION::MAJOR == 5
-    assert_equal 23, User.group_by_hour_of_day(:created_at).reverse_order.count.keys.first
-  end
-
-  def test_order_hour_of_day_order_reverse
-    skip if ActiveRecord::VERSION::MAJOR == 5
-    assert_equal 0, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").reverse_order.count.keys.first
-  end
-
   def test_order_hour_of_day_reverse_option
     assert_equal 23, call_method(:hour_of_day, :created_at, reverse: true).keys.first
   end
 
-  def test_table_name
-    assert_empty User.group_by_day("users.created_at").count
-  end
-
-  def test_previous_scopes
-    create_user "2013-05-01 00:00:00 UTC"
-    assert_empty User.where("id = 0").group_by_day(:created_at).count
-  end
-
   def test_time_zone
     create_user "2013-05-01 00:00:00 UTC"
     time_zone = "Pacific Time (US & Canada)"
     assert_equal time_zone, call_method(:day, :created_at, time_zone: time_zone).keys.first.time_zone.name
   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
-  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
-    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
-    }
-    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
-    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
-    }
-    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
-    expected = {
-      [1, 0] => 0,
-      [1, 1] => 0,
-      [1, 2] => 0,
-      [1, 3] => 1,
-      [1, 4] => 0,
-      [1, 5] => 0,
-      [1, 6] => 0,
-      [2, 0] => 0,
-      [2, 1] => 0,
-      [2, 2] => 0,
-      [2, 3] => 0,
-      [2, 4] => 1,
-      [2, 5] => 1,
-      [2, 6] => 0
-    }
-    assert_equal expected, User.group(:score).group_by_day_of_week(:created_at).count
-  end
-
-  def test_groupdate_multiple
-    create_user "2013-05-01 00:00:00 UTC", 1
-    expected = {
-      [utc.parse("2013-05-01 00:00:00 UTC"), utc.parse("2013-01-01 00:00:00 UTC")] => 1
-    }
-    assert_equal expected, User.group_by_day(:created_at).group_by_year(:created_at).count
-  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}
-    relation = User.group_by_day(:created_at)
-    relation.where("created_at > ?", "2013-05-01 00:00:00 UTC")
-    assert_equal expected, relation.count
-  end
-
-  def test_bad_method
-    assert_raises(NoMethodError) { User.group_by_day(:created_at).no_such_method }
-  end
-
-  def test_respond_to_where
-    assert User.group_by_day(:created_at).respond_to?(:order)
-  end
-
-  def test_respond_to_bad_method
-    assert !User.group_by_day(:created_at).respond_to?(:no_such_method)
-  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"
-    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
-    }
-    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"
-    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
-    }
-    assert_equal expected, User.group_by_year(:created_at, last: 2, current: false).count
-  end
-
   def test_format_day
     create_user "2014-03-01 00:00:00 UTC"
     assert_format :day, "March 1, 2014", "%B %-e, %Y"
@@ -807,110 +962,32 @@ module TestGroupdate
     assert_format :month_of_year, "Jan", "%b"
   end
 
-  def test_format_locale
-    create_user "2014-10-01 00:00:00 UTC"
-    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"
-    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"
-    I18n.locale = :de
-    assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b").count
-  ensure
-    I18n.locale = :en
-  end
-
-  def test_format_multiple_groups
-    create_user "2014-03-01 00:00:00 UTC"
-    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
-
-  # permit
-
-  def test_permit
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w(week)).count }
-  end
-
-  def test_permit_bad_period
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:bad_period, :created_at).count }
-  end
-
-  def test_permit_symbol_symbols
-    assert_equal ({}), User.group_by_period(:day, :created_at, permit: [:day]).count
-  end
-
-  def test_permit_string_symbols
-    assert_equal ({}), User.group_by_period("day", :created_at, permit: [:day]).count
-  end
-
-  def test_permit_symbol_strings
-    assert_equal ({}), User.group_by_period(:day, :created_at, permit: %w(day)).count
-  end
-
-  def test_permit_string_strings
-    assert_equal ({}), User.group_by_period("day", :created_at, permit: %w(day)).count
-  end
-
-  # default value
+  # date column
 
-  def test_default_value
-    create_user "#{this_year}-01-01 00:00:00 UTC"
+  def test_date_column
     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("2013-05-03") => 1
     }
-    assert_equal expected, User.group_by_year(:created_at, last: 2, default_value: nil).count
-  end
-
-  # associations
-
-  def test_associations
-    user = create_user("2014-03-01 00:00:00 UTC")
-    assert_empty user.posts.group_by_day(:created_at).count
-  end
-
-  # activerecord default_timezone option
-
-  def test_default_timezone_local
-    User.default_timezone = :local
-    assert_raises(RuntimeError) { User.group_by_day(:created_at).count }
-  ensure
-    User.default_timezone = :utc
+    assert_equal expected, result(:day, "2013-05-03", false, dates: true)
   end
 
-  # Brasilia Summer Time
-
-  def test_brasilia_summer_time
-    # must parse and convert to UTC for ActiveRecord 3.1
-    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)
+  def test_date_column_with_time_zone
+    # TODO change for Groupdate 3.0
+    skip
     expected = {
-      brasilia.parse("2014-10-19 01:00:00") => 1,
-      brasilia.parse("2014-10-20 00:00:00") => 1
+      Date.parse("2013-05-03") => 1
     }
-    assert_equal expected, User.group_by_day(:created_at, time_zone: "Brasilia").count
+    assert_equal expected, result(:day, "2013-05-03", true, dates: true)
   end
 
-  # carry_forward option
+  # day start
 
-  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")]
+  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
   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
+  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
   end
 
   # helpers
@@ -942,14 +1019,6 @@ module TestGroupdate
     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)))
   end
 
-  def call_method(method, field, options)
-    User.group_by_period(method, field, options).count
-  end
-
-  def create_user(created_at, score = 1)
-    User.create! name: "Andrew", score: score, created_at: utc.parse(created_at)
-  end
-
   def this_year
     Time.now.utc.year
   end
@@ -961,8 +1030,4 @@ module TestGroupdate
   def brasilia
     ActiveSupport::TimeZone["Brasilia"]
   end
-
-  def teardown
-    User.delete_all
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data