rollups 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc765589c1bb3ac755335e36a1a283ef4aeac8ac54a6bc102d3358c57768628
-  data.tar.gz: 0eab24b5cd948823ab190674618fec7ce0935b91d740384854e0474b931d9318
+  metadata.gz: b0fa306f943a2bad69a6515e6735374dd1ee4e927e6bd01dfb3b5dc33cd59aa0
+  data.tar.gz: 8ae83c58992563b5c7b7474c29df74ef45d5450eac7ce4be4280e7ff36712435
 SHA512:
-  metadata.gz: 8a64dd7d050f06d49a5d8261b09b0437faf7a579e086b154903daf86de86ad799a1b97c98d44149b0e0fb20e4531a9d435b787adccefff7b89afb91f4cc44af3
-  data.tar.gz: 60ac29b15fb518bfaad4026ca02d55a926a829f1229f758993a07cace6117030247211750fb1bc33deb9547e55e406ab81e1a06f2ecc3f9208d626d62744aa3c
+  metadata.gz: d59d9c091e78af3808e494ff89d9dc0432528a8b69b9c413111a994e7d1fef2718797e23090c885307be2932ea021834fcb25298b173477d9fcad5696148a537
+  data.tar.gz: ed3bae975a14d4790044097200984c8dd48c28a50023a0e6326c1dd709c117f35f399a8491125fb9eb9c5cf432519e370fc4cdc5c40ec5b4c5da82e0fdf47290

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.3.1 (2023-09-20)
+
+- Added support for Trilogy
+
+## 0.3.0 (2023-07-02)
+
+- Dropped support for Ruby < 3 and Active Record < 6.1
+
 ## 0.2.0 (2022-04-05)
 
 - Added `range` option

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2022 Andrew Kane
+Copyright (c) 2020-2023 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

@@ -219,6 +219,12 @@ If a series has dimensions, they must match exactly as well
 Rollup.series("Orders by platform and channel", dimensions: {platform: "Web", channel: "Search"})
 ```
 
+Get a specific time range
+
+```ruby
+Rollup.where(time: Date.current.all_year).series("New Users")
+```
+
 ### Multiple Series
 
 *PostgreSQL only*
@@ -241,6 +247,12 @@ Filter by dimensions
 Rollup.where_dimensions(platform: "Web").multi_series("Orders by platform and channel")
 ```
 
+Get a specific time range
+
+```ruby
+Rollup.where(time: Date.current.all_year).multi_series("Orders by platform")
+```
+
 ### Raw Data
 
 Uses the `Rollup` model to query the data directly

data/lib/generators/rollups_generator.rb

@@ -25,10 +25,6 @@ class RollupsGenerator < Rails::Generators::Base
   end
 
   def adapter
-    if ActiveRecord::VERSION::STRING.to_f >= 6.1
-      ActiveRecord::Base.connection_db_config.adapter.to_s
-    else
-      ActiveRecord::Base.connection_config[:adapter].to_s
-    end
+    ActiveRecord::Base.connection_db_config.adapter.to_s
   end
 end

data/lib/rollup/aggregator.rb

@@ -183,16 +183,8 @@ class Rollup
       conflict_target = [:name, :interval, :time]
       conflict_target << :dimensions if Utils.dimensions_supported?
 
-      if ActiveRecord::VERSION::MAJOR >= 6
-        options = Utils.mysql? ? {} : {unique_by: conflict_target}
-        Rollup.unscoped.upsert_all(records, **options)
-      else
-        update = Utils.mysql? ? [:value] : {columns: [:value], conflict_target: conflict_target}
-        Rollup.unscoped.import(records,
-          on_duplicate_key_update: update,
-          validate: false
-        )
-      end
+      options = Utils.mysql? ? {} : {unique_by: conflict_target}
+      Rollup.unscoped.upsert_all(records, **options)
     end
   end
 end

data/lib/rollup/utils.rb

@@ -41,7 +41,7 @@ class Rollup
       end
 
       def mysql?
-        adapter_name =~ /mysql/i
+        adapter_name =~ /mysql|trilogy/i
       end
 
       def sqlite?

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.2.0"
+  VERSION = "0.3.1"
 end

data/lib/rollups.rb

@@ -4,14 +4,14 @@ require "groupdate"
 
 ActiveSupport.on_load(:active_record) do
   # must come first
-  require "rollup"
+  require_relative "rollup"
 
-  require "rollup/model"
+  require_relative "rollup/model"
   extend Rollup::Model
   Rollup.rollup_column = :time
 
   # modules
-  require "rollup/aggregator"
-  require "rollup/utils"
-  require "rollup/version"
+  require_relative "rollup/aggregator"
+  require_relative "rollup/utils"
+  require_relative "rollup/version"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollups
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !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: '2.6'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rollup time-series data in Rails