groupdate 6.0.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cfc48ae509ac20872022dd07429dd7bd8f24a5bfd81dcb16242f3519cb5385
-  data.tar.gz: 3079f700f956f141184fbc5bc8244ad90380804cea9f15fef51300985380d13e
+  metadata.gz: ee8a614ef0b4d869d534df2d0bb972296d26edd2839e430547d54a8ffb22a2b0
+  data.tar.gz: f15a380692b7726895a3083a4bd5e013610f6583bce614ede9e2fefd06d30f60
 SHA512:
-  metadata.gz: 64b4e317731bc0032a914e4f07ca751ee276e41b7a30a2113bff9d9f2437196916c68e5f1f699c2e107861d0022b712b32315132cd0f530bb7caad5f41955e45
-  data.tar.gz: ea085f2e6985f4df40f591333935b88f8c59b2be87943f39241254dbbc8ac18cc1aaa2b54030880a804117ecdc0451a65463b07ea758d3fc93d99697a11a5711
+  metadata.gz: 6145ca25662c5df8cab197d570a1bf1b26e7492e0404faba390d4af793992fbb3405c4995136b6818ac0be6a6bc3ff4da2ee8288860fd5c2b9b4fadad036c9e6
+  data.tar.gz: aaccec08b13902b51c2eb8180bb5a0807e6d2905fdd5b658a3dfab74dd2b4f2fed96dffc2dc42edcf61fe0a4eb20e21efca6a86ef55402a1f9d594d7eecb77e1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.2.0 (2023-01-29)
+
+- Added support for async methods with Active Record 7.1
+
+## 6.1.0 (2022-04-05)
+
+- Added `expand_range` option
+
 ## 6.0.1 (2022-01-16)
 
 - Fixed incorrect results (error before 6.0) with `includes` with Active Record 6.1+

data/README.md

@@ -119,6 +119,12 @@ To get a specific time range, use:
 User.group_by_day(:created_at, range: 2.weeks.ago.midnight..Time.now).count
 ```
 
+To expand the range to the start and end of the time period, use:
+
+```ruby
+User.group_by_day(:created_at, range: 2.weeks.ago..Time.now, expand_range: true).count
+```
+
 To get the most recent time periods, use:
 
 ```ruby

data/lib/groupdate/magic.rb

@@ -22,7 +22,7 @@ module Groupdate
     end
 
     def validate_keywords
-      known_keywords = [:time_zone, :series, :format, :locale, :range, :reverse]
+      known_keywords = [:time_zone, :series, :format, :locale, :range, :expand_range, :reverse]
 
       if %i[week day_of_week].include?(period)
         known_keywords << :week_start
@@ -125,6 +125,10 @@ module Groupdate
       end
 
       def perform(relation, result, default_value:)
+        if defined?(ActiveRecord::Promise) && result.is_a?(ActiveRecord::Promise)
+          return result.then { |r| perform(relation, r, default_value: default_value) }
+        end
+
         multiple_groups = relation.group_values.size > 1
 
         check_nils(result, multiple_groups, relation)

data/lib/groupdate/series_builder.rb

@@ -123,32 +123,32 @@ module Groupdate
             exclude_end = true
           end
 
+          if options[:expand_range]
+            start = round_time(start) if start
+            if finish && !(finish == round_time(finish) && exclude_end)
+              finish = round_time(finish) + step
+              exclude_end = true
+            end
+          end
+
           time_range = Range.new(start, finish, exclude_end)
         elsif !time_range && options[:last]
-          if period == :quarter
-            step = 3.months
-          elsif period == :custom
-            step = n_seconds
-          elsif 1.respond_to?(period)
-            step = 1.send(period)
-          else
-            raise ArgumentError, "Cannot use last option with #{period}"
-          end
-          if step
-            # loop instead of multiply to change start_at - see #151
-            start_at = now
-            (options[:last].to_i - 1).times do
-              start_at -= step
-            end
+          step = step()
+          raise ArgumentError, "Cannot use last option with #{period}" unless step
 
-            time_range =
-              if options[:current] == false
-                round_time(start_at - step)...round_time(now)
-              else
-                # extend to end of current period
-                round_time(start_at)...(round_time(now) + step)
-              end
+          # loop instead of multiply to change start_at - see #151
+          start_at = now
+          (options[:last].to_i - 1).times do
+            start_at -= step
           end
+
+          time_range =
+            if options[:current] == false
+              round_time(start_at - step)...round_time(now)
+            else
+              # extend to end of current period
+              round_time(start_at)...(round_time(now) + step)
+            end
         end
         time_range
       end
@@ -210,13 +210,7 @@ module Groupdate
         if time_range.begin
           series = [round_time(time_range.begin)]
 
-          if period == :quarter
-            step = 3.months
-          elsif period == :custom
-            step = n_seconds
-          else
-            step = 1.send(period)
-          end
+          step = step()
 
           last_step = series.last
           day_start_hour = day_start / 3600
@@ -273,6 +267,16 @@ module Groupdate
       end
     end
 
+    def step
+      if period == :quarter
+        3.months
+      elsif period == :custom
+        n_seconds
+      elsif 1.respond_to?(period)
+        1.send(period)
+      end
+    end
+
     def handle_multiple(data, series, multiple_groups, group_index)
       reverse = options[:reverse]
 

data/lib/groupdate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data