hiccup 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 604218739c9eacb3fe347bb5ce9aaec11b9043c1
-  data.tar.gz: 8dfd6a12f48cdaec2dc78a6b2388e4153ea94a60
+  metadata.gz: 5b2f49ba420f01d88054405099c8018481fbd287
+  data.tar.gz: 238c4d45fefd07b91b72ec70c8cd43c23a324e40
 SHA512:
-  metadata.gz: dbb02a81c4a2fbc22d62d859208030166cebb5d5fcc558b2b8026cd003fef3294e1aae837bf4ad8a0f8a5730499720d09d03323bd58685bf309a24f9fa729ba5
-  data.tar.gz: 708ade0f9f4f66c75bb3834767a9cae0840d8906831a56cb22a4d6755f218f643079b2f7779c851ae2d3ca92c49cb78fb8670c511696b02ca0a8e6f022d1b585
+  metadata.gz: f6b93567956cd2211d490e8aea9533c4f18cbb2f5262f9ecf97e94084c31aa0261071bd9b345b19fa45ed97b9c15d90ffe710fd5fcd5fa9ae3d312e72bab782b
+  data.tar.gz: 8bfbda4a4ba9b3d338d4b579cbe86f3b1fceffab2bb3f6f153d22854d1d4516054d0a0c193b136c8551e8fb94573580b07d881a48c4168f0f55e8ae0b5c7a355

data/lib/hiccup/enumerable/monthly_date_enumerator.rb

@@ -6,7 +6,7 @@ module Hiccup
     protected
 
       def occurrences_in_month(year, month)
-        monthly_pattern
+        monthly_pattern.map(&method(:coerce_day_to_positive))
       end
 
     end

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -110,7 +110,8 @@ module Hiccup
             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
+              day = day - wday_of_last_of_month + (ordinal * 7)
+              day = last_day_of_month + day
             else
               wday_of_first_of_month = Date.new(year, month, 1).wday
               day = day + 7 if (wday < wday_of_first_of_month)
@@ -119,7 +120,7 @@ module Hiccup
             end
             day
           else
-            occurrence
+            coerce_day_to_positive(occurrence)
           end
         end
       end
@@ -165,6 +166,12 @@ module Hiccup
       end
 
 
+      def coerce_day_to_positive(index)
+        # Converts e.g. -1 (last day of the month) to 31
+        return index if index > 0
+        last_day_of_month + index + 1
+      end
+
     end
   end
 end

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.17"
+  VERSION = "0.5.18"
 end

data/test/monthly_enumerator_test.rb

@@ -71,16 +71,15 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
 
   context "last of the month" do
     should "return the last day of the month" do
-      date = Date.new(2014, 12, 31)
+      date = Date.new(2014, 12, 30)
       @schedule = Schedule.new(
         kind: :monthly,
         monthly_pattern: [-1],
         start_date: date
       )
       enumerator = @schedule.enumerator.new(@schedule, date)
+      assert_equal Date.new(2014, 12, 31), enumerator.next
       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
@@ -126,6 +125,27 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
       enumerator = @schedule.enumerator.new(@schedule, Date.new(2015, 2, 28))
       assert_equal Date.new(2015, 2, 17), enumerator.prev
     end
+
+    should "find the correct occurence on or after a date in the same month" do
+      date = Date.new(2016, 1, 1)
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-1, "Sunday"]],
+        start_date: date
+      )
+      enumerator = @schedule.enumerator.new(@schedule, date)
+      assert_equal Date.new(2016, 1, 31), enumerator.next
+    end
+
+    should "find the correct occurence on or before a date in a subsequent month" do
+      @schedule = Schedule.new(
+        kind: :monthly,
+        monthly_pattern: [[-1, "Friday"]],
+        start_date: Date.new(2016, 1, 1)
+      )
+      enumerator = @schedule.enumerator.new(@schedule, Date.new(2016, 2, 1))
+      assert_equal Date.new(2016, 1, 29), enumerator.prev
+    end
   end
 
   context "with an empty schedule" do

metadata

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