dry-logic 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828bea190b3733a29b940d0fa6bbb1270bb12ee6bbbef77d1ce6bbfd7ff11a27
-  data.tar.gz: 319087e0aa57490d3a0bbff76efd6b01119a55135de7dbe0829d64cfee604d82
+  metadata.gz: 18fd19e7ba009817c12de16b828fb0e1dd04f1e5d2305fa9eeb8be9a55681473
+  data.tar.gz: a4f2ff3297ab4684323489bd0a371f759b1b99d0a5c5f5425a3158f4d8af45e7
 SHA512:
-  metadata.gz: 5e3d3d3d7c486aec5e4c01ebc15f90ba485dfe4d10086c11a732ea3ffac5749de02b4ecc0fb0beafe8bcc593fa07286c1c8c30f2973baaf70598a3f212e949eb
-  data.tar.gz: beb0445b376e9e8f545615d69af4c7cc1ad76db1ac55de9bd54784d8ff914165afec81ce174843efac5cffeda8bba494bca9e686d75052f00dee87abbfef03b3
+  metadata.gz: c57af697d43afe951a6cfdce3a9afd2ce12399b95e6d48f9468c84a2de33299d8a20b8f1851652a86cb922868974b2be80f434d38c8086022db42d9baa7df5dc
+  data.tar.gz: a33e8cfcec95668d7189ac1921bce8c88602dd25fea59f10174cef42ff7130cd9bb4285884d4c241eeb98fcd842a5268078c14649851e1b24fc20a56633fcd43

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## unreleased 
+
+
+### Fixed
+
+- Better Ruby 3 support with fixed specialization for rules of negative arity (@flash-gordon)
+
+
+[Compare v1.0.7...master](https://github.com/dry-rb/dry-logic/compare/v1.0.7...master)
+
 ## 1.0.7 2020-08-13
 
 

data/lib/dry/logic/rule/interface.rb

@@ -4,6 +4,8 @@ module Dry
   module Logic
     class Rule
       class Interface < ::Module
+        SPLAT = ["*rest"].freeze
+
         attr_reader :arity
 
         attr_reader :curried
@@ -18,12 +20,10 @@ module Dry
 
           define_constructor if curried?
 
-          if variable_arity?
-            define_splat_application
-          elsif constant?
+          if constant?
             define_constant_application
           else
-            define_fixed_application
+            define_application
           end
         end
 
@@ -32,7 +32,7 @@ module Dry
         end
 
         def variable_arity?
-          arity.equal?(-1)
+          arity.negative?
         end
 
         def curried?
@@ -41,7 +41,13 @@ module Dry
 
         def unapplied
           if variable_arity?
-            -1
+            unapplied = arity.abs - 1 - curried
+
+            if unapplied.negative?
+              0
+            else
+              unapplied
+            end
           else
             arity - curried
           end
@@ -51,8 +57,19 @@ module Dry
           if constant?
             "Constant"
           else
-            arity_str = variable_arity? ? "VariableArity" : "#{arity}Arity"
-            curried_str = curried? ? "#{curried}Curried" : EMPTY_STRING
+            arity_str =
+              if variable_arity?
+                "Variable#{arity.abs - 1}Arity"
+              else
+                "#{arity}Arity"
+              end
+
+            curried_str =
+              if curried?
+                "#{curried}Curried"
+              else
+                EMPTY_STRING
+              end
 
             "#{arity_str}#{curried_str}"
           end
@@ -91,32 +108,10 @@ module Dry
           end
         end
 
-        def define_splat_application
-          application =
-            if curried?
-              "@predicate[#{curried_args.join(", ")}, *input]"
-            else
-              "@predicate[*input]"
-            end
-
-          module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-            def call(*input)
-              if #{application}
-                Result::SUCCESS
-              else
-                Result.new(false, id) { ast(*input) }
-              end
-            end
-
-            def [](*input)
-              #{application}
-            end
-          RUBY
-        end
-
-        def define_fixed_application
-          parameters = unapplied_args.join(", ")
-          application = "@predicate[#{(curried_args + unapplied_args).join(", ")}]"
+        def define_application
+          splat = variable_arity? ? SPLAT : EMPTY_ARRAY
+          parameters = (unapplied_args + splat).join(", ")
+          application = "@predicate[#{(curried_args + unapplied_args + splat).join(", ")}]"
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
             def call(#{parameters})

data/lib/dry/logic/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Logic
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby