cron_calc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5dd3a2f576d78996d783668af59a058a4fd9256072dfa25b84760d64e09797
-  data.tar.gz: 922e53ae27d369035d3b7fff81e1ba624756fa365c30694e6871abc54421473e
+  metadata.gz: 65bbd980a990785461ad8513755d5ef1effc8d14f4dac4205bf0381f4489bbcd
+  data.tar.gz: 116ac513ff00017a519997d1399748faa95284b2171e6f11c5097a25b10525ee
 SHA512:
-  metadata.gz: 85a0d0ea11962ee78495e6c6c8ee40ea9695d20df2635efbb67cdc32502086032b3aa85aaa419b39cc1a736a31c6d1ecc577afd60b571d4e8d120c5adcd922fc
-  data.tar.gz: aab193b3c8afe9551dd46fe1b9e0061702cc69e3fa739c08c774d5f77ef40dabbd5c90c816b93a1e864d2e05c6c5278eda102c07649c83afd3a43553c5cc5ef8
+  metadata.gz: 70d5d114af61a0430a52b8ef0fc06caecc693fe8f632472814f4335543b038ba6c94565069f831ee7486a8633e015e8833c65b6f1ba2814832a7bb5e4352c9fb
+  data.tar.gz: cb5b23e742052e1b76035721214c28c2a9ce162b70d7c1d60bb308e378db36318c3e4ceac9e65b4a7dc779c1cc710109880f8b921f00580df77bf5f1cc8d3539

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.3.0] - 2023-12-22
+
+- Added support for DOWs
+
 ## [0.2.0] - 2023-12-19
 
 - Added #next method

data/README.md

@@ -21,8 +21,8 @@ Now, you can use one of three methods `#in`, `#next`, `#last` to determine cron
 
 ### Using `#in`
 
-Calculates cron job occurrences within a given time period.
-@param period [Range] The time period for which to calculate cron job occurrences.
+Calculates cron job occurrences within a given time period.\
+@param period [Range] The time period for which to calculate cron job occurrences.\
 @return [Array<Time>] An array of Time instances representing each occurrence.
 
 ```ruby
@@ -34,10 +34,10 @@ Calculates cron job occurrences within a given time period.
 
 ### Using `#next`
 
-Calculates the next 'n' occurrences of the cron job from a given start time.
-@param count [Integer] The number of occurrences to calculate. Defaults to `1`.
-@param period_start [Time] The start time from which to calculate occurrences. Defaults to `Time.now`.
-@param max_years [Integer] The maximum number of years to consider for the period. Defaults to `5`.
+Calculates the next 'n' occurrences of the cron job from a given start time.\
+@param count [Integer] The number of occurrences to calculate. Defaults to `1`.\
+@param period_start [Time] The start time from which to calculate occurrences. Defaults to `Time.now`.\
+@param max_years [Integer] The maximum number of years to consider for the period. Defaults to `5`.\
 @return [Array<Time>] An array of the next 'n' occurrences.
 
 ```ruby
@@ -53,10 +53,10 @@ Calculates the next 'n' occurrences of the cron job from a given start time.
 
 ### Using `#last`
 
-Calculates the last 'n' occurrences of the cron job until a given end time.
-@param count [Integer] The number of past occurrences to calculate.
-@param period_end [Time] The end time until which to calculate occurrences.
-@param max_years [Integer] The maximum number of years to consider for the period.
+Calculates the last 'n' occurrences of the cron job until a given end time.\
+@param count [Integer] The number of past occurrences to calculate.\
+@param period_end [Time] The end time until which to calculate occurrences.\
+@param max_years [Integer] The maximum number of years to consider for the period.\
 @return [Array<Time>] An array of the last 'n' occurrences.
 
 ```ruby
@@ -69,7 +69,6 @@ Calculates the last 'n' occurrences of the cron job until a given end time.
 
 ## Unsupported features
 
-- DOW (Day of Week) - always require *
 - Named DOW and months (SUN-SAT, JAN-DEC)
 - Joining characters , - /
 - Predefined definitions (@yearly, @monthly, @weekly, @daily, @midnight, @hourly)

data/cron_calc.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email = ['jakubmizinski@gmail.com']
 
   spec.summary = 'Calculates cron job occurrences'
-  spec.description = 'Calculates cron job occurrences within a specified period \n
+  spec.description = 'Calculates cron job occurrences within a specified period
                       or determines next/last "n" occurrences based on a specified time.'
   spec.homepage = 'https://github.com/mizinsky/cron_calc'
   spec.license = 'MIT'

data/lib/cron_calc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CronCalc
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/cron_calc.rb

@@ -21,7 +21,8 @@ module CronCalc
       minutes: 0..59,
       hours: 0..23,
       days: 1..31,
-      months: 1..12
+      months: 1..12,
+      dows: 0..7
     }.freeze
 
     def initialize(cron_string)
@@ -68,12 +69,13 @@ module CronCalc
 
     def occurrences(period, count = nil, reverse: false)
       time_combinations = generate_time_combinations(period, reverse).lazy
+      wdays = parse_cron_part(:dows)
 
       time_combinations.each_with_object([]) do |(year, month, day, hour, minute), occ|
         break occ if count && occ.length == count
 
         time = Time.new(year, month, day, hour, minute)
-        occ << time if Date.valid_date?(year, month, day) && period.include?(time)
+        occ << time if Date.valid_date?(year, month, day) && period.include?(time) && wdays.include?(time.wday)
       end
     end
 
@@ -92,7 +94,8 @@ module CronCalc
         minutes: splitted[0],
         hours: splitted[1],
         days: splitted[2],
-        months: splitted[3]
+        months: splitted[3],
+        dows: splitted[4]
       }
     end
 
@@ -122,7 +125,7 @@ module CronCalc
 
     def cron_string_valid?
       # rubocop:disable Layout/LineLength
-      regex = %r{\A(\*|([0-5]?\d)(,([0-5]?\d))*|(\*/\d+)|(\d+-\d+)) (\*|([01]?\d|2[0-3])(,([01]?\d|2[0-3]))*|(\*/\d+)|(\d+-\d+)) (\*|([12]?\d|3[01])(,([12]?\d|3[01]))*|(\*/\d+)|(\d+-\d+)) (\*|([1-9]|1[0-2])(,([1-9]|1[0-2]))*|(\*/\d+)|(\d+-\d+)) \*\z}
+      regex = %r{\A(\*|([0-5]?\d)(,([0-5]?\d))*|(\*/\d+)|(\d+-\d+)) (\*|([01]?\d|2[0-3])(,([01]?\d|2[0-3]))*|(\*/\d+)|(\d+-\d+)) (\*|([12]?\d|3[01])(,([12]?\d|3[01]))*|(\*/\d+)|(\d+-\d+)) (\*|([1-9]|1[0-2])(,([1-9]|1[0-2]))*|(\*/\d+)|(\d+-\d+)) (\*|([0-6])(,([0-6]))*|(\*/[0-6]+)|([0-6]-[0-6]))\z}
       # rubocop:enable Layout/LineLength
       cron_string.match?(regex)
     end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cron_calc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jakub Miziński
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies: []
 description: |-
-  Calculates cron job occurrences within a specified period \n
+  Calculates cron job occurrences within a specified period
                         or determines next/last "n" occurrences based on a specified time.
 email:
 - jakubmizinski@gmail.com