sidekiq_publisher 1.8.0.rc0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e164c321e567b1b58344c77cfb0dbb9889e1fbc6ec7440a02c3c6460290d73a
-  data.tar.gz: f7c13b3cc7e994df855b0de0aeeab9a34b68accd1a4ae1d50485f907ccfdd05c
+  metadata.gz: 35ad0d16467d78de77ede70a744b248a9dbe33d6f4ceec9c37df10c8478693d1
+  data.tar.gz: af3f7362bb2f539a1a8d4b506f8004fc9cdf9b9927685fc09fc49f74b569cf54
 SHA512:
-  metadata.gz: 0eb8e48640b4afc46d9f5e55c77e691dd391a6fbdace88f5704acc899ee82699f6dfbe5038ed426a46bb4bbf73bd377cd6b89a1e58c148961347bdb61f3bcf80
-  data.tar.gz: bc3fbdacdc63d7217ed17222acdb4b8e67cb02f21d15c931e16c866ba3ae46913c6afbc777b1c7f09a4c8bc49e1314e854ec55e3014fd9fc71943bdd3ba05b20
+  metadata.gz: 549f8fd72294075b7f5cca99edcf2b6a2682210f1a494fcf9ce1639c91bd43f8139a269bc1045108de6c52820e5416277fdd04497a795ed5c123a5a2ae77f33c
+  data.tar.gz: 62f6cd338b10e13a82ab4421d55817df95f5d791ac83a5f2e2f4dbdae2327c69a0e09d7b914711d7216651294d30788d411d9ab0eb8208d78b941c6dd8da98ce

data/Appraisals

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-appraise "rails-5.1" do
-  gem "activejob", "~> 5.1.6"
-  gem "activesupport", "~> 5.1.6"
-end
-
 appraise "rails-5.2-sidekiq-5.0" do
   gem "activejob", "~> 5.2.0"
   gem "activesupport", "~> 5.2.0"
@@ -35,6 +30,12 @@ appraise "rails-5.2-sidekiq-6.1" do
   gem "sidekiq", "~> 6.1.0"
 end
 
+appraise "rails-5.2-sidekiq-6.2" do
+  gem "activejob", "~> 5.2.0"
+  gem "activesupport", "~> 5.2.0"
+  gem "sidekiq", "~> 6.2.0"
+end
+
 appraise "rails-6.0-sidekiq-5.2" do
   gem "activejob", "~> 6.0.0"
   gem "activesupport", "~> 6.0.0"
@@ -53,6 +54,12 @@ appraise "rails-6.0-sidekiq-6.1" do
   gem "sidekiq", "~> 6.1.0"
 end
 
+appraise "rails-6.0-sidekiq-6.2" do
+  gem "activejob", "~> 6.0.0"
+  gem "activesupport", "~> 6.0.0"
+  gem "sidekiq", "~> 6.2.0"
+end
+
 appraise "rails-6.1-sidekiq-5.2" do
   gem "activejob", "~> 6.1.0"
   gem "activesupport", "~> 6.1.0"
@@ -70,3 +77,9 @@ appraise "rails-6.1-sidekiq-6.1" do
   gem "activesupport", "~> 6.1.0"
   gem "sidekiq", "~> 6.1.0"
 end
+
+appraise "rails-6.1-sidekiq-6.2" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.2.0"
+end

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # sidekiq_publisher
 
