groupdate 6.4.0 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdca24f5af218da761aff856a2798e39d4469fa5cdf5186d061572cea4b256a6
-  data.tar.gz: 3b327397c8ba2638ccda503d3d3fd9d641b86cf8018161fc3cbb7891122d3b3f
+  metadata.gz: f55bd15dca1c101b40370cd1fb1f82eca0567fb73511849135a1989fa4a6a11a
+  data.tar.gz: 7299ac70d10043b1f95de4885bb02683f55b33f1b075c7e5aced130ef8a6d979
 SHA512:
-  metadata.gz: 0b06dcf600f13158dbf4d5edeab2212aedd21b4a2e4efb36d26ab1635c035c562e28932b03ed26bdb452c5118c125d38fc8ea665e2dc5c458a986bd87e62912b
-  data.tar.gz: 0b78a8ee21b370052d1eacffa3c5c42ceb059ec1a1d14a7b992076cd02cfe158dc6ecee027578aeb233d2adc1c3fa4e71b2f572bf87affd51077b2282e6b2e21
+  metadata.gz: 9c1d74da58305bdf89f9c5196ef730712463e4c001ca4592a2f4d1b60d88deb5ca3ba6650f19d307a56e6ffc465f551b7d70ea14008c0445cad8d9f056e751f5
+  data.tar.gz: 8ce0e0a7b317214b1eb31913083d9f8f6657b62255617752432c6ede1d3fb1e83cab133bc7cdd725c11522f4d2548ebef2df6bff271f06d02dfa6302e0954d77

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.5.1 (2024-10-07)
+
+- Fixed connection leasing for Active Record 7.2+
+
+## 6.5.0 (2024-10-01)
+
+- Added support for Active Record 8
+- Dropped support for Ruby < 3.1 and Active Record < 7
+
 ## 6.4.0 (2023-09-13)
 
 - Added support for Trilogy
@@ -173,7 +182,7 @@ Breaking changes
 - Added `default_value` option
 - Accept symbol for `format` option
 - Raise `ArgumentError` if no field specified
-- Added support for ActiveRecord 5 beta
+- Added support for Active Record 5 beta
 
 ## 2.5.0 (2015-09-29)
 
@@ -187,18 +196,18 @@ Breaking changes
 - Added `carry_forward` option
 - Added `series: false` option for arrays and hashes
 - Fixed issue w/ Brasilia Summer Time
-- Fixed issues w/ ActiveRecord 4.2
+- Fixed issues w/ Active Record 4.2
 
 ## 2.3.0 (2014-08-31)
 
-- Raise error when ActiveRecord::Base.default_timezone is not `:utc`
+- Raise error when `ActiveRecord::Base.default_timezone` is not `:utc`
 - Added `day_of_month`
 - Added `month_of_year`
 - Do not quote column name
 
 ## 2.2.1 (2014-06-23)
 
-- Fixed ActiveRecord 3 associations
+- Fixed Active Record 3 associations
 
 ## 2.2.0 (2014-06-22)
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022 Andrew Kane
+Copyright (c) 2013-2024 Andrew Kane
 
 MIT License
 

data/README.md

@@ -11,11 +11,11 @@ The simplest way to group by:
 
 :cake: Get the entire series - **the other best part**
 
-Supports PostgreSQL, MySQL, and Redshift, plus arrays and hashes (and limited support for [SQLite](#for-sqlite))
+Supports PostgreSQL, MySQL, MariaDB, and Redshift, plus arrays and hashes (and limited support for [SQLite](#for-sqlite))
 
 :cupid: Goes hand in hand with [Chartkick](https://www.chartkick.com)
 
-[![Build Status](https://github.com/ankane/groupdate/workflows/build/badge.svg?branch=master)](https://github.com/ankane/groupdate/actions)
+[![Build Status](https://github.com/ankane/groupdate/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/groupdate/actions)
 
 ## Installation
 
@@ -25,7 +25,7 @@ Add this line to your application’s Gemfile:
 gem "groupdate"
 ```
 
-For MySQL and SQLite, also follow [these instructions](#additional-instructions).
+For MySQL, MariaDB, and SQLite, also follow [these instructions](#additional-instructions).
 
 ## Getting Started
 
@@ -250,7 +250,9 @@ users.group_by_day { |u| u.created_at }.to_h { |k, v| [k, v.count] }
 
 ## Additional Instructions
 
-### For MySQL
+<a name="for-mysql"></a>
+
+### For MySQL and MariaDB
 
 [Time zone support](https://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html) must be installed on the server.
 
@@ -280,18 +282,6 @@ If your application’s time zone is set to something other than `Etc/UTC` (the
 Groupdate.time_zone = false
 ```
 
-## Upgrading
-
-### 6.0
-
-Groupdate 6.0 protects against unsafe input by default. For non-attribute arguments, use:
-
-```ruby
-User.group_by_day(Arel.sql(known_safe_value)).count
-```
-
-Also, the `dates` option has been removed.
-
 ## History
 
 View the [changelog](https://github.com/ankane/groupdate/blob/master/CHANGELOG.md)

data/lib/groupdate/adapters/base_adapter.rb

@@ -3,7 +3,7 @@ module Groupdate
     class BaseAdapter
       attr_reader :period, :column, :day_start, :week_start, :n_seconds
 
-      def initialize(relation, column:, period:, time_zone:, time_range:, week_start:, day_start:, n_seconds:)
+      def initialize(relation, column:, period:, time_zone:, time_range:, week_start:, day_start:, n_seconds:, adapter_name: nil)
         @relation = relation
         @column = column
         @period = period
@@ -12,6 +12,7 @@ module Groupdate
         @week_start = week_start
         @day_start = day_start
         @n_seconds = n_seconds
+        @adapter_name = adapter_name
 
         if ActiveRecord::VERSION::MAJOR >= 7
           if ActiveRecord.default_timezone == :local

data/lib/groupdate/adapters/postgresql_adapter.rb

@@ -23,7 +23,7 @@ module Groupdate
           when :week
             ["(DATE_TRUNC('day', #{day_start_column} - INTERVAL '1 day' * ((? + EXTRACT(DOW FROM #{day_start_column})::integer) % 7)) + INTERVAL ?)::date", time_zone, day_start_interval, 13 - week_start, time_zone, day_start_interval, day_start_interval]
           when :custom
-            if @relation.connection.adapter_name == "Redshift"
+            if @adapter_name == "Redshift"
               ["TIMESTAMP 'epoch' + (FLOOR(EXTRACT(EPOCH FROM #{column}::timestamp) / ?) * ?) * INTERVAL '1 second'", n_seconds, n_seconds]
             else
               ["TO_TIMESTAMP(FLOOR(EXTRACT(EPOCH FROM #{column}::timestamptz) / ?) * ?)", n_seconds, n_seconds]

data/lib/groupdate/enumerable.rb

@@ -5,7 +5,7 @@ module Enumerable
         raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0)" if args.any?
         Groupdate::Magic::Enumerable.group_by(self, period, options, &block)
       elsif respond_to?(:scoping)
-        scoping { @klass.group_by_period(period, *args, **options, &block) }
+        scoping { klass.group_by_period(period, *args, **options, &block) }
       else
         raise ArgumentError, "no block given"
       end
@@ -19,7 +19,7 @@ module Enumerable
       Groupdate::Magic.validate_period(period, options.delete(:permit))
       send("group_by_#{period}", **options, &block)
     else
-      scoping { @klass.group_by_period(period, *args, **options, &block) }
+      scoping { klass.group_by_period(period, *args, **options, &block) }
     end
   end
 end

data/lib/groupdate/magic.rb

@@ -180,12 +180,13 @@ module Groupdate
       end
 
       def time_zone_support?(relation)
-        if relation.connection.adapter_name =~ /mysql/i
-          # need to call klass for Rails < 5.2
-          sql = relation.klass.send(:sanitize_sql_array, ["SELECT CONVERT_TZ(NOW(), '+00:00', ?)", time_zone.tzinfo.name])
-          !relation.connection.select_all(sql).first.values.first.nil?
-        else
-          true
+        relation.connection_pool.with_connection do |connection|
+          if connection.adapter_name.match?(/mysql|trilogy/i)
+            sql = relation.send(:sanitize_sql_array, ["SELECT CONVERT_TZ(NOW(), '+00:00', ?)", time_zone.tzinfo.name])
+            !connection.select_all(sql).to_a.first.values.first.nil?
+          else
+            true
+          end
         end
       end
 
@@ -203,7 +204,7 @@ module Groupdate
       def self.generate_relation(relation, field:, **options)
         magic = Groupdate::Magic::Relation.new(**options)
 
-        adapter_name = relation.connection.adapter_name
+        adapter_name = relation.connection_pool.with_connection { |c| c.adapter_name }
         adapter = Groupdate.adapters[adapter_name]
         raise Groupdate::Error, "Connection adapter not supported: #{adapter_name}" unless adapter
 
@@ -221,7 +222,8 @@ module Groupdate
             time_range: magic.time_range,
             week_start: magic.week_start,
             day_start: magic.day_start,
-            n_seconds: magic.n_seconds
+            n_seconds: magic.n_seconds,
+            adapter_name: adapter_name
           ).generate
 
         # add Groupdate info
@@ -238,7 +240,7 @@ module Groupdate
         def validate_column(column)
           unless column.is_a?(Symbol) || column.is_a?(Arel::Nodes::SqlLiteral)
             column = column.to_s
-            unless /\A\w+(\.\w+)?\z/i.match(column)
+            unless /\A\w+(\.\w+)?\z/i.match?(column)
               raise ActiveRecord::UnknownAttributeReference, "Query method called with non-attribute argument(s): #{column.inspect}. Use Arel.sql() for known-safe values."
             end
           end
@@ -251,13 +253,13 @@ module Groupdate
         def resolve_column(relation, column)
           node = relation.send(:relation).send(:arel_columns, [column]).first
           node = Arel::Nodes::SqlLiteral.new(node) if node.is_a?(String)
-          relation.connection.visitor.accept(node, Arel::Collectors::SQLString.new).value
+          relation.connection_pool.with_connection { |c| c.visitor.accept(node, Arel::Collectors::SQLString.new).value }
         end
       end
 
       # allow any options to keep flexible for future
       def self.process_result(relation, result, **options)
-        relation.groupdate_values.reverse.each do |gv|
+        relation.groupdate_values.reverse_each do |gv|
           result = gv.perform(relation, result, default_value: options[:default_value])
         end
         result

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "6.4.0"
+  VERSION = "6.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 description:
 email: andrew@ankane.org
 executables: []
@@ -58,14 +58,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The simplest way to group temporal data