rollups 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ec70ee09b71a3a86cb895a6ebb08da1a10fcce3387a713e48f459bd6b3b1b2
-  data.tar.gz: df6c597429334dac4f29d2da102a01818d8bad8bf7f42b3e93801b11cee6d2bf
+  metadata.gz: b33b1111b50f1f8fcc5b6982932a09c840ca4f4a81191380737e8cdf68775c9e
+  data.tar.gz: 85d9688173df57cd7ab8eb40a4def91adde625303df8374a397e2e136820256f
 SHA512:
-  metadata.gz: 64b0b3d9f3f81292de5753c2514bbe6d976fdcd2a4636c3563c1e8ba6e45d0f4b44a00b5dbf239dbb811decbb28695cade962f304edebc19518c383fbe04fac0
-  data.tar.gz: 6a096a113be0c7a1a1ab543f43110c1894d418f53163cd3c632baa1a53e311ffd3947a7ccddecc0b7333257cb35a874d8cd1192289e83e1e03e619a3b7c0cfaa
+  metadata.gz: f64fac7253c86ae3bbc92086551f8c76cb565d5d0630b700707ffd059630bb60017469be586126bc54051ca8df6ccfdfbb42664eacefc982e9618457f4e5e65b
+  data.tar.gz: a7971f424d126c532f03208cf7fb9f72d505787dd3251df33db10d6487d39e29ab6de7d55249d064c9153d50cf2bb07a29a0a3124c1c1111cb585560565b6418

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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

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://travis-ci.org/ankane/rollup.svg?branch=master)](https://travis-ci.org/ankane/rollup)
+[![Build Status](https://github.com/ankane/rollup/workflows/build/badge.svg?branch=master)](https://github.com/ankane/rollup/actions)
 
 ## Installation
 

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.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_s(:db)}\"")
     else
       super
     end

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.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollups
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -158,7 +158,7 @@ homepage: https://github.com/ankane/rollup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,8 +173,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.3
+signing_key:
 specification_version: 4
 summary: Rollup time-series data in Rails
 test_files: []