talentbox-delayed_job_sequel 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b27b56543c6f834b32df106575fdabc9320e401
-  data.tar.gz: 2d6077064b7ce9fc38d543ad6055d8ddfc7ae6de
+SHA256:
+  metadata.gz: 9df8379a22448df5d83e80a07c9203f4f18a3a92b26b2adbdd58c3b34439edd6
+  data.tar.gz: 69c7e61e93e6125950d41839f5547c3bfd9151b41aaa4500b0efe729bb34d0d7
 SHA512:
-  metadata.gz: 77472993bc21cf97075217409ae09f528f74887eb6ebf5f163d855a6703519e1a96e22d08efc8dd51ae73c007e90edbdd987680c0af780d0c6691436def24d71
-  data.tar.gz: 823c43ae1aaf0d783879187ed129e0f07e7665a04f44b0be97f2e1ef66dc52071c8444c7cb259ee488027cdc3dd84b952b794b8096bc9938a43757ef47149c59
+  metadata.gz: 7e561a008f43677037414d62dfb26a258630dc041ede13b3afc08bb4bcda8d756925274995a4af26a42889f598a00bacee543fe28475b839e2fba9fe50576904
+  data.tar.gz: 05a2b56eedc5e54c0a56dec32179bc3a5fcbb11d30814d80b87002de8f5c32928c5ceb92f45e7a7f96e49132c8f5be95ba15670841eeb2cbca3d1222adeafb11

data/README.md

@@ -1,13 +1,12 @@
 # DelayedJob Sequel Backend
 
