delegate_matcher 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907400f6ff89ecfdf2e5b3d2be559badf3bd5732
-  data.tar.gz: 909ebfb8f6134e64fb9fd92166573da8ed41c69b
+  metadata.gz: c9fdc23becc9ee4140d9ffe5f0df88eb2bbb69dd
+  data.tar.gz: b34d2e491be7137558a07b5985e78f3bd7ba8850
 SHA512:
-  metadata.gz: e8901ccdeb2ce0543a88c55ada12f76862eec14bbbac6c7854f0f25aa9ae7fe030930d70d4588e588edf1f3c199c10fdc48ebc22940c6394ee8597639bda7ef4
-  data.tar.gz: cae4cd06519c5c6983be8cc1fb694715d58a1eba8ad965f7a62a68f889048bd3fc004b5b2f69b99534514a1b14e075e428c163db21e33470533fe4fe51a420ac
+  metadata.gz: bc8e1c48bc5fa6d8520fb74f4d3bbfade1bf9fb22f50296c72bfc1c7919fe3c94764a52040f61b276fa0b24071bc0d56cbb7aa65009666076bbd4d40d126d683
+  data.tar.gz: 2cc6ae5fe888e1e20c7e7ef806d7b37068f52affa9e983b979e9942e623e7eead1d0f1580452a770ba228925a724ff794f3fc6c2cf0b238757a136bae3157fbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    delegate_matcher (0.4.2)
+    delegate_matcher (0.4.3)
       proc_extensions (~> 0.2)
 
 GEM

data/lib/delegate_matcher/delegation.rb

@@ -43,25 +43,30 @@ module RSpec
           delegate.all? { |delegate| args_matcher.args_match?(*delegate.args) }
         end
 
-        # rubocop:disable Metrics/AbcSize
         def block_ok?
-          case
-          when expected.block.nil?
-            true
-          when expected.block == false
-            delegate.all? { |d| d.block.nil? }
-          when expected.block == true
-            delegate.all? { |d| d.block == dispatcher.block }
-          else
-            delegate.all? { |d| d.block_source == expected.block_source }
+          expected_block = expected.block
+          return true if expected_block.nil?
+
+          delegate.all? do |d|
+            case
+            when expected_block == false
+              d.block.nil?
+            when expected_block == true
+              d.block == dispatcher.block
+            else
+              d.block_source == expected.block_source
+            end
           end
         end
 
         def return_value_ok?
           case
-          when !expected.check_return then true
-          when expected.return_value.nil? then  dispatcher.return_value == delegate_return_value
-          else dispatcher.return_value == expected.return_value
+          when !expected.check_return
+            true
+          when expected.return_value.nil?
+            dispatcher.return_value == delegate_return_value
+          else
+            dispatcher.return_value == expected.return_value
           end
         end
 
@@ -90,6 +95,7 @@ module RSpec
 
         def block_failure_message(negated)
           proc_source = ProcSource.new(delegate[0].block)
+
           case
           when expected.block.nil? || negated ^ block_ok?
             ''
@@ -108,10 +114,8 @@ module RSpec
             ''
           when negated
             ''
-          when !expected.return_value.nil?
-            "a value of \"#{dispatcher.return_value}\" was returned instead of \"#{expected.return_value}\""
           else
-            "a value of \"#{dispatcher.return_value}\" was returned instead of \"#{delegate_return_value}\""
+            "a value of \"#{dispatcher.return_value}\" was returned instead of \"#{expected.return_value || delegate_return_value}\""
           end
         end
 

data/lib/delegate_matcher/version.rb

@@ -1,3 +1,3 @@
 module DelegateMatcher
-  VERSION ||= '0.4.2'.freeze
+  VERSION ||= '0.4.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delegate_matcher
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Declan Whelan