delayed_job_heartbeat_plugin 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba564b35f94921f30c324a5597705a743fd443946492b131f382282d2650c91
-  data.tar.gz: 63947153fbcf5b303d47981cee2a21eb8f4d76298ad6bc4e8fefe18da9cabe26
+  metadata.gz: 4e345f76bdcd070b600dfab6df2b3eb8605b9c782f9e1b889c737f9e928fa3d3
+  data.tar.gz: 9d1a29cf20de158f54c7cb1c56eb6ed39e18112e21af8021c62a2eb911220598
 SHA512:
-  metadata.gz: 25f9c2a073c041070f6f25d0b5c20a03fe60a598880a95f25478e62fca3d1c2cd046e312e4d7da4355254b86f3fc2b5551a8d35d287baff015dcde5a767dc727
-  data.tar.gz: 6abadd87e0918dc4f0cb9f501455444b8ea81e30473913d229967d95909682d1673402267fe47c20c4d134136e09592f6607648b70320fa1f6b508dc78e70bda
+  metadata.gz: b67e3d0bed56aeb692398b6b3bb83cdb11faafd8fdb1f392961ffe61e97537f7918b42927e58f561e7d8b8c643ea6c368fa32bd937d0d8bd483f588d185d54b8
+  data.tar.gz: 409f328c1244d38bc9f161dbfd28e6169b626b0831a896716090b7d05357e3d43688cf448c22494bd2a154a399c5e6c28a4eefc962c606fcf1f639adb055694e

data/.circleci/config.yml

@@ -1,81 +1,83 @@
 version: 2.1
 jobs:
   lint:
-      docker:
-        - image: salsify/ruby_ci:2.7.6
-      working_directory: ~/delayed_job_heartbeat_plugin
-      steps:
-        - checkout
-        - restore_cache:
-            keys:
-              - v1-gems-ruby-2.7.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
-              - v1-gems-ruby-2.7.6-
-        - run:
-            name: Install Gems
-            command: |
-              if ! bundle check --path=vendor/bundle; then
-                bundle install --path=vendor/bundle --jobs=4 --retry=3
-                bundle clean
-              fi
-        - save_cache:
-            key: v1-gems-ruby-2.7.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
-            paths:
-              - "vendor/bundle"
-              - "gemfiles/vendor/bundle"
-        - run:
-            name: Run Rubocop
-            command: bundle exec rubocop --config .rubocop.yml
+    docker:
+      - image: cimg/ruby:3.1.6
+    working_directory: ~/delayed_job_heartbeat_plugin
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-gems-ruby-3.1.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-3.1.6-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v1-gems-ruby-3.1.6-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "Gemfile" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop --config .rubocop.yml
   test:
-      parameters:
-        gemfile:
-          type: string
-        ruby_version:
-          type: string
-      docker:
-        - image: salsify/ruby_ci:<< parameters.ruby_version >>
-          environment:
-            DB_USER: "circleci"
-        - image: cimg/postgres:12.7
-          environment:
-            POSTGRES_USER: "circleci"
-            POSTGRES_DB: "circle_test"
-            POSTGRES_HOST_AUTH_METHOD: "trust"
-      environment:
-        RACK_ENV: "test"
-        RAILS_ENV: "test"
-        CIRCLE_TEST_REPORTS: "test-results"
-        BUNDLE_GEMFILE: << parameters.gemfile >>
-      working_directory: ~/delayed_job_heartbeat_plugin
-      steps:
-        - checkout
-        - restore_cache:
-            keys:
-              - v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
-              - v1-gems-ruby-<< parameters.ruby_version >>-
-        - run:
-            name: Install Gems
-            command: |
-              if ! bundle check --path=vendor/bundle; then
-                bundle install --path=vendor/bundle --jobs=4 --retry=3
-                bundle clean
-              fi
-        - save_cache:
-            key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
-            paths:
-              - "vendor/bundle"
-              - "gemfiles/vendor/bundle"
-        - run:
-            name: Wait for Database
-            command: dockerize -wait tcp://localhost:5432 -timeout 60s
-        - run:
-            name: Wait for Database User
-            command: t=30; for i in `seq $t`; do psql -h localhost -p 5432 -U circleci -d circle_test -c '\q' && break; [ $i -eq $t ] && return 2; sleep 1; done;
-        - run:
-            name: Run Tests
-            command: |
-              bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
-        - store_test_results:
-            path: "test-results"
+    parameters:
+      gemfile:
+        type: string
+      ruby_version:
+        type: string
+    docker:
+      - image: cimg/ruby:<< parameters.ruby_version >>
+        environment:
+          DB_USER: "circleci"
+      - image: cimg/postgres:12.9
+        environment:
+          POSTGRES_USER: "circleci"
+          POSTGRES_DB: "circle_test"
+          POSTGRES_HOST_AUTH_METHOD: "trust"
+    environment:
+      RACK_ENV: "test"
+      RAILS_ENV: "test"
+      DB_USER: "circleci"
+      ADMIN_DB_NAME: "circle_test"
+      CIRCLE_TEST_REPORTS: "test-results"
+      BUNDLE_GEMFILE: << parameters.gemfile >>
+    working_directory: ~/delayed_job_heartbeat_plugin
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+            - v1-gems-ruby-<< parameters.ruby_version >>-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_heartbeat_plugin.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Wait for Database
+          command: dockerize -wait tcp://localhost:5432 -timeout 60s
+      - run:
+          name: Wait for Database User
+          command: t=30; for i in `seq $t`; do psql -h localhost -p 5432 -U circleci -d circle_test -c '\q' && break; [ $i -eq $t ] && return 2; sleep 1; done;
+      - run:
+          name: Run Tests
+          command: |
+            bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
+      - store_test_results:
+          path: "test-results"
 workflows:
   build:
     jobs:
@@ -84,10 +86,11 @@ workflows:
           matrix:
             parameters:
               gemfile:
-                - "gemfiles/rails_6.0.gemfile"
-                - "gemfiles/rails_6.1.gemfile"
-                - "gemfiles/rails_7.0.gemfile"
+                - gemfiles/rails_6.1.gemfile
+                - gemfiles/rails_7.0.gemfile
+                - gemfiles/rails_7.1.gemfile
+                - gemfiles/rails_7.2.gemfile
               ruby_version:
-                - "2.7.6"
-                - "3.0.4"
-                - "3.1.2"
+                - 3.1.6
+                - 3.2.5
+                - 3.3.4

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @jturkel @will89
+* @salsify/pim-core-backend

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'

data/Appraisals

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-6.0' do
-  gem 'activerecord', '~> 6.0.4'
-  gem 'activesupport', '~> 6.0.4'
-end
-
 appraise 'rails-6.1' do
   gem 'activerecord', '~> 6.1.5'
   gem 'activesupport', '~> 6.1.5'
@@ -14,3 +9,13 @@ appraise 'rails-7.0' do
   gem 'activerecord', '~> 7.0.2'
   gem 'activesupport', '~> 7.0.2'
 end
+
+appraise 'rails-7.1' do
+  gem 'activerecord', '~> 7.1.3'
+  gem 'activesupport', '~> 7.1.3'
+end
+
+appraise 'rails-7.2' do
+  gem 'activerecord', '~> 7.2.0'
+  gem 'activesupport', '~> 7.2.0'
+end

data/CHANGELOG.md

@@ -1,18 +1,29 @@
 # Changelog
 
-### 0.5.0
+## 0.6.0
+
+- Drop support for Ruby < 3.1
+- Drop Rails 6.0
+- Add Rails 7.2
+  **Thanks [@DRSisco](https://github.com/DRSisco)**
+
+## 0.5.0
+
 - Drop support for ruby < 2.7
 - Add support for ruby 3.1
 - Drop Rails 5.2
 - Add Rails 7.0
 
-### 0.4.0
+## 0.4.0
+
 - Use frozen string literals.
 
-### 0.3.0
-* Drop support for Ruby < 2.5.
-* Drop support for Rails < 5.2.
-* Bugfix for rails version in generated migration files
+## 0.3.0
+
+- Drop support for Ruby < 2.5.
+- Drop support for Rails < 5.2.
+- Bugfix for rails version in generated migration files
+
+## 0.2.0
 
-### 0.2.0
-* Enable correlation between workers and unlocked jobs in results returned from deleting workers
+- Enable correlation between workers and unlocked jobs in results returned from deleting workers

data/delayed_job_heartbeat_plugin.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'delayed_job', '>= 4.1.0'
   spec.add_dependency 'delayed_job_active_record', '>= 4.1.0'
 
-  spec.add_development_dependency 'activerecord', ['>= 5.2', '< 7.1']
+  spec.add_development_dependency 'activerecord', ['>= 6.1', '< 7.3']
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'salsify_rubocop', '~> 1.0.2'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.59.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'timecop'
 end

data/gemfiles/{rails_6.0.gemfile → rails_7.1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.4"
-gem "activesupport", "~> 6.0.4"
+gem "activerecord", "~> 7.1.3"
+gem "activesupport", "~> 7.1.3"
 
 gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.2.0"
+gem "activesupport", "~> 7.2.0"
+
+gemspec path: "../"

data/lib/delayed/heartbeat/tasks.rb

@@ -16,7 +16,7 @@ namespace :delayed do
 
     def print_results(results)
       puts "Deleted #{results.workers.size} and unlocked #{results.unlocked_jobs.size} orphaned jobs"
-      puts results.to_s if verbose? && results.present?
+      puts results if verbose? && results.present?
     end
 
     def verbose?

data/lib/delayed/heartbeat/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module Heartbeat
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/delayed/heartbeat/worker_heartbeat.rb

@@ -46,7 +46,7 @@ module Delayed
           update_heartbeat
           # Return the connection back to the pool since we won't be needing
           # it again for a while.
-          Delayed::Backend::ActiveRecord::Job.clear_active_connections!
+          Delayed::Backend::ActiveRecord::Job.connection_handler.clear_active_connections!
         end
       rescue StandardError => e
         # We don't want the worker to continue running if the heartbeat can't be written.
@@ -58,8 +58,8 @@ module Delayed
       ensure
         @stop_reader.close
         @worker_model.delete
-        # Note: The built-in Delayed::Plugins::ClearLocks will unlock the jobs for us
-        Delayed::Backend::ActiveRecord::Job.clear_active_connections!
+        # NOTE: The built-in Delayed::Plugins::ClearLocks will unlock the jobs for us
+        Delayed::Backend::ActiveRecord::Job.connection_handler.clear_active_connections!
       end
 
       def update_heartbeat

data/spec/delayed/heartbeat_spec.rb

@@ -42,7 +42,7 @@ describe Delayed::Heartbeat do
 
     let!(:failed_orphaned_job) do
       Delayed::Job.create!(locked_by: dead_worker.name, locked_at: dead_worker.last_heartbeat_at,
-          payload_object: TestJobWithCallbacks.new) do |job|
+                           payload_object: TestJobWithCallbacks.new) do |job|
         job.attempts = max_attempts - 1
       end
     end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ require 'database_cleaner'
 require 'delayed_job_heartbeat_plugin'
 require 'yaml'
 require 'timecop'
+require 'pg'
 
 spec_dir = File.dirname(__FILE__)
 Dir["#{spec_dir}/support/**/*.rb"].sort.each { |f| require f }
@@ -31,34 +32,51 @@ Delayed::Worker.logger.level = Logger::DEBUG
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
 
-database_name = 'delayed_job_heartbeat_plugin_test'
-database_host = ENV.fetch('PGHOST', 'localhost')
-database_port = ENV.fetch('PGPORT', 5432)
+database_host = ENV.fetch('DB_HOST', 'localhost')
+database_port = ENV.fetch('DB_PORT', 5432)
+database_user = ENV.fetch('DB_USER', 'postgres')
+database_password = ENV.fetch('DB_PASSWORD', 'password')
+database_url = "postgres://#{database_user}:#{database_password}@#{database_host}:#{database_port}"
+admin_database_name = "/#{ENV['ADMIN_DB_NAME']}" if ENV['ADMIN_DB_NAME'].present?
+
+DATABASE_NAME = 'delayed_job_heartbeat_plugin_test'
+
+def setup_test_database(pg_conn, database_name)
+  pg_conn.exec("DROP DATABASE IF EXISTS #{database_name}")
+  pg_conn.exec("CREATE DATABASE #{database_name}")
+
+  pg_version = pg_conn.exec('SELECT version()')
+  puts "Testing with Postgres version: #{pg_version.getvalue(0, 0)}"
+  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+end
+
+def teardown_test_database(pg_conn, database_name)
+  pg_conn.exec("DROP DATABASE IF EXISTS #{database_name}")
+end
 
 RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:suite) do
-    db_connection_args = "--host #{database_host} --port #{database_port}"
-    `dropdb #{db_connection_args} --if-exists #{database_name} 2> /dev/null`
-    `createdb #{db_connection_args} #{database_name}`
+    PG::Connection.open("#{database_url}#{admin_database_name}") do |connection|
+      setup_test_database(connection, DATABASE_NAME)
+    end
 
-    pg_version = `psql #{db_connection_args} --dbname #{database_name} --tuples-only --command "select version()";`
-    puts "Testing with Postgres version: #{pg_version.strip}"
-    puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+    ActiveRecord::Base.establish_connection("#{database_url}/#{DATABASE_NAME}")
 
-    database_url = "postgres://#{database_host}:#{database_port}/#{database_name}"
-    puts "Using database #{database_url}"
-    ActiveRecord::Base.establish_connection(database_url)
     require 'db/schema'
-    DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before do |example|
-    DatabaseCleaner.strategy = example.metadata.fetch(:cleaner_strategy, :transaction)
+  config.after(:suite) do
+    ActiveRecord::Base.connection_pool.disconnect!
+
+    PG::Connection.open("#{database_url}#{admin_database_name}") do |connection|
+      teardown_test_database(connection, DATABASE_NAME)
+    end
   end
 
-  config.before do
+  config.before do |example|
+    DatabaseCleaner.strategy = example.metadata.fetch(:cleaner_strategy, :transaction)
     DatabaseCleaner.start
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_heartbeat_plugin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.59.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.59.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -232,9 +232,10 @@ files:
 - Rakefile
 - bin/setup
 - delayed_job_heartbeat_plugin.gemspec
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/delayed/heartbeat.rb
 - lib/delayed/heartbeat/compatibility.rb
 - lib/delayed/heartbeat/configuration.rb
@@ -271,14 +272,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Delayed::Job plugin to unlock jobs from dead workers