rrule 0.3.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cef0ad524f55bb65033204ddb1b134d6e9fb0c6f
-  data.tar.gz: 881e0c1e363a355b8908fb036568525e8b77dacf
+SHA256:
+  metadata.gz: 75e4c7df763fb7f51c26dd5c904838cd711236c4f0c1b8903aaaa9fa8cb3a177
+  data.tar.gz: 8bd2ccc6326b7d839f53744091fed93000616e32af1305c8395fe129e9e5d294
 SHA512:
-  metadata.gz: e3a41b83fbd8b90734f1b9c97d493f8e4fa2e6314e300603b6cb0d9949151d60a3bcc34073a03c37e2aeece752ec99e9633f5c5f48b9f9eadb445407f3e5abb3
-  data.tar.gz: d4a47101d49896dcc2ac9ab2108ae64c1873fc52f1bea394623508f8887d3c23748c728ffaede12a079b662f0da33256f5dd30970845e41348a12444b8b5d394
+  metadata.gz: 744bc6a792d4ccaf944b6ed56c090387fe7c7dd87c79eae8f5c93fee299b47451d3834d6bfa7dd7dab062e7ae80fa12b0b333984d18e1579a9d2228ad4119543
+  data.tar.gz: 641c8c1f5c8320e4e17461a3dd040171c9a4a71cc6bb3cc1e70d3e16bb6ef8536ff54ace59447c7854a1504a86e0f140bbdc558bffe33515c79e802410c1ec0e

data/.gitignore

@@ -1,4 +1,7 @@
+Gemfile.lock
 .rspec
 *.gem
 *.sublime-project
 *.sublime-workspace
+.ruby-version
+gemfiles/*.lock

data/.rubocop.yml

@@ -0,0 +1,28 @@
+AllCops:
+  TargetRubyVersion: 2.6
+  Exclude:
+    - 'gemfiles/**/*'
+    - Appraisals
+
+Layout:
+  Enabled: false
+
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/RescueModifier:
+  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,3 +1,28 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.3.1
+  - 2.6.5
+  - 2.7.0
+  - 3.0.0
+
+gemfile:
+  - gemfiles/activesupport_2.3_LTS.gemfile
+  - gemfiles/activesupport_3.gemfile
+  - gemfiles/activesupport_4.gemfile
+  - gemfiles/activesupport_5.gemfile
+  - gemfiles/activesupport_6.gemfile
+
+jobs:
+  exclude:
+  - rvm: 2.7.0
+    gemfile: gemfiles/activesupport_3.gemfile
+  - rvm: 2.7.0
+    gemfile: gemfiles/activesupport_4.gemfile
+  - rvm: 3.0.0
+    gemfile: gemfiles/activesupport_3.gemfile
+  - rvm: 3.0.0
+    gemfile: gemfiles/activesupport_4.gemfile
+
+before_install:
+  - yes | gem update --system --force
+  - gem install bundler

data/Appraisals

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+appraise 'activesupport-2.3-LTS' do
+  gem 'rexml'
+  gem 'activesupport', '>= 2', git: 'https://github.com/makandra/rails.git', branch: '2-3-lts'
+end
+
+appraise 'activesupport-3' do
+  gem 'activesupport', '~> 3'
+  gem 'tzinfo', '~> 1.2'
+end
+
+appraise 'activesupport-4' do
+  gem 'activesupport', '~> 4'
+end
+
+appraise 'activesupport-5' do
+  gem 'activesupport', '~> 5'
+end
+
+appraise 'activesupport-6' do
+  gem 'activesupport', '~> 6'
+end

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 Change Log
 ==========
 
+Version 0.4.3 *(2021-08-10)*
+----------------------------
+Adding support for multiple versions of ActiveSupport, up until at least ActiveSupport 6
+Handle case where DTSTART is a date
+Several bugfixes (fix weekday ordinal matching, BYDAY calculations with and without ordinals)
+
+Version 0.4.2 *(2019-02-05)*
+----------------------------
+Truncate the floor_date option if it's less than the dtstart option
+
+Version 0.4.1 *(2018-11-28)*
+----------------------------
+Fix bug in SimpleWeekly when ENV['TZ'] was not equal to time zone of rrule
+
+
 Version 0.1.0 *(2017-06-06)*
 ----------------------------
 

data/Gemfile

@@ -1,5 +1,14 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
+gem 'pry', '~> 0.12.2'
 gem 'rake'
+gem 'rspec', '~> 3.8'
+gem 'rubocop', '0.63.1'
+
+platform :mri do
+  gem 'pry-byebug'
+end
 
 gemspec

data/Rakefile

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require File.expand_path('../lib/rrule', __FILE__)
+require File.expand_path('lib/rrule', __dir__)
 
 RSpec::Core::RakeTask.new(:spec)
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 namespace :spec do
-  task :all => ['spec']
+  task all: ['spec']
 end
 
-task :default => 'spec:all'
+task default: %w[spec:all rubocop]

