sidekiq_publisher 1.8.0 → 2.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b87dcb63524894c48e9a75cb8ed5773fddaa897e599fbb0f9c18c2fc06d7c30e
-  data.tar.gz: f8656103322b18569ee5f5ca131e1a40348d3f7d686eb3d3f22b9481a816d89a
+  metadata.gz: 1bef2eda10ec3e9fc09d95fe0af551b408331b8d3a42ff35d6c0f1012ea744e2
+  data.tar.gz: 317a3f1d450d71e0504fc351b33792002f83a0c9d36e2e2f6cf1c985d546c62b
 SHA512:
-  metadata.gz: 11199b4b29998e62288777547706a6c545b2c0a2d74bf883a5ed5264031edca7d259fb702e131e473865aaff7f447d1fbdccb6c48a5786b3cda21dba23636afc
-  data.tar.gz: 2789c1e753de096ce9b42a964e0daea6df2e542430d4ff8bd775eedae5db26ec5bf4ea17cfde021870d0f1c41869ce068d9f3230f3494a94fc3ec561d839a666
+  metadata.gz: c6dc3e3765c0b2e819087aa249add2fb2baf7b625394def4702e7340d210aeb6e2f51be9d529d19be4731742ec66f7a940867f8f28b1dd09112abafc7a620929
+  data.tar.gz: '09598e9b91cd23c47f8aa583155acfb16d54b01a534ef727463f77692999776f29db0df7dfa826b961688f9e20ed6beda568e5c6bd8abb76148717411604f2ce'

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"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # sidekiq_publisher
 
+## v2.0.0 (unreleased)
+- 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
+  change 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.
 

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"

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/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.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/{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"
+  VERSION = "2.0.0.rc0"
 end

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
+  version: 2.0.0.rc0
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -289,8 +289,8 @@ 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
@@ -309,18 +309,17 @@ files:
 - 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 +327,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,16 +335,16 @@ 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: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq
 test_files: []

data/gemfiles/rails_5.1.gemfile

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