groupdate 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df818b929dceeddfccab948ceb591ad26c7334c8
-  data.tar.gz: 370a704d7ff6a17fb82bb057d717141ed87bc69f
+  metadata.gz: f98770b6255920a055b3d7ab6c9bf36227580077
+  data.tar.gz: 4d7d1eb90c872e35ba89ad0eead165841f1e0506
 SHA512:
-  metadata.gz: 7a77d1af0c530bfab9552ddff8f7149575c9821bcff772d33454b50c0050561d861a7eb5f220c5aa19200f80194f07c6a550c412be2ac76eedd88dbddb143faf
-  data.tar.gz: 91d207a5493bcafe51e94a884809e37b8250e9c2e581bf26172a5d0810d32c64aa63f21aead7935d1096c4d27dcde4c8d49cc8de821cdae4c83634e6a168cf94
+  metadata.gz: 4aca35fb45ab76e77535404eb6123efc25bcdf4b2414b7255f8dd62e87e4b1d567eaf367807f93ac9ce18f5a571d752ea4d3dc2c47cc141413ebd49eeb656b31
+  data.tar.gz: 3f4ade3ccaab2acc62a413ca93ff618b1d89c2daa0c4d341b895b76db055dd6c0b208826c12696eb4c3f83900afcea69560f6c9bdf8d34c15e3c781264785e1b

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.4
+  - 2.4.2
   - jruby-9.1.5.0
 gemfile:
   - Gemfile
-  - test/gemfiles/activerecord32.gemfile
-  - test/gemfiles/activerecord40.gemfile
-  - test/gemfiles/activerecord41.gemfile
+  - test/gemfiles/activerecord52.gemfile
+  - test/gemfiles/activerecord50.gemfile
   - test/gemfiles/activerecord42.gemfile
 sudo: false
 script: RUBYOPT=W0 bundle exec rake test
@@ -15,11 +14,17 @@ before_install:
   - 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
+env:
+  - TRAVIS=t
 notifications:
   email:
     on_success: never
     on_failure: change
 matrix:
   allow_failures:
+    - rvm: 2.4.2
+      gemfile: test/gemfiles/activerecord52.gemfile
     - rvm: jruby-9.1.5.0
-      gemfile: Gemfile
+      gemfile: test/gemfiles/activerecord52.gemfile
+    - rvm: jruby-9.1.5.0
+      gemfile: test/gemfiles/activerecord42.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.2.1
+
+- Added `minute_of_hour`
+- Added support for `unscoped`
+
 ## 3.2.0
 
 - Added limited support for SQLite

data/CONTRIBUTING.md

