groupdate 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b555424def0887e8b0ab933f26c84844a6e9b8b
-  data.tar.gz: c16d375c965c0d289ffc8476435b47b61e09ebf2
+  metadata.gz: e50a64260e2d0aa3ce8675cce56a1b074c4e1bff
+  data.tar.gz: 08366d6b98a953349a1dff0e1585de45d3f4ff05
 SHA512:
-  metadata.gz: 835b67dacd82ce1fde549847fcf2647cad712ef75a14841c13b42d06ce95f606c4f5db124f0795dedace821d9c0113211b6d4c011a9c29cfc717fe2cbbc4e643
-  data.tar.gz: 3cb677877505d1f09ad3067fbc0777f4db8d0330429710d43f38544b0782dec7ce1c98f7f9d488c947f9c8de4bb638fced6475e98514c06c6a4ad72891852a01
+  metadata.gz: cc9ae556196bbb405d1524d55b770a67b4b68647fc54332636e01b65e325221158cbb90bfd4868d47e7a6c8d86f267e507da0bb9213aff7c0322d8943214096f
+  data.tar.gz: 63b2478668b5f76a29b4c72beffa227402eedd5671a9b4da7ad88a748373847e6ae5c181b64c0ec692c637c3914313e2731919e8356f0b03e33e3733313a13a1

data/.travis.yml

@@ -1,16 +1,18 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.2
+  - 2.2.4
   - jruby
 gemfile:
   - Gemfile
-  - gemfiles/activerecord31.gemfile
-  - gemfiles/activerecord32.gemfile
-  - gemfiles/activerecord40.gemfile
-  - gemfiles/activerecord41.gemfile
+  - test/gemfiles/activerecord31.gemfile
+  - test/gemfiles/activerecord32.gemfile
+  - test/gemfiles/activerecord40.gemfile
+  - test/gemfiles/activerecord41.gemfile
+  - test/gemfiles/activerecord50.gemfile
+sudo: false
 script: bundle exec rake test
-before_script:
+before_install:
+  - gem install bundler
   - mysql -e 'create database groupdate_test;'
   - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
   - psql -c 'create database groupdate_test;' -U postgres
@@ -22,3 +24,4 @@ matrix:
   allow_failures:
     - rvm: jruby
       gemfile: Gemfile
+    - gemfile: test/gemfiles/activerecord50.gemfile

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.5.1
+
+- Added `group_by_quarter`
+- Added `default_value` option
+- Accept symbol for `format` option
+- Raise `ArgumentError` if no field specified
+- Added support for ActiveRecord 5 beta
+
 ## 2.5.0
 
 - Added `group_by_period` method

data/README.md

@@ -41,6 +41,7 @@ You can also group by:
 - hour
 - week
 - month
+- quarter
 - year
 
 and
@@ -140,10 +141,10 @@ User.group_by_day(:created_at).order("day desc").count
 To get keys in a different format, use:
 
 ```ruby
-User.group_by_day(:created_at, format: "%b %-e, %Y").count
+User.group_by_month(:created_at, format: "%b %Y").count
 # {
-#   "Jan 1, 2015" => 10
-#   "Jan 2, 2015" => 12
+#   "Jan 2015" => 10
+#   "Feb 2015" => 12
 # }
 ```
 
