servactory 2.9.0.rc6 → 2.9.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a762f7cbe5f9ac88c14ef817109ee6b1e1f29e4c404ddd73b20520fd48705e
-  data.tar.gz: 1205b74201b08c5191813f9c02e5da954609d20d66d9bbdb7815bbfeaa01a4c6
+  metadata.gz: fc0459a342f5c414049d7076a5528caffde75708da4db7dfbf87fe1fe391d9c1
+  data.tar.gz: b7c803517e06af791bd0fa3d3807b802b404603a1d0f7555d72349e5341c55c7
 SHA512:
-  metadata.gz: c3a02731634fa02a71318580051704310519fcbbee287ecadfa15f31ae567e4015b08d30cfb30513d4a21df75a5457a22aec22a4afc46350401c5f1a43dda5fc
-  data.tar.gz: 6e157f714eab85943554d2a02a061b82b681c85ce1b1dcaab396d0f67e209db7ab40c334047cb849b500be1d8794f02d73e1d93267d3c27f1707ca3f522f250e
+  metadata.gz: c9cf3ac1cc28007ab25711d1586f8ebfecc513f73858eec2cf46f7f3c9ff2f7a18b0a2d5ddb313ef111c00433194fb563158bb659b93a38fa97ae0e5e6ac9246
+  data.tar.gz: b76e44154fb22358c0b10d8c80909430d74d524c3a7a6013a669e2279244d9343d31007cc67a7d702284650f805a837f9f97a714abf6d9dc3de2f42854848199

data/lib/servactory/test_kit/rspec/matchers.rb

@@ -38,7 +38,7 @@ module Servactory
             @nested = values
           end
 
-          chain :with do |value|
+          chain :contains do |value|
             @value = value
           end
 
@@ -50,6 +50,12 @@ module Servactory
           def match_for(actual, output_name)
             given_value = actual.public_send(output_name)
 
+            if defined?(@instance_of)
+              expect(given_value).to(
+                RSpec::Matchers::BuiltIn::BeAnInstanceOf.new(@instance_of)
+              )
+            end
+
             if defined?(@nested) && @nested.present?
               @nested.each do |method_name|
                 next unless given_value.respond_to?(method_name)
@@ -58,16 +64,17 @@ module Servactory
               end
             end
 
+            return true if !defined?(@value) && @value.nil?
+
             expect(given_value).to(
-              if defined?(@instance_of)
-                RSpec::Matchers::BuiltIn::BeAnInstanceOf.new(@instance_of)
-              elsif @value.is_a?(Array)
+              case @value
+              when Array
                 RSpec::Matchers::BuiltIn::ContainExactly.new(@value)
-              elsif @value.is_a?(Hash)
+              when Hash
                 RSpec::Matchers::BuiltIn::Match.new(@value)
-              elsif @value.is_a?(TrueClass) || @value.is_a?(FalseClass)
+              when TrueClass, FalseClass
                 RSpec::Matchers::BuiltIn::Equal.new(@value)
-              elsif @value.is_a?(NilClass)
+              when NilClass
                 RSpec::Matchers::BuiltIn::BeNil.new(@value)
               else
                 RSpec::Matchers::BuiltIn::Eq.new(@value)

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 9
     PATCH = 0
-    PRE = "rc6"
+    PRE = "rc7"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.9.0.rc6
+  version: 2.9.0.rc7
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-13 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport