rollups 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33b1111b50f1f8fcc5b6982932a09c840ca4f4a81191380737e8cdf68775c9e
-  data.tar.gz: 85d9688173df57cd7ab8eb40a4def91adde625303df8374a397e2e136820256f
+  metadata.gz: 436de838dcb69b97a2e4be818c0b512b6e59b843da66f74d3d58f78b1930d487
+  data.tar.gz: a3b91b96b19d804fce867f6faa1f72e031840bd4c5b3f3689342af9a17a6a1ec
 SHA512:
-  metadata.gz: f64fac7253c86ae3bbc92086551f8c76cb565d5d0630b700707ffd059630bb60017469be586126bc54051ca8df6ccfdfbb42664eacefc982e9618457f4e5e65b
-  data.tar.gz: a7971f424d126c532f03208cf7fb9f72d505787dd3251df33db10d6487d39e29ab6de7d55249d064c9153d50cf2bb07a29a0a3124c1c1111cb585560565b6418
+  metadata.gz: ff9d17de99816333b6ce804aba196ab0a494bbe4c9549f6a3449aa158673f58322dc313ab9e984453ab6a7367d85bd89afc60440f1b2ed89bc82a0e5dd6754ff
+  data.tar.gz: 7af20ea69dbd59dbbca0a6aaebd91fc546d627f0cf4a4d58abbfec045a1b0d9d2bb3cc69f48b4d1c0cae8f270246ede2aee69e9c4c9bba76a12fd1e30fdf9178

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 (2021-10-20)
+
+- Fixed issue rolling up rollups
+
 ## 0.1.2 (2021-06-07)
 
 - Fixed deprecation warning with Active Record 6.1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Andrew Kane
+Copyright (c) 2020-2021 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/lib/rollup/aggregator.rb

@@ -51,7 +51,7 @@ class Rollup
       elsif !clear
         # if no rollups, compute all intervals
         # if rollups, recompute last interval
-        max_time = Rollup.where(name: name, interval: interval).maximum(Utils.time_sql(interval))
+        max_time = Rollup.unscoped.where(name: name, interval: interval).maximum(Utils.time_sql(interval))
         if max_time
           # for MySQL on Ubuntu 18.04 (and likely other platforms)
           if max_time.is_a?(String)
@@ -157,7 +157,7 @@ class Rollup
     def maybe_clear(clear, name, interval)
       if clear
         Rollup.transaction do
-          Rollup.where(name: name, interval: interval).delete_all
+          Rollup.unscoped.where(name: name, interval: interval).delete_all
           yield
         end
       else
@@ -173,10 +173,10 @@ class Rollup
 
       if ActiveRecord::VERSION::MAJOR >= 6
         options = Utils.mysql? ? {} : {unique_by: conflict_target}
-        Rollup.upsert_all(records, **options)
+        Rollup.unscoped.upsert_all(records, **options)
       else
         update = Utils.mysql? ? [:value] : {columns: [:value], conflict_target: conflict_target}
-        Rollup.import(records,
+        Rollup.unscoped.import(records,
           on_duplicate_key_update: update,
           validate: false
         )

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.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rollups.rb

@@ -8,6 +8,7 @@ ActiveSupport.on_load(:active_record) do
 
   require "rollup/model"
   extend Rollup::Model
+  Rollup.rollup_column = :time
 
   # modules
   require "rollup/aggregator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollups
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,106 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -173,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Rollup time-series data in Rails