-## v1.8.0 (unreleased)
+## 2.0.1
+- Changing the `Job#args` validator to be a manual check instead of using the `exclusions` validator.  This is to fix an issue introduced with rails 6.1 and the condition of `in: [nil]`.  More details [here](https://github.com/rails/rails/issues/41051).
+
+## v2.0.0
+- Transition from defining a Railtie to becoming a Rails Engine
+  [(#44)](https://github.com/ezcater/sidekiq_publisher/pull/44). This change was
+  made to better support Ruby 3.0 and Rails 6.1. The change is *not* expected to
+  be breaking but it does represent a major change in the gem's implementation
+  and that is the reason for the major version bump.
+- Require Ruby 2.6 or later.
+
+## v1.8.0
 - Extend support to Rails 6.1.
 
 ## v1.7.1

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ezcater-production.jfrog.io/ruby:f08726283c
+FROM ezcater-production.jfrog.io/ruby:90790156c4
 RUN mkdir /usr/src/gem
 WORKDIR /usr/src/gem
 ADD . /usr/src/gem

data/{lib → app/models}/sidekiq_publisher/job.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "active_record"
-
 module SidekiqPublisher
   class Job < ActiveRecord::Base
     self.table_name = "sidekiq_publisher_jobs"
@@ -12,7 +10,11 @@ module SidekiqPublisher
     before_save :ensure_string_job_class
 
     validates :job_class, presence: true
-    validates :args, exclusion: { in: [nil] }
+    # This exclusion rule currently has a bug in rails 6.1. For now, we will use a manual implementation
+    # Github Issue: https://github.com/rails/rails/issues/41051
+    # Possible PR: https://github.com/rails/rails/pull/41412
+    # validates :args, exclusion: { in: [nil] }
+    validate :args_not_nil
 
     scope :unpublished, -> { where(published_at: nil) }
     scope :published, -> { where.not(published_at: nil) }
@@ -56,6 +58,10 @@ module SidekiqPublisher
 
     private
 
+    def args_not_nil
+      errors.add(:args, "is reserved") if args.nil?
+    end
+
     def ensure_job_id
       self.job_id ||= self.class.generate_sidekiq_jid
     end

data/docker-compose.yml

@@ -7,6 +7,7 @@ x-environment: &default-environment
   BUNDLE_IGNORE_CONFIG: 1
   BUNDLE_DISABLE_SHARED_GEMS: "true"
   PGUSER: postgres
+  PGPASSWORD: postgres
   PGHOST: sidekiq-publisher-postgres
   PGPORT: 5432
   PGDATABASE: sidekiq_publisher_test
@@ -28,9 +29,10 @@ services:
     image: redis:5.0.9-alpine
   sidekiq-publisher-postgres:
     container_name: sidekiq-publisher-postgres_1
-    image: postgres:11.6
+    image: postgres:12.6
     environment:
       POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
       POSTGRES_DB: sidekiq_publisher_test
   sidekiq-publisher-console:
     <<: *default-service

data/gemfiles/{rails_5.1.gemfile → rails_5.2_sidekiq_6.2.gemfile}

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activejob", "~> 5.1.6"
-gem "activesupport", "~> 5.1.6"
+gem "activejob", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
+gem "sidekiq", "~> 6.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.0_sidekiq_6.2.gemfile

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

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

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

data/lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_job/queue_adapters/sidekiq_adapter"
+require "active_support/core_ext/object/blank"
 
 module ActiveJob
   module QueueAdapters

data/lib/sidekiq_publisher/{railtie.rb → engine.rb}

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load "sidekiq_publisher/tasks.rake"
-    end
+  class Engine < Rails::Engine
+    isolate_namespace SidekiqPublisher
 
     initializer "sidekiq_publisher.configure" do
       SidekiqPublisher.logger = Rails.logger

data/lib/sidekiq_publisher/metrics_reporter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/subscriber"
+require "active_support/core_ext/object/try"
 
 module SidekiqPublisher
   module MetricsReporter

data/lib/sidekiq_publisher/publisher.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "sidekiq_publisher/client"
-require "active_support/core_ext/object/try"
+require "active_support/core_ext/object/blank"
 
 module SidekiqPublisher
   class Publisher

data/lib/sidekiq_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  VERSION = "1.8.0.rc0"
+  VERSION = "2.0.1"
 end

data/lib/sidekiq_publisher.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 require "active_support"
+require "active_support/core_ext/numeric/time"
 require "sidekiq_publisher/version"
 require "sidekiq_publisher/instrumenter"
 require "sidekiq_publisher/metrics_reporter"
 require "sidekiq_publisher/exception_reporter"
 require "sidekiq_publisher/report_unpublished_count"
-require "sidekiq_publisher/job"
 require "sidekiq_publisher/worker"
 require "sidekiq_publisher/publisher"
 require "sidekiq_publisher/runner"
-require "sidekiq_publisher/railtie" if defined?(Rails)
+require "sidekiq_publisher/engine" if defined?(Rails)
 
 module SidekiqPublisher
   DEFAULT_BATCH_SIZE = 100

data/lib/{sidekiq_publisher/tasks.rake → tasks/sidekiq_publisher.rake}

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 namespace :sidekiq_publisher do
+  desc "Start the Sidekiq Publisher runner"
   task publish: [:environment] do
     Signal.trap("INT") { exit(0) }
     Signal.trap("TERM") { exit(0) }

data/sidekiq_publisher.gemspec

@@ -41,6 +41,8 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.6"
+
   spec.add_development_dependency "activejob"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 1.12"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 1.8.0.rc0
+  version: 2.0.1
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -289,38 +289,40 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- app/models/sidekiq_publisher/job.rb
 - docker-compose.yml
-- gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5.2_sidekiq_5.0.gemfile
 - gemfiles/rails_5.2_sidekiq_5.1.gemfile
 - gemfiles/rails_5.2_sidekiq_5.2.gemfile
 - gemfiles/rails_5.2_sidekiq_6.0.gemfile
 - gemfiles/rails_5.2_sidekiq_6.1.gemfile
+- gemfiles/rails_5.2_sidekiq_6.2.gemfile
 - gemfiles/rails_6.0_sidekiq_5.2.gemfile
 - gemfiles/rails_6.0_sidekiq_6.0.gemfile
 - gemfiles/rails_6.0_sidekiq_6.1.gemfile
+- gemfiles/rails_6.0_sidekiq_6.2.gemfile
 - 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
 - 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/datadog_apm.rb
+- lib/sidekiq_publisher/engine.rb
 - lib/sidekiq_publisher/exception_reporter.rb
 - lib/sidekiq_publisher/instrumenter.rb
-- lib/sidekiq_publisher/job.rb
 - lib/sidekiq_publisher/metrics_reporter.rb
 - lib/sidekiq_publisher/publisher.rb
-- lib/sidekiq_publisher/railtie.rb
 - lib/sidekiq_publisher/report_unpublished_count.rb
 - lib/sidekiq_publisher/runner.rb
-- lib/sidekiq_publisher/tasks.rake
 - lib/sidekiq_publisher/testing.rb
 - lib/sidekiq_publisher/version.rb
 - lib/sidekiq_publisher/worker.rb
+- lib/tasks/sidekiq_publisher.rake
 - log/.gitkeep
 - sidekiq_publisher.gemspec
 homepage: https://github.com/ezcater/sidekiq_publisher
@@ -328,7 +330,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,16 +338,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq
 test_files: []