-[![Build Status](https://secure.travis-ci.org/TalentBox/delayed_job_sequel.png?branch=master)](http://travis-ci.org/TalentBox/delayed_job_sequel)
-[![Code Climate](https://codeclimate.com/github/TalentBox/delayed_job_sequel.png)](https://codeclimate.com/github/TalentBox/delayed_job_sequel)
+[![CI](https://github.com/TalentBox/delayed_job_sequel/actions/workflows/ci.yml/badge.svg)](https://github.com/TalentBox/delayed_job_sequel/actions/workflows/ci.yml)
 
 ## Compatibility
 
-This gem works on Ruby (MRI/CRuby) 1.9.3 and 2.0.x.
+This gem is tested to work on `Ruby` (MRI/CRuby) `>= 3.4`, `Sequel` `~> 5.0`, and `DelayedJob` `~> 4.1`.
 
-It's strongly recommended to use a Ruby >= 1.9.3 version.
+It should work with older Ruby/Sequel/DelayedJob combinations, but we don't test those anymore.
 
 ## Installation
 
@@ -53,6 +52,7 @@ Improvements has been made by those awesome contributors:
 * James Goodhouse (@jamesgoodhouse)
 * Lyle Franklin (@ljfranklin)
 * Florent Piteau (@flop)
+* Pedro Fayolle (@pilaf)
 
 ## How to contribute
 

data/lib/delayed/backend/sequel.rb

@@ -20,10 +20,10 @@ module Delayed
             filter do
               (
                 (run_at <= db_time_now) &
-                ::Sequel.expr(:locked_at => nil) |
+                ::Sequel.expr(locked_at: nil) |
                 (::Sequel.expr(:locked_at) < lock_upper_bound) |
-                {:locked_by => worker_name}
-              ) & {:failed_at => nil}
+                {locked_by: worker_name}
+              ) & {failed_at: nil}
             end
           end
 
@@ -41,7 +41,7 @@ module Delayed
 
         # When a worker is exiting, make sure we don't have any locked jobs.
         def self.clear_locks!(worker_name)
-          filter(:locked_by => worker_name).update(:locked_by => nil, :locked_at => nil)
+          filter(locked_by: worker_name).update(locked_by: nil, locked_at: nil)
         end
 
         # adapted from
@@ -51,7 +51,7 @@ module Delayed
 
           ds = ds.filter(::Sequel.lit("priority >= ?", Worker.min_priority)) if Worker.min_priority
           ds = ds.filter(::Sequel.lit("priority <= ?", Worker.max_priority)) if Worker.max_priority
-          ds = ds.filter(:queue => Worker.queues) if Worker.queues.any?
+          ds = ds.filter(queue: Worker.queues) if Worker.queues.any?
           ds = ds.by_priority
 
           case ::Sequel::Model.db.database_type
@@ -70,7 +70,7 @@ module Delayed
             if job = ds.first
               job.locked_at = self.db_time_now
               job.locked_by = worker.name
-              job.save(:raise_on_failure => true)
+              job.save(raise_on_failure: true)
               job
             end
           end
@@ -108,7 +108,7 @@ module Delayed
         end
 
         def save!
-          save :raise_on_failure => true
+          save raise_on_failure: true
         end
 
         def update_attributes(attrs)
@@ -116,7 +116,7 @@ module Delayed
         end
 
         def self.create!(attrs)
-          new(attrs).save :raise_on_failure => true
+          new(attrs).save raise_on_failure: true
         end
 
         def self.silence_log(&block)

data/lib/generators/delayed_job/templates/migration.rb

@@ -1,8 +1,8 @@
 class CreateDelayedJobs < ActiveRecord::Migration
   def self.up
-    create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+    create_table :delayed_jobs, force: true do |table|
+      table.integer  :priority, default: 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, default: 0      # Provides for retries, but still fail eventually.
       table.text     :handler                      # YAML-encoded string of the object that will do work
       table.text     :last_error                   # reason for last failure (See Note below)
       table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
@@ -13,7 +13,7 @@ class CreateDelayedJobs < ActiveRecord::Migration
       table.timestamps
     end
 
-    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+    add_index :delayed_jobs, [:priority, :run_at], name: 'delayed_jobs_priority'
   end
 
   def self.down

data/spec/delayed/backend/sequel_spec.rb

@@ -49,10 +49,10 @@ describe Delayed::Backend::Sequel::Job do
         described_class.create(failed_at: Time.now)
         expect do
           expect(
-            Delayed::Job.count(:conditions => "failed_at is not NULL")
+            Delayed::Job.count(conditions: "failed_at is not NULL")
           ).to eq 1
           expect(
-            Delayed::Job.count(:conditions => "locked_by is not NULL")
+            Delayed::Job.count(conditions: "locked_by is not NULL")
           ).to eq 0
         end.to_not raise_error
       end
@@ -62,10 +62,10 @@ describe Delayed::Backend::Sequel::Job do
         described_class.create(queue: "important", priority: 1)
         expect do
           expect(
-            Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now])
+            Delayed::Job.count(group: "queue", conditions: ['run_at < ? and failed_at is NULL', Time.now])
           ).to match_array [["slow", 1], ["important", 1]]
           expect(
-            Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now])
+            Delayed::Job.count(group: "priority", conditions: ['run_at < ? and failed_at is NULL', Time.now])
           ).to match_array [[1, 1], [2, 1]]
         end.to_not raise_error
       end
@@ -107,7 +107,7 @@ describe Delayed::Backend::Sequel::Job do
   describe "enqueue" do
     it "should allow enqueue hook to modify job at DB level" do
       later = described_class.db_time_now + 20.minutes
-      job = Delayed::Backend::Sequel::Job.enqueue :payload_object => EnqueueJobMod.new
+      job = Delayed::Backend::Sequel::Job.enqueue payload_object: EnqueueJobMod.new
       expect(
         Delayed::Backend::Sequel::Job[job.id].run_at
       ).to be_within(1).of(later)
@@ -115,16 +115,16 @@ describe Delayed::Backend::Sequel::Job do
   end
 end
 
-describe Delayed::Backend::Sequel::Job, "override table name" do
+describe Delayed::Backend::Sequel::Job, "override table name", :postgres do
   it "allows to override the table name" do
-    ::Sequel::Model.db.transaction :rollback => :always do
+    ::Sequel::Model.db.transaction rollback: :always do
       begin
         DB.create_table :another_delayed_jobs do
           primary_key :id
-          Integer :priority, :default => 0
-          Integer :attempts, :default => 0
-          String  :handler, :text => true
-          String  :last_error, :text => true
+          Integer :priority, default: 0
+          Integer :attempts, default: 0
+          String  :handler, text: true
+          String  :last_error, text: true
           Time    :run_at
           Time    :locked_at
           Time    :failed_at

data/spec/delayed/serialization/sequel_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Sequel::Model do
   it 'should load classes with non-default primary key' do
     expect do
-      YAML.load(Story.create.to_yaml)
+      YAML.safe_load(Story.create.to_yaml, permitted_classes: [Story, Symbol])
     end.not_to raise_error
   end
 end

data/spec/spec_helper.rb

@@ -11,28 +11,59 @@ def jruby?
   (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
 end
 
-DB = case ENV["DB"]
-when "mysql"
+rspec_exclusions = {}
+rspec_exclusions[:skip_jdbc] = !jruby?
+rspec_exclusions[:postgres] = ENV['TEST_ADAPTER'] != 'postgresql'
+rspec_exclusions[:mysql] = !%w[mysql mysql2].include?(ENV['TEST_ADAPTER'])
+rspec_exclusions[:sqlite] = ENV['TEST_ADAPTER'] != 'sqlite3'
+
+RSpec.configure do |config|
+  config.filter_run_excluding rspec_exclusions
+end
+
+db_host = ENV.fetch("TEST_DATABASE_HOST", "127.0.0.1")
+db_name = ENV.fetch("TEST_DATABASE", "delayed_jobs_test")
+
+DB = case ENV["TEST_ADAPTER"]
+when /mysql/
+  db_port = ENV.fetch("TEST_DATABASE_PORT", 3306)
+  opts = {test: true, encoding: ENV.fetch("TEST_ENCODING", "utf8")}
   begin
     if jruby?
-      Sequel.connect "jdbc:mysql://localhost/delayed_jobs", test: true
+      Sequel.connect "jdbc:mysql://#{db_host}:#{db_port}/#{db_name}", opts
     else
-      Sequel.connect adapter: "mysql2", database: "delayed_jobs", test: true
+      opts.merge!({database: db_name, host: db_host, port: db_port})
+      opts[:user] = ENV["TEST_USERNAME"] if ENV.key?("TEST_USERNAME")
+      opts[:password] = ENV["TEST_PASSWORD"] if ENV.key?("TEST_PASSWORD")
+      Sequel.connect({adapter: "mysql2"}.merge(opts))
     end
   rescue Sequel::DatabaseConnectionError
-    system "mysql -e 'CREATE DATABASE IF NOT EXISTS `delayed_jobs` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci'"
-    retry
+    if ENV.key? "CI"
+      raise
+    else
+      system "mysql -e 'CREATE DATABASE IF NOT EXISTS `#{db_name}` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci'"
+      retry
+    end
   end
-when "postgres"
+when /postgres/
+  db_port = ENV.fetch("TEST_DATABASE_PORT", 5432)
+  opts = {test: true, encoding: ENV.fetch("TEST_ENCODING", nil)}
   begin
     if jruby?
-      Sequel.connect "jdbc:postgresql://localhost/delayed_jobs", test: true
+      Sequel.connect "jdbc:postgresql://#{db_host}:#{db_port}/#{db_name}", opts
     else
-      Sequel.connect adapter: "postgres", database: "delayed_jobs", test: true
+      opts.merge!({database: db_name, host: db_host, port: db_port})
+      opts[:user] = ENV["TEST_USERNAME"] if ENV.key?("TEST_USERNAME")
+      opts[:password] = ENV["TEST_PASSWORD"] if ENV.key?("TEST_PASSWORD")
+      Sequel.connect({adapter: "postgres"}.merge(opts))
     end
   rescue Sequel::DatabaseConnectionError
-    system "createdb --encoding=UTF8 delayed_jobs"
-    retry
+    if ENV.key? "CI"
+      raise
+    else
+      system "createdb --encoding=UTF8 #{db_name}"
+      retry
+    end
   end
 else
   if jruby?
@@ -43,14 +74,15 @@ else
 end
 
 DB.drop_table :delayed_jobs rescue Sequel::DatabaseError
+DB.drop_table :another_delayed_jobs rescue Sequel::DatabaseError
 DB.drop_table :stories rescue Sequel::DatabaseError
 
 DB.create_table :delayed_jobs do
   primary_key :id
-  Integer :priority, :default => 0
-  Integer :attempts, :default => 0
-  String  :handler, :text => true
-  String  :last_error, :text => true
+  Integer :priority, default: 0
+  Integer :attempts, default: 0
+  String  :handler, text: true
+  String  :last_error, text: true
   Time    :run_at
   Time    :locked_at
   Time    :failed_at
@@ -63,7 +95,7 @@ end
 DB.create_table :stories do
   primary_key :story_id
   String      :text
-  TrueClass   :scoped, :default => true
+  TrueClass   :scoped, default: true
 end
 
 require "delayed_job_sequel"
@@ -83,4 +115,7 @@ class Story < Sequel::Model
   end
   handle_asynchronously :whatever
   alias_method :persisted?, :exists?
+  def save!
+    save(raise_on_failure: true)
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Jonathan Tron
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.38'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -26,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.38'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -36,22 +35,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,21 +58,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +134,6 @@ files:
 homepage: http://github.com/TalentBox/delayed_job_sequel
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -126,9 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Sequel backend for DelayedJob
 test_files: