rrule 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef0ad524f55bb65033204ddb1b134d6e9fb0c6f
-  data.tar.gz: 881e0c1e363a355b8908fb036568525e8b77dacf
+  metadata.gz: 524b148cf5608df2145bb75da8b5bca29867a30a
+  data.tar.gz: d258adb876e71ce558ffa5831d2964ddd9263e00
 SHA512:
-  metadata.gz: e3a41b83fbd8b90734f1b9c97d493f8e4fa2e6314e300603b6cb0d9949151d60a3bcc34073a03c37e2aeece752ec99e9633f5c5f48b9f9eadb445407f3e5abb3
-  data.tar.gz: d4a47101d49896dcc2ac9ab2108ae64c1873fc52f1bea394623508f8887d3c23748c728ffaede12a079b662f0da33256f5dd30970845e41348a12444b8b5d394
+  metadata.gz: 47e40a473aaf70514150dc11c6779cb3bb31e2d985324416df60515e678bd111fae56a2ff84529e4deab3572c477fa7cdbcfc1437f1e429db25056e1564f026b
+  data.tar.gz: 02ff7616862c0307a838f04eb4714fb57f9d261991199c09560ef51dd4d0c6cb223f4d2ff584d2ac94d09337b5dbd00c8a4bb96a6a52bdf1f7a02c34e680acab

data/lib/rrule.rb

@@ -18,6 +18,7 @@ module RRule
   autoload :ByYearDay, 'rrule/filters/by_year_day'
   autoload :ByMonthDay, 'rrule/filters/by_month_day'
 
+  autoload :Generator, 'rrule/generators/generator'
   autoload :AllOccurrences, 'rrule/generators/all_occurrences'
   autoload :BySetPosition, 'rrule/generators/by_set_position'
 

data/lib/rrule/context.rb

@@ -39,10 +39,10 @@ module RRule
             end
           end
         end
-
-        @last_year = year
-        @last_month = month
       end
+
+      @last_year = year
+      @last_month = month
     end
 
     def year_length_in_days
@@ -82,7 +82,7 @@ module RRule
     end
 
     def negative_week_number_by_day_of_year
-      @negative_month_day_by_day_of_year ||= days_in_year.map { |day| day.cweek - Date.new(day.cwyear, 12, 28).cweek - 1 }
+      @negative_week_number_by_day_of_year ||= days_in_year.map { |day| day.cweek - Date.new(day.cwyear, 12, 28).cweek - 1 }
     end
 
     def elapsed_days_in_year_by_month

data/lib/rrule/frequencies/frequency.rb

@@ -2,9 +2,9 @@ module RRule
   class Frequency
     attr_reader :current_date, :filters, :generator, :timeset
 
-    def initialize(context, filters, generator, timeset)
+    def initialize(context, filters, generator, timeset, start_date: nil)
       @context = context
-      @current_date = context.dtstart
+      @current_date = start_date.presence || context.dtstart
       @filters = filters
       @generator = generator
       @timeset = timeset
@@ -50,6 +50,8 @@ module RRule
         Monthly
       when 'YEARLY'
         Yearly
+      else
+        raise InvalidRRule, "Valid FREQ value is required"
       end
     end
 

data/lib/rrule/frequencies/simple_weekly.rb

@@ -1,9 +1,22 @@
 module RRule
   class SimpleWeekly < Frequency
     def next_occurrences
+      correct_current_date_if_needed
       this_occurrence = current_date
       @current_date += context.options[:interval].weeks
-      [this_occurrence]
+      generator.process_timeset(this_occurrence, timeset)
+    end
+
+    def correct_current_date_if_needed
+      if context.options[:byweekday].present?
+        target_wday = context.options[:byweekday].first.index
+      else
+        target_wday = context.dtstart.wday
+      end
+
+      while @current_date.wday != target_wday
+        @current_date = @current_date + 1.day
+      end
     end
   end
 end

data/lib/rrule/generators/all_occurrences.rb

