groupdate 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0169fac01ba6b7b7a051ae37d2cc3d5b89b137b7bb3d609df7a633b534ac89b
-  data.tar.gz: ccdf270ed3726d0c0a52e9fafe0fb3b2281f6b31ac0a9a731eaedfbda8f42067
+  metadata.gz: 12cfc48ae509ac20872022dd07429dd7bd8f24a5bfd81dcb16242f3519cb5385
+  data.tar.gz: 3079f700f956f141184fbc5bc8244ad90380804cea9f15fef51300985380d13e
 SHA512:
-  metadata.gz: aa3150d5c5edd803e225045d745faf191fef78f483fec13aac05f4fb7dc0ee04a1b7a9340f1f8cf35a8d1c79ed09a6e6e6c4432e094d54faf5c7af48385c5e68
-  data.tar.gz: 97137d089ec745cdbcf08d1c7999f3efefab9c8cb3dd39e4e033f28184b8e4d4955cb4f7777cd7e8f8d28a3dda8b3dce2826242322de1949c2f72ad11f24a32d
+  metadata.gz: 64b4e317731bc0032a914e4f07ca751ee276e41b7a30a2113bff9d9f2437196916c68e5f1f699c2e107861d0022b712b32315132cd0f530bb7caad5f41955e45
+  data.tar.gz: ea085f2e6985f4df40f591333935b88f8c59b2be87943f39241254dbbc8ac18cc1aaa2b54030880a804117ecdc0451a65463b07ea758d3fc93d99697a11a5711

data/CHANGELOG.md

@@ -1,10 +1,14 @@
+## 6.0.1 (2022-01-16)
+
+- Fixed incorrect results (error before 6.0) with `includes` with Active Record 6.1+
+
 ## 6.0.0 (2022-01-15)
 
-- Changed SQL to return dates instead of times for day, week, month, quarter, and year
-- Added `n` option for Redshift
-- Removed `dates` option
 - Raise `ActiveRecord::UnknownAttributeReference` for non-attribute arguments
 - Raise `ArgumentError` for ranges with string bounds
+- Added `n` option for Redshift
+- Changed SQL to return dates instead of times for day, week, month, quarter, and year
+- Removed `dates` option
 - Dropped support for Ruby < 2.6 and Rails < 5.2
 
 ## 5.2.4 (2021-12-15)

data/lib/groupdate/magic.rb

@@ -146,6 +146,7 @@ module Groupdate
           when :day_of_week
             lambda { |k| (k.to_i - 1 - week_start) % 7 }
           when :day, :week, :month, :quarter, :year
+            # TODO keep as date
             if day_start != 0
               day_start_hour = day_start / 3600
               day_start_min = (day_start % 3600) / 60

data/lib/groupdate/relation.rb

@@ -9,6 +9,9 @@ module Groupdate
     end
 
     def calculate(*args, &block)
+      # prevent calculate from being called twice
+      return super if ActiveRecord::VERSION::STRING.to_f >= 6.1 && has_include?(args[1])
+
       default_value = [:count, :sum].include?(args[0]) ? 0 : nil
       Groupdate.process_result(self, super, default_value: default_value)
     end

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data