groupdate 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80d5888009185498959b5a739bc9a4517d45b801391a91cfcfc7a0f0b914b68
-  data.tar.gz: 2a6b502d0526c534ca2ffdfbe28cf1fa1c394e3643c9a9546e1c288305022642
+  metadata.gz: 3bdc7848103a019e737a44e522ae42dcdb521c2ae136d9a52d1bafba795127d4
+  data.tar.gz: fccb9acee92d478d605ac8022e75173bccd4825ad5118a32d5aaaf3ef34c5349
 SHA512:
-  metadata.gz: '0867e9d04c7cf962813e9ed6ce4c3e8e94f4e468b198ade9278dabe03d5ae6b2538190cb427f074ac469b1ed19edc094f741461b550a6629de99b82aeca592c5'
-  data.tar.gz: 32244b184845925291bbc4cf399d0967413bd17456c9b534a9184f19e965654a8bad239a44d5b0555f7b63090d75e501ddaef449c83becfaf48d9ad136230ca0
+  metadata.gz: 9ad47038f6ec8193721ebc56509c1bda0feff36ecb65a7c08e63859592d55de1387e3e0fb907ac55c16329bf8c275265492ab45b6d7217643203d1c94419d324
+  data.tar.gz: c53eb19f798e162eef984cf6dc32b8be7b3b9e40008dfed445653fae618ae0d1db65e1420db6896f254f5c48daf49f3e97e163c5ed41958e75ad98c7d77590a0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.1.1
+
+- Made column resolution consistent with `group`
+- Added support for `alias_attribute`
+
 ## 4.1.0
 
 - Many performance improvements
@@ -8,7 +13,7 @@
 ## 4.0.2
 
 - Make `current` option work without `last`
-- Fixed default value for `maximum`, `minimum`, and `average`
+- Fixed default value for `maximum`, `minimum`, and `average` (periods with no results now return `nil` instead of `0`, pass `default_value: 0` for previous behavior)
 
 ## 4.0.1
 

data/README.md

@@ -48,7 +48,7 @@ and
 - day_of_month
 - month_of_year
 
-Use it anywhere you can use `group`. Works with `count`, `sum`, `minimum`, `maximum`, `average`, and [`median`](https://github.com/ankane/active_median).
+Use it anywhere you can use `group`. Works with `count`, `sum`, `minimum`, `maximum`, and `average`. For `median`, check out [ActiveMedian](https://github.com/ankane/active_median). For other aggregate functions, including multiple together, check out [CalculateAll](https://github.com/codesnik/calculate-all).
 
 ### Time Zones
 

data/lib/groupdate/relation_builder.rb

@@ -4,7 +4,7 @@ module Groupdate
 
     def initialize(relation, column:, period:, time_zone:, time_range:, week_start:, day_start:)
       @relation = relation
-      @column = column
+      @column = resolve_column(relation, column)
       @period = period
       @time_zone = time_zone
       @time_range = time_range
@@ -173,5 +173,14 @@ module Groupdate
         ["#{column} IS NOT NULL"]
       end
     end
+
+    # resolves eagerly
+    # need to convert both where_clause (easy)
+    # and group_clause (not easy) if want to avoid this
+    def resolve_column(relation, column)
+      node = relation.send(:relation).send(:arel_columns, [column]).first
+      node = Arel::Nodes::SqlLiteral.new(node) if node.is_a?(String)
+      relation.connection.visitor.accept(node, Arel::Collectors::SQLString.new).value
+    end
   end
 end

data/lib/groupdate/series_builder.rb

@@ -176,7 +176,7 @@ module Groupdate
           last_step = series.last
           loop do
             next_step = last_step + step
-            next_step = round_time(next_step) if next_step.hour != 0 # add condition to speed up
+            next_step = round_time(next_step) if next_step.hour != day_start # add condition to speed up
             break unless time_range.cover?(next_step)
 
             if next_step == last_step

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data