@@ -1,25 +1,8 @@
 module RRule
-  class AllOccurrences
-    attr_reader :context
-
-    def initialize(context)
-      @context = context
-    end
-
+  class AllOccurrences < Generator
     def combine_dates_and_times(dayset, timeset)
       dayset.compact.map { |i| context.first_day_of_year + i }.flat_map do |date|
-        timeset.map do |time|
-          Time.use_zone(context.tz) do
-            Time.zone.local(
-                date.year,
-                date.month,
-                date.day,
-                time[:hour],
-                time[:minute],
-                time[:second]
-            )
-          end
-        end
+        process_timeset(date, timeset)
       end
     end
   end

data/lib/rrule/generators/by_set_position.rb

@@ -1,26 +1,15 @@
 module RRule
-  class BySetPosition
-    attr_reader :by_set_positions, :context
+  class BySetPosition < Generator
+    attr_reader :by_set_positions
 
     def initialize(by_set_positions, context)
       @by_set_positions = by_set_positions
-      @context = context
+      super(context)
     end
 
     def combine_dates_and_times(dayset, timeset)
       valid_dates(dayset).flat_map do |date|
-        timeset.map do |time|
-          Time.use_zone(context.tz) do
-            Time.zone.local(
-                date.year,
-                date.month,
-                date.day,
-                time[:hour],
-                time[:minute],
-                time[:second]
-            )
-          end
-        end
+        process_timeset(date, timeset)
       end
     end
 

data/lib/rrule/generators/generator.rb

@@ -0,0 +1,34 @@
+module RRule
+  class Generator
+    attr_reader :context
+
+    def initialize(context)
+      @context = context
+    end
+
+    def process_timeset(date, timeset)
+      timeset.map do |time|
+        hour_sets = (
+          Array.wrap(time[:hour]).sort.map do |hour|
+            Array.wrap(time[:minute]).sort.map do  |minute|
+              Array.wrap(time[:second]).sort.map{ |second| [hour, minute, second]}
+            end
+          end
+        ).flatten(2)
+
+        Time.use_zone(context.tz) do
+          hour_sets.map do |hour, minute, second|
+            Time.zone.local(
+              date.year,
+              date.month,
+              date.day,
+              hour,
+              minute,
+              second
+            )
+          end
+        end
+      end.flatten
+    end
+  end
+end

data/lib/rrule/rule.rb

@@ -9,6 +9,7 @@ module RRule
       @tz = tzid
       @exdate = exdate
       @options = parse_options(rrule)
+      @frequency_type = Frequency.for_options(options)
       @max_year = max_year || 9999
       @max_date = DateTime.new(@max_year)
     end
@@ -20,14 +21,19 @@ module RRule
     def between(start_date, end_date, limit: nil)
       floored_start_date = floor_to_seconds(start_date)
       floored_end_date = floor_to_seconds(end_date)
-      all_until(end_date: floored_end_date, limit: limit).reject { |instance| instance < floored_start_date }
+      all_until(start_date: floored_start_date, end_date: floored_end_date, limit: limit).reject { |instance| instance < floored_start_date }
     end
 
-    def each
-      return enum_for(:each) unless block_given?
+    def each(floor_date: nil)
+      floor_date ||= dtstart
+      # If we have a COUNT or INTERVAL option, we have to start at dtstart, because those are relative to dtstart
+      if count_or_interval_present?
+        floor_date = dtstart
+      end
 
+      return enum_for(:each, floor_date: floor_date) unless block_given?
       context = Context.new(options, dtstart, tz)
-      context.rebuild(dtstart.year, dtstart.month)
+      context.rebuild(floor_date.year, floor_date.month)
 
       timeset = options[:timeset]
       count = options[:count]
@@ -59,13 +65,14 @@ module RRule
         generator = AllOccurrences.new(context)
       end
 
-      frequency = Frequency.for_options(options).new(context, filters, generator, timeset)
+      frequency = Frequency.for_options(options).new(context, filters, generator, timeset, start_date: floor_date)
 
       loop do
         return if frequency.current_date.year > max_year
 
         frequency.next_occurrences.each do |this_result|
           next if this_result < dtstart
+          next if floor_date.present? && this_result < floor_date
           return if options[:until] && this_result > options[:until]
           return if count && (count -= 1) < 0
           yield this_result unless exdate.include?(this_result)
@@ -79,7 +86,7 @@ module RRule
 
     private
 
-    attr_reader :options, :max_year, :max_date
+    attr_reader :options, :max_year, :max_date, :frequency_type
 
     def floor_to_seconds(date)
       # This removes all sub-second and floors it to the second level.
@@ -92,8 +99,8 @@ module RRule
       @enumerator ||= to_enum
     end
 
-    def all_until(end_date: max_date, limit: nil)
-      limit ? take(limit) : take_while { |date| date <= end_date }
+    def all_until(start_date: nil, end_date: max_date, limit: nil)
+      limit ? take(limit) : each(floor_date: start_date).take_while { |date| date <= end_date }
     end
 
     def parse_options(rule)
@@ -120,6 +127,12 @@ module RRule
           i = Integer(value) rescue 0
           raise InvalidRRule, "INTERVAL must be a positive integer" unless i > 0
           options[:interval] = i
+        when 'BYHOUR'
+          options[:byhour] = value.split(',').compact.map(&:to_i)
+        when 'BYMINUTE'
+          options[:byminute] = value.split(',').compact.map(&:to_i)
+        when 'BYSECOND'
+          options[:bysecond] = value.split(',').compact.map(&:to_i)
         when 'BYDAY'
           options[:byweekday] = value.split(',').map { |day| Weekday.parse(day) }
         when 'BYSETPOS'
@@ -156,9 +169,13 @@ module RRule
         options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? }
       end
 
-      options[:timeset] = [{ hour: dtstart.hour, minute: dtstart.min, second: dtstart.sec }]
+      options[:timeset] = [{ hour: (options[:byhour].presence || dtstart.hour), minute: (options[:byminute].presence || dtstart.min), second: (options[:bysecond].presence || dtstart.sec) }]
 
       options
     end
+
+    def count_or_interval_present?
+      options[:count].present? || (options[:interval].present? && options[:interval] > 1)
+    end
   end
 end

data/rrule.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rrule'
-  s.version = '0.3.1'
+  s.version = '0.4.0'
   s.date = '2018-04-24'
   s.summary = 'RRule expansion'
   s.description = 'A gem for expanding dates according to the RRule specification'

data/spec/frequencies/simple_weekly_spec.rb

@@ -1,19 +1,21 @@
 require 'spec_helper'
 
 describe RRule::SimpleWeekly do
-  let(:context) { RRule::Context.new({ interval: interval }, date, nil) }
-  let(:frequency) { described_class.new(context, nil, nil, nil) }
+  let(:context) { RRule::Context.new({ interval: interval }, date, 'America/Los_Angeles') }
+  let(:frequency) { described_class.new(context, nil, generator, timeset) }
+  let(:generator) { RRule::AllOccurrences.new(context) }
+  let(:timeset) { [{ hour: date.hour, minute: date.min, second: date.sec }] }
 
   describe '#next_occurrences' do
-    let(:date) { Date.new(1997, 1, 1) }
+    let(:date) { Time.zone.local(1997, 1, 1) }
 
     context 'with an interval of 1' do
       let(:interval) { 1 }
 
       it 'returns occurrences every week' do
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 1)]
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 8)]
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 15)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 1)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 8)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 15)]
       end
     end
 
@@ -21,9 +23,9 @@ describe RRule::SimpleWeekly do
       let(:interval) { 2 }
 
       it 'returns occurrences every other week' do
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 1)]
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 15)]
-        expect(frequency.next_occurrences).to eql [Date.new(1997, 1, 29)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 1)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 15)]
+        expect(frequency.next_occurrences).to eql [Time.zone.local(1997, 1, 29)]
       end
     end
   end

