hiccup 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12836b490a92bc840e8813971b18961e8937db6e
-  data.tar.gz: cfb2ada216ea9649659e720425ecab1f3639a7ed
+  metadata.gz: 6c7d5467534e26cb3bb22d205c08b4b064651f71
+  data.tar.gz: 89bf8ac258976fbe3d95c8f3fd66e9908d5a72b8
 SHA512:
-  metadata.gz: f1edf0d7587372b3475b5f80e716d6f355fe227653a3b972e70af069524effced0c4bf153ab1e11e67060fdab30fb54b9bac802e0bbdf3091818310ad6cf3423
-  data.tar.gz: 428785f29fb442dee1cba0c1a5cee48348f654f12213a2e15fb4b944260d1f4a85bdd72143d36fb1ae7fb3af8ce96964fc77afeec7b47d35bdf0fbf24536fc27
+  metadata.gz: 37af0836777d27ec8bc5b0b4fa83a6bc77baf71108a50d80401cf1a314be919c817aac5c1aa1651d7bb31f245f2c7c5989361c910d01e1c9ab4640332faaefa0
+  data.tar.gz: 559990a51e3b9bc7b62da61f5036e53a937110e09f60ec9db4e6879f8811d4a84a4e40512275beb171773d8b214261769757a1c8d69a3e5b2303215c3e8abd1c

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -51,15 +51,19 @@ module Hiccup
       
       
       def first_occurrence_on_or_after(date)
-        @year, @month = date.year, date.month
+        @year, @month, seed_day = date.year, date.month, date.day
         if skip > 1
           offset = months_since_schedule_start(@year, @month)
-          add_to_months offset % skip
+          remainder = offset % skip
+          if remainder > 0
+            add_to_months remainder
+            seed_day = first_day_of_month
+          end
         end
         
         get_context
         
-        @position = cycle.index { |day| day >= date.day }
+        @position = cycle.index { |day| day >= seed_day }
         next_month unless @position
         
         day = cycle[@position]
@@ -70,15 +74,20 @@ module Hiccup
       end
       
       def first_occurrence_on_or_before(date)
-        @year, @month = date.year, date.month
+        @year, @month, seed_day = date.year, date.month, date.day
         if skip > 1
           offset = months_since_schedule_start(@year, @month)
-          subtract_from_months offset % skip
+          remainder = offset % skip
+          if remainder > 0
+            subtract_from_months remainder
+            get_context # figure out last_day_of_month
+            seed_day = last_day_of_month
+          end
         end
         
         get_context
         
-        @position = cycle.rindex { |day| day <= date.day }
+        @position = cycle.rindex { |day| day <= seed_day }
         prev_month unless @position
         
         day = cycle[@position]
@@ -143,6 +152,10 @@ module Hiccup
         (year - start_date.year) * 12 + (month - start_date.month)
       end
       
+      def first_day_of_month
+        1
+      end
+      
       
     end
   end

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
 end

data/test/monthly_enumerator_test.rb

@@ -43,17 +43,27 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
         start_date: Date.new(2015, 1, 1))
     end
     
-    context "when enumerating from the start date" do
-      should "skip months from the schedule's start date" do
-        assert_equal [Date.new(2015, 1, 1), Date.new(2015, 3, 5), Date.new(2015, 5, 7)],
-                     @schedule.occurrences_between(Date.new(2015, 1, 1), Date.new(2015, 5, 31))
+    context "when enumerating from a date in a skipped month" do
+      should "skip months from the schedule's start date not from the offset" do
+        date = Date.new(2015, 2, 1)
+        enumerator = @schedule.enumerator.new(@schedule, date)
+        assert_equal Date.new(2015, 3, 5), enumerator.next
       end
     end
     
-    context "when enumerating from an offset" do
-      should "skip months from the schedule's start date not from the offset" do
-        assert_equal [Date.new(2015, 3, 5), Date.new(2015, 5, 7)],
-                     @schedule.occurrences_between(Date.new(2015, 2, 1), Date.new(2015, 6, 30))
+    context "when enumerating forward from a date toward the end of a skipped month" do
+      should "find the first date from the start of an unskipped month" do
+        date = Date.new(2015, 4, 30)
+        enumerator = @schedule.enumerator.new(@schedule, date)
+        assert_equal Date.new(2015, 5, 7), enumerator.next
+      end
+    end
+    
+    context "when enumerating backward from a date toward the beginning of a skipped month" do
+      should "find the first date from the end of an unskipped month" do
+        date = Date.new(2015, 6, 1)
+        enumerator = @schedule.enumerator.new(@schedule, date)
+        assert_equal Date.new(2015, 5, 7), enumerator.prev
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Bob Lail