inst-jobs 2.2.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9550c353f31dc1d34a15993bdfbf279d87979ebb625ae776fb6727d7dc9e897e
-  data.tar.gz: 379f8faac5d3369551b4012a00f522d7871a4001776120c4e02535b70bdef8a3
+  metadata.gz: 5ab1bd6816331fee7e233542126f85236688fc647050bfc18a1b635e78cd34e5
+  data.tar.gz: 8b5a8e483f8052ed8a01b77a5a610d06bb9b4f3b59b253982d96c353a24fa113
 SHA512:
-  metadata.gz: 4dbb7a9366256f16a0fd7fbf22938d94c7754cdd3d9189d3d7d94e0d8deda59859ec4822f1e3c1d05cc7a2a67c8501a79c83d7b0b69f91fd106d9b24b4f35b06
-  data.tar.gz: 637e09a985feeef6144e5b172a04c8ceee5980eed3b1b49f2597e33bbf26522c43244bc2778905ba400cf0de6485166258103e09aa7a765e261f8971b89b2c06
+  metadata.gz: e1affab489a4655084667dee40a487964da7c50780e7124b15ed18b7319bad1db6606f11bde3e109feef9d09ed94c2fd7d70b5c8f0da049c6f3411f5d9d4bf67
+  data.tar.gz: eae5d0a5db108e6f0ed92567a466a1663a411fdeac386b159eba906d26f05bea199ef495c020f43ae10d03d6bf6efdfa198e8b39f46caf8d0fb7e8f2a7192704

data/lib/delayed/backend/active_record.rb

@@ -13,9 +13,13 @@ end
 module Delayed
   module Backend
     module ActiveRecord
+      class AbstractJob < ::ActiveRecord::Base
+        self.abstract_class = true
+      end
+
       # A job object that is persisted to the database.
       # Contains the work object as a YAML field.
-      class Job < ::ActiveRecord::Base
+      class Job < AbstractJob
         include Delayed::Backend::Base
         self.table_name = :delayed_jobs
 
@@ -27,7 +31,7 @@ module Delayed
 
         class << self
           def create(attributes, &block)
-            return super if connection.prepared_statements || Rails.version < '5.2'
+            return super if connection.prepared_statements
 
             # modified from ActiveRecord::Persistence.create and ActiveRecord::Persistence#_insert_record
             job = new(attributes, &block)
@@ -37,7 +41,7 @@ module Delayed
 
         def single_step_create
           connection = self.class.connection
-          return save if connection.prepared_statements || Rails.version < '5.2'
+          return save if connection.prepared_statements
 
           # a before_save callback that we're skipping
           initialize_defaults
@@ -66,7 +70,8 @@ module Delayed
           # > Multiple queries sent in a single PQexec call are processed in a single transaction,
           # unless there are explicit BEGIN/COMMIT commands included in the query string to divide
           # it into multiple transactions.
-          sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"]
+          # but we don't need to lock when inserting into Delayed::Failed
+          sql = "SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(#{connection.quote(values['strand'])})); #{sql}" if values["strand"] && self.class == Job
           result = connection.execute(sql, "#{self} Create")
           self.id = result.values.first.first
           result.clear
@@ -98,7 +103,7 @@ module Delayed
         # to raise the lock level
         before_create :lock_strand_on_create
         def lock_strand_on_create
-          if strand.present?
+          if strand.present? && self.class == Job
             self.class.connection.execute("SELECT pg_advisory_xact_lock(#{self.class.connection.quote_table_name('half_md5_as_bigint')}(#{self.class.connection.quote(strand)}))")
           end
         end
@@ -513,17 +518,6 @@ module Delayed
         class Failed < Job
           include Delayed::Backend::Base
           self.table_name = :failed_jobs
-          # Rails hasn't completely loaded yet, and setting the table name will cache some stuff
-          # so reset that cache so that it will load correctly after Rails is all loaded
-          # It's fixed in Rails 5 to not cache anything when you set the table_name
-          if Rails.version < '5' && Rails.version >= '4.2'
-            @arel_engine = nil
-            @arel_table = nil
-          end
-        end
-        if Rails.version < '5' && Rails.version >= '4.2'
-          @arel_engine = nil
-          @arel_table = nil
         end
       end
 

data/lib/delayed/backend/redis/job.rb

@@ -395,13 +395,6 @@ class Job
     result
   end
 
-  if Rails.version < "4.1"
-    def changes_applied
-      @previously_changed = changes
-      @changed_attributes.clear
-    end
-  end
-
   def save!(*a)
     save(*a) || raise(RecordNotSaved)
   end

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "2.2.1"
+  VERSION = "2.3.1"
 end

data/lib/delayed_job.rb

@@ -18,6 +18,7 @@ require 'rails'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_record'
 require 'after_transaction_commit'
+require 'debug_inspector'
 
 require 'delayed/core_ext/kernel'
 

