rrule 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad88610152ac491684d813f22ced6298dd37075b43c0832bf5ddea6b722e5906
-  data.tar.gz: 8c18b1a8f5244cefe797e77a73fd6717cd0e4e754b7858045e2480c24a0d4a12
+  metadata.gz: 18b66d2de18ada244aeacb726282250b2d9790852df19256fbc60427d719e5ec
+  data.tar.gz: a89994f6528f083862167f71af7fefca19ecd556376d8d0072dc61644b1d7950
 SHA512:
-  metadata.gz: 97d4c45d2cc25a7624f4b237b8b309d878f27cff652e2f45b50141d57b2273da3b715f1f967e6885e2b669904e8e748bd2f09c34c9aa91d6b03ca759c567f387
-  data.tar.gz: fa4a974eb0acd3244232acafaf97a3220e2539673da54efcc116f6042272919805828a9b7aff3668675f25d22f295e21ac172764a085f4e1ea0749c35770c489
+  metadata.gz: 54e5ab9633d824c81c72e1fdafada840c77fa3154f7e56e8d553784bc000aac67937bd3860aa28bcdd4f62b19d5192c7fc5783abc02aff3bd0d72bca4bb7be8c
+  data.tar.gz: 2603169ed547adea95c88b0377afd6e9707d7845759aceb153c284b81c2b0971dfc4d73c47bcd0634db80c1fb08d3728b4805408ddacb1be3d935dae55657873

data/.github/workflows/test.yml

@@ -10,18 +10,11 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.0.0
-          - 3.1.0
-          - 3.2.0
-          - 3.3.0
-        gemfile:
-          - gemfiles/activesupport_6_1.gemfile
-          - gemfiles/activesupport_7_0.gemfile
-          - gemfiles/activesupport_7_1.gemfile
+          - 3.2
+          - 3.3
+          - 3.4
 
-    name: Ruby ${{ matrix.ruby }} using Gemfile ${{ matrix.gemfile }}
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
@@ -31,11 +24,14 @@ jobs:
         run: yes | gem update --system --force
       - name: 'Update Bundler'
         run: gem install bundler
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
       - run: bundle install
-      - run: bundle exec rake
+      - name: 'Ensure appraisals are up to date'
+        run: appraisal clean && appraisal generate && git diff --exit-code
+      - run: appraisal install
+      - run: appraisal rake

data/.gitignore

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

data/Appraisals

@@ -1,27 +1,17 @@
 # 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'
+appraise 'activesupport-7_0' do
+  gem 'activesupport', '~> 7.0'
 end
 
-appraise 'activesupport-3' do
-  gem 'activesupport', '~> 3'
-  gem 'tzinfo', '~> 1.2'
+appraise 'activesupport-7_1' do
+  gem 'activesupport', '~> 7.1'
 end
 
-appraise 'activesupport-4' do
-  gem 'activesupport', '~> 4'
+appraise 'activesupport-7_2' do
+  gem 'activesupport', '~> 7.2'
 end
 
-appraise 'activesupport-5' do
-  gem 'activesupport', '~> 5'
-end
-
-appraise 'activesupport-6' do
-  gem 'activesupport', '~> 6'
-end
-
-appraise 'activesupport-7' do
-  gem 'activesupport', '~> 7'
+appraise 'activesupport-8_0' do
+  gem 'activesupport', '~> 8.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 0.7.0 *(2025-10-20)*
+----------------------------
+## What's Changed
+* Add support for `YEARLY` `BYMONTHDAY` https://github.com/square/ruby-rrule/pull/69
+
 Version 0.6.0 *(2024-03-07)*
 ----------------------------
 ## What's Changed

data/Gemfile

@@ -2,13 +2,10 @@
 
 source 'https://rubygems.org'
 
-gem 'pry', '~> 0.14.1'
+gem 'appraisal'
+gem 'pry-byebug'
 gem 'rake'
-gem 'rspec', '~> 3.8'
+gem 'rspec'
 gem 'rubocop', '0.63.1'
 
-platform :mri do
-  gem 'pry-byebug', '~> 3.10.1'
-end
-
 gemspec

data/gemfiles/activesupport_7_0.gemfile

@@ -2,14 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "pry", "~> 0.14.1"
+gem "appraisal"
+gem "pry-byebug"
 gem "rake"
-gem "rspec", "~> 3.8"
+gem "rspec"
 gem "rubocop", "0.63.1"
 gem "activesupport", "~> 7.0"
 
-platforms :mri do
-  gem "pry-byebug"
-end
-
 gemspec path: "../"

data/gemfiles/activesupport_7_1.gemfile

@@ -2,14 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "pry", "~> 0.14.1"
+gem "appraisal"
+gem "pry-byebug"
 gem "rake"
-gem "rspec", "~> 3.8"
+gem "rspec"
 gem "rubocop", "0.63.1"
 gem "activesupport", "~> 7.1"
 
-platforms :mri do
-  gem "pry-byebug"
-end
-
 gemspec path: "../"

data/gemfiles/{activesupport_6_1.gemfile → activesupport_7_2.gemfile}

@@ -2,14 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "pry", "~> 0.14.1"
+gem "appraisal"
+gem "pry-byebug"
 gem "rake"
-gem "rspec", "~> 3.8"
+gem "rspec"
 gem "rubocop", "0.63.1"
-gem "activesupport", "~> 6.1"
-
-platforms :mri do
-  gem "pry-byebug"
-end
+gem "activesupport", "~> 7.2"
 
 gemspec path: "../"

data/gemfiles/activesupport_8_0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "pry-byebug"
+gem "rake"
+gem "rspec"
+gem "rubocop", "0.63.1"
+gem "activesupport", "~> 8.0"
+
+gemspec path: "../"

data/lib/rrule/frequencies/frequency.rb

@@ -34,6 +34,12 @@ module RRule
 
     def self.for_options(options)
       case options[:freq]
+      when 'SECONDLY'
+        Secondly
+      when 'MINUTELY'
+        Minutely
+      when 'HOURLY'
+        Hourly
       when 'DAILY'
         Daily
       when 'WEEKLY'

data/lib/rrule/frequencies/hourly.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RRule
+  class Hourly < Frequency
+    def possible_days
+      [current_date.yday - 1] # convert to 0-indexed
+    end
+
+    def timeset
+      super.map { |time| time.merge(hour: current_date.hour) }
+    end
+
+    private
+
+    def advance_by
+      { hours: context.options[:interval] }
+    end
+  end
+end

data/lib/rrule/frequencies/minutely.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RRule
+  class Minutely < Frequency
+    def possible_days
+      [current_date.yday - 1] # convert to 0-indexed
+    end
+
+    def timeset
+      super.map { |time| time.merge(hour: current_date.hour, minute: current_date.min) }
+    end
+
+    private
+
+    def advance_by
+      { minutes: context.options[:interval] }
+    end
+  end
+end

data/lib/rrule/frequencies/secondly.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RRule
+  class Secondly < Frequency
+    def possible_days
+      [current_date.yday - 1] # convert to 0-indexed
+    end
+
+    def timeset
+      super.map { |time| time.merge(hour: current_date.hour, minute: current_date.min, second: current_date.sec) }
+    end
+
+    private
+
+    def advance_by
+      { seconds: context.options[:interval] }
+    end
+  end
+end

data/lib/rrule/humanizer.rb

@@ -18,6 +18,21 @@ module RRule
       Saturday
     ].freeze
 
+    MONTH_NAMES = %w[
+      January
+      February
+      March
+      April
+      May
+      June
+      July
+      August
+      September
+      October
+      November
+      December
+    ].freeze
+
     def initialize(rrule, options)
       @rrule = rrule
       @options = options
@@ -97,6 +112,17 @@ module RRule
         end
       end
 
+      def yearly
+        add interval_option if interval_option != 1
+        add plural?(interval_option) ? 'years' : 'year'
+
+        add 'on' if bymonthday_option || bymonth_option
+
+        add list(options.fetch(:bymonth), method(:monthtext), 'and') if bymonth_option
+
+        add list (bymonthday_option.map { |o| nth(o) }), :to_s, 'and' if bymonthday_option
+      end
+
       def weekly
         if interval_option != 1
           add interval_option
@@ -157,6 +183,10 @@ module RRule
         [day.ordinal && nth(day.ordinal), DAY_NAMES[day.index]].compact.join(' ')
       end
 
+      def monthtext(month)
+        MONTH_NAMES[month - 1]
+      end
+
       def all_weeks?
         bynweekday_option.all? { |option| option.ordinal.nil? }
       end
@@ -172,7 +202,7 @@ module RRule
       end
 
       def _bymonth
-        add list(this.options.bymonth, method(:monthtext), 'and')
+        add list(options.fetch(:bymonth), method(:monthtext), 'and')
       end
 
       def _byweekday
@@ -188,6 +218,11 @@ module RRule
         add list(bynweekday_option, method(:weekdaytext), 'and')
       end
 
+      def _bymonthday
+        add 'on the'
+        add list (bymonthday_option.map { |o| nth(o) }), :to_s, 'and'
+      end
+
       def _byhour
         add 'at'
         add list byhour_option, :to_s, 'and'

data/lib/rrule/rule.rb

@@ -168,13 +168,13 @@ module RRule
         end
       end
 
-      unless options[:byweekno] || options[:byyearday] || options[:bymonthday] || options[:byweekday]
+      unless options[:byweekno] || options[:byyearday] || options[:byweekday]
         case options[:freq]
         when 'YEARLY'
-          options[:bymonth] = [dtstart.month] unless options[:bymonth]
-          options[:bymonthday] = [dtstart.day]
+          options[:bymonth] = [dtstart.month] unless options[:bymonth] || (options[:bymonthday] && options[:count])
+          options[:bymonthday] = [dtstart.day] unless options[:bymonthday]
         when 'MONTHLY'
-          options[:bymonthday] = [dtstart.day]
+          options[:bymonthday] = [dtstart.day] unless options[:bymonthday]
         when 'WEEKLY'
           options[:simple_weekly] = true
           options[:byweekday] = [Weekday.new(dtstart.wday)]
@@ -187,7 +187,7 @@ module RRule
       # 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[: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.6.0'
+  VERSION = '0.7.0'
 end

data/lib/rrule.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require 'active_support/all'
+require 'active_support'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/integer/time'
+require 'active_support/core_ext/array/wrap'
 
 module RRule
   autoload :Rule, 'rrule/rule'
@@ -9,6 +13,9 @@ module RRule
   autoload :Humanizer, 'rrule/humanizer'
 
   autoload :Frequency, 'rrule/frequencies/frequency'
+  autoload :Secondly, 'rrule/frequencies/secondly'
+  autoload :Minutely, 'rrule/frequencies/minutely'
+  autoload :Hourly, 'rrule/frequencies/hourly'
   autoload :Daily, 'rrule/frequencies/daily'
   autoload :Weekly, 'rrule/frequencies/weekly'
   autoload :SimpleWeekly, 'rrule/frequencies/simple_weekly'

data/rrule.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.6.0'
   s.add_runtime_dependency 'activesupport', '>= 2.3'
-  s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rrule
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryan Mitchell
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
-- !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: []
@@ -54,9 +39,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activesupport_6_1.gemfile
 - gemfiles/activesupport_7_0.gemfile
 - gemfiles/activesupport_7_1.gemfile
+- gemfiles/activesupport_7_2.gemfile
+- gemfiles/activesupport_8_0.gemfile
 - lib/rrule.rb
 - lib/rrule/context.rb
 - lib/rrule/filters/by_month.rb
@@ -66,7 +52,10 @@ files:
 - lib/rrule/filters/by_year_day.rb
 - lib/rrule/frequencies/daily.rb
 - lib/rrule/frequencies/frequency.rb
+- lib/rrule/frequencies/hourly.rb
+- lib/rrule/frequencies/minutely.rb
 - lib/rrule/frequencies/monthly.rb
+- lib/rrule/frequencies/secondly.rb
 - lib/rrule/frequencies/simple_weekly.rb
 - lib/rrule/frequencies/weekly.rb
 - lib/rrule/frequencies/yearly.rb
@@ -87,7 +76,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: RRule expansion
 test_files: []