sidekiq_publisher 3.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4cfd9a6432a0e864ad275e0ad4d9ef2e37e7e03e2d60c323d9658ae1ac40bc
-  data.tar.gz: f0895de91a5bf0b5755835b997bd9ffa64a7b8c659516500eb21401c282b4379
+  metadata.gz: c19a1a0814263440df5e67a3fccbfcde9db9dd1e157f0fa338b8a39a2c72469d
+  data.tar.gz: 63863dfadce1cba213ec980e8f9eaf2d73a7b63a38a7bb99e608475fb57fbd00
 SHA512:
-  metadata.gz: bba1eb7da24705acef0140082b509622c96184997a11562d6714f552ddf2fe8aa03840723e5714c677f1e5748e9c640f771245559201084627f2dd271f36d25f
-  data.tar.gz: '069d74cacc7a2369564402944ae2dfa20b6973fcf4aee7e0d2bbb14bfb207b089aa4b15ae59abea81de2f392bdf480a2b0eadb5790c234ee7cfdf9ed6717fa64'
+  metadata.gz: 93d33b65bd3bf779451172474eff1b87b1552aefd8858aa3614bdb755710aded386b7909b31f1aba4d708868828dbfdda2ed676a01781fa2034772fe5cdd1afa
+  data.tar.gz: 5c16c2f64f50b68345a341cabb032c34f7afc4dca02c0d048880e2bb4d9dc6603edeacf86f1e7e2c83c9ed0a42d75720425ba122b2994a6f718abc1a34305ae4

data/Appraisals

@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
-appraise "rails-6.1-sidekiq-5.2" do
+appraise "rails-6.1-sidekiq-6.4" do
   gem "activejob", "~> 6.1.0"
   gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 5.2.0"
+  gem "sidekiq", "~> 6.4.1"
 end
 
-appraise "rails-6.1-sidekiq-6.0" do
+appraise "rails-6.1-sidekiq-6.5" do
   gem "activejob", "~> 6.1.0"
   gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 6.0.1"
+  gem "sidekiq", "~> 6.5.0"
 end
 
-appraise "rails-6.1-sidekiq-6.1" do
-  gem "activejob", "~> 6.1.0"
-  gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 6.1.0"
+appraise "rails-7.0-sidekiq-6.4" do
+  gem "activejob", "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
+  gem "sidekiq", "~> 6.4.1"
 end
 
-appraise "rails-6.1-sidekiq-6.2" do
-  gem "activejob", "~> 6.1.0"
-  gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 6.2.0"
+appraise "rails-7.0-sidekiq-6.5" do
+  gem "activejob", "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
+  gem "sidekiq", "~> 6.5.0"
 end
 
-appraise "rails-6.1-sidekiq-6.3" do
-  gem "activejob", "~> 6.1.0"
-  gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 6.3.0"
+appraise "rails-7.1-sidekiq-6.4" do
+  gem "activejob", "~> 7.1.0"
+  gem "activesupport", "~> 7.1.0"
+  gem "sidekiq", "~> 6.4.1"
 end
 
-appraise "rails-6.1-sidekiq-6.4" do
-  gem "activejob", "~> 6.1.0"
-  gem "activesupport", "~> 6.1.0"
-  gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
+appraise "rails-7.1-sidekiq-6.5" do
+  gem "activejob", "~> 7.1.0"
+  gem "activesupport", "~> 7.1.0"
+  gem "sidekiq", "~> 6.5.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # sidekiq_publisher
 
