say_when 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ca076d2e879f88cc05052565164e4d2c0b856ae
-  data.tar.gz: 0e5b360cad802e12fdab9d86fa77087069374ccc
+SHA256:
+  metadata.gz: 004f8130b1969d9e862595417d9794f7d64ed16afbdf34f40302334b8a942aa9
+  data.tar.gz: e91ef4b230b9c2b846be3c383dc8a2ed05fb818cf1545f9eec46be47da91fd40
 SHA512:
-  metadata.gz: 38f5109ee6927dea6cf452cbee4fe995723f6dc851e76d654609a02085cba1d91e395c62abc7dee65f6bb2cf264ed550ea96a50dd8832edefecb5826a51222cc
-  data.tar.gz: 4de6d52afcfdcf86312bb739b3d6b15729dc5ba035997edfda7f5a2565e4ee6069c3e433b0e366e11e9f0fbb97d018f3e2371bb30cbe765e1a80651654c11311
+  metadata.gz: a00b44161859bc4f2c526e724bee7037dcdead017e08c183c80ca0cb30f13ec8eee631f69d6734bfcc7ecf0dee32fe388cec1852d2b31892d17ad210ee00789d
+  data.tar.gz: 196771d5723fbf2b077ad93fa6ab7e2c8b5923d55090523d38e72e860ba1cce0d3b71938afbf3ce409a260e0022604394401c5db7fb6dc91113cd70d3468af39

data/lib/say_when/poller/concurrent_poller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'concurrent'
 require 'logger'
 require 'say_when/poller/base_poller'
@@ -11,20 +9,19 @@ module SayWhen
 
       def initialize(tick = nil)
         @tick_length = tick.to_i if tick
-        start
       end
 
       def start
-        @tick_timer = Concurrent::TimerTask.new(execution_interval: tick_length) do
+        @tick_timer ||= Concurrent::TimerTask.new(execution_interval: tick_length) do
           process_jobs
         end.tap(&:execute)
       end
 
       def stop
-        if @tick_timer
-          @tick_timer.shutdown
-          @tick_timer = nil
-        end
+        return unless @tick_timer
+
+        @tick_timer.shutdown
+        @tick_timer = nil
       end
     end
   end

data/lib/say_when/storage/active_record_strategy.rb

@@ -47,14 +47,14 @@ module SayWhen
         serialize :trigger_options
         serialize :data
 
-        belongs_to :scheduled, polymorphic: true
-        has_many  :job_executions, class_name: 'SayWhen::Storage::ActiveRecordStrategy::JobExecution'
+        belongs_to :scheduled, polymorphic: true, optional: true
+        has_many :job_executions, class_name: 'SayWhen::Storage::ActiveRecordStrategy::JobExecution'
 
         before_create :set_defaults
 
         def self.job_create(job)
           if existing_job = find_named_job(job[:group], job[:name])
-            existing_job.tap { |j| j.update_attributes(job) }
+            existing_job.tap { |j| j.update(job) }
           else
             create(job)
           end
@@ -71,15 +71,15 @@ module SayWhen
           check_connection
           hide_logging do
             SayWhen::Storage::ActiveRecordStrategy::Job.transaction do
-              # select and lock the next job that needs executin' (status waiting, and after no_later_than)
-              next_job = where(status: STATE_WAITING).
-                         where('next_fire_at < ?', no_later_than).
-                         order('next_fire_at ASC').
-                         lock(true).
-                         first
+              # select and lock the next job that needs executing (status waiting, and after no_later_than)
+              next_job = where(status: STATE_WAITING)
+                         .where('next_fire_at < ?', no_later_than)
+                         .order(next_fire_at: 'asc')
+                         .lock(true)
+                         .first
 
               # set status to acquired to take it out of rotation
-              next_job.update_attribute(:status, STATE_ACQUIRED) if next_job
+              next_job&.update_attribute(:status, STATE_ACQUIRED)
             end
           end
           next_job
@@ -87,8 +87,9 @@ module SayWhen
 
         def self.reset_acquired(older_than_seconds)
           return unless older_than_seconds.to_i > 0
+
           older_than = (Time.now - older_than_seconds.to_i)
-          where('status = ? and updated_at < ?', STATE_ACQUIRED, older_than).update_all("status = '#{STATE_WAITING}'")
+          where('status = ? and updated_at < ?', STATE_ACQUIRED, older_than).update_all(status: STATE_WAITING)
         end
 
         def self.check_connection
@@ -100,10 +101,10 @@ module SayWhen
         end
 
         def self.hide_logging
-          old_logger = nil
+          @_null_logger ||= Logger.new(IO::NULL)
+          old_logger = ::ActiveRecord::Base.logger
           begin
-            old_logger = ::ActiveRecord::Base.logger
-            ::ActiveRecord::Base.logger = nil
+            ::ActiveRecord::Base.logger = @_null_logger
             yield
           ensure
             ::ActiveRecord::Base.logger = old_logger
@@ -112,21 +113,21 @@ module SayWhen
 
         def set_defaults
           self.status = STATE_WAITING
-          self.next_fire_at = self.trigger.next_fire_at
+          self.next_fire_at = trigger.next_fire_at
         end
 
-        def fired(fired_at=Time.now)
-          self.class.transaction {
+        def fired(fired_at = Time.now)
+          self.class.transaction do
             super
-            self.save!
-          }
+            save!
+          end
         end
 
         def release
-          self.class.transaction {
+          self.class.transaction do
             super
-            self.save!
-          }
+            save!
+          end
         end
 
         # default impl with some error handling and result recording
@@ -136,11 +137,11 @@ module SayWhen
             result = execute_with_stored_result
           else
             begin
-              result = self.execute_job(data)
-              SayWhen.logger.info("complete - job: #{self.inspect}, result: #{result}")
-            rescue Object => ex
-              result = "#{ex.class.name}: #{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
-              SayWhen.logger.error("error - job: #{self.inspect}, exception: #{result}")
+              result = execute_job(data)
+              SayWhen.logger.info("complete - job: #{inspect}, result: #{result}")
+            rescue Object => e
+              result = "#{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+              SayWhen.logger.error("error - job: #{inspect}, exception: #{result}")
             end
           end
           result
@@ -150,10 +151,10 @@ module SayWhen
           execution = JobExecution.create(job: self, status: STATE_EXECUTING, start_at: Time.now)
 
           begin
-            execution.result = self.execute_job(data)
+            execution.result = execute_job(data)
             execution.status = 'complete'
-          rescue Object => ex
-            execution.result = "#{ex.class.name}: #{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
+          rescue Object => e
+            execution.result = "#{e.class.name}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
             execution.status = 'error'
           end
 
@@ -164,7 +165,7 @@ module SayWhen
         end
       end
 
-      module Acts #:nodoc:
+      module Acts # :nodoc:
         extend ActiveSupport::Concern
 
         module ClassMethods
@@ -172,9 +173,9 @@ module SayWhen
             include SayWhen::Storage::ActiveRecordStrategy::Acts::InstanceMethods
 
             has_many :scheduled_jobs,
-              as: :scheduled,
-              class_name: 'SayWhen::Storage::ActiveRecordStrategy::Job',
-              dependent: :destroy
+                     as: :scheduled,
+                     class_name: 'SayWhen::Storage::ActiveRecordStrategy::Job',
+                     dependent: :destroy
           end
         end
 
@@ -214,6 +215,4 @@ module SayWhen
 end
 
 aas = SayWhen::Storage::ActiveRecordStrategy::Acts
-unless ActiveRecord::Base.include?(aas)
-  ActiveRecord::Base.send(:include, aas)
-end
+ActiveRecord::Base.send(:include, aas) unless ActiveRecord::Base.include?(aas)

data/lib/say_when/version.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module SayWhen
-  VERSION = '2.1.1'
+  VERSION = '2.2.1'
 end

data/test/say_when/storage/active_record_strategy_test.rb

@@ -85,7 +85,7 @@ describe SayWhen::Storage::ActiveRecordStrategy do
   it 'resets acquired jobs' do
     old = 2.hours.ago
     j = strategy.create(valid_attributes)
-    j.update_attributes(status: 'acquired', updated_at: old, created_at: old)
+    j.update(status: 'acquired', updated_at: old, created_at: old)
 
     j.status.must_equal 'acquired'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: say_when
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -270,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Scheduling system for programmatically defined and stored jobs.