data/spec/generators/generator_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe RRule::Generator do
+  let(:context) do
+    RRule::Context.new(
+        { interval: 1, wkst: 1 },
+        Time.parse('Wed Jan  1 00:00:00 PST 1997'),
+        'America/Los_Angeles'
+    )
+  end
+
+  around(:each) do |example|
+    Time.use_zone('America/Los_Angeles') do
+      example.run
+    end
+  end
+
+  before(:each) { context.rebuild(1997, 1) }
+
+  describe '#process_timeset' do
+    describe "single timeset" do
+      subject { described_class.new(context).process_timeset(date, timeset)}
+
+      context 'with a timeset with only 1 set' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: 12, minute: 30, second: 15 }] }
+
+        it { is_expected.to match_array [Time.parse('Wed Jan  1 12:30:15 PST 1997')] }
+      end
+
+      context 'with multiple hours in the timeset' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [12, 15], minute: 30, second: 15 }] }
+
+        it { is_expected.to match_array [Time.parse('Wed Jan  1 12:30:15 PST 1997'), Time.parse('Wed Jan  1 15:30:15 PST 1997')] }
+      end
+
+      context 'with multiple minutes in the timeset' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [12], minute: [15, 30], second: 15 }] }
+
+        it { is_expected.to match_array [Time.parse('Wed Jan  1 12:15:15 PST 1997'), Time.parse('Wed Jan  1 12:30:15 PST 1997')] }
+      end
+
+      context 'with multiple seconds in the timeset' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [12], minute: [30], second: [15, 59] }] }
+
+        it { is_expected.to match_array [Time.parse('Wed Jan  1 12:30:15 PST 1997'), Time.parse('Wed Jan  1 12:30:59 PST 1997')] }
+      end
+
+      context 'with multiple hours, minutes, and seconds in the timeset' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [12, 20], minute: [30, 55], second: [15, 59] }] }
+
+        it { is_expected.to eq [
+          Time.parse('Wed Jan  1 12:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 12:30:59 PST 1997'),
+          Time.parse('Wed Jan  1 12:55:15 PST 1997'),
+          Time.parse('Wed Jan  1 12:55:59 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:59 PST 1997'),
+          Time.parse('Wed Jan  1 20:55:15 PST 1997'),
+          Time.parse('Wed Jan  1 20:55:59 PST 1997'),
+        ] }
+      end
+
+      context 'with multiple hours, minutes, and seconds in the timeset, unsorted' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [20, 12], minute: [55, 30], second: [59, 15] }] }
+
+        it { is_expected.to eq [
+          Time.parse('Wed Jan  1 12:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 12:30:59 PST 1997'),
+          Time.parse('Wed Jan  1 12:55:15 PST 1997'),
+          Time.parse('Wed Jan  1 12:55:59 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:59 PST 1997'),
+          Time.parse('Wed Jan  1 20:55:15 PST 1997'),
+          Time.parse('Wed Jan  1 20:55:59 PST 1997'),
+        ] }
+      end
+    end
+  end
+
+  describe "multiple timesets" do
+    subject { described_class.new(context).process_timeset(date, timeset)}
+
+      context 'with multiple timsets' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: 12, minute: 30, second: 15 }, { hour: 18, minute: 45, second: 20 }] }
+
+        it { is_expected.to eq [Time.parse('Wed Jan  1 12:30:15 PST 1997'), Time.parse('Wed Jan  1 18:45:20 PST 1997')] }
+      end
+
+      context 'with multiple timsets with multiple hour sets' do
+        let(:date) { Time.parse('Wed Jan  1 00:11:22 PST 1997') }
+        let(:timeset) { [{ hour: [12, 20], minute: 30, second: [15, 45] }, { hour: 18, minute: [22, 45], second: 20 }] }
+
+        it { is_expected.to eq [
+          Time.parse('Wed Jan  1 12:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 12:30:45 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:15 PST 1997'),
+          Time.parse('Wed Jan  1 20:30:45 PST 1997'),
+          Time.parse('Wed Jan  1 18:22:20 PST 1997'),
+          Time.parse('Wed Jan  1 18:45:20 PST 1997')
+        ] }
+      end
+  end
+end