@@ -0,0 +1,67 @@
+# Contributing
+
+First, thanks for wanting to contribute. You’re awesome! :heart:
+
+## Questions
+
+Use [Stack Overflow](https://stackoverflow.com/) with the tag `groupdate`.
+
+## Feature Requests
+
+Create an issue. Start the title with `[Idea]`.
+
+## Issues
+
+Think you’ve discovered an issue?
+
+1. Search existing issues to see if it’s been reported.
+2. Try the `master` branch to make sure it hasn’t been fixed.
+
+```rb
+gem "groupdate", github: "ankane/groupdate"
+```
+
+If the above steps don’t help, create an issue. Include the complete backtrace for exceptions.
+
+## Pull Requests
+
+Fork the project and create a pull request. A few tips:
+
+- Keep changes to a minimum. If you have multiple features or fixes, submit multiple pull requests.
+- Follow the existing style. The code should read like it’s written by a single person.
+- Add one or more tests if possible. Make sure existing tests pass with:
+
+```sh
+bundle exec rake test
+```
+
+Feel free to open an issue to get feedback on your idea before spending too much time on it.
+
+## Dev Setup
+
+On Mac:
+
+```sh
+# install and run PostgreSQL
+brew install postgresql
+brew services start postgresql
+
+# install and run MySQL
+brew install mysql
+brew services start mysql
+
+# create databases
+createdb groupdate_test
+mysql -u root -e "create database groupdate_test"
+mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
+
+# clone the repo and run the tests
+git clone https://github.com/ankane/groupdate.git
+cd groupdate
+bundle install
+bundle exec rake test
+```
+
+---
+
+This contributing guide is released under [CCO](https://creativecommons.org/publicdomain/zero/1.0/) (public domain). Use it for your own project without attribution.

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in groupdate.gemspec
 gemspec
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "5.1.4" # "~> 5.1.0"

data/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+Hi,
+
+Before creating an issue, please check out the Contributing Guide:
+
+https://github.com/ankane/groupdate/blob/master/CONTRIBUTING.md
+
+Thanks!

data/README.md

@@ -11,16 +11,12 @@ The simplest way to group by:
 
 :cake: Get the entire series - **the other best part**
 
-Supports PostgreSQL, MySQL, and Redshift, plus arrays and hashes
+Supports PostgreSQL, MySQL, and Redshift, plus arrays and hashes (and limited support for [SQLite](#for-sqlite))
 
-Limited support for [SQLite](#for-sqlite)
+:cupid: Goes hand in hand with [Chartkick](https://www.chartkick.com)
 
 [![Build Status](https://travis-ci.org/ankane/groupdate.svg?branch=master)](https://travis-ci.org/ankane/groupdate)
 
-: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
@@ -212,6 +208,37 @@ Count
 Hash[ users.group_by_day { |u| u.created_at }.map { |k, v| [k, v.size] } ]
 ```
 
+## Custom Calculation Methods
+
+Groupdate knows all of the calculations defined by `ActiveRecord` like `count`,
+`sum`, or `average`. However you may have your own class level calculation
+methods that you need to tell Groupdate about. All you have to do is define the
+class method `groupdate_calculation_methods` returning an array of the method
+names as symbols.
+
+```ruby
+class User < ApplicationRecord
+  def self.groupdate_calculation_methods
+    [:total_sign_ins]
+  end
+
+  def self.total_sign_ins
+    all.sum(:sign_ins)
+  end
+end
+```
+
+Then you can use your custom calculation method:
+
+```ruby
+User.group_by_week(:created_at).total_sign_ins
+```
+
+Note that even if your method uses one of the calculations from `ActiveRecord`,
+you'll still need to add it to the `groupdate_calculation_methods` array to have
+it return the Hash of dates to values. Otherwise it will return a
+`Groupdate::Series` object.
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/groupdate.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |spec|
   spec.version       = Groupdate::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.description   = "The simplest way to group temporal data"
   spec.summary       = "The simplest way to group temporal data"
   spec.homepage      = "https://github.com/ankane/groupdate"
   spec.license       = "MIT"
@@ -20,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">= 3"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "activerecord"
@@ -30,8 +29,8 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "activerecord-jdbcmysql-adapter"
     spec.add_development_dependency "activerecord-jdbcsqlite3-adapter"
   else
-    spec.add_development_dependency "pg"
-    spec.add_development_dependency "mysql2", "~> 0.3.20"
+    spec.add_development_dependency "pg", "< 1"
+    spec.add_development_dependency "mysql2"
     spec.add_development_dependency "sqlite3"
   end
 end

data/lib/groupdate.rb

@@ -6,7 +6,7 @@ require "groupdate/magic"
 module Groupdate
   class Error < RuntimeError; end
 
-  PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
+  PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :minute_of_hour, :day_of_month, :month_of_year]
   # backwards compatibility for anyone who happened to use it
   FIELDS = PERIODS
   METHODS = PERIODS.map { |v| :"group_by_#{v}" } + [:group_by_period]

data/lib/groupdate/magic.rb

@@ -2,15 +2,15 @@ require "i18n"
 
 module Groupdate
   class Magic
-    attr_accessor :field, :options
+    attr_accessor :period, :options
 
-    def initialize(field, options)
-      @field = field
+    def initialize(period, options)
+      @period = period
       @options = options
 
       raise Groupdate::Error, "Unrecognized time zone" unless time_zone
 
-      raise Groupdate::Error, "Unrecognized :week_start option" if field == :week && !week_start
+      raise Groupdate::Error, "Unrecognized :week_start option" if period == :week && !week_start
     end
 
     def group_by(enum, &_block)
@@ -28,13 +28,15 @@ module Groupdate
       adapter_name = relation.connection.adapter_name
       query =
         case adapter_name
-        when "MySQL", "Mysql2", "Mysql2Spatial"
-          case field
+        when "MySQL", "Mysql2", "Mysql2Spatial", 'Mysql2Rgeo'
+          case period
           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} second), '+00:00', ?)) - 1", time_zone]
           when :hour_of_day
             ["(EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)) + 24 - #{day_start / 3600}) % 24", time_zone]
+          when :minute_of_hour
+            ["(EXTRACT(MINUTE from CONVERT_TZ(#{column}, '+00:00', ?)))", time_zone]
           when :day_of_month
             ["DAYOFMONTH(CONVERT_TZ(DATE_SUB(#{column}, INTERVAL #{day_start} second), '+00:00', ?))", time_zone]
           when :month_of_year
@@ -45,7 +47,7 @@ module Groupdate
             ["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
+              case period
               when :second
                 "%Y-%m-%d %H:%i:%S"
               when :minute
@@ -63,62 +65,68 @@ module Groupdate
             ["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
+          case period
           when :day_of_week
             ["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} second')::integer", time_zone]
+          when :minute_of_hour
+            ["EXTRACT(MINUTE 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} second')::integer", time_zone]
           when :month_of_year
             ["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} second') AT TIME ZONE ?) + INTERVAL '#{week_start} day' + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
+            ["(DATE_TRUNC('#{period}', (#{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} second') AT TIME ZONE ?) + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
+            ["(DATE_TRUNC('#{period}', (#{column}::timestamptz - INTERVAL '#{day_start} second') AT TIME ZONE ?) + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
           end
         when "SQLite"
           raise Groupdate::Error, "Time zones not supported for SQLite" unless self.time_zone.utc_offset.zero?
           raise Groupdate::Error, "day_start not supported for SQLite" unless day_start.zero?
           raise Groupdate::Error, "week_start not supported for SQLite" unless week_start == 6
 
-          if field == :week
+          if period == :week
             ["strftime('%%Y-%%m-%%d 00:00:00 UTC', #{column}, '-6 days', 'weekday 0')"]
           else
             format =
-              case field
-                when :hour_of_day
-                  "%H"
-                when :day_of_week
-                  "%w"
-                when :day_of_month
-                  "%d"
-                when :month_of_year
-                  "%m"
-                when :second
-                  "%Y-%m-%d %H:%M:%S UTC"
-                when :minute
-                  "%Y-%m-%d %H:%M:00 UTC"
-                when :hour
-                  "%Y-%m-%d %H:00:00 UTC"
-                when :day
-                  "%Y-%m-%d 00:00:00 UTC"
-                when :month
-                  "%Y-%m-01 00:00:00 UTC"
-                when :quarter
-                  raise Groupdate::Error, "Quarter not supported for SQLite"
-                else # year
-                  "%Y-01-01 00:00:00 UTC"
-                end
+              case period
+              when :hour_of_day
+                "%H"
+              when :minute_of_hour
+                "%M"
+              when :day_of_week
+                "%w"
+              when :day_of_month
+                "%d"
+              when :month_of_year
+                "%m"
+              when :second
+                "%Y-%m-%d %H:%M:%S UTC"
+              when :minute
+                "%Y-%m-%d %H:%M:00 UTC"
+              when :hour
+                "%Y-%m-%d %H:00:00 UTC"
+              when :day
+                "%Y-%m-%d 00:00:00 UTC"
+              when :month
+                "%Y-%m-01 00:00:00 UTC"
+              when :quarter
+                raise Groupdate::Error, "Quarter not supported for SQLite"
+              else # year
+                "%Y-01-01 00:00:00 UTC"
+              end
 
             ["strftime('#{format.gsub(/%/, '%%')}', #{column})"]
           end
         when "Redshift"
-          case field
+          case period
           when :day_of_week # Sunday = 0, Monday = 1, etc.
             ["EXTRACT(DOW from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
           when :hour_of_day
             ["EXTRACT(HOUR from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
+          when :minute_of_hour
+            ["EXTRACT(MINUTE from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
           when :day_of_month
             ["EXTRACT(DAY from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
           when :month_of_year
@@ -128,19 +136,19 @@ module Groupdate
             # always says it is in UTC time, so we must convert
             # back to UTC to play properly with the rest of Groupdate.
             #
-            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{week_start} day' - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{week_start} day' + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
+            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{week_start} day' - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{week_start} day' + INTERVAL '#{day_start} second'", time_zone, period, time_zone]
           else
-            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
+            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{day_start} second'", time_zone, period, time_zone]
           end
         else
           raise Groupdate::Error, "Connection adapter not supported: #{adapter_name}"
         end
 
-      if adapter_name == "MySQL" && field == :week
+      if adapter_name == "MySQL" && period == :week
         query[0] = "CAST(#{query[0]} AS DATETIME)"
       end
 
-      group = relation.group(Groupdate::OrderHack.new(relation.send(:sanitize_sql_array, query), field, time_zone))
+      group = relation.group(Groupdate::OrderHack.new(relation.send(:sanitize_sql_array, query), period, time_zone))
       relation =
         if time_range.is_a?(Range)
           # doesn't matter whether we include the end of a ... range - it will be excluded later
@@ -162,7 +170,7 @@ module Groupdate
       order = relation.order_values.first
       if order.is_a?(String)
         parts = order.split(" ")
-        reverse_order = (parts.size == 2 && (parts[0].to_sym == field || (activerecord42? && parts[0] == "#{relation.quoted_table_name}.#{relation.quoted_primary_key}")) && parts[1].to_s.downcase == "desc")
+        reverse_order = (parts.size == 2 && (parts[0].to_sym == period || (activerecord42? && parts[0] == "#{relation.quoted_table_name}.#{relation.quoted_primary_key}")) && parts[1].to_s.downcase == "desc")
         if reverse_order
           reverse = !reverse
           relation = relation.reorder(relation.order_values[1..-1])
@@ -172,8 +180,8 @@ module Groupdate
       multiple_groups = relation.group_values.size > 1
 
       cast_method =
-        case field
-        when :day_of_week, :hour_of_day, :day_of_month, :month_of_year
+        case period
+        when :day_of_week, :hour_of_day, :day_of_month, :month_of_year, :minute_of_hour
           lambda { |k| k.to_i }
         else
           utc = ActiveSupport::TimeZone["UTC"]
@@ -181,13 +189,18 @@ module Groupdate
         end
 
       result = relation.send(method, *args, &block)
-      missing_time_zone_support = multiple_groups ? (result.keys.first && result.keys.first[@group_index].nil?) : result.key?(nil)
-      if missing_time_zone_support
-        raise Groupdate::Error, "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
-      end
-      result = Hash[result.map { |k, v| [multiple_groups ? k[0...@group_index] + [cast_method.call(k[@group_index])] + k[(@group_index + 1)..-1] : cast_method.call(k), v] }]
+      if result.is_a?(Hash)
+        missing_time_zone_support = multiple_groups ? (result.keys.first && result.keys.first[@group_index].nil?) : result.key?(nil)
+        if missing_time_zone_support
+          raise Groupdate::Error, "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
+        end
+        result = Hash[result.map { |k, v| [multiple_groups ? k[0...@group_index] + [cast_method.call(k[@group_index])] + k[(@group_index + 1)..-1] : cast_method.call(k), v] }]
 
-      series(result, (options.key?(:default_value) ? options[:default_value] : 0), multiple_groups, reverse)
+        series(result, (options.key?(:default_value) ? options[:default_value] : 0), multiple_groups, reverse)
+      else
+        # for ActiveRecord::Calculations methods that don't call calculate, like pluck
+        result
+      end
     end
 
     protected
@@ -218,12 +231,12 @@ module Groupdate
           last += 1.day unless time_range.exclude_end?
           time_range = Range.new(time_zone.parse(time_range.first.to_s), last, true)
         elsif !time_range && options[:last]
-          if field == :quarter
+          if period == :quarter
             step = 3.months
-          elsif 1.respond_to?(field)
-            step = 1.send(field)
+          elsif 1.respond_to?(period)
+            step = 1.send(period)
           else
-            raise ArgumentError, "Cannot use last option with #{field}"
+            raise ArgumentError, "Cannot use last option with #{period}"
           end
           if step
             now = Time.now
@@ -249,11 +262,13 @@ module Groupdate
       reverse = !reverse if options[:reverse]
 
       series =
-        case field
+        case period
         when :day_of_week
           0..6
         when :hour_of_day
           0..23
+        when :minute_of_hour
+          0..59
         when :day_of_month
           1..31
         when :month_of_year
@@ -277,10 +292,10 @@ module Groupdate
           if time_range.first
             series = [round_time(time_range.first)]
 
-            if field == :quarter
+            if period == :quarter
               step = 3.months
             else
-              step = 1.send(field)
+              step = 1.send(period)
             end
 
             last_step = series.last
@@ -322,9 +337,11 @@ module Groupdate
           else
             sunday = time_zone.parse("2014-03-02 00:00:00")
             lambda do |key|
-              case field
+              case period
               when :hour_of_day
                 key = sunday + key.hours + day_start.seconds
+              when :minute_of_hour
+                key = sunday + key.minutes + day_start.seconds
               when :day_of_week
                 key = sunday + key.days
               when :day_of_month
@@ -335,7 +352,7 @@ module Groupdate
               I18n.localize(key, format: options[:format], locale: locale)
             end
           end
-        elsif [:day, :week, :month, :quarter, :year].include?(field) && use_dates
+        elsif [:day, :week, :month, :quarter, :year].include?(period) && use_dates
           lambda { |k| k.to_date }
         else
           lambda { |k| k }
@@ -357,7 +374,7 @@ module Groupdate
       time = time.to_time.in_time_zone(time_zone) - day_start.seconds
 
       time =
-        case field
+        case period
         when :second
           time.change(usec: 0)
         when :minute
@@ -378,6 +395,8 @@ module Groupdate
           time.beginning_of_year
         when :hour_of_day
           time.hour
+        when :minute_of_hour
+          time.min
         when :day_of_week
           time.wday
         when :day_of_month
@@ -385,7 +404,7 @@ module Groupdate
         when :month_of_year
           time.month
         else
-          raise Groupdate::Error, "Invalid field"
+          raise Groupdate::Error, "Invalid period"
         end
 
       time.is_a?(Time) ? time + day_start.seconds : time

data/lib/groupdate/series.rb

@@ -26,5 +26,9 @@ module Groupdate
     def reverse_order_value
       nil
     end
+
+    def unscoped
+      @relation.unscoped
+    end
   end
 end

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/test/gemfiles/activerecord50.gemfile

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

data/test/gemfiles/activerecord52.gemfile

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

data/test/sqlite_test.rb

@@ -17,6 +17,11 @@ class TestSqlite < Minitest::Test
     skip
   end
 
+  def test_zeros_datetime
+    skip if ENV["TRAVIS"]
+    super
+  end
+
   def call_method(method, field, options)
     if method == :quarter || options[:time_zone] || options[:day_start] || options[:week_start] || Groupdate.week_start != :sun || (Time.zone && options[:time_zone] != false)
       error = assert_raises(Groupdate::Error) { super }

data/test/test_helper.rb

@@ -413,6 +413,19 @@ module TestDatabase
     end
   end
 
+  # unscope
+
+  def test_unscope
+    assert_equal User.all, User.group_by_day(:created_at).unscoped.all
+  end
+
+  # pluck
+
+  def test_pluck
+    create_user "2014-05-01"
+    assert_equal [0], User.group_by_hour_of_day(:created_at).pluck(0)
+  end
+
   private
 
   def call_method(method, field, options)
@@ -431,8 +444,7 @@ module TestDatabase
     # hack for Redshift adapter, which doesn't return id on creation...
     user = User.last if user.id.nil?
 
-    # hack for MySQL & Redshift adapters
-    user.update_attributes(created_at: nil, created_on: nil) if created_at.nil? && is_redshift?
+    user.update_columns(created_at: nil, created_on: nil) if created_at.nil?
 
     user
   end
@@ -741,6 +753,16 @@ module TestGroupdate
     assert_result :hour_of_day, 0, "2013-01-01 10:00:00", true, day_start: 2
   end
 
+  # minute of hour
+
+  def test_minute_of_hour_end_of_hour
+    assert_result :minute_of_hour, 59, "2017-02-09 23:59:59"
+  end
+
+  def test_minute_of_hour_beginning_of_hour
+    assert_result :minute_of_hour, 0, "2017-02-09 00:00:00"
+  end
+
   # day of week
 
   def test_day_of_week_end_of_day
@@ -941,6 +963,15 @@ module TestGroupdate
     assert_equal expected, call_method(:hour_of_day, :created_at, {series: true})
   end
 
+  def test_zeros_minute_of_hour
+    create_user "2017-02-09 20:05:00 UTC"
+    expected = {}
+    60.times do |n|
+      expected[n] = n == 5 ? 1 : 0
+    end
+    assert_equal expected, call_method(:minute_of_hour, :created_at, {series: true})
+  end
+
   def test_zeros_day_of_month
     create_user "1978-12-18"
     expected = {}
@@ -1045,6 +1076,16 @@ module TestGroupdate
     assert_format :hour_of_day, "12 am", "%-l %P", day_start: 2
   end
 
+  def test_format_minute_of_hour
+    create_user "2017-02-09"
+    assert_format :minute_of_hour, "0", "%-M"
+  end
+
+  def test_format_minute_of_hour_day_start
+    create_user "2017-02-09"
+    assert_format :minute_of_hour, "0", "%-M", day_start: 2
+  end
+
   def test_format_day_of_week
     create_user "2014-03-01"
     assert_format :day_of_week, "Sat", "%a"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The simplest way to group temporal data
+description: 
 email:
 - andrew@chartkick.com
 executables: []
@@ -132,7 +132,9 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -152,6 +154,8 @@ files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
+- test/gemfiles/activerecord50.gemfile
+- test/gemfiles/activerecord52.gemfile
 - test/gemfiles/redshift.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb
@@ -178,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data
@@ -189,6 +193,8 @@ test_files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
+- test/gemfiles/activerecord50.gemfile
+- test/gemfiles/activerecord52.gemfile
 - test/gemfiles/redshift.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb