rollups 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac85a23af0477ab8ce7abed983995b06a935f82c2836fc0a63ff1fe4b150b9d7
-  data.tar.gz: bb60e3c7c87e22e68a4ba94652e011031292ce879d60824f745d7f808055684c
+  metadata.gz: e0ec70ee09b71a3a86cb895a6ebb08da1a10fcce3387a713e48f459bd6b3b1b2
+  data.tar.gz: df6c597429334dac4f29d2da102a01818d8bad8bf7f42b3e93801b11cee6d2bf
 SHA512:
-  metadata.gz: abee36f374c42202b8a13919ff863aef511af7c28258eb5f657b0b00de4d8f9d329d53d1f58768377372eae428c09b7f223fbcdeb2b7a43a87339fbe3d9f3e9e
-  data.tar.gz: 452951f5d6a8fda80288650b7061e0e17ab9bfd76a2638a7f529b4919ec2933fb725b07e6f85392665fd4e44b69790eed1d69b88341122aa8338640e4b45c868
+  metadata.gz: 64b0b3d9f3f81292de5753c2514bbe6d976fdcd2a4636c3563c1e8ba6e45d0f4b44a00b5dbf239dbb811decbb28695cade962f304edebc19518c383fbe04fac0
+  data.tar.gz: 6a096a113be0c7a1a1ab543f43110c1894d418f53163cd3c632baa1a53e311ffd3947a7ccddecc0b7333257cb35a874d8cd1192289e83e1e03e619a3b7c0cfaa

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (2020-09-09)
+
+- Fixed results for earlier versions of MySQL
+
 ## 0.1.0 (2020-09-07)
 
 - First release

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://travis-ci.org/ankane/rollup.svg?branch=master)](https://travis-ci.org/ankane/rollup)
+
 ## Installation
 
 Add this line to your application’s Gemfile:

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)
 
@@ -51,6 +53,12 @@ class Rollup
         # if rollups, recompute last interval
         max_time = Rollup.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..

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.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollups
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport