groupdate 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87e6343538ca0aa70041863153b514d765952ca9
-  data.tar.gz: a5121f5bab5c8f9de575e5adcf09885c88abd08a
+  metadata.gz: a75601315268495e473958ab19c6a39197efb3b9
+  data.tar.gz: 1b0e1d8b246e49e5e4d3abb76c40bc617f97e7bf
 SHA512:
-  metadata.gz: 62c9cc55ca4f808911727d3513a50f79b379b041589b38a52214b9d87fe38d2d321ce6bb4d41a7b0fc9a8fc9a780f039d626582ce71cd65fdfe81467ac1a9107
-  data.tar.gz: b0dd02d55c7f72247e1bb5c7b9f221cddd4321fcb4e77d2101b9b759948e145385987e938134d5888ee95864066fbb943aae7a6226b7bc26fc334ffb6c219402
+  metadata.gz: 4c0edf976534abc2ccb263b39e48b3664991122ed50b541d4535f139243e5d657a2a525054a2906a1d037a4a65f7dbe1ea9d5f932d70f1d1fd507433cb00d499
+  data.tar.gz: 073ec218da11f747a93af186e5c82ed7e4035f0904816013b34f89130608befe984af491acbc3fcfd8da55ffd6d92d6545eeffb2a3ed15f946e821f3eb45dcf3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.1.1
+
+- Fixed `current: false`
+- Fixed `last` with `group_by_quarter`
+- Raise `ArgumentError` when `last` option is not supported
+
 ## 3.1.0
 
 - Better support for date columns with `time_zone: false`

data/lib/groupdate/magic.rb

@@ -182,11 +182,27 @@ module Groupdate
           last += 1.day unless time_range.exclude_end?
           time_range = Range.new(time_zone.parse(time_range.first.to_s), last, true)
         elsif !time_range && options[:last]
-          step = 1.send(field) if 1.respond_to?(field)
+          if field == :quarter
+            step = 3.months
+          elsif 1.respond_to?(field)
+            step = 1.send(field)
+          else
+            raise ArgumentError, "Cannot use last option with #{field}"
+          end
           if step
             now = Time.now
-            now -= step if options[:current] == false
-            time_range = round_time(now - (options[:last].to_i - 1).send(field))..now
+            # loop instead of multiply to change start_at - see #151
+            start_at = now
+            (options[:last].to_i - 1).times do
+              start_at -= step
+            end
+
+            time_range =
+              if options[:current] == false
+                round_time(start_at - step)...round_time(now)
+              else
+                round_time(start_at)..now
+              end
           end
         end
         time_range

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/test/test_helper.rb

@@ -225,6 +225,11 @@ module TestDatabase
     assert_equal expected, User.group_by_year(:created_at, last: 3).count
   end
 
+  def test_last_hour_of_day
+    error = assert_raises(ArgumentError) { User.group_by_hour_of_day(:created_at, last: 3).count }
+    assert_equal "Cannot use last option with hour_of_day", error.message
+  end
+
   def test_current
     create_user "#{this_year - 3}-01-01"
     create_user "#{this_year - 1}-01-01"
@@ -235,6 +240,16 @@ module TestDatabase
     assert_equal expected, User.group_by_year(:created_at, last: 2, current: false).count
   end
 
+  def test_quarter_and_last
+    create_user "#{this_year}-#{this_quarters_month}-01"
+    create_user "#{this_year}-#{this_quarters_month - 6}-01"
+    expected = {
+      Date.parse("#{this_year}-#{this_quarters_month - 3}-01") => 0,
+      Date.parse("#{this_year}-#{this_quarters_month}-01") => 1
+    }
+    assert_equal expected, User.group_by_quarter(:created_at, last: 2).count
+  end
+
   def test_format_locale
     create_user "2014-10-01"
     assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b", locale: :de).count
@@ -262,11 +277,13 @@ module TestDatabase
   # permit
 
   def test_permit
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w(week)).count }
+    error = assert_raises(ArgumentError) { User.group_by_period(:day, :created_at, permit: %w(week)).count }
+    assert_equal "Unpermitted period", error.message
   end
 
   def test_permit_bad_period
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:bad_period, :created_at).count }
+    error = assert_raises(ArgumentError) { User.group_by_period(:bad_period, :created_at).count }
+    assert_equal "Unpermitted period", error.message
   end
 
   def test_permit_symbol_symbols
@@ -1046,7 +1063,6 @@ module TestGroupdate
   end
 
   def test_date_column_with_time_zone
-    # TODO change for Groupdate 3.0
     expected = {
       Date.parse("2013-05-02") => 1
     }
@@ -1148,6 +1164,10 @@ module TestGroupdate
     assert_equal expected, call_method(method, :created_at, options.merge(series: true, time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end)))
   end
 
+  def this_quarters_month
+    Time.now.utc.beginning_of_quarter.month
+  end
+
   def this_year
     Time.now.utc.year
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport