rrule 0.3.1 → 0.4.3

data/lib/rrule/frequencies/monthly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Monthly < Frequency
     def possible_days

data/lib/rrule/frequencies/simple_weekly.rb

@@ -1,9 +1,22 @@
+# frozen_string_literal: true
+
 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
+      target_wday = if context.options[:byweekday].present?
+        context.options[:byweekday].first.index
+      else
+        context.dtstart.wday
+      end
+
+      @current_date += 1.day while @current_date.wday != target_wday
     end
   end
 end

data/lib/rrule/frequencies/weekly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Weekly < Frequency
     def possible_days

data/lib/rrule/frequencies/yearly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Yearly < Frequency
     def possible_days

data/lib/rrule/generators/all_occurrences.rb

@@ -1,25 +1,10 @@
-module RRule
-  class AllOccurrences
-    attr_reader :context
-
-    def initialize(context)
-      @context = context
-    end
+# frozen_string_literal: true
 
+module RRule
+  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,17 @@
+# frozen_string_literal: true
+
 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,38 @@
+# frozen_string_literal: true
+
+module RRule
+  class Generator
+    attr_reader :context
+
+    def initialize(context)
+      @context = context
+    end
+
+    def process_timeset(date, timeset)
+      return [date] if timeset.blank?
+
+      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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Rule
     include Enumerable
@@ -5,10 +7,11 @@ module RRule
     attr_reader :dtstart, :tz, :exdate
 
     def initialize(rrule, dtstart: Time.now, tzid: 'UTC', exdate: [], max_year: nil)
-      @dtstart = floor_to_seconds(dtstart).in_time_zone(tzid)
       @tz = tzid
+      @dtstart = dtstart.is_a?(Date) ? dtstart : floor_to_seconds_in_timezone(dtstart)
       @exdate = exdate
       @options = parse_options(rrule)
+      @frequency_type = Frequency.for_options(options)
       @max_year = max_year || 9999
       @max_date = DateTime.new(@max_year)
     end
@@ -18,54 +21,47 @@ module RRule
     end
 
     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 }
+      floored_start_date = floor_to_seconds_in_timezone(start_date)
+      floored_end_date = floor_to_seconds_in_timezone(end_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)
+      # If we have a COUNT or INTERVAL option, we have to start at dtstart, because those are relative to dtstart
+      floor_date = dtstart if count_or_interval_present? || floor_date.nil? || dtstart > floor_date
 
+      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]
 
       filters = []
-      if options[:bymonth]
-        filters.push(ByMonth.new(options[:bymonth], context))
-      end
+      filters.push(ByMonth.new(options[:bymonth], context)) if options[:bymonth]
 
-      if options[:byweekno]
-        filters.push(ByWeekNumber.new(options[:byweekno], context))
-      end
+      filters.push(ByWeekNumber.new(options[:byweekno], context)) if options[:byweekno]
 
-      if options[:byweekday]
-        filters.push(ByWeekDay.new(options[:byweekday], context))
-      end
+      filters.push(ByWeekDay.new(options[:byweekday], context)) if options[:byweekday]
 
-      if options[:byyearday]
-        filters.push(ByYearDay.new(options[:byyearday], context))
-      end
+      filters.push(ByYearDay.new(options[:byyearday], context)) if options[:byyearday]
 
-      if options[:bymonthday]
-        filters.push(ByMonthDay.new(options[:bymonthday], context))
-      end
+      filters.push(ByMonthDay.new(options[:bymonthday], context)) if options[:bymonthday]
 
-      if options[:bysetpos]
-        generator = BySetPosition.new(options[:bysetpos], context)
+      generator = if options[:bysetpos]
+        BySetPosition.new(options[:bysetpos], context)
       else
-        generator = AllOccurrences.new(context)
+        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,21 +75,21 @@ module RRule
 
     private
 
-    attr_reader :options, :max_year, :max_date
+    attr_reader :options, :max_year, :max_date, :frequency_type
 
-    def floor_to_seconds(date)
+    def floor_to_seconds_in_timezone(date)
       # This removes all sub-second and floors it to the second level.
       # Sub-second level calculations breaks a lot of assumptions in this
       # library and rounding it may also cause unexpected inequalities.
-      Time.at(date.to_i)
+      Time.at(date.to_i).in_time_zone(tz)
     end
 
     def enumerator
       @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)
@@ -110,22 +106,30 @@ module RRule
           i = begin
             Integer(value)
           rescue ArgumentError
-            raise InvalidRRule, "COUNT must be a non-negative integer"
+            raise InvalidRRule, 'COUNT must be a non-negative integer'
           end
-          raise InvalidRRule, "COUNT must be a non-negative integer" if i < 0
+          raise InvalidRRule, 'COUNT must be a non-negative integer' if i < 0
           options[:count] = i
         when 'UNTIL'
-          options[:until] = Time.parse(value)
+          # The value of the UNTIL rule part MUST have the same
+          # value type as the "DTSTART" property.
+          options[:until] = @dtstart.is_a?(Date) ? Date.parse(value) : Time.parse(value)
         when 'INTERVAL'
           i = Integer(value) rescue 0
-          raise InvalidRRule, "INTERVAL must be a positive integer" unless i > 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'
           options[:bysetpos] = value.split(',').map(&:to_i)
         when 'WKST'
-          options[:wkst] = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'].index(value)
+          options[:wkst] = RRule::WEEKDAYS.index(value)
         when 'BYMONTH'
           options[:bymonth] = value.split(',').compact.map(&:to_i)
         when 'BYMONTHDAY'
@@ -137,12 +141,10 @@ module RRule
         end
       end
 
-      if !(options[:byweekno] || options[:byyearday] || options[:bymonthday] || options[:byweekday])
+      unless options[:byweekno] || options[:byyearday] || options[:bymonthday] || options[:byweekday]
         case options[:freq]
         when 'YEARLY'
-          unless options[:bymonth]
-            options[:bymonth] = [dtstart.month]
-          end
+          options[:bymonth] = [dtstart.month] unless options[:bymonth]
           options[:bymonthday] = [dtstart.day]
         when 'MONTHLY'
           options[:bymonthday] = [dtstart.day]
@@ -152,13 +154,19 @@ module RRule
         end
       end
 
-      unless options[:byweekday].nil?
-        options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? }
-      end
+      options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? } unless options[:byweekday].nil?
 
-      options[:timeset] = [{ hour: dtstart.hour, minute: dtstart.min, second: dtstart.sec }]
+      # The BYSECOND, BYMINUTE and BYHOUR rule parts MUST NOT be specified
+      # when the associated "DTSTART" property has a DATE value type.
+      # These rule parts MUST be ignored in RECUR value that violate the
+      # above requirement
+      options[:timeset] = [{ hour: (options[:byhour].presence || dtstart.hour), minute: (options[:byminute].presence || dtstart.min), second: (options[:bysecond].presence || dtstart.sec) }] unless dtstart.is_a?(Date)
 
       options
     end
+
+    def count_or_interval_present?
+      options[:count].present? || (options[:interval].present? && options[:interval] > 1)
+    end
   end
 end

data/lib/rrule/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RRule
+  VERSION = '0.4.3'
+end

data/lib/rrule/weekday.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Weekday
     attr_reader :index, :ordinal
@@ -8,8 +10,8 @@ module RRule
     end
 
     def self.parse(weekday)
-      match = /([+-]?\d)?([A-Z]{2})/.match(weekday)
-      index = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA'].index(match[2])
+      match = /([+-]?\d+)?([A-Z]{2})/.match(weekday)
+      index = RRule::WEEKDAYS.index(match[2])
       ordinal = match[1] ? match[1].to_i : nil
       new(index, ordinal)
     end

data/rrule.gemspec

@@ -1,20 +1,27 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rrule/version'
+
 Gem::Specification.new do |s|
   s.name = 'rrule'
-  s.version = '0.3.1'
-  s.date = '2018-04-24'
+  s.version = RRule::VERSION
   s.summary = 'RRule expansion'
   s.description = 'A gem for expanding dates according to the RRule specification'
   s.authors = ['Ryan Mitchell']
   s.email = 'rmitchell@squareup.com'
-  s.files = `git ls-files`.split($/)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.require_paths = ['lib']
-  s.homepage = 'http://rubygems.org/gems/rrule'
+  s.homepage = 'https://rubygems.org/gems/rrule'
+  s.metadata = {
+    'homepage' => 'https://rubygems.org/gems/rrule',
+    'source_code_uri' => 'https://github.com/square/ruby-rrule',
+    'bug_tracker_uri' => 'https://github.com/square/ruby-rrule/issues',
+    'changelog_uri' => 'https://github.com/square/ruby-rrule/blob/master/CHANGELOG.md'
+  }
 
-  # Since Ruby 1.9.2, Time implementation uses a signed 63 bit integer, Bignum
-  # or Rational. This enables Time to finally work with years after 2038 which
-  # is critical for this library.
-  s.required_ruby_version = '>= 1.9.2'
-  s.add_runtime_dependency 'activesupport', '>= 4.1'
-  s.add_development_dependency 'rspec', '~> 3.4'
+  s.required_ruby_version = '>= 2.6.0'
+  s.add_runtime_dependency 'activesupport', '>= 2.3', '< 7'
+  s.add_development_dependency 'appraisal'
 end

data/scripts/benchmark.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../lib/'))
 require 'rrule'
-include Benchmark
+require 'benchmark'
 
 rules_to_benchmark = ['FREQ=WEEKLY', 'FREQ=WEEKLY;BYDAY=WE']
 rrule_version = '0.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrule
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Ryan Mitchell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 description: A gem for expanding dates according to the RRule specification
 email: rmitchell@squareup.com
 executables: []
@@ -45,13 +51,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/activesupport_2.3_LTS.gemfile
+- gemfiles/activesupport_3.gemfile
+- gemfiles/activesupport_4.gemfile
+- gemfiles/activesupport_5.gemfile
+- gemfiles/activesupport_6.gemfile
 - lib/rrule.rb
 - lib/rrule/context.rb
 - lib/rrule/filters/by_month.rb
@@ -67,31 +80,21 @@ 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/version.rb
 - lib/rrule/weekday.rb
 - rrule.gemspec
 - scripts/benchmark.rb
 - scripts/history.txt
-- spec/context_spec.rb
-- spec/filters/by_month_day_spec.rb
-- spec/filters/by_month_spec.rb
-- spec/filters/by_week_day_spec.rb
-- spec/filters/by_week_number_spec.rb
-- spec/filters/by_year_day_spec.rb
-- spec/frequencies/daily_spec.rb
-- spec/frequencies/monthly_spec.rb
-- spec/frequencies/simple_weekly_spec.rb
-- spec/frequencies/weekly_spec.rb
-- spec/frequencies/yearly_spec.rb
-- spec/generators/all_occurrences_spec.rb
-- spec/generators/by_set_position_spec.rb
-- spec/rule_spec.rb
-- spec/spec_helper.rb
-- spec/weekday_spec.rb
-homepage: http://rubygems.org/gems/rrule
+homepage: https://rubygems.org/gems/rrule
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  homepage: https://rubygems.org/gems/rrule
+  source_code_uri: https://github.com/square/ruby-rrule
+  bug_tracker_uri: https://github.com/square/ruby-rrule/issues
+  changelog_uri: https://github.com/square/ruby-rrule/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,32 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: RRule expansion
-test_files:
-- spec/context_spec.rb
-- spec/filters/by_month_day_spec.rb
-- spec/filters/by_month_spec.rb
-- spec/filters/by_week_day_spec.rb
-- spec/filters/by_week_number_spec.rb
-- spec/filters/by_year_day_spec.rb
-- spec/frequencies/daily_spec.rb
-- spec/frequencies/monthly_spec.rb
-- spec/frequencies/simple_weekly_spec.rb
-- spec/frequencies/weekly_spec.rb
-- spec/frequencies/yearly_spec.rb
-- spec/generators/all_occurrences_spec.rb
-- spec/generators/by_set_position_spec.rb
-- spec/rule_spec.rb
-- spec/spec_helper.rb
-- spec/weekday_spec.rb
+test_files: []