inst-jobs 0.16.0 → 1.0.0

data/lib/delayed/performable_method.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module Delayed
-  class PerformableMethod < Struct.new(:object, :method, :args, :fail_cb, :permanent_fail_cb)
-    def initialize(object, method, args = [], fail_cb = nil, permanent_fail_cb = nil)
+  class PerformableMethod < Struct.new(:object, :method, :args, :kwargs, :fail_cb, :permanent_fail_cb)
+    def initialize(object, method, args: [], kwargs: {}, on_failure: nil, on_permanent_failure: nil)
       raise NoMethodError, "undefined method `#{method}' for #{object.inspect}" unless object.respond_to?(method, true)
 
       self.object = object
       self.args   = args
+      self.kwargs = kwargs
       self.method = method.to_sym
-      self.fail_cb           = fail_cb
-      self.permanent_fail_cb = permanent_fail_cb
+      self.fail_cb           = on_failure
+      self.permanent_fail_cb = on_permanent_failure
     end
 
     def display_name
@@ -20,7 +23,12 @@ module Delayed
     alias_method :tag, :display_name
 
     def perform
-      object.send(method, *args)
+      kwargs = self.kwargs || {}
+      if kwargs.empty?
+        object.send(method, *args)
+      else
+        object.send(method, *args, **kwargs)
+      end
     end
 
     def on_failure(error)
@@ -46,7 +54,8 @@ module Delayed
 
     def full_name
       obj_name = object.is_a?(ActiveRecord::Base) ? "#{object.class}.find(#{object.id}).#{method}" : display_name
-      "#{obj_name}(#{args.map { |a| deep_de_ar_ize(a) }.join(', ')})"
+      kwargs_str = kwargs.map { |(k, v)| ", #{k}: #{deep_de_ar_ize(v)}"}.join("")
+      "#{obj_name}(#{args.map { |a| deep_de_ar_ize(a) }.join(', ')}#{kwargs_str})"
     end
   end
 end

data/lib/delayed/periodic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fugit'
 
 module Delayed
@@ -47,10 +49,10 @@ class Periodic
   end
 
   def enqueue
-    Delayed::Job.enqueue(self, @job_args.merge(:max_attempts => 1,
-                                               :run_at => @cron.next_time(Delayed::Periodic.now).utc.to_time,
-                                               :singleton => tag,
-                                               on_conflict: :patient))
+    Delayed::Job.enqueue(self, **@job_args.merge(:max_attempts => 1,
+                                                 :run_at => @cron.next_time(Delayed::Periodic.now).utc.to_time,
+                                                 :singleton => tag,
+                                                 on_conflict: :patient))
   end
 
   def perform

data/lib/delayed/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 
 module Delayed

data/lib/delayed/pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 class Pool
   include Delayed::Logging

data/lib/delayed/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 require 'sinatra/json'
 require 'json'

data/lib/delayed/server/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Server
     module Helpers

data/lib/delayed/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'erb'
 require 'active_support/core_ext/hash/indifferent_access'

data/lib/delayed/testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module Testing
   def self.run_job(job)

data/lib/delayed/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
-  VERSION = "0.16.0"
+  VERSION = "1.0.0"
 end

data/lib/delayed/work_queue/in_process.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 # The simplest possible implementation of a WorkQueue -- just turns around and

data/lib/delayed/work_queue/parent_process.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'socket'
 require 'timeout'

data/lib/delayed/work_queue/parent_process/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 class ParentProcess

data/lib/delayed/work_queue/parent_process/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 class ParentProcess

data/lib/delayed/worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 
 class TimeoutError < RuntimeError; end

data/lib/delayed/worker/consul_health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'health_check'
 require_relative 'process_helper'
 require 'socket'

data/lib/delayed/worker/health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     class HealthCheck

data/lib/delayed/worker/null_health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     class NullHealthCheck < HealthCheck

data/lib/delayed/worker/process_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     module ProcessHelper

data/lib/delayed/yaml_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # New definitions for YAML to aid in serialization and deserialization of delayed jobs.
 
 require 'yaml'

data/lib/delayed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   MIN_PRIORITY = 0
   HIGH_PRIORITY = 0

data/lib/inst-jobs.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'delayed_job'

data/spec/active_record_job_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path("../spec_helper", __FILE__)
 
 describe 'Delayed::Backed::ActiveRecord::Job' do
@@ -17,7 +19,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
 
   it "should recover as well as possible from a failure failing a job" do
     allow(Delayed::Job::Failed).to receive(:create).and_raise(RuntimeError)
-    job = "test".send_later_enqueue_args :reverse, no_delay: true
+    job = "test".delay(ignore_transaction: true).reverse
     job_id = job.id
     proc { job.fail! }.should raise_error(RuntimeError)
     proc { Delayed::Job.find(job_id) }.should raise_error(ActiveRecord::RecordNotFound)
@@ -43,7 +45,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     it "should select the next job at random if enabled" do
       begin
         Delayed::Settings.select_random_from_batch = true
-        15.times { "test".send_later :length }
+        15.times { "test".delay.length }
         founds = []
         15.times do
           job = Delayed::Job.get_and_lock_next_available('tester')

data/spec/delayed/cli_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::CLI do

data/spec/delayed/daemon_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Daemon do

data/spec/delayed/server_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'delayed/server'
 

data/spec/delayed/settings_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Settings do

data/spec/delayed/work_queue/in_process_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::InProcess do

data/spec/delayed/work_queue/parent_process/client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Client do

data/spec/delayed/work_queue/parent_process/server_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Server do

data/spec/delayed/work_queue/parent_process_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fileutils'
 

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'imperium'
 

data/spec/delayed/worker/health_check_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Worker::HealthCheck do

data/spec/delayed/worker_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../spec_helper"
 
 describe Delayed::Worker do

data/spec/gemfiles/42.gemfile.lock

@@ -0,0 +1,192 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (0.15.12)
+      activerecord (>= 4.2)
+      activesupport (>= 4.2)
+      after_transaction_commit (>= 1.0, < 3)
+      railties (>= 4.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.4, < 3.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
+      globalid (>= 0.3.0)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    after_transaction_commit (1.1.2)
+      activerecord (>= 4.0)
+    arel (6.0.4)
+    backports (3.8.0)
+    builder (3.2.3)
+    bump (0.5.4)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    et-orbi (1.2.1)
+      tzinfo
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    httpclient (2.8.3)
+    i18n (0.8.6)
+    imperium (0.3.0)
+      addressable (~> 2.5.0)
+      httpclient (~> 2.8)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.4.0)
+    minitest (5.10.3)
+    multi_json (1.12.1)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    pg (0.21.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    public_suffix (3.0.2)
+    rack (1.6.8)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.9)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    redis (4.1.2)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rufus-scheduler (3.4.2)
+      et-orbi (~> 1.0)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    timecop (0.7.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  after_transaction_commit (< 2)
+  bump
+  byebug
+  database_cleaner (= 1.6.1)
+  imperium (>= 0.2.3)
+  inst-jobs!
+  pg (< 1.0)
+  pry
+  rack-test
+  rails (~> 4.2.5)
+  rake
+  rspec (~> 3.8.0)
+  sinatra
+  sinatra-contrib
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.17.2