data/spec/rule_spec.rb

@@ -30,6 +30,80 @@ describe RRule::Rule do
     end
   end
 
+  describe 'iterating with a floor_date' do
+    describe 'No COUNT or INTERVAL > 1' do
+      it 'uses the floor_date provided when iterating' do
+        rrule = 'FREQ=DAILY'
+        dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+        timezone = 'America/New_York'
+
+        rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+        floor_date = Time.parse('Mon Sep  3 06:00:00 PDT 2018')
+
+        expect(rrule.each(floor_date: floor_date).take(3)).to match_array([
+          Time.parse('Tue Sep  3 06:00:00 PDT 2018'),
+          Time.parse('Wed Sep  4 06:00:00 PDT 2018'),
+          Time.parse('Thu Sep  5 06:00:00 PDT 2018')
+        ])
+      end
+    end
+
+    describe 'COUNT present' do
+      it 'starts at dtstart when iterating' do
+        rrule = 'FREQ=DAILY;COUNT=10'
+        dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+        timezone = 'America/New_York'
+
+        rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+        floor_date = Time.parse('Mon Sep  3 06:00:00 PDT 2018')
+
+        expect(rrule.each(floor_date: floor_date).take(3)).to match_array([
+          Time.parse('Tue Sep  2 06:00:00 PDT 1997'),
+          Time.parse('Wed Sep  3 06:00:00 PDT 1997'),
+          Time.parse('Thu Sep  4 06:00:00 PDT 1997'),
+        ])
+      end
+    end
+
+    describe 'INTERVAL present' do
+      it 'starts at dtstart when iterating' do
+        rrule = 'FREQ=DAILY;INTERVAL=10'
+        dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+        timezone = 'America/New_York'
+
+        rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+        floor_date = Time.parse('Mon Sep  3 06:00:00 PDT 2018')
+
+        expect(rrule.each(floor_date: floor_date).take(3)).to match_array([
+          Time.parse('Tue Sep  2 06:00:00 PDT 1997'),
+          Time.parse('Fri Sep 12 06:00:00 PDT 1997'),
+          Time.parse('Mon Sep 22 06:00:00 PDT 1997'),
+        ])
+      end
+    end
+
+    describe 'INTERVAL AND COUNT present' do
+      it 'starts at dtstart when iterating' do
+        rrule = 'FREQ=DAILY;INTERVAL=10;COUNT=5'
+        dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+        timezone = 'America/New_York'
+
+        rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+        floor_date = Time.parse('Mon Sep  3 06:00:00 PDT 2018')
+
+        expect(rrule.each(floor_date: floor_date).take(3)).to match_array([
+          Time.parse('Tue Sep  2 06:00:00 PDT 1997'),
+          Time.parse('Fri Sep 12 06:00:00 PDT 1997'),
+          Time.parse('Mon Sep 22 06:00:00 PDT 1997'),
+        ])
+      end
+    end
+  end
+
   describe '#all' do
     it 'returns the correct result with an rrule of FREQ=DAILY;COUNT=10' do
       rrule = 'FREQ=DAILY;COUNT=10'
@@ -1715,6 +1789,25 @@ describe RRule::Rule do
   end
 
   describe '#between' do
+    it 'returns the correct result with an rrule of FREQ=WEEKLY;BYSECOND=59;BYMINUTE=59;BYHOUR=23;WKST=SU' do
+      rrule = 'FREQ=WEEKLY;BYSECOND=59;BYMINUTE=59;BYHOUR=23;WKST=SU'
+      dtstart = DateTime.parse('2018-02-04 04:00:00 +1000')
+      timezone = 'Brisbane'
+
+      rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+      expect(rrule.between(Time.parse('Sun, 08 Apr 2018 00:00:00 +0000'), Time.parse('Fri, 08 Jun 2018 23:59:59 +0000'))).to match_array([
+        Time.parse('Sun, 08 Apr 2018 23:59:59 +1000'),
+        Time.parse('Sun, 15 Apr 2018 23:59:59 +1000'),
+        Time.parse('Sun, 22 Apr 2018 23:59:59 +1000'),
+        Time.parse('Sun, 29 Apr 2018 23:59:59 +1000'),
+        Time.parse('Sun, 06 May 2018 23:59:59 +1000'),
+        Time.parse('Sun, 13 May 2018 23:59:59 +1000'),
+        Time.parse('Sun, 20 May 2018 23:59:59 +1000'),
+        Time.parse('Sun, 27 May 2018 23:59:59 +1000'),
+        Time.parse('Sun, 03 Jun 2018 23:59:59 +1000'),
+      ])
+    end
+
     it 'returns the correct result with an rrule of FREQ=DAILY;INTERVAL=2' do
       rrule = 'FREQ=DAILY;INTERVAL=2'
       dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
@@ -1979,7 +2072,7 @@ describe RRule::Rule do
       ])
     end
 
-    it 'returns the correct result with an rrule of FREQ=DAILY;COUNT=7 when the range extends beyond the end of the recurrence' do
+    it 'returns the correct result with an rrule of FREQ=DAILY;COUNT=7 when the range extends beyond the end of the recurrence (run out of COUNT before the range ends)' do
       rrule ='FREQ=DAILY;COUNT=7'
       dtstart = Time.parse('Thu Feb  6 16:00:00 PST 2014')
       timezone = 'America/Los_Angeles'
