hiccup 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe99ba209d0c2a346d24591b15b1dc0cabfbfb6
-  data.tar.gz: 100d9df2ccd8d556ce1427df1660f28882a3289f
+  metadata.gz: 12836b490a92bc840e8813971b18961e8937db6e
+  data.tar.gz: cfb2ada216ea9649659e720425ecab1f3639a7ed
 SHA512:
-  metadata.gz: 8d8cb3e0f69afab72778f2d0850a158126de8224683f938e028132a146f5418afc9952b4101e8b7a859e45aaf64b9dcc0598394dd062a1f32a23812fe318923d
-  data.tar.gz: 513c539cff89280cf305c767ef82410bba962d45d03f4b17b3265d6023582e859d8d050e97f17e71f640ea174e0f069b248cf1beba0c4950b116e0770e402ecf
+  metadata.gz: f1edf0d7587372b3475b5f80e716d6f355fe227653a3b972e70af069524effced0c4bf153ab1e11e67060fdab30fb54b9bac802e0bbdf3091818310ad6cf3423
+  data.tar.gz: 428785f29fb442dee1cba0c1a5cee48348f654f12213a2e15fb4b944260d1f4a85bdd72143d36fb1ae7fb3af8ce96964fc77afeec7b47d35bdf0fbf24536fc27

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -52,6 +52,11 @@ module Hiccup
       
       def first_occurrence_on_or_after(date)
         @year, @month = date.year, date.month
+        if skip > 1
+          offset = months_since_schedule_start(@year, @month)
+          add_to_months offset % skip
+        end
+        
         get_context
         
         @position = cycle.index { |day| day >= date.day }
@@ -66,6 +71,11 @@ module Hiccup
       
       def first_occurrence_on_or_before(date)
         @year, @month = date.year, date.month
+        if skip > 1
+          offset = months_since_schedule_start(@year, @month)
+          subtract_from_months offset % skip
+        end
+        
         get_context
         
         @position = cycle.rindex { |day| day <= date.day }
@@ -101,18 +111,26 @@ module Hiccup
       
       def next_month
         @position = 0
-        @month += skip
-        @year, @month = year + 1, month - 12 if month > 12
+        add_to_months skip
         get_context
       end
       
+      def add_to_months(offset)
+        @month += offset
+        @year, @month = @year + 1, @month - 12 while @month > 12
+      end
+      
       def prev_month
         @position = @cycle.length - 1
-        @month -= skip
-        @year, @month = year - 1, month + 12 if month < 1
+        subtract_from_months skip
         get_context
       end
       
+      def subtract_from_months(offset)
+        @month -= offset
+        @year, @month = @year - 1, @month + 12 while @month < 1
+      end
+      
       def get_context
         @last_day_of_month = [4, 6, 9, 11].member?(month) ? 30 : 31
         @last_day_of_month = leap_year?(year) ? 29 : 28 if month == 2
@@ -121,6 +139,11 @@ module Hiccup
       
       
       
+      def months_since_schedule_start(year, month)
+        (year - start_date.year) * 12 + (month - start_date.month)
+      end
+      
+      
     end
   end
 end

data/lib/hiccup/version.rb

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

data/test/monthly_enumerator_test.rb

@@ -22,7 +22,6 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
     end
     
     context "when enumerating backward" do
-      
       should "return the most-recent date prior to the start_date, NOT the earliest date in the month" do
         # Start with a date in the middle of the month
         # More than one date prior to the seed date, yet
@@ -31,8 +30,33 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
         enumerator = @schedule.enumerator.new(@schedule, date)
         assert_equal Date.new(2013, 10, 13), enumerator.prev
       end
-      
     end
   end
   
+  
+  context "with a schedule that skips" do
+    setup do
+      @schedule = Schedule.new(
+        kind: :monthly,
+        skip: 2,
+        monthly_pattern: [[1, "Thursday"]],
+        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))
+      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))
+      end
+    end
+  end
+  
+  
 end

metadata

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