rrule 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110d8805d4e642767c86d7e23f0b77d8d42a0a11ef3c5edf5c08ee2d8f78d4ab
-  data.tar.gz: 8dcd49b64e8300b5facdfb92c72485b6c87b3003ba9dc87116fe13ca9bd44bf5
+  metadata.gz: 75e4c7df763fb7f51c26dd5c904838cd711236c4f0c1b8903aaaa9fa8cb3a177
+  data.tar.gz: 8bd2ccc6326b7d839f53744091fed93000616e32af1305c8395fe129e9e5d294
 SHA512:
-  metadata.gz: 467ad003c49dea6fb320775f59a33f739405edd0b330b87512ed4e183bcd757f8e16e4deda296c6f916055056ba98ae0be623df3f78fc9b8c39b790ca4198db6
-  data.tar.gz: c51e63c57919c57c4954b66c4b55d77ed6f513117a338ea76c595239433a1bc983c50706e642ba3b7b596aaf1feb3d111743ba8bd945c61d372f099656170dbb
+  metadata.gz: 744bc6a792d4ccaf944b6ed56c090387fe7c7dd87c79eae8f5c93fee299b47451d3834d6bfa7dd7dab062e7ae80fa12b0b333984d18e1579a9d2228ad4119543
+  data.tar.gz: 641c8c1f5c8320e4e17461a3dd040171c9a4a71cc6bb3cc1e70d3e16bb6ef8536ff54ace59447c7854a1504a86e0f140bbdc558bffe33515c79e802410c1ec0e

data/.gitignore

@@ -3,4 +3,5 @@ Gemfile.lock
 *.gem
 *.sublime-project
 *.sublime-workspace
-Gemfile.lock
+.ruby-version
+gemfiles/*.lock

data/.rubocop.yml

@@ -1,5 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
+  Exclude:
+    - 'gemfiles/**/*'
+    - Appraisals
 
 Layout:
   Enabled: false

data/.travis.yml

@@ -1,8 +1,28 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-  - ruby-head
+  - 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,16 @@
 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

data/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'pry'
+gem 'pry', '~> 0.12.2'
 gem 'rake'
 gem 'rspec', '~> 3.8'
 gem 'rubocop', '0.63.1'

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/filters/by_week_day.rb

@@ -8,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/generators/generator.rb

@@ -9,6 +9,8 @@ module RRule
     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|

data/lib/rrule/rule.rb

@@ -8,7 +8,7 @@ module RRule
 
     def initialize(rrule, dtstart: Time.now, tzid: 'UTC', exdate: [], max_year: nil)
       @tz = tzid
-      @dtstart = floor_to_seconds_in_timezone(dtstart)
+      @dtstart = dtstart.is_a?(Date) ? dtstart : floor_to_seconds_in_timezone(dtstart)
       @exdate = exdate
       @options = parse_options(rrule)
       @frequency_type = Frequency.for_options(options)
@@ -111,7 +111,9 @@ module RRule
           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
@@ -154,7 +156,11 @@ module RRule
 
       options[:byweekday], options[:bynweekday] = options[:byweekday].partition { |wday| wday.ordinal.nil? } unless options[:byweekday].nil?
 
-      options[:timeset] = [{ hour: (options[:byhour].presence || dtstart.hour), minute: (options[:byminute].presence || dtstart.min), second: (options[:bysecond].presence || 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

data/lib/rrule/version.rb

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

data/lib/rrule/weekday.rb

@@ -10,7 +10,7 @@ module RRule
     end
 
     def self.parse(weekday)
-      match = /([+-]?\d)?([A-Z]{2})/.match(weekday)
+      match = /([+-]?\d+)?([A-Z]{2})/.match(weekday)
       index = RRule::WEEKDAYS.index(match[2])
       ordinal = match[1] ? match[1].to_i : nil
       new(index, ordinal)

data/rrule.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     'changelog_uri' => 'https://github.com/square/ruby-rrule/blob/master/CHANGELOG.md'
   }
 
-  s.required_ruby_version = '>= 2.3.0'
-  s.add_runtime_dependency 'activesupport', '>= 4.1'
+  s.required_ruby_version = '>= 2.6.0'
+  s.add_runtime_dependency 'activesupport', '>= 2.3', '< 7'
+  s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrule
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ryan Mitchell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +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: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem for expanding dates according to the RRule specification
 email: rmitchell@squareup.com
 executables: []
@@ -33,12 +53,18 @@ 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
@@ -68,7 +94,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,15 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: RRule expansion
 test_files: []