hiccup 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180b4da041c8d42e737e95f8d2960f810d499880
-  data.tar.gz: 749a34b97e947982cb47f3623b34b9953368b5a0
+  metadata.gz: 5360432a77538aebc70858cfabaa86053f0de7d2
+  data.tar.gz: f6b1a1605bcb80ab578dda9b44c2dc6d50199c23
 SHA512:
-  metadata.gz: 9ce0d249305f1740a3f01eae8397591c54872f7eb91b82a7696bb6546f0e7dff76f42c925ea0b7d8504ff6660b5f791dcdc49ed9f9108fb0ede15ad0f59be94b
-  data.tar.gz: cbe05cd9de92f19f785300905c17c19c55aec7c0700d09fc6282df45963f0d1b1f217d934d982fe879106c15dce77b4e09f2810ea099ac6b4e36cd3c4a5af787
+  metadata.gz: 0d1ed6207b1477718f353df54ff3b5bd430d0f4ff223fcf312a7419165decee220cf0b8981ad54c2d768b4528d2a8f101e4104206f2e499fa557e7a05e658829
+  data.tar.gz: 5b9dd9c74e8b5baf294e5a108a82933bdf179740cb1083d56d7339fc33576ed5defc074af775eb94a999a1ba1d284cff944c0470f949d579b7c555289367d59e

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -102,15 +102,21 @@ module Hiccup
 
 
       def occurrences_in_month(year, month)
-        wday_of_first_of_month = Date.new(year, month, 1).wday
         monthly_pattern.map do |occurrence|
           if occurrence.is_a?(Array)
             ordinal, weekday = occurrence
             wday = Date::DAYNAMES.index(weekday)
             day = wday
-            day = day + 7 if (wday < wday_of_first_of_month)
-            day = day - wday_of_first_of_month
-            day = day + (ordinal * 7) - 6
+            if ordinal < 0
+              wday_of_last_of_month = Date.new(year, month, -1).wday
+              day = day + 7 if wday <= wday_of_last_of_month
+              day = day - wday_of_last_of_month + (ordinal * 7) - 1
+            else
+              wday_of_first_of_month = Date.new(year, month, 1).wday
+              day = day + 7 if (wday < wday_of_first_of_month)
+              day = day - wday_of_first_of_month
+              day = day + (ordinal * 7) - 6
+            end
             day
           else
             occurrence

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.15"
+  VERSION = "0.5.16"
 end

data/test/monthly_enumerator_test.rb

@@ -69,6 +69,65 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
   end
 
 
+  context "last of the month" do
+    should "return the last day of the month" do
+      date = Date.new(2014, 12, 31)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [-1],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, date)
+      assert_equal Date.new(2015, 1, 31), enumerator.next
+      assert_equal Date.new(2015, 2, 28), enumerator.next
+      assert_equal Date.new(2015, 3, 31), enumerator.next
+    end
+
+    should "return the last sunday of the month" do
+      date = Date.new(2014, 12, 31)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-1, "Sunday"]],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, date)
+      assert_equal Date.new(2015, 1, 25), enumerator.next
+    end
+
+    should "return the last monday of the month" do
+      date = Date.new(2014, 12, 31)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-1, "Monday"]],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, Date.new(2015, 2, 28))
+      assert_equal Date.new(2015, 3, 30), enumerator.next
+    end
+
+    should "return the last tuesday of the month" do
+      date = Date.new(2014, 12, 31)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-1, "Tuesday"]],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, Date.new(2015, 1, 31))
+      assert_equal Date.new(2015, 2, 24), enumerator.next
+    end
+
+    should "return the second to last tuesday of the month" do
+      date = Date.new(2014, 12, 31)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-2, "Tuesday"]],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, Date.new(2015, 2, 28))
+      assert_equal Date.new(2015, 2, 17), enumerator.prev
+    end
+  end
+
   context "with an empty schedule" do
     setup do
       @schedule = Schedule.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport