groupdate 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d18870af57fc18006c5f176fa3138dfe36a715b16e5a6113f447aee6d3b7468
-  data.tar.gz: 889870a1a2db8784e28413c6071a784dff66d00b4aaf05a323e70e5d16f09fd8
+  metadata.gz: 448e7901aa2448bca591568110960048d18ac0f21faa5c3cae566fc4a6de30c4
+  data.tar.gz: ba242e41103ae9d2542ff0509de1f454f58142957f0da190482769a42a152887
 SHA512:
-  metadata.gz: 2ae29a1e8d0eb14c4ef904fbe366cb5f7029d9e94429a74f6f70073a880f2910f62d5161d39618808c09dc937185cc79ba233ac3fc7e34f983a8e32d60e0be70
-  data.tar.gz: 6348f6853cf2015f6777bcc63e1e416a31456a0e779678164992bd6424daca73272bb5fcb12016d1f3c085b4e14e991afa067f4f93354982e7229699f3ea2eab
+  metadata.gz: 91b008f8ee0d9ad419ec042ee2f417b621fba09793b223705a2898fe21083a09527885ead3be2d3b8003427473d1f996938098c9bd7139bcb9bffdad2810734c
+  data.tar.gz: d4eb493bdf4b7f40eda2733003263bee49e62f9f69fb6239bec118d1768ce0630c21244e819147ca6b5b1556a9b5e125ed69748e2ee69d3c325f31a2740a6ec5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.2.1 (2020-09-09)
+
+- Improved error message for invalid ranges
+- Fixed bug with date string ranges
+
 ## 5.2.0 (2020-09-07)
 
 - Added warning for non-attribute argument

data/lib/groupdate/relation_builder.rb

@@ -194,12 +194,12 @@ module Groupdate
         if @time_range.end
           op = @time_range.exclude_end? ? "<" : "<="
           if @time_range.begin
-            ["#{column} >= ? AND #{column} #{op} ?", @time_range.first, @time_range.last]
+            ["#{column} >= ? AND #{column} #{op} ?", @time_range.begin, @time_range.end]
           else
-            ["#{column} #{op} ?", @time_range.last]
+            ["#{column} #{op} ?", @time_range.end]
           end
         else
-          ["#{column} >= ?", @time_range.first]
+          ["#{column} >= ?", @time_range.begin]
         end
       else
         ["#{column} IS NOT NULL"]

data/lib/groupdate/series_builder.rb

@@ -141,16 +141,35 @@ module Groupdate
     def time_range
       @time_range ||= begin
         time_range = options[:range]
-        # entire range must be Date if begin or end is Date
-        if time_range.is_a?(Range) && (time_range.begin.is_a?(Date) || time_range.end.is_a?(Date))
-          if time_range.begin
-            start = time_zone.parse(time_range.first.to_s)
+
+        if time_range.is_a?(Range)
+          # check types
+          [time_range.begin, time_range.end].each do |v|
+            case v
+            when nil, Date, Time
+              # good
+            when String
+              # TODO raise error in Groupdate 6
+              warn "[groupdate] Range bounds should be Date or Time, not #{v.class.name}. This will raise an error in Groupdate 6"
+              break
+            else
+              raise ArgumentError, "Range bounds should be Date or Time, not #{v.class.name}"
+            end
           end
-          if time_range.end
-            last = time_zone.parse(time_range.last.to_s)
-            last += 1.day unless time_range.exclude_end?
+
+          start = time_range.begin
+          start = start.in_time_zone(time_zone) if start
+
+          exclude_end = time_range.exclude_end?
+
+          finish = time_range.end
+          finish = finish.in_time_zone(time_zone) if finish
+          if time_range.end.is_a?(Date) && !exclude_end
+            finish += 1.day
+            exclude_end = true
           end
-          time_range = Range.new(start, last, true)
+
+          time_range = Range.new(start, finish, exclude_end)
         elsif !time_range && options[:last]
           if period == :quarter
             step = 3.months

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.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