data/gemfiles/activesupport_2.3_LTS.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry", "~> 0.12.2"
+gem "rake"
+gem "rspec", "~> 3.8"
+gem "rubocop", "0.63.1"
+gem "rexml"
+gem "activesupport", ">= 2", git: "https://github.com/makandra/rails.git", branch: "2-3-lts"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_3.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry", "~> 0.12.2"
+gem "rake"
+gem "rspec", "~> 3.8"
+gem "rubocop", "0.63.1"
+gem "activesupport", "~> 3"
+gem "tzinfo", "~> 1.2"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_4.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry", "~> 0.12.2"
+gem "rake"
+gem "rspec", "~> 3.8"
+gem "rubocop", "0.63.1"
+gem "activesupport", "~> 4"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_5.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry", "~> 0.12.2"
+gem "rake"
+gem "rspec", "~> 3.8"
+gem "rubocop", "0.63.1"
+gem "activesupport", "~> 5"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_6.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry", "~> 0.12.2"
+gem "rake"
+gem "rspec", "~> 3.8"
+gem "rubocop", "0.63.1"
+gem "activesupport", "~> 6"
+
+platforms :mri do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/lib/rrule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/all'
 
 module RRule
@@ -18,9 +20,12 @@ 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'
 
+  WEEKDAYS = %w[SU MO TU WE TH FR SA].freeze
+
   def self.parse(rrule, **options)
     Rule.new(rrule, **options)
   end

data/lib/rrule/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class Context
     attr_reader :options, :dtstart, :tz, :day_of_year_mask, :year
@@ -17,14 +19,14 @@ module RRule
         possible_date_ranges = []
         if options[:freq] == 'YEARLY'
           if options[:bymonth]
-            options[:bymonth].each do |month|
-              possible_date_ranges.push(elapsed_days_in_year_by_month[(month - 1)..(month)])
+            options[:bymonth].each do |mon|
+              possible_date_ranges.push(elapsed_days_in_year_by_month[(mon - 1)..mon])
             end
           else
             possible_date_ranges = [[0, year_length_in_days]]
           end
         elsif options[:freq] == 'MONTHLY'
-          possible_date_ranges = [elapsed_days_in_year_by_month[(month - 1)..(month)]]
+          possible_date_ranges = [elapsed_days_in_year_by_month[(month - 1)..month]]
         end
 
         unless possible_date_ranges.empty?
@@ -39,10 +41,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 +84,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/filters/by_month.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByMonth
     def initialize(by_months, context)

data/lib/rrule/filters/by_month_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByMonthDay
     def initialize(by_month_days, context)

data/lib/rrule/filters/by_week_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByWeekDay
     def initialize(weekdays, context)
@@ -6,17 +8,17 @@ module RRule
     end
 
     def reject?(i)
-      masked?(i) || !matches_by_week_days?(i)
+      masked?(i) && !matches_by_week_days?(i)
     end
 
     private
 
     def masked?(i)
-      context.day_of_year_mask && !context.day_of_year_mask[i]
+      context.day_of_year_mask.blank? || !context.day_of_year_mask[i]
     end
 
     def matches_by_week_days?(i)
-      by_week_days.empty? || by_week_days.include?(context.weekday_by_day_of_year[i])
+      by_week_days.present? && by_week_days.include?(context.weekday_by_day_of_year[i])
     end
 
     attr_reader :by_week_days, :context

data/lib/rrule/filters/by_week_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByWeekNumber
     def initialize(by_week_numbers, context)

data/lib/rrule/filters/by_year_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RRule
   class ByYearDay
     def initialize(by_year_days, context)
@@ -6,7 +8,7 @@ module RRule
     end
 
     def reject?(i)
-      !by_year_days.empty? && 
+      !by_year_days.empty? &&
         ((i < context.year_length_in_days && !by_year_days.include?(i + 1) && !by_year_days.include?(i - context.year_length_in_days)) ||
           (i >= context.year_length_in_days && !by_year_days.include?(i + 1 - context.year_length_in_days) && !by_year_days.include?(i - context.year_length_in_days - context.next_year_length_in_days)))
     end

data/lib/rrule/frequencies/daily.rb

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

data/lib/rrule/frequencies/frequency.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 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
@@ -12,9 +14,7 @@ module RRule
 
     def advance
       @current_date = current_date.advance(advance_by).tap do |new_date|
-        unless same_month(current_date, new_date)
-          context.rebuild(new_date.year, new_date.month)
-        end
+        context.rebuild(new_date.year, new_date.month) unless same_month(current_date, new_date)
       end
     end
 
@@ -32,10 +32,6 @@ module RRule
       end
     end
 
-    def possible_days
-      fail NotImplementedError
-    end
-
     def self.for_options(options)
       case options[:freq]
       when 'DAILY'
@@ -50,6 +46,8 @@ module RRule
         Monthly
       when 'YEARLY'
         Yearly
+      else
+        raise InvalidRRule, 'Valid FREQ value is required'
       end
     end
 
@@ -60,9 +58,5 @@ module RRule
     def same_month(first_date, second_date)
       first_date.month == second_date.month && first_date.year == second_date.year
     end
-
-    def advance_by
-      fail NotImplementedError
-    end
   end
 end