groupdate 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358ad13de46aa60a282d59df8b6de77acfced7b7
-  data.tar.gz: c90febd166be21d77ce02aac0335b0691ffb8950
+  metadata.gz: cc3e5e97ecbb9ce920165a63a9cba725b6f4c0d5
+  data.tar.gz: 366b811759baa6dfc4918a91428f36a1f503e35e
 SHA512:
-  metadata.gz: 69a1f081be83ddd6bf8d36ce2839bc47957b64ca35f2b71f61a545cf0f4c77fcc80e1a2fbc216aaa5f5a7429c45b1fb07139b99ca640f0efa068454e0965cece
-  data.tar.gz: 29865ae92770fed0d36ed7e4d9d21042057a152e12ed74d49ee0214328a960d3b6008ce63c6fca497982920dbdd5f322ffc0986976ef419c477b7995f37cda8c
+  metadata.gz: 0245a5804aca2739f67d6b53552ba584533d237ed14ed47112a8a2995ddc3fa4e3808cc8bb304c58697886fd5a9431870f6f3a1c99e4cdfc57bf815a8b973e6b
+  data.tar.gz: e2c50ef5c06f46a7a311828a835b271ababe0e6589a6d1374097fa7830ab0416c875a5b49c8f539799d3e73181b6fe42e5a0a58556a14a666736abd953788db3

data/.travis.yml

@@ -3,6 +3,11 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby
+gemfile:
+  - Gemfile
+  - gemfiles/activerecord31.gemfile
+  - gemfiles/activerecord32.gemfile
+  - gemfiles/activerecord40.gemfile
 script: bundle exec rake test
 before_script:
   - mysql -e 'create database groupdate_test;'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0
+
+- Added support for Arrays and Hashes
+
 ## 2.1.1
 
 - Fixed format option with multiple groups

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in groupdate.gemspec
 gemspec
+
+gem "activerecord", "~> 4.1"

data/README.md

@@ -11,9 +11,9 @@ The simplest way to group by:
 
 :cake: Get the entire series - **the other best part**
 
-Works with Rails 3.0+
+Works with Rails 3.1+
 