+## 5.0.0
+- BREAKING: Drop support for Sidekiq < 6.1.
+- Add support for ActiveSupport and ActiveJob 7.1
+
+## 4.0.0
+- BREAKING: Enqueue directly to Redis unless in a transaction ([#74](https://github.com/ezcater/sidekiq_publisher/pull/74/))
+
 ## 3.0.0
 - BREAKING: Drop support for Ruby `2.6` and `2.7` as they are [past end of life](https://endoflife.date/ruby)
 - BREAKING: Drop support for `ddtrace <= 1.8.0`

data/README.md

@@ -16,6 +16,11 @@ that modifies the system of record for the application. It also allows jobs to
 be created even when Sidekiq/Redis is temporarily unavailable. The separate
 publisher process handles retries and ensure that each job is delivered to Sidekiq.
 
+> :warning: Not all jobs are staged in Postgres. This is determined dynamically:
+> if the job is enqueued from within an `ActiveRecord` transaction, then it is
+> staged in Postgres. If not, then it bypasses Postgres and is enqueued directly
+> to Redis via Sidekiq.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/gemfiles/rails_6.1_sidekiq_6.4.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activejob", "~> 6.1.0"
 gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 6.4.2"
+gem "sidekiq", "~> 6.4.1"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1_sidekiq_5.2.gemfile → rails_6.1_sidekiq_6.5.gemfile}

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activejob", "~> 6.1.0"
 gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 5.2.0"
+gem "sidekiq", "~> 6.5.0"
 
 gemspec path: "../"

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

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activejob", "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 6.0.1"
+gem "activejob", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "sidekiq", "~> 6.4.1"
 
 gemspec path: "../"

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

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activejob", "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 6.1.0"
+gem "activejob", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "sidekiq", "~> 6.5.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1_sidekiq_6.2.gemfile → rails_7.1_sidekiq_6.4.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activejob", "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 6.2.0"
+gem "activejob", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
+gem "sidekiq", "~> 6.4.1"
 
 gemspec path: "../"

data/gemfiles/rails_7.1_sidekiq_6.5.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activejob", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
+gem "sidekiq", "~> 6.5.0"
+
+gemspec path: "../"

data/lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb

@@ -11,19 +11,28 @@ module ActiveJob
       JOB_WRAPPER_CLASS = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.to_s.freeze
 
       def enqueue(job)
-        internal_enqueue(job)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          create_job_record(job)
+        else
+          sidekiq_adapter.enqueue(job)
+        end
       end
 
       def enqueue_at(job, timestamp)
-        internal_enqueue(job, timestamp)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          create_job_record(job, timestamp)
+        else
+          sidekiq_adapter.enqueue_at(job, timestamp)
+        end
       end
 
       private
 
-      def internal_enqueue(job, timestamp = nil)
+      def create_job_record(job, timestamp = nil)
         job.provider_job_id = SidekiqPublisher::Job.generate_sidekiq_jid
         attributes = job_attributes(job)
         attributes[:run_at] = timestamp if timestamp.present?
+
         SidekiqPublisher::Job.create!(attributes).job_id
       end
 
@@ -36,6 +45,10 @@ module ActiveJob
           args: [job.serialize],
         }
       end
+
+      def sidekiq_adapter
+        @_sidekiq_adapter ||= ActiveJob::QueueAdapters::SidekiqAdapter.new
+      end
     end
   end
 end

data/lib/sidekiq_publisher/database_connection.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SidekiqPublisher
+  module DatabaseConnection
+    def self.transaction_open?
+      ActiveRecord::Base.connection.transaction_open?
+    end
+  end
+end

data/lib/sidekiq_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  VERSION = "3.0.0"
+  VERSION = "5.0.0"
 end

data/lib/sidekiq_publisher/worker.rb

@@ -10,7 +10,11 @@ module SidekiqPublisher
 
     module ClassMethods
       def client_push(item)
-        SidekiqPublisher::Job.create_job!(item)
+        if SidekiqPublisher::DatabaseConnection.transaction_open?
+          SidekiqPublisher::Job.create_job!(item)
+        else
+          super
+        end
       end
     end
   end

data/lib/sidekiq_publisher.rb

@@ -4,6 +4,7 @@ require "active_support"
 require "active_support/core_ext/numeric/time"
 require "sidekiq_publisher/version"
 require "sidekiq_publisher/compatibility"
+require "sidekiq_publisher/database_connection"
 require "sidekiq_publisher/instrumenter"
 require "sidekiq_publisher/metrics_reporter"
 require "sidekiq_publisher/exception_reporter"

data/sidekiq_publisher.gemspec

@@ -60,6 +60,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "< 0.18"
 
   spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
-  spec.add_runtime_dependency "activesupport", ">= 6.1", "< 7.1"
-  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7"
+  spec.add_runtime_dependency "activesupport", ">= 6.1", "< 7.2"
+  spec.add_runtime_dependency "sidekiq", ">= 6.4.1", "< 7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -249,7 +249,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -259,14 +259,14 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 6.4.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -276,7 +276,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 6.4.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -297,18 +297,19 @@ files:
 - LICENSE.txt
 - README.md
 - app/models/sidekiq_publisher/job.rb
-- gemfiles/rails_6.1_sidekiq_5.2.gemfile
-- gemfiles/rails_6.1_sidekiq_6.0.gemfile
-- gemfiles/rails_6.1_sidekiq_6.1.gemfile
-- gemfiles/rails_6.1_sidekiq_6.2.gemfile
-- gemfiles/rails_6.1_sidekiq_6.3.gemfile
 - gemfiles/rails_6.1_sidekiq_6.4.gemfile
+- gemfiles/rails_6.1_sidekiq_6.5.gemfile
+- gemfiles/rails_7.0_sidekiq_6.4.gemfile
+- gemfiles/rails_7.0_sidekiq_6.5.gemfile
+- gemfiles/rails_7.1_sidekiq_6.4.gemfile
+- gemfiles/rails_7.1_sidekiq_6.5.gemfile
 - lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb
 - lib/generators/sidekiq_publisher/install_generator.rb
 - lib/generators/sidekiq_publisher/templates/create_sidekiq_publisher_jobs.rb
 - lib/sidekiq_publisher.rb
 - lib/sidekiq_publisher/client.rb
 - lib/sidekiq_publisher/compatibility.rb
+- lib/sidekiq_publisher/database_connection.rb
 - lib/sidekiq_publisher/datadog_apm.rb
 - lib/sidekiq_publisher/engine.rb
 - lib/sidekiq_publisher/exception_reporter.rb
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq

data/gemfiles/rails_6.1_sidekiq_6.3.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activejob", "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "sidekiq", "~> 6.3.0"
-
-gemspec path: "../"