@@ -158,7 +159,7 @@ User.group_by_hour_of_day(:created_at, format: "%-l %P").count
 # }
 ```
 
-Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Proc`.  You can pass a locale with the `locale` option.
+Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Symbol`, which is looked up by `I18n.localize` in `i18n` scope 'time.formats', or a `Proc`.  You can pass a locale with the `locale` option.
 
 ### Dynamic Grouping
 

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"

data/lib/groupdate.rb

@@ -4,8 +4,10 @@ require "groupdate/version"
 require "groupdate/magic"
 
 module Groupdate
-  FIELDS = [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
-  METHODS = FIELDS.map { |v| :"group_by_#{v}" }
+  PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
+  # backwards compatibility for anyone who happened to use it
+  FIELDS = PERIODS
+  METHODS = PERIODS.map { |v| :"group_by_#{v}" }
 
   mattr_accessor :week_start, :day_start, :time_zone
   self.week_start = :sun

data/lib/groupdate/active_record.rb

@@ -26,25 +26,27 @@ module ActiveRecord
   module Associations
     class CollectionProxy
       if ActiveRecord::VERSION::MAJOR == 3
-        delegate *Groupdate::METHODS, :to => :scoped
+        delegate *Groupdate::METHODS, to: :scoped
       end
     end
   end
 end
 
-# hack for **unfixed** rails issue
+# hack for issue before Rails 5
 # https://github.com/rails/rails/issues/7121
 module ActiveRecord
   module Calculations
     private
 
-    def column_alias_for_with_hack(*keys)
-      if keys.first.is_a?(Groupdate::OrderHack)
-        keys.first.field
-      else
-        column_alias_for_without_hack(*keys)
+    if ActiveRecord::VERSION::MAJOR < 5
+      def column_alias_for_with_hack(*keys)
+        if keys.first.is_a?(Groupdate::OrderHack)
+          keys.first.field
+        else
+          column_alias_for_without_hack(*keys)
+        end
       end
+      alias_method_chain :column_alias_for, :hack
     end
-    alias_method_chain :column_alias_for, :hack
   end
 end

data/lib/groupdate/enumerable.rb

@@ -1,8 +1,10 @@
 module Enumerable
-  Groupdate::FIELDS.each do |field|
-    define_method :"group_by_#{field}" do |options = {}, &block|
+  Groupdate::PERIODS.each do |period|
+    define_method :"group_by_#{period}" do |*args, &block|
       if block
-        Groupdate::Magic.new(field, options).group_by(self, &block)
+        Groupdate::Magic.new(period, args[0] || {}).group_by(self, &block)
+      elsif respond_to?(:scoping)
+        scoping { @klass.send(:"group_by_#{period}", *args, &block) }
       else
         raise ArgumentError, "no block given"
       end
@@ -11,7 +13,7 @@ module Enumerable
 
   def group_by_period(period, options = {}, &block)
     # to_sym is unsafe on user input, so convert to strings
-    permitted_periods = ((options[:permit] || Groupdate::FIELDS).map(&:to_sym) & Groupdate::FIELDS).map(&:to_s)
+    permitted_periods = ((options[:permit] || Groupdate::PERIODS).map(&:to_sym) & Groupdate::PERIODS).map(&:to_s)
     if permitted_periods.include?(period.to_s)
       send("group_by_#{period}", options, &block)
     else

data/lib/groupdate/magic.rb

@@ -8,13 +8,9 @@ module Groupdate
       @field = field
       @options = options
 
-      unless time_zone
-        raise "Unrecognized time zone"
-      end
+      raise "Unrecognized time zone" unless time_zone
 
-      if field == :week && !week_start
-        raise "Unrecognized :week_start option"
-      end
+      raise "Unrecognized :week_start option" if field == :week && !week_start
     end
 
     def group_by(enum, &_block)
@@ -36,7 +32,7 @@ module Groupdate
       adapter_name = relation.connection.adapter_name
       query =
         case adapter_name
-        when "MySQL", "Mysql2"
+        when "MySQL", "Mysql2", "Mysql2Spatial"
           case field
           when :day_of_week # Sunday = 0, Monday = 1, etc
             # use CONCAT for consistent return type (String)
@@ -49,6 +45,8 @@ module Groupdate
             ["MONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} HOUR), '+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]
+          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]
           else
             format =
               case field
@@ -109,9 +107,7 @@ module Groupdate
     def perform(relation, method, *args, &block)
       # undo reverse since we do not want this to appear in the query
       reverse = relation.send(:reverse_order_value)
-      if reverse
-        relation = relation.except(:reverse_order)
-      end
+      relation = relation.except(:reverse_order) if reverse
       order = relation.order_values.first
       if order.is_a?(String)
         parts = order.split(" ")
@@ -140,7 +136,7 @@ module Groupdate
           raise "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
         end
 
-      series(count, 0, multiple_groups, reverse)
+      series(count, (options.key?(:default_value) ? options[:default_value] : 0), multiple_groups, reverse)
     end
 
     protected
@@ -207,7 +203,11 @@ module Groupdate
           if time_range.first
             series = [round_time(time_range.first)]
 
-            step = 1.send(field)
+            if field == :quarter
+              step = 3.months
+            else
+              step = 1.send(field)
+            end
 
             while (next_step = round_time(series.last + step)) && time_range.cover?(next_step)
               series << next_step
@@ -231,9 +231,7 @@ module Groupdate
         end
 
       # reversed above if multiple groups
-      if !multiple_groups && reverse
-        series = series.to_a.reverse
-      end
+      series = series.to_a.reverse if !multiple_groups && reverse
 
       locale = options[:locale] || I18n.locale
       key_format =
@@ -253,7 +251,7 @@ module Groupdate
               when :month_of_year
                 key = Date.new(2014, key, 1).to_time
               end
-              I18n.localize(key, format: options[:format].to_s, locale: locale)
+              I18n.localize(key, format: options[:format], locale: locale)
             end
           end
         else
@@ -273,11 +271,11 @@ module Groupdate
       time =
         case field
         when :second
-          time.change(:usec => 0)
+          time.change(usec: 0)
         when :minute
-          time.change(:sec => 0)
+          time.change(sec: 0)
         when :hour
-          time.change(:min => 0)
+          time.change(min: 0)
         when :day
           time.beginning_of_day
         when :week
@@ -286,6 +284,8 @@ module Groupdate
           (time - ((7 - week_start + weekday) % 7).days).midnight
         when :month
           time.beginning_of_month
+        when :quarter
+          time.beginning_of_quarter
         when :year
           time.beginning_of_year
         when :hour_of_day

data/lib/groupdate/scopes.rb

@@ -1,19 +1,19 @@
 module Groupdate
   module Scopes
-    Groupdate::FIELDS.each do |field|
-      define_method :"group_by_#{field}" do |*args|
+    Groupdate::PERIODS.each do |period|
+      define_method :"group_by_#{period}" do |field, *args|
         args = args.dup
         options = args[-1].is_a?(Hash) ? args.pop : {}
-        options[:time_zone] ||= args[1] unless args[1].nil?
-        options[:range] ||= args[2] unless args[2].nil?
+        options[:time_zone] ||= args[0] unless args[0].nil?
+        options[:range] ||= args[1] unless args[1].nil?
 
-        Groupdate::Magic.new(field, options).relation(args[0], self)
+        Groupdate::Magic.new(period, options).relation(field, self)
       end
     end
 
     def group_by_period(period, field, options = {})
       # to_sym is unsafe on user input, so convert to strings
-      permitted_periods = ((options[:permit] || Groupdate::FIELDS).map(&:to_sym) & Groupdate::FIELDS).map(&:to_s)
+      permitted_periods = ((options[:permit] || Groupdate::PERIODS).map(&:to_sym) & Groupdate::PERIODS).map(&:to_s)
       if permitted_periods.include?(period.to_s)
         send("group_by_#{period}", field, options)
       else

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/{gemfiles → test/gemfiles}/activerecord31.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "activerecord", "~> 3.1.0"

data/{gemfiles → test/gemfiles}/activerecord32.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "activerecord", "~> 3.2.0"

data/{gemfiles → test/gemfiles}/activerecord40.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "activerecord", "~> 4.0.0"

data/{gemfiles → test/gemfiles}/activerecord41.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "activerecord", "~> 4.1.0"

data/test/gemfiles/activerecord50.gemfile

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

data/test/mysql_test.rb

@@ -5,6 +5,6 @@ class TestMysql < Minitest::Test
 
   def setup
     super
-    User.establish_connection :adapter => "mysql2", :database => "groupdate_test", :username => "root"
+    User.establish_connection adapter: "mysql2", database: "groupdate_test", username: "root"
   end
 end

data/test/postgresql_test.rb

@@ -5,6 +5,10 @@ class TestPostgresql < Minitest::Test
 
   def setup
     super
-    User.establish_connection :adapter => "postgresql", :database => "groupdate_test"
+    User.establish_connection adapter: "postgresql", database: "groupdate_test"
+  end
+
+  def test_no_column
+    assert_raises(ArgumentError) { User.group_by_day.first }
   end
 end

data/test/test_helper.rb

@@ -24,21 +24,24 @@ end
 
 # i18n
 I18n.enforce_available_locales = true
-I18n.backend.store_translations :de, :date => {
-  :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil)
+I18n.backend.store_translations :de, date: {
+  abbr_month_names: %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil)
+},
+time: {
+  formats: {special: "%b %e, %Y"}
 }
 
 # migrations
 %w(postgresql mysql2).each do |adapter|
-  ActiveRecord::Base.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
+  ActiveRecord::Base.establish_connection adapter: adapter, database: "groupdate_test", username: adapter == "mysql2" ? "root" : nil
 
-  ActiveRecord::Migration.create_table :users, :force => true do |t|
+  ActiveRecord::Migration.create_table :users, force: true do |t|
     t.string :name
     t.integer :score
     t.timestamp :created_at
   end
 
-  ActiveRecord::Migration.create_table :posts, :force => true do |t|
+  ActiveRecord::Migration.create_table :posts, force: true do |t|
     t.references :user
     t.timestamp :created_at
   end
@@ -104,19 +107,19 @@ module TestGroupdate
   # 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_time :day, "2013-05-03 02:00:00 UTC", "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_time :day, "2013-05-03 02:00:00 UTC", "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_time :day, "2013-05-03 02:00:00 PDT", "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_time :day, "2013-05-03 02:00:00 PDT", "2013-05-03 09:00:00", true, day_start: 2
   end
 
   # week
@@ -176,19 +179,19 @@ module TestGroupdate
   # 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_time :week, "2013-03-17 02:00:00 UTC", "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_time :week, "2013-03-17 02:00:00 UTC", "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_time :week, "2013-03-17 02:00:00 PDT", "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_time :week, "2013-03-17 02:00:00 PDT", "2013-03-17 09:00:00", true, day_start: 2
   end
 
   # month
@@ -212,19 +215,55 @@ module TestGroupdate
   # 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_time :month, "2013-03-01 02:00:00 UTC", "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_time :month, "2013-03-01 02:00:00 UTC", "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_time :month, "2013-03-01 02:00:00 PST", "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_time :month, "2013-03-01 02:00:00 PST", "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"
+  end
+
+  def test_quarter_start_of_quarter
+    assert_result_time :quarter, "2013-04-01 00:00:00 UTC", "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
+  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
+  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
+  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
+  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
+  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
   end
 
   # year
@@ -248,19 +287,19 @@ module TestGroupdate
   # 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_time :year, "2013-01-01 02:00:00 UTC", "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_time :year, "2013-01-01 02:00:00 UTC", "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_time :year, "2013-01-01 02:00:00 PST", "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_time :year, "2013-01-01 02:00:00 PST", "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # hour of day
@@ -284,19 +323,19 @@ module TestGroupdate
   # hour of day starts at 2am
 
   def test_hour_of_day_end_of_day_day_start_2am
-    assert_result :hour_of_day, 23, "2013-01-01 01:59:59", false, :day_start => 2
+    assert_result :hour_of_day, 23, "2013-01-01 01:59:59", false, day_start: 2
   end
 
   def test_hour_of_day_start_of_day_day_start_2am
-    assert_result :hour_of_day, 0, "2013-01-01 02:00:00", false, :day_start => 2
+    assert_result :hour_of_day, 0, "2013-01-01 02:00:00", false, day_start: 2
   end
 
   def test_hour_of_day_end_of_day_with_time_zone_day_start_2am
-    assert_result :hour_of_day, 23, "2013-01-01 09:59:59", true, :day_start => 2
+    assert_result :hour_of_day, 23, "2013-01-01 09:59:59", true, day_start: 2
   end
 
   def test_hour_of_day_start_of_day_with_time_zone_day_start_2am
-    assert_result :hour_of_day, 0, "2013-01-01 10:00:00", true, :day_start => 2
+    assert_result :hour_of_day, 0, "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # day of week
@@ -320,19 +359,19 @@ module TestGroupdate
   # day of week starts at 2am
 
   def test_day_of_week_end_of_day_day_start_2am
-    assert_result :day_of_week, 3, "2013-01-03 01:59:59", false, :day_start => 2
+    assert_result :day_of_week, 3, "2013-01-03 01:59:59", false, day_start: 2
   end
 
   def test_day_of_week_start_of_day_day_start_2am
-    assert_result :day_of_week, 3, "2013-01-02 02:00:00", false, :day_start => 2
+    assert_result :day_of_week, 3, "2013-01-02 02:00:00", false, day_start: 2
   end
 
   def test_day_of_week_end_of_day_with_time_zone_day_start_2am
-    assert_result :day_of_week, 3, "2013-01-03 09:59:59", true, :day_start => 2
+    assert_result :day_of_week, 3, "2013-01-03 09:59:59", true, day_start: 2
   end
 
   def test_day_of_week_start_of_day_with_time_zone_day_start_2am
-    assert_result :day_of_week, 3, "2013-01-02 10:00:00", true, :day_start => 2
+    assert_result :day_of_week, 3, "2013-01-02 10:00:00", true, day_start: 2
   end
 
   # day of month
@@ -360,19 +399,19 @@ module TestGroupdate
   # day of month starts at 2am
 
   def test_day_of_month_end_of_day_day_start_2am
-    assert_result :day_of_month, 31, "2013-01-01 01:59:59", false, :day_start => 2
+    assert_result :day_of_month, 31, "2013-01-01 01:59:59", false, day_start: 2
   end
 
   def test_day_of_month_start_of_day_day_start_2am
-    assert_result :day_of_month, 1, "2013-01-01 02:00:00", false, :day_start => 2
+    assert_result :day_of_month, 1, "2013-01-01 02:00:00", false, day_start: 2
   end
 
   def test_day_of_month_end_of_day_with_time_zone_day_start_2am
-    assert_result :day_of_month, 31, "2013-01-01 09:59:59", true, :day_start => 2
+    assert_result :day_of_month, 31, "2013-01-01 09:59:59", true, day_start: 2
   end
 
   def test_day_of_month_start_of_day_with_time_zone_day_start_2am
-    assert_result :day_of_month, 1, "2013-01-01 10:00:00", true, :day_start => 2
+    assert_result :day_of_month, 1, "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # month of year
@@ -396,19 +435,19 @@ module TestGroupdate
   # month of year starts at 2am
 
   def test_month_of_year_end_of_month_day_start_2am
-    assert_result :month_of_year, 12, "2013-01-01 01:59:59", false, :day_start => 2
+    assert_result :month_of_year, 12, "2013-01-01 01:59:59", false, day_start: 2
   end
 
   def test_month_of_year_start_of_month_day_start_2am
-    assert_result :month_of_year, 1, "2013-01-01 02:00:00", false, :day_start => 2
+    assert_result :month_of_year, 1, "2013-01-01 02:00:00", false, day_start: 2
   end
 
   def test_month_of_year_end_of_month_with_time_zone_day_start_2am
-    assert_result :month_of_year, 12, "2013-01-01 09:59:59", true, :day_start => 2
+    assert_result :month_of_year, 12, "2013-01-01 09:59:59", true, day_start: 2
   end
 
   def test_month_of_year_start_of_month_with_time_zone_day_start_2am
-    assert_result :month_of_year, 1, "2013-01-01 10:00:00", true, :day_start => 2
+    assert_result :month_of_year, 1, "2013-01-01 10:00:00", true, day_start: 2
   end
 
   # zeros
@@ -465,6 +504,14 @@ module TestGroupdate
     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
   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"
+  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
+  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"
   end
@@ -573,10 +620,12 @@ module TestGroupdate
   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
 
@@ -688,22 +737,22 @@ module TestGroupdate
   end
 
   def test_last
-    create_user "2012-05-01 00:00:00 UTC"
-    create_user "2014-05-01 00:00:00 UTC"
+    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("2013-01-01 00:00:00 UTC") => 0,
-      utc.parse("2014-01-01 00:00:00 UTC") => 1,
-      utc.parse("2015-01-01 00:00:00 UTC") => 0
+      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 "2012-05-01 00:00:00 UTC"
-    create_user "2014-05-01 00:00:00 UTC"
+    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("2013-01-01 00:00:00 UTC") => 0,
-      utc.parse("2014-01-01 00:00:00 UTC") => 1
+      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
@@ -718,6 +767,11 @@ module TestGroupdate
     assert_format :month, "March 2014", "%B %Y"
   end
 
+  def test_format_quarter
+    create_user "2014-03-05 00:00:00 UTC"
+    assert_format :quarter, "January 1, 2014", "%B %-e, %Y"
+  end
+
   def test_format_year
     create_user "2014-03-01 00:00:00 UTC"
     assert_format :year, "2014", "%Y"
@@ -758,6 +812,11 @@ module TestGroupdate
     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
@@ -775,7 +834,7 @@ module TestGroupdate
   # permit
 
   def test_permit
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w[week]).count }
+    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w(week)).count }
   end
 
   def test_permit_bad_period
@@ -791,11 +850,22 @@ module TestGroupdate
   end
 
   def test_permit_symbol_strings
-    assert_equal ({}), User.group_by_period(:day, :created_at, permit: %w[day]).count
+    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
+    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
@@ -870,7 +940,11 @@ module TestGroupdate
   end
 
   def create_user(created_at, score = 1)
-    User.create! :name => "Andrew", :score => score, :created_at => utc.parse(created_at)
+    User.create! name: "Andrew", score: score, created_at: utc.parse(created_at)
+  end
+
+  def this_year
+    Time.now.utc.year
   end
 
   def utc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,10 +122,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activerecord31.gemfile
-- gemfiles/activerecord32.gemfile
-- gemfiles/activerecord40.gemfile
-- gemfiles/activerecord41.gemfile
 - groupdate.gemspec
 - lib/groupdate.rb
 - lib/groupdate/active_record.rb
@@ -136,6 +132,11 @@ files:
 - lib/groupdate/series.rb
 - lib/groupdate/version.rb
 - test/enumerable_test.rb
+- test/gemfiles/activerecord31.gemfile
+- test/gemfiles/activerecord32.gemfile
+- test/gemfiles/activerecord40.gemfile
+- test/gemfiles/activerecord41.gemfile
+- test/gemfiles/activerecord50.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb
 - test/test_helper.rb
@@ -159,12 +160,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data
 test_files:
 - test/enumerable_test.rb
+- test/gemfiles/activerecord31.gemfile
+- test/gemfiles/activerecord32.gemfile
+- test/gemfiles/activerecord40.gemfile
+- test/gemfiles/activerecord41.gemfile
+- test/gemfiles/activerecord50.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb
 - test/test_helper.rb