fix interval use with bysetpos

Author: nehresma

lib/ice_cube/validations/monthly_by_set_pos.rb

@@ -31,11 +31,12 @@ def dst_adjust?
         true
       end
 
-      def validate(step_time, schedule)
+      def validate(step_time, start_time)
         start_of_month = step_time.beginning_of_month
         end_of_month = step_time.end_of_month
 
-        new_schedule = IceCube::Schedule.new(step_time - 1.month) do |s|
+        # Needs to start on the first day of the month
+        new_schedule = IceCube::Schedule.new(start_of_month.change(hour: step_time.hour, min: step_time.min, sec: step_time.sec)) do |s|
           s.add_recurrence_rule(IceCube::Rule.from_hash(rule.to_hash.except(:by_set_pos, :count, :until)))
         end
 

lib/ice_cube/validations/yearly_by_set_pos.rb

@@ -33,11 +33,12 @@ def dst_adjust?
         true
       end
 
-      def validate(step_time, schedule)
+      def validate(step_time, start_time)
         start_of_year = step_time.beginning_of_year
         end_of_year = step_time.end_of_year
 
-        new_schedule = IceCube::Schedule.new(step_time - 1.year) do |s|
+        # Needs to start on the first day of the year
+        new_schedule = IceCube::Schedule.new(start_of_year.change(hour: step_time.hour, min: step_time.min, sec: step_time.sec)) do |s|
           s.add_recurrence_rule(IceCube::Rule.from_hash(rule.to_hash.except(:by_set_pos, :count, :until)))
         end
 

spec/examples/by_set_pos_spec.rb

@@ -13,6 +13,18 @@ module IceCube
           Time.new(2015,9,23,12,0,0)
         ])
     end
+
+    it 'should work with intervals' do
+      schedule = IceCube::Schedule.from_ical "RRULE:FREQ=MONTHLY;COUNT=4;BYDAY=WE;BYSETPOS=4;INTERVAL=2"
+      schedule.start_time = Time.new(2015, 5, 28, 12, 0, 0)
+      expect(schedule.occurrences_between(Time.new(2015, 01, 01), Time.new(2017, 01, 01))).
+        to eq([
+          Time.new(2015,7,22,12,0,0),
+          Time.new(2015,9,23,12,0,0),
+          Time.new(2015,11,25,12,0,0),
+          Time.new(2016,1,27,12,0,0),
+        ])
+    end
   end
 
   describe YearlyRule, 'BYSETPOS' do
@@ -25,5 +37,39 @@ module IceCube
           Time.new(2016, 7, 31)
         ])
     end
+
+    it 'should work with intervals' do
+      schedule = IceCube::Schedule.from_ical "RRULE:FREQ=YEARLY;BYMONTH=7;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYSETPOS=-1;INTERVAL=2"
+      schedule.start_time = Time.new(1966,7,5)
+      expect(schedule.occurrences_between(Time.new(2015, 01, 01), Time.new(2023, 01, 01))).
+        to eq([
+          Time.new(2016, 7, 31),
+          Time.new(2018, 7, 31),
+          Time.new(2020, 7, 31),
+          Time.new(2022, 7, 31),
+        ])
+    end
+
+    it 'should work with counts' do
+      schedule = IceCube::Schedule.from_ical "RRULE:FREQ=YEARLY;BYMONTH=7;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYSETPOS=-1;COUNT=3"
+      schedule.start_time = Time.new(2016,1,1)
+      expect(schedule.occurrences_between(Time.new(2016, 01, 01), Time.new(2050, 01, 01))).
+        to eq([
+          Time.new(2016, 7, 31),
+          Time.new(2017, 7, 31),
+          Time.new(2018, 7, 31),
+        ])
+    end
+
+    it 'should work with counts and intervals' do
+      schedule = IceCube::Schedule.from_ical "RRULE:FREQ=YEARLY;BYMONTH=7;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYSETPOS=-1;COUNT=3;INTERVAL=2"
+      schedule.start_time = Time.new(2016,1,1)
+      expect(schedule.occurrences_between(Time.new(2016, 01, 01), Time.new(2050, 01, 01))).
+        to eq([
+          Time.new(2016, 7, 31),
+          Time.new(2018, 7, 31),
+          Time.new(2020, 7, 31),
+        ])
+    end
   end
 end