data/spec/active_record_job_spec.rb

@@ -262,8 +262,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
 
   context "non-transactional", non_transactional: true do
     it "creates a stranded job in a single statement" do
-      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
-
       allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
       allow(Delayed::Job.connection).to receive(:execute).with(be_include("pg_advisory_xact_lock"), anything).and_call_original.once
       allow(Delayed::Job.connection).to receive(:insert).never
@@ -273,8 +271,6 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     end
 
     it "creates a non-stranded job in a single statement" do
-      skip "Requires Rails 5.2 or greater" unless Rails.version >= '5.2'
-
       allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
       call_count = 0
       allow(Delayed::Job.connection).to receive(:execute).and_wrap_original do |m, (arg1, arg2)|
@@ -286,5 +282,20 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
       expect(call_count).to eq 1
       expect(Delayed::Job.find(j.id)).to eq j
     end
+
+    it "does not lock a stranded failed job creation" do
+      j = create_job(strand: "test1")
+      # query for metadata to ensure it's loaded before we start mucking with the connection
+      Delayed::Backend::ActiveRecord::Job::Failed.new
+
+      allow(Delayed::Job.connection).to receive(:prepared_statements).and_return(false)
+      allow(Delayed::Job.connection).to receive(:execute).and_wrap_original do |original, *args|
+        expect(args.first).not_to include("pg_advisory_xact_lock")
+        original.call(*args)
+      end
+      allow(Delayed::Job.connection).to receive(:insert).never
+      j.fail!
+      allow(Delayed::Job.connection).to receive(:execute).and_call_original
+    end
   end
 end

data/spec/gemfiles/52.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gemspec :path=>"../../"
+gemspec :path => "../../"
 
 gem "rails", "~> 5.2.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"
+gem 'sinatra', "~> 2.0"
+gem 'sinatra-contrib', "~> 2.0"

data/spec/gemfiles/60.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gemspec :path=>"../../"
+gemspec :path => "../../"
 
 gem "rails", "~> 6.0.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"
+gem 'sinatra', "~> 2.0"
+gem 'sinatra-contrib', "~> 2.0"

data/spec/gemfiles/61.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../../"
+
+gem "rails", "~> 6.1.0"
+gem 'sinatra', "~> 2.0"
+gem 'sinatra-contrib', "~> 2.0"

data/spec/shared/worker.rb

@@ -21,7 +21,7 @@ shared_examples_for 'Delayed::Worker' do
 
   describe "running a job" do
     it "should not fail when running a job with a % in the name" do
-      @job = "Some % Name here".delay(ignore_transaction: true).starts_with?("Some % Name")
+      @job = "Some % Name here".delay(ignore_transaction: true).start_with?("Some % Name")
       @worker.perform(@job)
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'delayed/testing'
 
 require 'database_cleaner'
 require 'rack/test'
-require 'test_after_commit' if ::Rails.version < '5'
 require 'timecop'
 require 'webmock/rspec'
 
@@ -63,18 +62,8 @@ connection_config = {
   database: ENV['TEST_DB_DATABASE'],
 }
 
-if ::Rails.version < '5'
-  class ActiveRecord::Migration
-    class << self
-      def [](_version); self; end
-    end
-  end
-end
-
 def migrate(file)
-  if ::Rails.version < '5.2'
-    ActiveRecord::Migrator.migrate(file)
-  elsif ::Rails.version >= '6'
+  if ::Rails.version >= '6'
     ActiveRecord::MigrationContext.new(file, ActiveRecord::SchemaMigration).migrate
   else
     ActiveRecord::MigrationContext.new(file).migrate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -161,16 +161,30 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -261,14 +275,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -303,14 +317,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -436,11 +450,9 @@ files:
 - spec/delayed/worker/consul_health_check_spec.rb
 - spec/delayed/worker/health_check_spec.rb
 - spec/delayed/worker_spec.rb
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/50.gemfile
-- spec/gemfiles/51.gemfile
 - spec/gemfiles/52.gemfile
 - spec/gemfiles/60.gemfile
+- spec/gemfiles/61.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -470,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -478,11 +490,9 @@ test_files:
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/redis_job_spec.rb
+- spec/gemfiles/61.gemfile
 - spec/gemfiles/60.gemfile
-- spec/gemfiles/42.gemfile
 - spec/gemfiles/52.gemfile
-- spec/gemfiles/50.gemfile
-- spec/gemfiles/51.gemfile
 - spec/shared_jobs_specs.rb
 - spec/shared/performable_method.rb
 - spec/shared/testing.rb

data/spec/gemfiles/42.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 4.2.5"
-gem "after_transaction_commit", "<2"
-gem 'test_after_commit', '0.4.1'

data/spec/gemfiles/50.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 5.0.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"

data/spec/gemfiles/51.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../../"
-
-gem "rails", "~> 5.1.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"