@@ -2002,7 +2095,7 @@ describe RRule::Rule do
       expect(rrule.all).to match_array([
         Time.parse('Tue Sep  2 06:00:00 PST 1997'),
         Time.parse('Wed Sep  3 06:00:00 PST 1997'),
-        Time.parse('Thu Sep  4 06:00:00 PST 1997"'),
+        Time.parse('Thu Sep  4 06:00:00 PST 1997'),
         Time.parse('Sat Sep  6 06:00:00 PST 1997'),
         Time.parse('Sun Sep  7 06:00:00 PST 1997'),
         Time.parse('Tue Sep  9 06:00:00 PST 1997'),
@@ -2046,9 +2139,159 @@ describe RRule::Rule do
       end_time = Time.parse('Wed Aug 31 21:59:59 PDT 2016')
       expect(rule.between(start_time, end_time)).to eql([expected_instance])
     end
+
+
+    describe 'iterating with a floor_date' do
+      describe 'No COUNT or INTERVAL > 1' do
+        it 'still limits to the given range' do
+          rrule = 'FREQ=DAILY'
+          dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+          timezone = 'America/New_York'
+
+          rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+          start_time = Time.parse('Mon Sep  3 06:00:00 PDT 2018')
+          end_time   = Time.parse('Thu Sep  10 06:00:00 PDT 2018')
+
+          expect(rrule.between(start_time, end_time).take(3)).to match_array([
+            Time.parse('Tue Sep  3 06:00:00 PDT 2018'),
+            Time.parse('Wed Sep  4 06:00:00 PDT 2018'),
+            Time.parse('Thu Sep  5 06:00:00 PDT 2018')
+          ])
+        end
+      end
+
+      describe 'COUNT present' do
+        it 'still limits to the given range' do
+          rrule = 'FREQ=DAILY;COUNT=10'
+          dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+          timezone = 'America/New_York'
+
+          rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+          start_time = Time.parse('Wed Sep  3 06:00:00 PDT 1997')
+          end_time   = Time.parse('Thu Sep  10 06:00:00 PDT 2018')
+
+          expect(rrule.between(start_time, end_time).take(3)).to match_array([
+            Time.parse('Tue Sep  3 06:00:00 PDT 1997'),
+            Time.parse('Wed Sep  4 06:00:00 PDT 1997'),
+            Time.parse('Thu Sep  5 06:00:00 PDT 1997'),
+          ])
+        end
+      end
+
+      describe 'INTERVAL present' do
+        it 'still limits to the given range' do
+          rrule = 'FREQ=DAILY;INTERVAL=10'
+          dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+          timezone = 'America/New_York'
+
+          rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+          start_time = Time.parse('Wed Sep  3 06:00:00 PDT 1997')
+          end_time   = Time.parse('Thu Sep  30 06:00:00 PDT 2018')
+
+          expect(rrule.between(start_time, end_time).take(3)).to match_array([
+            Time.parse('Tue Sep 12 06:00:00 PDT 1997'),
+            Time.parse('Fri Sep 22 06:00:00 PDT 1997'),
+            Time.parse('Mon Oct 02 06:00:00 PDT 1997'),
+          ])
+        end
+      end
+
+      describe 'INTERVAL AND COUNT present' do
+        it 'still limits to the given range' do
+          rrule = 'FREQ=DAILY;INTERVAL=10;COUNT=5'
+          dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
+          timezone = 'America/New_York'
+
+          rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+          start_time = Time.parse('Wed Sep  3 06:00:00 PDT 1997')
+          end_time   = Time.parse('Thu Sep  30 06:00:00 PDT 2018')
+
+          expect(rrule.between(start_time, end_time).take(3)).to match_array([
+            Time.parse('Tue Sep 12 06:00:00 PDT 1997'),
+            Time.parse('Fri Sep 22 06:00:00 PDT 1997'),
+            Time.parse('Mon Oct 02 06:00:00 PDT 1997'),
+          ])
+        end
+      end
+    end
+  end
+
+  it 'returns the correct result with an rrule of FREQ=WEEKLY;BYMONTH=1,3;COUNT=4;BYHOUR=2' do
+    rrule = 'FREQ=WEEKLY;BYMONTH=1,3;COUNT=4;BYHOUR=2'
+    dtstart = Time.parse('Tue Sep  2 09:00:00 PDT 1997')
+    timezone = 'America/Los_Angeles'
+
+    rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+
+    expect(rrule.all).to match_array([
+      Time.parse('Tue Jan  6 02:00:00 PST 1998'),
+      Time.parse('Tue Jan 13 02:00:00 PST 1998'),
+      Time.parse('Tue Jan 20 02:00:00 PST 1998'),
+      Time.parse('Tue Jan 27 02:00:00 PST 1998')
+    ])
+  end
+
+  it 'returns the correct result with an rrule of FREQ=WEEKLY;BYMONTH=1,3;COUNT=4;BYHOUR=2;BYMINUTE=44' do
+    rrule = 'FREQ=WEEKLY;BYMONTH=1,3;COUNT=4;BYHOUR=2;BYMINUTE=44'
+    dtstart = Time.parse('Tue Sep  2 09:00:00 PDT 1997')
+    timezone = 'America/Los_Angeles'
+
+    rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+    expect(rrule.all).to match_array([
+      Time.parse('Tue Jan  6 02:44:00 PST 1998'),
+      Time.parse('Tue Jan 13 02:44:00 PST 1998'),
+      Time.parse('Tue Jan 20 02:44:00 PST 1998'),
+      Time.parse('Tue Jan 27 02:44:00 PST 1998')
+    ])
+  end
+
+  it 'returns the correct result with an rrule of FREQ=WEEKLY;BYMONTH=1,3;COUNT=24;BYHOUR=2,4,6;BYMINUTE=33,22' do
+    rrule = 'FREQ=WEEKLY;BYMONTH=1,3;COUNT=24;BYHOUR=2,4,6;BYMINUTE=33,22'
+    dtstart = Time.parse('Tue Sep  2 09:23:42 PDT 1997')
+    timezone = 'America/Los_Angeles'
+
+    rrule = RRule::Rule.new(rrule, dtstart: dtstart, tzid: timezone)
+    expect(rrule.all).to match_array([
+      Time.parse('Tue Jan  6 02:22:42 PST 1998'),
+      Time.parse('Tue Jan  6 02:33:42 PST 1998'),
+      Time.parse('Tue Jan  6 04:22:42 PST 1998'),
+      Time.parse('Tue Jan  6 04:33:42 PST 1998'),
+      Time.parse('Tue Jan  6 06:22:42 PST 1998'),
+      Time.parse('Tue Jan  6 06:33:42 PST 1998'),
+      Time.parse('Tue Jan 13 02:22:42 PST 1998'),
+      Time.parse('Tue Jan 13 02:33:42 PST 1998'),
+      Time.parse('Tue Jan 13 04:22:42 PST 1998'),
+      Time.parse('Tue Jan 13 04:33:42 PST 1998'),
+      Time.parse('Tue Jan 13 06:22:42 PST 1998'),
+      Time.parse('Tue Jan 13 06:33:42 PST 1998'),
+      Time.parse('Tue Jan 20 02:22:42 PST 1998'),
+      Time.parse('Tue Jan 20 02:33:42 PST 1998'),
+      Time.parse('Tue Jan 20 04:22:42 PST 1998'),
+      Time.parse('Tue Jan 20 04:33:42 PST 1998'),
+      Time.parse('Tue Jan 20 06:22:42 PST 1998'),
+      Time.parse('Tue Jan 20 06:33:42 PST 1998'),
+      Time.parse('Tue Jan 27 02:22:42 PST 1998'),
+      Time.parse('Tue Jan 27 02:33:42 PST 1998'),
+      Time.parse('Tue Jan 27 04:22:42 PST 1998'),
+      Time.parse('Tue Jan 27 04:33:42 PST 1998'),
+      Time.parse('Tue Jan 27 06:22:42 PST 1998'),
+      Time.parse('Tue Jan 27 06:33:42 PST 1998')
+    ])
   end
 
   describe 'validation' do
+    it 'raises RRule::InvalidRRule if FREQ is not provided' do
+      expect { RRule::Rule.new('') }.to raise_error(RRule::InvalidRRule)
+      expect { RRule::Rule.new('FREQ=') }.to raise_error(RRule::InvalidRRule)
+      expect { RRule::Rule.new('FREQ=FOO') }.to raise_error(RRule::InvalidRRule)
+      expect { RRule::Rule.new('COUNT=1') }.to raise_error(RRule::InvalidRRule)
+      expect { RRule::Rule.new('FREQ=FOO;COUNT=1') }.to raise_error(RRule::InvalidRRule)
+    end
+
     it 'raises RRule::InvalidRRule if INTERVAL is not a positive integer' do
       dtstart = Time.parse('Tue Sep  2 06:00:00 PDT 1997')
       timezone = 'America/New_York'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrule
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Mitchell
@@ -67,6 +67,7 @@ files:
 - lib/rrule/frequencies/yearly.rb
 - lib/rrule/generators/all_occurrences.rb
 - lib/rrule/generators/by_set_position.rb
+- lib/rrule/generators/generator.rb
 - lib/rrule/rule.rb
 - lib/rrule/weekday.rb
 - rrule.gemspec
@@ -85,6 +86,7 @@ files:
 - spec/frequencies/yearly_spec.rb
 - spec/generators/all_occurrences_spec.rb
 - spec/generators/by_set_position_spec.rb
+- spec/generators/generator_spec.rb
 - spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/weekday_spec.rb
@@ -107,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: RRule expansion
@@ -125,6 +127,7 @@ test_files:
 - spec/frequencies/yearly_spec.rb
 - spec/generators/all_occurrences_spec.rb
 - spec/generators/by_set_position_spec.rb
+- spec/generators/generator_spec.rb
 - spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/weekday_spec.rb