groupdate 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
 SHA1:
-  metadata.gz: 8e473d607f5f1bf038d605fb7bb99c07876d4e20
-  data.tar.gz: 33f2c1067c4ac21b2dcb4e9c07402426e7d0abc7
+  metadata.gz: !binary |-
+    MGY4OTc0MzM2NTNlMjVlOWM1ZjhlNzczN2FjZmNjZjkyZDI4M2Y5Yg==
+  data.tar.gz: !binary |-
+    OGE0ZDVhNmNjNDNjYWI4ZmFlNGY4MTYzNTc5M2VjNDRlMWI4MjUwYQ==
 SHA512:
-  metadata.gz: 957ef7d7bb9ef5ef0857094c9330e5b294a7d4b001a2d83e04e536d0c6cc119fbab6f2c913b005029baba8f117444c181449e464a64258142d85c48734e03cf9
-  data.tar.gz: d8e4ac13ab0194543382942698373577fd40b8299f4b81acd220636d0bd505ba3ac92abe0581e28fb9b9a991235f3da7a1b542adb5fa86159717bdaf6ca14093
+  metadata.gz: !binary |-
+    NmI0MDM0MzEyOWFjMjYyNjk4N2VhNTE4Y2M5MzRlMzM5NTYyODc4OTA5M2Zh
+    ZTRkM2RiYjY0ODZkM2IyOGQxMzU4NTA4MTNiOGNjNWRlMjUyZWQ2MDNhYWQw
+    ZDlkOGVkYjZiOGE4MTE5MDBiYzUxZmQxYjQ3NjBiYmNjYWJkZjQ=
+  data.tar.gz: !binary |-
+    OWVmMTM2YmU1Y2IyY2ZmOGY5MWEzOTAxYjQ5NGIwNTVkOWM1Y2Q4NDZiOGVi
+    ODQ5MWZkZGM5ZDkzODU2ODlmZDk2MGU2NGMyOTFkZDRlZDU5ZDM4MmJkM2Q1
+    NTIyZjE0MzM4NzkzYzVmYWIzNzk0MWI1YjE2NTVlNzY4NWUxNGI=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.3
+
+- Fixed deprecation warning when used with will_paginate
+- Fixed bug with DateTime series
+
 ## 1.0.2
 
 - Added :start option for custom week start for group_by_week

data/lib/groupdate/scopes.rb

@@ -4,105 +4,76 @@ require "active_record"
 
 module Groupdate
   module Scopes
-    extend ActiveSupport::Concern
-
-    # Pattern from kaminari
-    # https://github.com/amatsuda/kaminari/blob/master/lib/kaminari/models/active_record_extension.rb
-    included do
-      # Future subclasses will pick up the model extension
-      class << self
-        def inherited_with_groupdate(kls) #:nodoc:
-          inherited_without_groupdate kls
-          kls.send(:include, ClassMethods) if kls.superclass == ActiveRecord::Base
+    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|
+      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] || Time.zone || "Etc/UTC"
+        if time_zone.is_a?(ActiveSupport::TimeZone) or time_zone = ActiveSupport::TimeZone[time_zone]
+          time_zone = time_zone.tzinfo.name
+        else
+          raise "Unrecognized time zone"
         end
-        alias_method_chain :inherited, :groupdate
-      end
-
-      # Existing subclasses pick up the model extension as well
-      self.descendants.each do |kls|
-        kls.send(:include, ClassMethods) if kls.superclass == ActiveRecord::Base
-      end
-    end
 
-    module ClassMethods
-      extend ActiveSupport::Concern
+        # for week
+        week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:start] || :sun).to_sym)
+        if field == "week" and !week_start
+          raise "Unrecognized :start option"
+        end
 
-      included do
-        # Field list from
-        # http://www.postgresql.org/docs/9.1/static/functions-datetime.html
-        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|
-          # no define_singleton_method in ruby 1.8
-          (class << self; self end).send :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] || Time.zone || "Etc/UTC"
-            if time_zone.is_a?(ActiveSupport::TimeZone) or time_zone = ActiveSupport::TimeZone[time_zone]
-              time_zone = time_zone.tzinfo.name
+        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(#{column}, '+00:00', ?)) - 1", time_zone]
+            when "hour_of_day"
+              ["EXTRACT(HOUR from CONVERT_TZ(#{column}, '+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', ?))) % 7) DAY), '+00:00', ?), '%Y-%m-%d 00:00:00'), ?, '+00:00')", time_zone, time_zone, time_zone]
             else
-              raise "Unrecognized time zone"
-            end
-
-            # for week
-            week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:start] || :sun).to_sym)
-            if field == "week" and !week_start
-              raise "Unrecognized :start option"
-            end
-
-            query =
-              case connection.adapter_name
-              when "MySQL", "Mysql2"
+              format =
                 case field
-                when "day_of_week" # Sunday = 0, Monday = 1, etc
-                  # use CONCAT for consistent return type (String)
-                  ["DAYOFWEEK(CONVERT_TZ(#{column}, '+00:00', ?)) - 1", time_zone]
-                when "hour_of_day"
-                  ["EXTRACT(HOUR from CONVERT_TZ(#{column}, '+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', ?))) % 7) DAY), '+00:00', ?), '%Y-%m-%d 00:00:00'), ?, '+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
-
-                  ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(#{column}, '+00:00', ?), '#{format}'), ?, '+00:00')", time_zone, time_zone]
+                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
-              when "PostgreSQL"
-                case field
-                when "day_of_week"
-                  ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
-                when "hour_of_day"
-                  ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
-                when "week" # start on Sunday, not PostgreSQL default Monday
-                  ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{week_start} day') AT TIME ZONE ?) + INTERVAL '#{week_start} day') AT TIME ZONE ?", time_zone, time_zone]
-                else
-                  ["DATE_TRUNC('#{field}', #{column}::timestamptz AT TIME ZONE ?) 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))
-            if args[2]
-              Series.new(group, field, column, time_zone, args[2], week_start)
+              ["CONVERT_TZ(DATE_FORMAT(CONVERT_TZ(#{column}, '+00:00', ?), '#{format}'), ?, '+00:00')", time_zone, time_zone]
+            end
+          when "PostgreSQL", "PostGIS"
+            case field
+            when "day_of_week"
+              ["EXTRACT(DOW from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
+            when "hour_of_day"
+              ["EXTRACT(HOUR from #{column}::timestamptz AT TIME ZONE ?)::integer", time_zone]
+            when "week" # start on Sunday, not PostgreSQL default Monday
+              ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{week_start} day') AT TIME ZONE ?) + INTERVAL '#{week_start} day') AT TIME ZONE ?", time_zone, time_zone]
             else
-              group
+              ["DATE_TRUNC('#{field}', #{column}::timestamptz AT TIME ZONE ?) 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))
+        if args[2]
+          Series.new(group, field, column, time_zone, args[2], week_start)
+        else
+          group
         end
       end
     end

data/lib/groupdate/series.rb

@@ -44,7 +44,7 @@ module Groupdate
             end
 
           # determine start time
-          time = time_range.first.in_time_zone(@time_zone)
+          time = time_range.first.to_time.in_time_zone(@time_zone)
           starts_at =
             case @field
             when "second"

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/groupdate.rb

@@ -1,7 +1,7 @@
 require "groupdate/version"
 require "groupdate/scopes"
 
-ActiveRecord::Base.send :include, Groupdate::Scopes
+ActiveRecord::Base.send :extend, Groupdate::Scopes
 
 # hack for **unfixed** rails issue
 # https://github.com/rails/rails/issues/7121

data/test/test_helper.rb

@@ -299,6 +299,14 @@ module TestGroupdate
     assert_equal(expected, User.where("id = 0").group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count)
   end
 
+  def test_zeros_datetime
+    create_user "2013-05-01 00:00:00 UTC"
+    expected = {
+      Time.parse("2013-05-01 00:00:00 UTC") => 1
+    }
+    assert_equal(expected, User.group_by_day(:created_at, Time.zone, DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC")).count)
+  end
+
   # misc
 
   def test_order_day

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcpostgresql-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcmysql-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: The simplest way to group temporal data
 email:
 - acekane1@gmail.com
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -121,24 +121,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.0
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.0.3
+signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data
 test_files: