dry-logic 1.0.3 → 1.0.8

data/lib/dry/logic/operations/abstract.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/core/constants'
-require 'dry/equalizer'
-require 'dry/logic/operators'
+require "dry/core/constants"
+require "dry/equalizer"
+require "dry/logic/operators"
 
 module Dry
   module Logic
@@ -26,15 +26,15 @@ module Dry
         end
 
         def curry(*args)
-          new(rules.map { |rule| rule.curry(*args) }, options)
+          new(rules.map { |rule| rule.curry(*args) }, **options)
         end
 
         def new(rules, **new_options)
-          self.class.new(*rules, options.merge(new_options))
+          self.class.new(*rules, **options, **new_options)
         end
 
         def with(new_options)
-          new(rules, options.merge(new_options))
+          new(rules, **options, **new_options)
         end
 
         def to_ast

data/lib/dry/logic/operations/and.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/binary'
-require 'dry/logic/result'
+require "dry/logic/operations/binary"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -9,7 +9,7 @@ module Dry
       class And < Binary
         attr_reader :hints
 
-        def initialize(*)
+        def initialize(*, **)
           super
           @hints = options.fetch(:hints, true)
         end
@@ -17,7 +17,7 @@ module Dry
         def type
           :and
         end
-        alias operator type
+        alias_method :operator, :type
 
         def call(input)
           left_result = left.(input)

data/lib/dry/logic/operations/attr.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/key'
+require "dry/logic/operations/key"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/binary.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/abstract'
+require "dry/logic/operations/abstract"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/check.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/unary'
-require 'dry/logic/evaluator'
-require 'dry/logic/result'
+require "dry/logic/operations/unary"
+require "dry/logic/evaluator"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -17,7 +17,7 @@ module Dry
             keys = options.fetch(:keys)
             evaluator = Evaluator::Set.new(keys)
 
-            super(rule, options.merge(evaluator: evaluator))
+            super(rule, **options, evaluator: evaluator)
           end
         end
 

data/lib/dry/logic/operations/each.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/unary'
-require 'dry/logic/result'
+require "dry/logic/operations/unary"
+require "dry/logic/result"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/implication.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/binary'
-require 'dry/logic/result'
+require "dry/logic/operations/binary"
+require "dry/logic/result"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/key.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/unary'
-require 'dry/logic/evaluator'
-require 'dry/logic/result'
+require "dry/logic/operations/unary"
+require "dry/logic/evaluator"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -12,13 +12,13 @@ module Dry
 
         attr_reader :path
 
-        def self.new(rules, options)
+        def self.new(rules, **options)
           if options[:evaluator]
             super
           else
             name = options.fetch(:name)
             eval = options.fetch(:evaluator, evaluator(name))
-            super(rules, options.merge(evaluator: eval, path: name))
+            super(rules, **options, evaluator: eval, path: name)
           end
         end
 

data/lib/dry/logic/operations/negation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/unary'
-require 'dry/logic/result'
+require "dry/logic/operations/unary"
+require "dry/logic/result"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/or.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/binary'
-require 'dry/logic/result'
+require "dry/logic/operations/binary"
+require "dry/logic/result"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/set.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/abstract'
-require 'dry/logic/result'
+require "dry/logic/operations/abstract"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -29,7 +29,7 @@ module Dry
         end
 
         def to_s
-          "#{type}(#{rules.map(&:to_s).join(', ')})"
+          "#{type}(#{rules.map(&:to_s).join(", ")})"
         end
       end
     end

data/lib/dry/logic/operations/unary.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/abstract'
+require "dry/logic/operations/abstract"
 
 module Dry
   module Logic

data/lib/dry/logic/operations/xor.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/binary'
-require 'dry/logic/result'
+require "dry/logic/operations/binary"
+require "dry/logic/result"
 
 module Dry
   module Logic

data/lib/dry/logic/operators.rb

@@ -6,22 +6,22 @@ module Dry
       def and(other)
         Operations::And.new(self, other)
       end
-      alias & and
+      alias_method :&, :and
 
       def or(other)
         Operations::Or.new(self, other)
       end
-      alias | or
+      alias_method :|, :or
 
       def xor(other)
         Operations::Xor.new(self, other)
       end
-      alias ^ xor
+      alias_method :^, :xor
 
       def then(other)
         Operations::Implication.new(self, other)
       end
-      alias > then
+      alias_method :>, :then
     end
   end
 end

data/lib/dry/logic/predicates.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bigdecimal'
-require 'bigdecimal/util'
-require 'date'
+require "bigdecimal"
+require "bigdecimal/util"
+require "date"
 
 module Dry
   module Logic
@@ -13,7 +13,7 @@ module Dry
         end
 
         def type?(type, input)
-          input.kind_of?(type)
+          input.is_a?(type)
         end
 
         def nil?(input)
@@ -147,12 +147,12 @@ module Dry
         end
 
         def inclusion?(list, input)
-          ::Kernel.warn 'inclusion is deprecated - use included_in instead.'
+          ::Kernel.warn "inclusion is deprecated - use included_in instead."
           included_in?(list, input)
         end
 
         def exclusion?(list, input)
-          ::Kernel.warn 'exclusion is deprecated - use excluded_from instead.'
+          ::Kernel.warn "exclusion is deprecated - use excluded_from instead."
           excluded_from?(list, input)
         end
 
@@ -199,18 +199,43 @@ module Dry
         end
 
         def format?(regex, input)
-          regex.match?(input)
+          !input.nil? && regex.match?(input)
         end
 
         def case?(pattern, input)
           pattern === input
         end
 
+        def uuid_v1?(input)
+          uuid_v1_format = /\A[0-9A-F]{8}-[0-9A-F]{4}-1[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/i
+          format?(uuid_v1_format, input)
+        end
+
+        def uuid_v2?(input)
+          uuid_v2_format = /\A[0-9A-F]{8}-[0-9A-F]{4}-2[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/i
+          format?(uuid_v2_format, input)
+        end
+
+        def uuid_v3?(input)
+          uuid_v3_format = /\A[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/i
+          format?(uuid_v3_format, input)
+        end
+
         def uuid_v4?(input)
-          uuid_v4_format = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+          uuid_v4_format = /\A[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/i
           format?(uuid_v4_format, input)
         end
 
+        def uuid_v5?(input)
+          uuid_v5_format = /\A[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/i
+          format?(uuid_v5_format, input)
+        end
+
+        def uri?(schemes, input)
+          uri_format = URI::DEFAULT_PARSER.make_regexp(schemes)
+          format?(uri_format, input)
+        end
+
         def respond_to?(method, input)
           input.respond_to?(method)
         end

data/lib/dry/logic/result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/constants'
+require "dry/core/constants"
 
 module Dry
   module Logic
@@ -69,7 +69,7 @@ module Dry
         if args.empty?
           name.to_s
         else
-          "#{name}(#{args.map(&:last).map(&:inspect).join(', ')})"
+          "#{name}(#{args.map(&:last).map(&:inspect).join(", ")})"
         end
       end
 

data/lib/dry/logic/rule.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/core/constants'
-require 'dry/equalizer'
-require 'dry/logic/operations'
-require 'dry/logic/result'
-require 'dry/logic/rule/interface'
+require "concurrent/map"
+require "dry/core/constants"
+require "dry/equalizer"
+require "dry/logic/operations"
+require "dry/logic/result"
+require "dry/logic/rule/interface"
 
 module Dry
   module Logic
@@ -38,13 +38,13 @@ module Dry
         base.interfaces.fetch_or_store([arity, curried]) do
           interface = Interface.new(arity, curried)
           klass = Class.new(base) { include interface }
-          base.const_set("#{base.name.split('::').last}#{interface.name}", klass)
+          base.const_set("#{base.name.split("::").last}#{interface.name}", klass)
           klass
         end
       end
 
       def self.build(predicate, args: EMPTY_ARRAY, arity: predicate.arity, **options)
-        specialize(arity, args.size).new(predicate, { args: args, arity: arity, **options })
+        specialize(arity, args.size).new(predicate, {args: args, arity: arity, **options})
       end
 
       def initialize(predicate, options = EMPTY_HASH)
@@ -68,11 +68,11 @@ module Dry
 
       def bind(object)
         if predicate.respond_to?(:bind)
-          self.class.build(predicate.bind(object), options)
+          self.class.build(predicate.bind(object), **options)
         else
           self.class.build(
             -> *args { object.instance_exec(*args, &predicate) },
-            options.merge(arity: arity, parameters: parameters)
+            **options, arity: arity, parameters: parameters
           )
         end
       end
@@ -82,7 +82,7 @@ module Dry
       end
 
       def with(new_opts)
-        self.class.build(predicate, options.merge(new_opts))
+        self.class.build(predicate, **options, **new_opts)
       end
 
       def parameters

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
@@ -49,10 +55,21 @@ module Dry
 
         def name
           if constant?
-            '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
@@ -61,9 +78,9 @@ module Dry
         def define_constructor
           assignment =
             if curried.equal?(1)
-              '@arg0 = @args[0]'
+              "@arg0 = @args[0]"
             else
-              "#{curried_args.join(', ')} = @args"
+              "#{curried_args.join(", ")} = @args"
             end
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
@@ -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})