message_bus_client_worker 1.2.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f7e3c9b947b2fa159ea74d50f018784ac5fcd25bdf021ef845c505b28c90ff6
-  data.tar.gz: 264bb1f14cabfda8a51c058907879d205497fe05226c4c9e8d3ab8a85e11cafc
+  metadata.gz: d7fea76cd116cee19a6770027158c1ede8fa993ebe8ab6941fbfe79478d8a059
+  data.tar.gz: e37e7016be468245237e8d0a2b17ea0f9944073833a623e6b571b16a17353f99
 SHA512:
-  metadata.gz: d708bfd122db410bf056edf86213fef2bc6fbf12560d78cc6eb6575db42ad9cf9b76418cdc02896d4e12785fd8f73b0ec0e0f1190dd7f17a29cfa44509b480dd
-  data.tar.gz: 550a4e018642df9e5569a31fcf0f5783ff57022c361a9d84e20f69884ce3535cd991042417d62d3e97f59e759f0d970dfe2c0818623114d0b1d56da4a74d3222
+  metadata.gz: 3fc0a430aefb533a04b359ee36e05b649ba8133c0ac37d126bfd5562dcfc3b4025e77a4fdd16416ddf041688c5e18787a165e38df7a612b74d75eae97582f0a0
+  data.tar.gz: 9e438dd0f45009973dc990cdedb4960755c3b222dcb827f727fa91b7fb29ecc584fdd3364945ef8827a02aee6bb706213804df608bbc28d056250cb503afaf92

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7.0
+    - name: Start dbs
+      run: docker-compose up --detach sidekiq chat
+    - name: Copy config
+      run: cp spec/config.yml{.sample,}
+    - name: Run tests
+      run: docker-compose run gem bundle exec rspec spec

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - 2022-05-26
+### Fixed
+- Support for Sidekiq 7 or when `Sidekiq.strict_args!` is called
+
+## [2.1.0] - 2021-10-01
+### Added
+- `MessageBusClientWorker.subscribe(host, config)` which recommended over setting subscriptions via `configure`
+
+## [2.0.0] - 2020-03-12
+### Changed
+- Update logging in Sidekiq; requires Sidekiq 6
+
 ## [1.2.2] - 2020-03-12
 ### Fixed
 - ensure sidekiq `< 6` is installed, since `Sidekiq::Logging` is not available

data/Gemfile.lock

@@ -1,49 +1,50 @@
 PATH
   remote: .
   specs:
-    message_bus_client_worker (1.2.2)
+    message_bus_client_worker (2.1.1)
       activesupport
       addressable
       excon
       gem_config
       light-service
-      sidekiq (>= 5.1, < 6)
+      sidekiq (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     byebug (10.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.2)
     diff-lcs (1.3)
-    excon (0.72.0)
+    excon (0.92.3)
     gem_config (0.3.2)
-    i18n (1.8.2)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    light-service (0.12.0)
+    light-service (0.18.0)
+      activesupport (>= 4.0.0)
     method_source (0.9.0)
-    minitest (5.14.0)
+    minitest (5.15.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (4.0.3)
-    rack (2.0.6)
-    rack-protection (2.0.3)
+    public_suffix (4.0.7)
+    rack (2.2.2)
+    rack-protection (2.0.8.1)
       rack
     rake (10.5.0)
-    redis (4.0.1)
+    redis (4.1.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -60,22 +61,20 @@ GEM
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.7.1)
-    sidekiq (5.1.3)
+    sidekiq (6.0.5)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
     wait (0.5.3)
-    zeitwerk (2.3.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
   message_bus_client_worker!
   pry-byebug
   rake (~> 10.0)
@@ -84,4 +83,4 @@ DEPENDENCIES
   wait
 
 BUNDLED WITH
-   1.17.3
+   2.2.28

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.2"
 services:
   redis:
-    image: redis:4.0.10
+    image: redis:5.0.7
     ports:
       - "6379:6379"
   gem:

data/lib/message_bus_client_worker/version.rb

@@ -1,3 +1,3 @@
 module MessageBusClientWorker
-  VERSION = "1.2.2"
+  VERSION = "2.1.1"
 end

data/lib/message_bus_client_worker/workers/enqueuing_worker.rb

@@ -6,7 +6,7 @@ module MessageBusClientWorker
 
     def perform
       MessageBusClientWorker.configuration.subscriptions.each do |host, subs|
-        SubscriptionWorker.perform_async(host, subs)
+        SubscriptionWorker.perform_async(host, subs.to_json)
       end
     end
 

data/lib/message_bus_client_worker/workers/subscription_worker.rb

@@ -4,16 +4,18 @@ module MessageBusClientWorker
     include Sidekiq::Worker
     sidekiq_options retry: 0
 
-    def perform(host, subscriptions, long = false)
-      log(host, subscriptions.with_indifferent_access)
-      Poll.call(host, subscriptions.with_indifferent_access, long)
+    def perform(host, subscriptions_json, long = false)
+      subscriptions = JSON.parse(subscriptions_json).with_indifferent_access
+
+      log(host, subscriptions)
+      Poll.call(host, subscriptions, long)
     end
 
     private
 
     def log(host, subscriptions)
       subscriptions[:channels].each do |channel, _|
-        Sidekiq::Logging.logger.info "Enqueued #{host} for #{channel}"
+        logger.info "Enqueued #{host} for #{channel}"
       end
     end
 

data/lib/message_bus_client_worker.rb

@@ -26,8 +26,18 @@ module MessageBusClientWorker
   include GemConfig::Base
 
   with_configuration do
-    has :subscriptions, classes: Hash
+    has :subscriptions, classes: [Hash, NilClass]
     has :client_id, classes: [Proc, String], default: -> {SecureRandom.uuid}
   end
 
+  def self.subscribe(host, options)
+    self.configuration.subscriptions ||= {}
+
+    if self.configuration.subscriptions.keys.include?(host)
+      warn "[#{self.name}] #{host} already configured, overwriting (called from #{caller.first})"
+    end
+
+    self.configuration.subscriptions[host] = options
+  end
+
 end

data/message_bus_client_worker.gemspec

@@ -31,13 +31,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "gem_config"
-  spec.add_dependency "sidekiq", ">= 5.1", "< 6"
+  spec.add_dependency "sidekiq", "~> 6.0"
   spec.add_dependency "excon"
   spec.add_dependency "addressable"
   spec.add_dependency "light-service"
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-sidekiq"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus_client_worker
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Ramon Tayag
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -28,22 +28,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,17 +150,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - ramon.tayag@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -211,7 +191,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Subscribe to MessageBus using Sidekiq workers
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_script:
-  - cp spec/config.yml{.sample,}
-  - docker-compose up -d sidekiq chat
-script: docker-compose run gem bundle exec rspec spec