dry-monads 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783c06bb3d7f0f2c9ab7e651ff30231495564a525cedd225d86f3c1340d7323b
-  data.tar.gz: d101ed3414fc9066d850fe7bd47554b2882a7fa719ddabe2476cf31c393d655d
+  metadata.gz: 0aa936c14c5b5099ef82374d3fdf1d09ac321089b24ff5928646915c5474c156
+  data.tar.gz: 3b0e347df2726f44c3a85d12dfb33e174e034c82d2de2ebd140550ac116e20d2
 SHA512:
-  metadata.gz: 6607ce497fc4ca210177ab690bb8190a185206f3f29e9ad91d064a6caa876ca8d2afd1ff2fddd9d8ef014203a6ecdde6a4b230436aa6346b50e2c4a883e4ecce
-  data.tar.gz: f1f94fc5cb99943aaa1af41a0fa0104531ed0bce2623a606a583b10355b4bb48ef2645e2e481d072739494d17ecceedc837c5fe7a4fffd85481e7e808dffc72c
+  metadata.gz: 5c881bc75da61d00e66d06ae79b1ab898cd62c1fd77bba22fe5a67ee89b024f2164d66e277c84f65e83dfa8c54901538b09e1d33a4db7393ccbe26adea7a0d01
+  data.tar.gz: b01cb23a977f6bb61f4b5505816562dc28431a53d9e0e2f9e01fa37d2545cd6ebc29e7c22cb76b868f77a82beecfe3f90a04b6de4502eb38af0ca1987429cef1

data/CHANGELOG.md

@@ -1,11 +1,21 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.8.2 2025-03-15
+
+
+### Fixed
+
+- Fix be_* matchers for non-monadic values (@flash-gordon, issue #186)
+
+
+[Compare v1.8.1...v1.8.2](https://github.com/dry-rb/dry-monads/compare/v1.8.1...v1.8.2)
+
 ## 1.8.1 2025-03-12
 
 
 ### Fixed
 
-- Exclude extensions from the Zeitwerk loader (fix #185) (@flash-gordon)
+- Exclude extensions from the Zeitwerk loader (@flash-gordon, issue #185)
 
 
 [Compare v1.8.0...v1.8.1](https://github.com/dry-rb/dry-monads/compare/v1.8.0...v1.8.1)

data/lib/dry/monads/extensions/rspec.rb

@@ -16,7 +16,7 @@ module Dry
       module Matchers
         extend ::RSpec::Matchers::DSL
 
-        {
+        PREDICATES = {
           failure: {
             expected_classes: [
               ::Dry::Monads::Result::Failure,
@@ -34,18 +34,24 @@ module Dry
             extract_value: :value!.to_proc
           },
           some: {
-            expected_classes: [
-              ::Dry::Monads::Maybe::Some
-            ],
+            expected_classes: [::Dry::Monads::Maybe::Some],
             extract_value: :value!.to_proc
           }
-        }.each do |name, args|
+        }.freeze
+
+        CONSTRUCTOR_CLASSES = PREDICATES.values.flat_map { |definition|
+          definition[:expected_classes]
+        }.freeze
+
+        PREDICATES.each do |name, args|
           args => { expected_classes:, extract_value: }
           expected_constructors = expected_classes.map(&:name).map do |c|
             c.split("::").last
           end
 
           matcher :"be_#{name}" do |expected = Undefined|
+            predicate = "#{name}?"
+
             match do |actual|
               if expected_classes.any? { |klass| actual.is_a?(klass) }
                 exact_match = actual.is_a?(expected_classes[0])
@@ -59,6 +65,8 @@ module Dry
                 else
                   false
                 end
+              elsif actual.respond_to?(predicate)
+                actual.__send__(predicate)
               else
                 false
               end
@@ -66,12 +74,16 @@ module Dry
 
             failure_message do |actual|
               if expected_classes.none? { |klass| actual.is_a?(klass) }
-                if expected_classes.size > 1
+                if actual.respond_to?(predicate)
+                  "expected #{actual.inspect}.#{predicate} to return truthy value, " \
+                    "but it returned false or nil"
+                elsif expected_classes.size > 1
                   "expected #{actual.inspect} to be one of the following values: " \
-                    "#{expected_constructors.join(", ")}, but it's #{actual.class}"
-                else
-                  "expected #{actual.inspect} to be a #{expected_constructors[0]} value, " \
+                    "#{expected_constructors.join(", ")} or respond to #{predicate}, " \
                     "but it's #{actual.class}"
+                else
+                  "expected #{actual.inspect} to be a #{expected_constructors[0]} value " \
+                    "or respond to #{predicate}, but it's #{actual.class}"
                 end
               elsif actual.is_a?(expected_classes[0]) && block_arg
                 "expected #{actual.inspect} to have a value satisfying the given block"
@@ -82,7 +94,15 @@ module Dry
             end
 
             failure_message_when_negated do |actual|
-              if expected_classes.size > 1
+              if expected_classes.none? { |klass| actual.is_a?(klass) }
+                if actual.respond_to?(predicate)
+                  "expected #{actual.inspect}.#{predicate} to return falsey value, " \
+                    "but it returned truthy value"
+                else
+                  "expected #{actual.inspect} to respond to #{predicate}, " \
+                    "but it doesn't"
+                end
+              elsif expected_classes.size > 1
                 "expected #{actual.inspect} to not be one of the following values: " \
                   "#{expected_constructors.join(", ")}, but it is"
               else
@@ -96,9 +116,7 @@ module Dry
         end
 
         matcher :be_none do
-          match do |actual|
-            actual.is_a?(::Dry::Monads::Maybe::None)
-          end
+          match { |actual| actual.is_a?(::Dry::Monads::Maybe::None) }
 
           failure_message do |actual|
             "expected #{actual.inspect} to be none"

data/lib/dry/monads/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Monads
     # Gem version
-    VERSION = "1.8.1"
+    VERSION = "1.8.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-monads
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby