rollups 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac85a23af0477ab8ce7abed983995b06a935f82c2836fc0a63ff1fe4b150b9d7
-  data.tar.gz: bb60e3c7c87e22e68a4ba94652e011031292ce879d60824f745d7f808055684c
+  metadata.gz: eb7a00e9ed34a6924e0d6ea7c27fbe96275817274abcc5e0aed4c03edf38f9b2
+  data.tar.gz: cb52591ce2a2f40c173bb925659a7b31812522dd2c81c0906ad2aff80b03f000
 SHA512:
-  metadata.gz: abee36f374c42202b8a13919ff863aef511af7c28258eb5f657b0b00de4d8f9d329d53d1f58768377372eae428c09b7f223fbcdeb2b7a43a87339fbe3d9f3e9e
-  data.tar.gz: 452951f5d6a8fda80288650b7061e0e17ab9bfd76a2638a7f529b4919ec2933fb725b07e6f85392665fd4e44b69790eed1d69b88341122aa8338640e4b45c868
+  metadata.gz: a7a044a8e1b85c51de0043e48381037adb080bded3dbd620fc1dec3715c8cf735a94778470672b269a66e31c764889dbc2d58f02dee7cb542eb739496d36d4c2
+  data.tar.gz: b66ea1e6f81de6bce70d947c816aee005363cdea4e61a1a98cdf4b83714f8b8c814bcba29806436589d6e5ee820f8704267944359341aa20afd84ceda215fb65

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.1.4 (2021-12-15)
+
+- Fixed warning with Active Record 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
+
+## 0.1.1 (2020-09-09)
+
+- Fixed results for earlier versions of MySQL
+
 ## 0.1.0 (2020-09-07)
 
 - First release

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/README.md

@@ -4,6 +4,8 @@
 
 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)
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/lib/generators/rollups_generator.rb

@@ -12,7 +12,7 @@ class RollupsGenerator < Rails::Generators::Base
   end
 
   def migration_source
-    case ActiveRecord::Base.connection_config[:adapter].to_s
+    case adapter
     when /postg/i
       "dimensions.rb"
     else
@@ -23,4 +23,12 @@ class RollupsGenerator < Rails::Generators::Base
   def migration_version
     "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
   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
+  end
 end

data/lib/rollup/aggregator.rb

@@ -35,12 +35,14 @@ class Rollup
     def perform_group(name, column:, interval:, time_zone:, current:, last:, clear:)
       raise ArgumentError, "Cannot use last and clear together" if last && clear
 
+      time_zone ||= Rollup.time_zone
+
       gd_options = {
         current: current
       }
 
       # make sure Groupdate global options aren't applied
-      gd_options[:time_zone] = time_zone || Rollup.time_zone
+      gd_options[:time_zone] = time_zone
       gd_options[:week_start] = Rollup.week_start if interval.to_s == "week"
       gd_options[:day_start] = 0 if Utils.date_interval?(interval)
 
@@ -49,8 +51,14 @@ 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)
+            utc = ActiveSupport::TimeZone["Etc/UTC"]
+            max_time = Utils.date_interval?(interval) ? max_time.to_date : utc.parse(max_time).in_time_zone(time_zone)
+          end
+
           # aligns perfectly if time zone doesn't change
           # if time zone does change, there are other problems besides this
           gd_options[:range] = max_time..
@@ -149,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
@@ -165,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.0"
+  VERSION = "0.1.4"
 end

data/lib/rollup.rb

@@ -75,10 +75,7 @@ class Rollup < ActiveRecord::Base
   # feels cleaner than overriding _read_attribute
   def inspect
     if Utils.date_interval?(interval)
-      previous_time = time_before_type_cast
-      previous_time = previous_time.to_s(:db) if previous_time.is_a?(Time)
-      previous_time = previous_time + " 00:00:00" if previous_time.length == 10
-      super.sub("time: \"#{previous_time}\"", "time: \"#{time.to_s(:db)}\"")
+      super.sub(/time: "[^"]+"/, "time: \"#{time.to_formatted_s(:db)}\"")
     else
       super
     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.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-12-16 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
+description:
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -158,7 +60,7 @@ homepage: https://github.com/ankane/rollup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,8 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Rollup time-series data in Rails
 test_files: []