Raise ArgumentError when last option is not supported

Andrew Kane
1 parent 7adfdd77
Showing 3 changed files with 13 additions and 3 deletions Show diff stats
CHANGELOG.md
lib/groupdate/magic.rb
test/test_helper.rb
@@ -2,6 +2,7 @@
 - Fixed `current: false`
 - Fixed `last` with `group_by_quarter`
+- Raise `ArgumentError` when `last` option is not supported
 ## 3.1.0
@@ -184,8 +184,10 @@ module Groupdate
         elsif !time_range && options[:last]
           if field == :quarter
             step = 3.months
+          elsif 1.respond_to?(field)
+            step = 1.send(field)
           else
-            step = 1.send(field) if 1.respond_to?(field)
+            raise ArgumentError, "Cannot use last option with #{field}"
           end
           if step
             now = Time.now
@@ -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"
@@ -272,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
	@@ -2,6 +2,7 @@		@@ -2,6 +2,7 @@
2		2
3	- Fixed `current: false`	3	- Fixed `current: false`
4	- Fixed `last` with `group_by_quarter`	4	- Fixed `last` with `group_by_quarter`
		5	+- Raise `ArgumentError` when `last` option is not supported
5		6
6	## 3.1.0	7	## 3.1.0
7		8