rollups 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5c6fead572e785077c4ab0afd4e627dd152580a5f7d06dfaec55cca368892f
-  data.tar.gz: c48a223298b96a5404fda29192f6453e92f6f00fe10b53db5dfc633fe46696c8
+  metadata.gz: 98d29255d1ec08a3ca9e7db462c8157b3c87056ffc2258c785bc768e87d1afaa
+  data.tar.gz: 1810ec099cb09c935de19a415e17bca8842f7d0a2cd5d1ecc5bbb5dc51c2b514
 SHA512:
-  metadata.gz: d831822c3b6c4b70d119a2bcd704ae579d8f444cf7ffce388842aa5fc7841d0435669a203b9c54a55629088dfb553ead3288a6282d9f4ea5d5b9b9f737222086
-  data.tar.gz: af477019c11b0a75548d4181e7cf693d75487565ab99dd4b469bc3d748902d0cb802f2f868509cc71eb914e37796a435b013bbcc42a82a3189f9be0779b43c19
+  metadata.gz: efdd0f38f818d3bef2cce27554b3b84e104b78f1844475b334273cbf81c3fbea0ebe7a2b37ae394eae9b429e4f7a687b6ee901ab286c6981aa5c177fec92a8f4
+  data.tar.gz: a6e0c406ccc598c3a070cf4819eef7d3cecb8ae761f825fe41580d21a95535f5c3c83c6b24569484be31865eba6dd36a0084c467a3f9324b5aa57b544040ad4c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.4.1 (2024-10-07)
+
+- Fixed connection leasing for Active Record 7.2+
+
+## 0.4.0 (2024-10-01)
+
+- Added support for Active Record 8
+- Dropped support for Ruby < 3.1 and Active Record < 7
+
 ## 0.3.2 (2024-02-09)
 
 - Fixed incorrect rollups with `time_zone: false` when `Rollup.time_zone` has a negative UTC offset

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2023 Andrew Kane
+Copyright (c) 2020-2024 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,7 +4,7 @@
 
 Works great with [Ahoy](https://github.com/ankane/ahoy) and [Searchjoy](https://github.com/ankane/searchjoy)
 
-[![Build Status](https://github.com/ankane/rollup/workflows/build/badge.svg?branch=master)](https://github.com/ankane/rollup/actions)
+[![Build Status](https://github.com/ankane/rollup/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/rollup/actions)
 
 ## Installation
 
@@ -14,12 +14,6 @@ Add this line to your application’s Gemfile:
 gem "rollups"
 ```
 
-For Rails < 6, also add:
-
-```ruby
-gem "activerecord-import"
-```
-
 And run:
 
 ```sh

data/lib/rollup/aggregator.rb

@@ -29,7 +29,7 @@ class Rollup
     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
@@ -119,9 +119,9 @@ class Rollup
 
       # removing starting and ending quotes
       # for simplicity, they don't need to be the same
-      value = value[1..-2] if value.match(/\A["'`].+["'`]\z/)
+      value = value[1..-2] if value.match?(/\A["'`].+["'`]\z/)
 
-      unless value.match(/\A\w+\z/)
+      unless value.match?(/\A\w+\z/)
         raise "Cannot determine dimension name: #{group}. Use the dimension_names option"
       end
 
@@ -191,6 +191,12 @@ class Rollup
       conflict_target << :dimensions if Utils.dimensions_supported?
 
       options = Utils.mysql? ? {} : {unique_by: conflict_target}
+      if ActiveRecord::VERSION::MAJOR >= 8
+        utc = ActiveSupport::TimeZone["Etc/UTC"]
+        records.each do |v|
+          v[:time] = v[:time].in_time_zone(utc) if v[:time].is_a?(Date)
+        end
+      end
       Rollup.unscoped.upsert_all(records, **options)
     end
   end

data/lib/rollup/utils.rb

@@ -33,7 +33,7 @@ class Rollup
       end
 
       def adapter_name
-        Rollup.connection.adapter_name
+        Rollup.connection_db_config.adapter.to_s
       end
 
       def postgresql?

data/lib/rollup/version.rb

@@ -1,5 +1,5 @@
 class Rollup
   # not used in gemspec to avoid superclass mismatch
   # be sure to update there as well
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

data/lib/rollup.rb

@@ -23,7 +23,7 @@ class Rollup < ActiveRecord::Base
 
       # use select_all due to incorrect casting with pluck
       sql = relation.order(:time).select(Utils.time_sql(interval), :value).to_sql
-      result = connection.select_all(sql).rows
+      result = connection_pool.with_connection { |c| c.select_all(sql) }.rows
 
       Utils.make_series(result, interval)
     end
@@ -35,7 +35,7 @@ class Rollup < ActiveRecord::Base
 
       # use select_all to reduce allocations
       sql = relation.order(:time).select(Utils.time_sql(interval), :value, :dimensions).to_sql
-      result = connection.select_all(sql).rows
+      result = connection_pool.with_connection { |c| c.select_all(sql) }.rows
 
       result.group_by { |r| JSON.parse(r[2]) }.map do |dimensions, rollups|
         {dimensions: dimensions, data: Utils.make_series(rollups, interval)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollups
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-10 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'
 - !ruby/object:Gem::Dependency
   name: groupdate
   requirement: !ruby/object:Gem::Requirement
@@ -68,14 +68,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.5.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Rollup time-series data in Rails