simple_scheduler 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f142ecc49b508ef2a79c390117fb6afb09834ac478ee7cd59fad7f48cf4bdd90
-  data.tar.gz: be59002f28130c9841b4f96c3fa5c79654e035b4e3ee29b7da7d208836b6d86f
+  metadata.gz: '04169aa142db6fc63fa654928bc8d7345bc35861e932ca8b9d533bdbd2873fc6'
+  data.tar.gz: ee4dd1ebe3aa396c10399e456134c583e133f76a94f316f64c652515d94fb9bc
 SHA512:
-  metadata.gz: 4eca24d40adfc372df948beacf0d390116fd8961b1e5d9dae36415da4f7035574b9e61b847cf2c890f43dfe6ef2c8fd55171a81daf7b08aa9fb5fa972fa73116
-  data.tar.gz: 26d1cc5f13e130ad71871ccc470adbeb6a8abd7c12379cf3a5b9cf1175eaeaa52e998eab1a9384808d6693732f61c34f262b9963d148a4846f68889efd40655b
+  metadata.gz: 8b14b423e9cfc343330ddddb38d316e45f6c86a798e4cfd453a32f4ee4078bb54b9d1af289cc8fc76f8d203adf862b4e2ced801aab4843162b3b2ee64cac8be1
+  data.tar.gz: 1758f31a3bc57ae0290bca4395d250b07951520aa7b270fdce2f3950be93b37a15bd01248eaa1a15c2dae453da79f2e05f478e53849ba5f87e0351ab88970369

data/README.md

@@ -1,8 +1,6 @@
 # Simple Scheduler
 
-[![Build Status](https://travis-ci.org/simplymadeapps/simple_scheduler.svg?branch=master)](https://travis-ci.org/simplymadeapps/simple_scheduler)
-[![Code Climate](https://codeclimate.com/github/simplymadeapps/simple_scheduler/badges/gpa.svg)](https://codeclimate.com/github/simplymadeapps/simple_scheduler)
-[![Test Coverage](https://codeclimate.com/github/simplymadeapps/simple_scheduler/badges/coverage.svg)](https://codeclimate.com/github/simplymadeapps/simple_scheduler/coverage)
+[![tests](https://github.com/simplymadeapps/simple_scheduler/actions/workflows/tests.yml/badge.svg)](https://github.com/simplymadeapps/simple_scheduler/actions/workflows/tests.yml)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/simplymadeapps/simple_scheduler/)
 
 Simple Scheduler is a scheduling add-on that is designed to be used with
@@ -27,7 +25,7 @@ Every option we evaluated seems to have the same flaw: **If your server is down,
 
 You must be using:
 
-- Rails 4.2+
+- Rails 7.2+
 - ActiveJob
 - [Sidekiq](http://sidekiq.org)
 - [Heroku Scheduler](https://elements.heroku.com/addons/scheduler)*

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require "bundler/setup"
 rescue LoadError

data/lib/simple_scheduler/at.rb

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
+require "delegate"
+
 module SimpleScheduler
-  # A Time class for parsing the :at option on a task into the first time it should run.
+  # A delegator that parses the :at option on a task into the first time it should run.
+  # Instead of inheriting from Time (which conflicts with ActiveSupport time helpers),
+  # this wraps a Time instance and selectively overrides hour/hour? semantics.
   #   Time.now
   #   # => 2016-12-09 08:24:11 -0600
   #   SimpleScheduler::At.new("*:30")
@@ -8,8 +14,8 @@ module SimpleScheduler
   #   # => 2016-12-10 01:00:00 -0600
   #   SimpleScheduler::At.new("Sun 0:00")
   #   # => 2016-12-11 00:00:00 -0600
-  class At < Time
-    AT_PATTERN = /\A(Sun|Mon|Tue|Wed|Thu|Fri|Sat)?\s?(?:\*{1,2}|((?:\b[0-1]?[0-9]|2[0-3]))):([0-5]\d)\z/.freeze
+  class At < SimpleDelegator
+    AT_PATTERN = /\A(Sun|Mon|Tue|Wed|Thu|Fri|Sat)?\s?(?:\*{1,2}|((?:\b[0-1]?[0-9]|2[0-3]))):([0-5]\d)\z/
     DAYS = %w[Sun Mon Tue Wed Thu Fri Sat].freeze
 
     # Error class raised when an invalid string is given for the time.
@@ -25,20 +31,16 @@ module SimpleScheduler
     #   "[Sun|Mon|Tue|Wed|Thu|Fri|Sat] 00:00"
     # @param at [String] The formatted string for a task's run time
     # @param time_zone [ActiveSupport::TimeZone] The time zone to parse the at time in
-    # rubocop:disable Metrics/AbcSize
     def initialize(at, time_zone = nil)
       @at = at
       @time_zone = time_zone || Time.zone
-      super(parsed_time.year, parsed_time.month, parsed_time.day,
-            parsed_time.hour, parsed_time.min, parsed_time.sec, parsed_time.utc_offset)
+      super(parsed_time) # Delegate all Time methods to parsed Time instance
     end
-    # rubocop:enable Metrics/AbcSize
 
-    # Always returns the specified hour if the hour was given, otherwise
-    # it returns the hour calculated based on other specified options.
+    # Returns the specified hour if present in the at string, else the delegated Time's hour.
     # @return [Integer]
     def hour
-      hour? ? at_hour : super
+      hour? ? at_hour : __getobj__.hour
     end
 
     # Returns whether or not the hour was specified in the :at string.
@@ -51,8 +53,9 @@ module SimpleScheduler
 
     def at_match
       @at_match ||= begin
-        match = AT_PATTERN.match(@at)
         raise InvalidTime, "The `at` option is required." if @at.nil?
+
+        match = AT_PATTERN.match(@at)
         raise InvalidTime, "The `at` option '#{@at}' is invalid." if match.nil?
 
         match
@@ -77,11 +80,11 @@ module SimpleScheduler
 
     def next_hour
       @next_hour ||= begin
-        next_hour = at_hour
+        h = at_hour
         # Add an additional hour if a specific hour wasn't given, if the minutes
         # given are less than the current time's minutes.
-        next_hour += 1 if next_hour?
-        next_hour
+        h += 1 if next_hour?
+        h
       end
     end
 
@@ -94,37 +97,36 @@ module SimpleScheduler
     end
 
     def parsed_day
-      parsed_day = now.beginning_of_day
+      day = now.beginning_of_day
 
       # If no day of the week is given, return today
-      return parsed_day unless at_wday?
+      return day unless at_wday?
 
       # Shift to the correct day of the week if given
-      add_days = at_wday - parsed_day.wday
-      add_days += 7 if parsed_day.wday > at_wday
-      parsed_day + add_days.days
+      add_days = at_wday - day.wday
+      add_days += 7 if day.wday > at_wday
+      day + add_days.days
     end
 
     # Returns the very first time a job should be run for the scheduled task.
     # @return [Time]
     def parsed_time
-      return @parsed_time if @parsed_time
+      return @parsed_time if defined?(@parsed_time) && @parsed_time
 
-      @parsed_time = parsed_day
+      time_object = parsed_day
       change_hour = next_hour
-
       # There is no hour 24, so we need to move to the next day
       if change_hour == 24
-        @parsed_time = 1.day.from_now(@parsed_time)
+        time_object = 1.day.from_now(time_object)
         change_hour = 0
       end
-
-      @parsed_time = @parsed_time.change(hour: change_hour, min: at_min)
+      time_object = time_object.change(hour: change_hour, min: at_min)
 
       # If the parsed time is still before the current time, add an additional day if
       # the week day wasn't specified or add an additional week to get the correct time.
-      @parsed_time += at_wday? ? 1.week : 1.day if now > @parsed_time
-      @parsed_time
+      time_object += at_wday? ? 1.week : 1.day if now > time_object
+
+      @parsed_time = time_object
     end
   end
 end

data/lib/simple_scheduler/future_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleScheduler
   # Active Job class that wraps the scheduled job and determines if the job
   # should still be run based on the scheduled time and when the job expires.

data/lib/simple_scheduler/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleScheduler
   # Load the rake task into the Rails app
   class Railtie < Rails::Railtie

data/lib/simple_scheduler/scheduler_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleScheduler
   # Active Job class that queues jobs defined in the config file.
   class SchedulerJob < ActiveJob::Base
@@ -11,7 +13,7 @@ module SimpleScheduler
     # Returns the path of the Simple Scheduler configuration file.
     # @return [String]
     def config_path
-      ENV["SIMPLE_SCHEDULER_CONFIG"] || "config/simple_scheduler.yml"
+      ENV.fetch("SIMPLE_SCHEDULER_CONFIG", "config/simple_scheduler.yml")
     end
 
     # Load the global scheduler config from the YAML file.

data/lib/simple_scheduler/task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleScheduler
   # Class for parsing each task in the scheduler config YAML file and returning
   # the values needed to schedule the task in the future.
@@ -66,7 +68,7 @@ module SimpleScheduler
     # rubocop:disable Metrics/AbcSize
     def future_run_times
       future_run_times = existing_run_times.dup
-      last_run_time = future_run_times.last || at - frequency
+      last_run_time = future_run_times.last || (at - frequency)
       last_run_time = last_run_time.in_time_zone(time_zone)
 
       # Ensure there are at least two future jobs scheduled and that the queue ahead time is filled

data/lib/simple_scheduler/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleScheduler
-  VERSION = "1.1.1".freeze
+  VERSION = "2.0.0"
 end

data/lib/simple_scheduler.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "active_job"
 require "sidekiq/api"
-require_relative "./simple_scheduler/at"
-require_relative "./simple_scheduler/future_job"
-require_relative "./simple_scheduler/railtie"
-require_relative "./simple_scheduler/scheduler_job"
-require_relative "./simple_scheduler/task"
-require_relative "./simple_scheduler/version"
+require_relative "simple_scheduler/at"
+require_relative "simple_scheduler/future_job"
+require_relative "simple_scheduler/railtie"
+require_relative "simple_scheduler/scheduler_job"
+require_relative "simple_scheduler/task"
+require_relative "simple_scheduler/version"
 
 # Module for scheduling jobs at specific times using Sidekiq.
 module SimpleScheduler

data/lib/tasks/simple_scheduler_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc "Queue future jobs defined using Simple Scheduler"
 task simple_scheduler: :environment do
   SimpleScheduler::SchedulerJob.perform_now

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: simple_scheduler
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2025-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,8 @@ files:
 homepage: https://github.com/simplymadeapps/simple_scheduler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -155,14 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: An enhancement for Heroku Scheduler + Sidekiq for scheduling jobs at specific