-Supports PostgreSQL and MySQL
+Supports PostgreSQL and MySQL, plus Arrays and Hashes
 
 [![Build Status](https://travis-ci.org/ankane/groupdate.png)](https://travis-ci.org/ankane/groupdate)
 
@@ -137,6 +137,18 @@ User.group_by_hour_of_day(:created_at, format: "%l %P").count.keys.first # 12 am
 
 Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Proc`
 
+## Arrays and Hashes
+
+```ruby
+users.group_by_day{|u| u.created_at } # or group_by_day(&:created_at)
+```
+
+Supports the same options as above
+
+```ruby
+users.group_by_day(time_zone: time_zone){|u| u.created_at }
+```
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/gemfiles/activerecord31.gemfile

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

data/gemfiles/activerecord32.gemfile

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

data/gemfiles/activerecord40.gemfile

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

data/groupdate.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 3.0.0"
+  spec.add_dependency "activesupport", ">= 3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest", ">= 5"
+  spec.add_development_dependency "activerecord"
 
   if RUBY_PLATFORM == "java"
     spec.add_development_dependency "activerecord-jdbcpostgresql-adapter"

data/lib/groupdate.rb

@@ -1,29 +1,21 @@
+require "active_support/core_ext/module/attribute_accessors"
+require "active_support/time"
 require "groupdate/version"
-require "groupdate/scopes"
-
-ActiveRecord::Base.send :extend, Groupdate::Scopes
-
-# hack for **unfixed** rails issue
-# 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)
-      end
-    end
-    alias_method_chain :column_alias_for, :hack
-
-  end
-end
+require "groupdate/magic"
 
 module Groupdate
+  FIELDS = [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day]
+  METHODS = FIELDS.map{|v| :"group_by_#{v}" }
+
   mattr_accessor :week_start, :day_start, :time_zone
   self.week_start = :sun
   self.day_start = 0
 end
+
+require "groupdate/enumerable"
+begin
+  require "active_record"
+rescue LoadError
+  # do nothing
+end
+require "groupdate/active_record" if defined?(ActiveRecord)

data/lib/groupdate/active_record.rb

@@ -0,0 +1,44 @@
+require "active_record"
+require "groupdate/order_hack"
+require "groupdate/scopes"
+require "groupdate/series"
+
+ActiveRecord::Base.send(:extend, Groupdate::Scopes)
+
+module ActiveRecord
+  class Relation
+
+    if ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
+
+      def method_missing_with_hack(method, *args, &block)
+        if Groupdate::METHODS.include?(method)
+          scoping { @klass.send(method, *args, &block) }
+        else
+          method_missing_without_hack(method, *args, &block)
+        end
+      end
+      alias_method_chain :method_missing, :hack
+
+    end
+
+  end
+end
+
+# hack for **unfixed** rails issue
+# 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)
+      end
+    end
+    alias_method_chain :column_alias_for, :hack
+
+  end
+end

data/lib/groupdate/enumerable.rb

@@ -0,0 +1,9 @@
+module Enumerable
+
+  Groupdate::FIELDS.each do |field|
+    define_method :"group_by_#{field}" do |options = {}, &block|
+      Groupdate::Magic.new(field, options).group_by(self, &block)
+    end
+  end
+
+end

data/lib/groupdate/magic.rb

@@ -0,0 +1,267 @@
+module Groupdate
+  class Magic
+    attr_accessor :field, :options
+
+    def initialize(field, options)
+      @field = field
+      @options = options
+
+      if !time_zone
+        raise "Unrecognized time zone"
+      end
+
+      if field == :week and !week_start
+        raise "Unrecognized :week_start option"
+      end
+    end
+
+    def group_by(enum, &block)
+      series(enum.group_by{|v| v = yield(v); v ? round_time(v) : nil }, [])
+    end
+
+    def relation(column, relation)
+      column = relation.connection.quote_table_name(column)
+      time_zone = self.time_zone.tzinfo.name
+
+      adapter_name = relation.connection.adapter_name
+      query =
+        case adapter_name
+        when "MySQL", "Mysql2"
+          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]
+          when :hour_of_day
+            ["(EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)) + 24 - #{day_start}) % 24", 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]
+          else
+            format =
+              case field
+              when :second
+                "%Y-%m-%d %H:%i:%S"
+              when :minute
+                "%Y-%m-%d %H:%i:00"
+              when :hour
+                "%Y-%m-%d %H:00:00"
+              when :day
+                "%Y-%m-%d 00:00:00"
+              when :month
+                "%Y-%m-01 00:00:00"
+              else # year
+                "%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]
+          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]
+          when :hour_of_day
+            ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::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]
+          else
+            ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{day_start} hour') AT TIME ZONE ?) + INTERVAL '#{day_start} hour') AT TIME ZONE ?", time_zone, time_zone]
+          end
+        else
+          raise "Connection adapter not supported: #{adapter_name}"
+        end
+
+      group = relation.group(Groupdate::OrderHack.new(relation.send(:sanitize_sql_array, query), field, time_zone))
+      if options[:series] == false
+        group
+      else
+        relation =
+          if time_range.is_a?(Range)
+            # doesn't matter whether we include the end of a ... range - it will be excluded later
+            group.where("#{column} >= ? AND #{column} <= ?", time_range.first, time_range.last)
+          else
+            group.where("#{column} IS NOT NULL")
+          end
+
+        # TODO do not change object state
+        @group_index = group.group_values.size - 1
+
+        Groupdate::Series.new(self, relation)
+      end
+    end
+
+    def perform(relation, method, *args, &block)
+      # undo reverse since we do not want this to appear in the query
+      reverse = relation.reverse_order_value
+      if reverse
+        relation = relation.reverse_order
+      end
+      order = relation.order_values.first
+      if order.is_a?(String)
+        parts = order.split(" ")
+        reverse_order = (parts.size == 2 && parts[0].to_sym == field && parts[1].to_s.downcase == "desc")
+        reverse = !reverse if reverse_order
+      end
+
+      multiple_groups = relation.group_values.size > 1
+
+      cast_method =
+        case field
+        when :day_of_week, :hour_of_day
+          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) }
+        end
+
+      count =
+        begin
+          Hash[ relation.send(method, *args, &block).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] } ]
+        rescue NoMethodError
+          raise "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
+        end
+
+      series(count, 0, multiple_groups, reverse)
+    end
+
+    protected
+
+    def time_zone
+      @time_zone ||= begin
+        time_zone = options[:time_zone] || Groupdate.time_zone || Time.zone || "Etc/UTC"
+        time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone]
+      end
+    end
+
+    def week_start
+      @week_start ||= [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:week_start] || options[:start] || Groupdate.week_start).to_sym)
+    end
+
+    def day_start
+      @day_start ||= (options[:day_start] || Groupdate.day_start).to_i
+    end
+
+    def time_range
+      @time_range ||= begin
+        time_range = options[:range]
+        if !time_range and options[:last]
+          step = 1.send(field) if 1.respond_to?(field)
+          if step
+            now = Time.now
+            time_range = round_time(now - (options[:last].to_i - 1).send(field))..now
+          end
+        end
+        time_range
+      end
+    end
+
+    def series(count, default_value, multiple_groups = false, reverse = false)
+      reverse = !reverse if options[:reverse]
+
+      series =
+        case field
+        when :day_of_week
+          0..6
+        when :hour_of_day
+          0..23
+        else
+          time_range = self.time_range
+          time_range =
+            if time_range.is_a?(Range)
+              time_range
+            else
+              # use first and last values
+              sorted_keys =
+                if multiple_groups
+                  count.keys.map{|k| k[@group_index] }.sort
+                else
+                  count.keys.sort
+                end
+              sorted_keys.first..sorted_keys.last
+            end
+
+          if time_range.first
+            series = [round_time(time_range.first)]
+
+            step = 1.send(field)
+
+            while time_range.cover?(series.last + step)
+              series << series.last + step
+            end
+
+            if multiple_groups
+              keys = count.keys.map{|k| k[0...@group_index] + k[(@group_index + 1)..-1] }.uniq
+              series = series.reverse if reverse
+              keys.flat_map do |k|
+                series.map{|s| k[0...@group_index] + [s] + k[@group_index..-1] }
+              end
+            else
+              series
+            end
+          else
+            []
+          end
+        end
+
+      # reversed above if multiple groups
+      if !multiple_groups and reverse
+        series = series.to_a.reverse
+      end
+
+      key_format =
+        if options[:format]
+          if options[:format].respond_to?(:call)
+            options[:format]
+          else
+            sunday = time_zone.parse("2014-03-02 00:00:00")
+            lambda do |key|
+              case field
+              when :hour_of_day
+                key = sunday + key.hours + day_start.hours
+              when :day_of_week
+                key = sunday + key.days
+              end
+              key.strftime(options[:format].to_s)
+            end
+          end
+        else
+          lambda{|k| k }
+        end
+
+      Hash[series.map do |k|
+        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), count[k] || default_value]
+      end]
+    end
+
+    def round_time(time)
+      time = time.to_time.in_time_zone(time_zone) - day_start.hours
+
+      time =
+        case field
+        when :second
+          time.change(:usec => 0)
+        when :minute
+          time.change(:sec => 0)
+        when :hour
+          time.change(:min => 0)
+        when :day
+          time.beginning_of_day
+        when :week
+          # same logic as MySQL group
+          weekday = (time.wday - 1) % 7
+          (time - ((7 - week_start + weekday) % 7).days).midnight
+        when :month
+          time.beginning_of_month
+        when :year
+          time.beginning_of_year
+        when :hour_of_day
+          time.hour
+        when :day_of_week
+          (7 - week_start + ((time.wday - 1) % 7) % 7)
+        else
+          raise "Invalid field"
+        end
+
+      time.is_a?(Time) ? time + day_start.hours : time
+    end
+
+  end
+end

data/lib/groupdate/order_hack.rb

@@ -4,7 +4,7 @@ module Groupdate
 
     def initialize(str, field, time_zone)
       super(str)
-      @field = field
+      @field = field.to_s
       @time_zone = time_zone
     end
   end

data/lib/groupdate/scopes.rb

@@ -1,86 +1,16 @@
-require "groupdate/order_hack"
-require "groupdate/series"
-require "active_record"
-
 module Groupdate
   module Scopes
-    time_fields = %w(second minute hour day week month year)
-    number_fields = %w(day_of_week hour_of_day)
-    (time_fields + number_fields).each do |field|
+
+    Groupdate::FIELDS.each do |field|
       define_method :"group_by_#{field}" do |*args|
         args = args.dup
         options = args[-1].is_a?(Hash) ? args.pop : {}
-        column = connection.quote_table_name(args[0])
-        time_zone = args[1] || options[:time_zone] || Groupdate.time_zone || Time.zone || "Etc/UTC"
-        if time_zone.is_a?(ActiveSupport::TimeZone) or time_zone = ActiveSupport::TimeZone[time_zone]
-          time_zone_object = time_zone
-          time_zone = time_zone.tzinfo.name
-        else
-          raise "Unrecognized time zone"
-        end
-
-        # for week
-        week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:week_start] || options[:start] || Groupdate.week_start).to_sym)
-        if field == "week" and !week_start
-          raise "Unrecognized :week_start option"
-        end
-
-        # for day
-        day_start = (options[:day_start] || Groupdate.day_start).to_i
+        options[:time_zone] ||= args[1] unless args[1].nil?
+        options[:range] ||= args[2] unless args[2].nil?
 
-        query =
-          case connection.adapter_name
-          when "MySQL", "Mysql2"
-            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]
-            when "hour_of_day"
-              ["(EXTRACT(HOUR from CONVERT_TZ(#{column}, '+00:00', ?)) + 24 - #{day_start}) % 24", 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]
-            else
-              format =
-                case field
-                when "second"
-                  "%Y-%m-%d %H:%i:%S"
-                when "minute"
-                  "%Y-%m-%d %H:%i:00"
-                when "hour"
-                  "%Y-%m-%d %H:00:00"
-                when "day"
-                  "%Y-%m-%d 00:00:00"
-                when "month"
-                  "%Y-%m-01 00:00:00"
-                else # year
-                  "%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]
-            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]
-            when "hour_of_day"
-              ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ? - INTERVAL '#{day_start} hour')::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]
-            else
-              ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{day_start} hour') AT TIME ZONE ?) + INTERVAL '#{day_start} hour') AT TIME ZONE ?", time_zone, time_zone]
-            end
-          else
-            raise "Connection adapter not supported: #{connection.adapter_name}"
-          end
-
-        group = group(Groupdate::OrderHack.new(sanitize_sql_array(query), field, time_zone))
-        range = args[2] || options[:range] || true
-        unless options[:series] == false
-          Series.new(group, field, column, time_zone_object, range, week_start, day_start, group.group_values.size - 1, options)
-        else
-          group
-        end
+        Groupdate::Magic.new(field, options).relation(args[0], self)
       end
     end
+
   end
 end

data/lib/groupdate/series.rb

@@ -1,189 +1,27 @@
 module Groupdate
   class Series
-    attr_accessor :relation
+    attr_accessor :magic, :relation
 
-    def initialize(relation, field, column, time_zone, time_range, week_start, day_start, group_index, options)
+    def initialize(magic, relation)
+      @magic = magic
       @relation = relation
-      @field = field
-      @column = column
-      @time_zone = time_zone
-      @time_range = time_range
-      @week_start = week_start
-      @day_start = day_start
-      @group_index = group_index
-      @options = options
-    end
-
-    def perform(method, *args, &block)
-      utc = ActiveSupport::TimeZone["UTC"]
-
-      time_range = @time_range
-      if !time_range.is_a?(Range) and @options[:last]
-        step = 1.send(@field) if 1.respond_to?(@field)
-        if step
-          now = Time.now
-          time_range = round_time(now - (@options[:last].to_i - 1).send(@field))..now
-        end
-      end
-
-      relation =
-        if time_range.is_a?(Range)
-          # doesn't matter whether we include the end of a ... range - it will be excluded later
-          @relation.where("#{@column} >= ? AND #{@column} <= ?", time_range.first, time_range.last)
-        else
-          @relation.where("#{@column} IS NOT NULL")
-        end
-
-      # undo reverse since we do not want this to appear in the query
-      reverse = relation.reverse_order_value
-      if reverse
-        relation = relation.reverse_order
-      end
-      order = relation.order_values.first
-      if order.is_a?(String)
-        parts = order.split(" ")
-        reverse_order = (parts.size == 2 && parts[0] == @field && parts[1].to_s.downcase == "desc")
-        reverse = !reverse if reverse_order
-      end
-
-      multiple_groups = relation.group_values.size > 1
-
-      cast_method =
-        case @field
-        when "day_of_week", "hour_of_day"
-          lambda{|k| k.to_i }
-        else
-          lambda{|k| (k.is_a?(String) ? utc.parse(k) : k.to_time).in_time_zone(@time_zone) }
-        end
-
-      count =
-        begin
-          Hash[ relation.send(method, *args, &block).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] } ]
-        rescue NoMethodError
-          raise "Be sure to install time zone support - https://github.com/ankane/groupdate#for-mysql"
-        end
-
-      series =
-        case @field
-        when "day_of_week"
-          0..6
-        when "hour_of_day"
-          0..23
-        else
-          time_range =
-            if time_range.is_a?(Range)
-              time_range
-            else
-              # use first and last values
-              sorted_keys =
-                if multiple_groups
-                  count.keys.map{|k| k[@group_index] }.sort
-                else
-                  count.keys.sort
-                end
-              sorted_keys.first..sorted_keys.last
-            end
-
-          if time_range.first
-            series = [round_time(time_range.first)]
-
-            step = 1.send(@field)
-
-            while time_range.cover?(series.last + step)
-              series << series.last + step
-            end
-
-            if multiple_groups
-              keys = count.keys.map{|k| k[0...@group_index] + k[(@group_index + 1)..-1] }.uniq
-              series = series.reverse if reverse
-              keys.flat_map do |k|
-                series.map{|s| k[0...@group_index] + [s] + k[@group_index..-1] }
-              end
-            else
-              series
-            end
-          else
-            []
-          end
-        end
-
-      # reversed above if multiple groups
-      if !multiple_groups and reverse
-        series = series.to_a.reverse
-      end
-
-      key_format =
-        if @options[:format]
-          if @options[:format].respond_to?(:call)
-            @options[:format]
-          else
-            sunday = @time_zone.parse("2014-03-02 00:00:00")
-            lambda do |key|
-              case @field
-              when "hour_of_day"
-                key = sunday + key.hours + @day_start.hours
-              when "day_of_week"
-                key = sunday + key.days
-              end
-              key.strftime(@options[:format].to_s)
-            end
-          end
-        else
-          lambda{|k| k }
-        end
-
-      Hash[series.map do |k|
-        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), count[k] || 0]
-      end]
-    end
-
-    def round_time(time)
-      time = time.to_time.in_time_zone(@time_zone) - @day_start.hours
-
-      time =
-        case @field
-        when "second"
-          time.change(:usec => 0)
-        when "minute"
-          time.change(:sec => 0)
-        when "hour"
-          time.change(:min => 0)
-        when "day"
-          time.beginning_of_day
-        when "week"
-          # same logic as MySQL group
-          weekday = (time.wday - 1) % 7
-          (time - ((7 - @week_start + weekday) % 7).days).midnight
-        when "month"
-          time.beginning_of_month
-        else # year
-          time.beginning_of_year
-        end
-
-      time + @day_start.hours
-    end
-
-    def clone
-      Groupdate::Series.new(@relation, @field, @column, @time_zone, @time_range, @week_start, @day_start, @group_index, @options)
     end
 
     # clone to prevent modifying original variables
     def method_missing(method, *args, &block)
       # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
       if ActiveRecord::Calculations.method_defined?(method)
-        clone.perform(method, *args, &block)
+        magic.perform(relation, method, *args, &block)
       elsif @relation.respond_to?(method)
-        series = clone
-        series.relation = @relation.send(method, *args, &block)
-        series
+        Groupdate::Series.new(magic, relation.send(method, *args, &block))
       else
         super
       end
     end
 
     def respond_to?(method, include_all = false)
-      ActiveRecord::Calculations.method_defined?(method) || @relation.respond_to?(method) || super
+      ActiveRecord::Calculations.method_defined?(method) || relation.respond_to?(method) || super
     end
 
-  end # Series
+  end
 end

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/test/enumerable_test.rb

@@ -0,0 +1,21 @@
+require_relative "test_helper"
+
+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"))
+    expected = {
+      utc.parse("2014-01-01") => [user_a],
+      utc.parse("2014-02-01") => [],
+      utc.parse("2014-03-01") => [user_b]
+    }
+    assert_equal expected, [user_a, user_b].group_by_month(&:created_at)
+  end
+
+  def call_method(method, field, options)
+    Hash[ User.all.to_a.send(:"group_by_#{method}", options){|u| u.send(field) }.map{|k, v| [k, v.size] } ]
+  end
+
+end

data/test/mysql_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestMysql < Minitest::Unit::TestCase
+class TestMysql < Minitest::Test
   include TestGroupdate
 
   def setup

data/test/postgresql_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestPostgresql < Minitest::Unit::TestCase
+class TestPostgresql < Minitest::Test
   include TestGroupdate
 
   def setup

data/test/test_helper.rb

@@ -3,6 +3,7 @@ Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
 require "logger"
+require "active_record"
 
 # TODO determine why this is necessary
 if RUBY_PLATFORM == "java"
@@ -26,7 +27,7 @@ end
   ActiveRecord::Migration.create_table :users, :force => true do |t|
     t.string :name
     t.integer :score
-    t.timestamps
+    t.timestamp :created_at
   end
 end
 
@@ -386,7 +387,7 @@ module TestGroupdate
     7.times do |n|
       expected[n] = n == 3 ? 1 : 0
     end
-    assert_equal expected, User.group_by_day_of_week(:created_at, range: true).count
+    assert_equal expected, call_method(:day_of_week, :created_at, {})
   end
 
   def test_zeros_hour_of_day
@@ -395,7 +396,7 @@ module TestGroupdate
     24.times do |n|
       expected[n] = n == 20 ? 1 : 0
     end
-    assert_equal expected, User.group_by_hour_of_day(:created_at, range: true).count
+    assert_equal expected, call_method(:hour_of_day, :created_at, {})
   end
 
   def test_zeros_excludes_end
@@ -403,7 +404,7 @@ module TestGroupdate
     expected = {
       utc.parse("2013-05-01 00:00:00 UTC") => 0
     }
-    assert_equal expected, User.group_by_day(:created_at, range: Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC")).count
+    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
@@ -419,13 +420,13 @@ module TestGroupdate
     expected = {
       utc.parse("2013-05-01 00:00:00 UTC") => 1
     }
-    assert_equal expected, User.group_by_day(:created_at, range: DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC")).count
+    assert_equal expected, call_method(:day, :created_at, range: DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC"))
   end
 
   def test_zeros_null_value
     user = User.create!(name: "Andrew")
     user.update_column :created_at, nil
-    assert_equal 0, User.group_by_hour_of_day(:created_at, range: true).count[0]
+    assert_equal 0, call_method(:hour_of_day, :created_at, range: true)[0]
   end
 
   def test_zeroes_range_true
@@ -436,7 +437,7 @@ module TestGroupdate
       utc.parse("2013-05-02 00:00:00 UTC") => 0,
       utc.parse("2013-05-03 00:00:00 UTC") => 1
     }
-    assert_equal expected, User.group_by_day(:created_at, range: true).count
+    assert_equal expected, call_method(:day, :created_at, range: true)
   end
 
   # week_start
@@ -469,6 +470,10 @@ module TestGroupdate
     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
@@ -481,7 +486,7 @@ module TestGroupdate
   def test_time_zone
     create_user "2013-05-01 00:00:00 UTC"
     time_zone = "Pacific Time (US & Canada)"
-    assert_equal time_zone, User.group_by_day(:created_at, time_zone: time_zone).count.keys.first.time_zone.name
+    assert_equal time_zone, call_method(:day, :created_at, time_zone: time_zone).keys.first.time_zone.name
   end
 
   def test_where_after
@@ -604,7 +609,7 @@ module TestGroupdate
   # helpers
 
   def assert_format(method, expected, format, options = {})
-    assert_equal expected, User.send(:"group_by_#{method}", :created_at, options.merge(format: format)).count.keys.first
+    assert_equal expected, call_method(method, :created_at, options.merge(format: format)).keys.first
   end
 
   def assert_result_time(method, expected, time_str, time_zone = false, options = {})
@@ -618,7 +623,7 @@ module TestGroupdate
 
   def result(method, time_str, time_zone = false, options = {})
     create_user time_str
-    User.send(:"group_by_#{method}", :created_at, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil)).count
+    call_method(method, :created_at, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil))
   end
 
   def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil, options = {})
@@ -627,7 +632,11 @@ module TestGroupdate
     keys.each_with_index do |key, i|
       expected[utc.parse(key).in_time_zone(time_zone ? "Pacific Time (US & Canada)" : utc)] = i == 1 ? 1 : 0
     end
-    assert_equal expected, User.send(:"group_by_#{method}", :created_at, options.merge(time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end))).count
+    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.send(:"group_by_#{method}", field, options).count
   end
 
   def create_user(created_at, score = 1)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,12 +123,18 @@ files:
 - README.md
 - Rakefile
 - gemfiles/activerecord31.gemfile
+- gemfiles/activerecord32.gemfile
+- gemfiles/activerecord40.gemfile
 - groupdate.gemspec
 - lib/groupdate.rb
+- lib/groupdate/active_record.rb
+- lib/groupdate/enumerable.rb
+- lib/groupdate/magic.rb
 - lib/groupdate/order_hack.rb
 - lib/groupdate/scopes.rb
 - lib/groupdate/series.rb
 - lib/groupdate/version.rb
+- test/enumerable_test.rb
 - test/mysql_test.rb
 - test/postgresql_test.rb
 - test/test_helper.rb
@@ -143,6 +163,7 @@ signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data
 test_files:
+- test/enumerable_test.rb
 - test/mysql_test.rb
 - test/postgresql_test.rb
 - test/test_helper.rb