wisper-sidekiq-compat 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a4388e72736b4fdac245dd3cdd98b9fd65b4b88f696f9ead73b394d32125e4
-  data.tar.gz: 20889dbe889541df920687d4aae172dbb8bb576e04f51299e19522e249c52f39
+  metadata.gz: 89dfef568f3b70e0ec7fedb7f0243e92d78f4480cb4c87733c3f2dc043c32487
+  data.tar.gz: 4b41d1ca8369e29f34218904c40a04e12c0334d8ba4ef3fc29311ab8f6faff49
 SHA512:
-  metadata.gz: 4c0b102c2eb662bbca2a7ca78c0fe6463b210183dd9769af23a42cc8ca29eb87eaff5633f89241f4e359236441aef54964c0e5177c2d40dffd3f336e50049e1a
-  data.tar.gz: 29cfb34f718162a6fb297ff6b835551160bd5ea3ad28f379f3ea2fd7c77c8bad4b55d5345bff31114f29a1764cd4729bfda82ec45d147f8d181b7320130e27de
+  metadata.gz: b02132db4f3f15d12fb7ad3d1cb04b076fd7a7464f2ee5d015539dab93abe21b860e89d62483e552851504df25eb3a1266e7f12bc7734cc8fda06d59e43968fd
+  data.tar.gz: f8d7fe4c763022bfbbccce1959262290622ad6b2a9742a7109c73a4c1524d4f62c244d427c1ae58862705071a7271ffcc621db19acf11e27d5e04834cf16169d

data/.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [3.0, 3.1, 3.2]
+        ruby: [2.7, 3.0, 3.1, 3.2]
     services:
       redis:
         image: redis:7-alpine

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.2

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## [Unreleased]
+## [2.3.0] - 20/Dec/2023
+
+## Fixed
+- Fixed version mess.
+
+## [2.2.0] - 20/Dec/2023
+
+## Fixed
+- Allow Sidekiq versions beyond 6.
 
 ## [2.0.0] - 28/Feb/2023
 
@@ -9,7 +17,7 @@
 - Support for Ruby < 3
 - Support for Sidekiq < 6.5
 - Rubinius support
- 
+
 ## Fixed
 - Compatibility with wisper-compat
 - `Psych::DisallowedClass: Tried to load unspecified class:` on Ruby 3.1

data/lib/wisper/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Wisper
   module Sidekiq
-    VERSION = "2.0.0"
+    VERSION = "2.3.0"
   end
 end

data/lib/wisper/sidekiq.rb

@@ -14,13 +14,13 @@ module Wisper
       include ::Sidekiq::Worker
 
       def perform(yml)
-        (subscriber, event, args) =
+        (subscriber, event, args, kwargs) =
           if Psych::VERSION.to_i >= 4
             ::YAML.unsafe_load(yml)
           else
             ::YAML.load(yml)
           end
-        subscriber.public_send(event, *args)
+        subscriber.public_send(event, *args, **kwargs)
       end
     end
 
@@ -31,13 +31,13 @@ module Wisper
       end
     end
 
-    def broadcast(subscriber, _publisher, event, *args, **_kwargs)
+    def broadcast(subscriber, _publisher, event, *args, **kwargs)
       options = sidekiq_options(subscriber)
       schedule_options = sidekiq_schedule_options(subscriber, event)
 
       Worker.set(options).perform_in(
         schedule_options.fetch(:delay, 0),
-        ::YAML.dump([subscriber, event, args])
+        ::YAML.dump([subscriber, event, args, kwargs])
       )
     end
 

data/spec/wisper/sidekiq_broadcaster_spec.rb

@@ -145,15 +145,17 @@ RSpec.describe Wisper::SidekiqBroadcaster do
         .to change { Sidekiq::Queues["default"].select{|job| job.key?('at')}.size }.by(1)
     end
 
-    context 'when provides subscriber with args' do
+    context 'when provides subscriber with args and/or kwargs' do
       let(:subscriber) { RegularSubscriberUnderTest }
       let(:event) { 'it_happened' }
       let(:args) { [1,2,3] }
+      let(:kwargs) { {hi: :there}}
 
-      subject(:broadcast_event) { described_class.new.broadcast(subscriber, nil, event, *args) }
+
+      subject(:broadcast_event) { described_class.new.broadcast(subscriber, nil, event, *args, **kwargs) }
 
       it 'subscriber receives event with corrects args' do
-        expect(RegularSubscriberUnderTest).to receive(event).with(*args)
+        expect(RegularSubscriberUnderTest).to receive(event).with(*args, **kwargs)
 
         Sidekiq::Testing.inline! { broadcast_event }
       end

data/wisper-sidekiq-compat.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 2.7'
   spec.add_dependency 'wisper-compat'
-  spec.add_dependency 'sidekiq', '>= 6.5', '< 7'
+  spec.add_dependency 'sidekiq', '>= 6.5'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wisper-sidekiq-compat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Kris Leech
 - Jamie Schembri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wisper-compat
@@ -32,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 description: Async publishing for Wisper using Sidekiq
 email:
 - kris.leech@gmail.com
@@ -77,7 +71,7 @@ homepage: https://github.com/nedap/wisper-sidekiq-compat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,15 +79,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Async publishing for Wisper using Sidekiq
 test_files: