sidekiq-amigo 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5224634ebf95a2fcaefc764d07114cc77b2feed22a15e736eec934d8eba84b0
-  data.tar.gz: 2e49a507f4e6d47e7ce25b676293738591807bc47dadf47e1fdbcb634d5a9df5
+  metadata.gz: 3cf72dfd7e1bbcc7217536a2344ce5ecdec41c0ae8769b44ec91b210b9a41d0b
+  data.tar.gz: 19f5fd437e47f5f2dc706877289f05fd7ee0d50426d4de42ac2bbdc304f9d882
 SHA512:
-  metadata.gz: fa9617859526003317496d860e07119a11e8d0d58e66382360078a74463760b78da8516d215a0922fd40ee5bcc4d5e35421be2aa393df1f0a0709c941c367560
-  data.tar.gz: 99876ed52f35b972bdc1a68a507c29b87f6a0aa5db6c2ae7738e203da8c66cb5dd01a4c2489fd4a923f117e84af308ea121f2be40ea95e5a3426485da114f216
+  metadata.gz: 970fa43283e3361af6b7caa12241ad1848426af476d0023a38148d435dbb07b7eabe31a79c2e0c23bce380097e1c5f9282eb16ef16a6e6372e6185fa1243744b
+  data.tar.gz: 7e421c9750235136306e8ae9010101d2611c4e8cf54a0cf8192407adba26e160ec17247db045d1e6c9c85c89cc67a383379bc625f01c88f81da683ca338ce860

data/lib/amigo/spec_helpers.rb

@@ -101,7 +101,8 @@ module Amigo
       def match_expected_events
         @expected_events.each do |expected_event, expected_payload|
           match = @recorded_events.find do |recorded|
-            recorded.name == expected_event && self.payloads_match?(expected_payload, recorded.payload)
+            self.event_names_match?(expected_event, recorded.name) &&
+              self.payloads_match?(expected_payload, recorded.payload)
           end
 
           if match
@@ -112,9 +113,15 @@ module Amigo
         end
       end
 
-      def payloads_match?(expected, recorded)
-        return expected.matches?(recorded) if expected.respond_to?(:matches?)
-        return expected.nil? || expected.empty? || expected == recorded
+      def event_names_match?(expected, actual)
+        return expected.matches?(actual) if expected.respond_to?(:matches?)
+        return expected.match?(actual) if expected.respond_to?(:match?)
+        return expected == actual
+      end
+
+      def payloads_match?(expected, actual)
+        return expected.matches?(actual) if expected.respond_to?(:matches?)
+        return expected.nil? || expected.empty? || expected == actual
       end
 
       def add_matched(event, payload)

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Amigo
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Lithic Technology
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="