dry-logic 0.4.2 → 1.1.0

data/lib/dry-logic.rb

@@ -1 +1,3 @@
-require 'dry/logic'
+# frozen_string_literal: true
+
+require "dry/logic"

data/lib/dry/logic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A collection of micro-libraries, each intended to encapsulate
 # a common task in Ruby
 module Dry
@@ -5,5 +7,5 @@ module Dry
   end
 end
 
-require 'dry/logic/rule/predicate'
-require 'dry/logic/operations'
+require "dry/logic/rule/predicate"
+require "dry/logic/operations"

data/lib/dry/logic/appliable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
     module Appliable

data/lib/dry/logic/evaluator.rb

@@ -1,4 +1,6 @@
-require 'dry/equalizer'
+# frozen_string_literal: true
+
+require "dry/core/equalizer"
 
 module Dry
   module Logic

data/lib/dry/logic/operations.rb

@@ -1,13 +1,15 @@
-require 'dry/logic/operations/and'
-require 'dry/logic/operations/or'
-require 'dry/logic/operations/xor'
-require 'dry/logic/operations/implication'
-require 'dry/logic/operations/negation'
+# frozen_string_literal: true
 
-require 'dry/logic/operations/key'
-require 'dry/logic/operations/attr'
-require 'dry/logic/operations/each'
-require 'dry/logic/operations/set'
-require 'dry/logic/operations/check'
+require "dry/logic/operations/and"
+require "dry/logic/operations/or"
+require "dry/logic/operations/xor"
+require "dry/logic/operations/implication"
+require "dry/logic/operations/negation"
 
-require 'dry/logic/operators'
+require "dry/logic/operations/key"
+require "dry/logic/operations/attr"
+require "dry/logic/operations/each"
+require "dry/logic/operations/set"
+require "dry/logic/operations/check"
+
+require "dry/logic/operators"

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

@@ -1,6 +1,8 @@
-require 'dry/core/constants'
-require 'dry/equalizer'
-require 'dry/logic/operators'
+# frozen_string_literal: true
+
+require "dry/core/constants"
+require "dry/core/equalizer"
+require "dry/logic/operators"
 
 module Dry
   module Logic
@@ -24,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,10 +1,19 @@
-require 'dry/logic/operations/binary'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/binary"
+require "dry/logic/result"
 
 module Dry
   module Logic
     module Operations
       class And < Binary
+        attr_reader :hints
+
+        def initialize(*, **)
+          super
+          @hints = options.fetch(:hints, true)
+        end
+
         def type
           :and
         end
@@ -22,7 +31,10 @@ module Dry
               Result.new(false, id) { right_result.ast(input) }
             end
           else
-            Result.new(false, id) { [type, [left_result.to_ast, [:hint, right.ast(input)]]] }
+            Result.new(false, id) do
+              left_ast = left_result.to_ast
+              hints ? [type, [left_ast, [:hint, right.ast(input)]]] : left_ast
+            end
           end
         end
 

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

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

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

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

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

@@ -1,6 +1,8 @@
-require 'dry/logic/operations/unary'
-require 'dry/logic/evaluator'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/unary"
+require "dry/logic/evaluator"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -15,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,5 +1,7 @@
-require 'dry/logic/operations/unary'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/unary"
+require "dry/logic/result"
 
 module Dry
   module Logic

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

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

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

@@ -1,6 +1,8 @@
-require 'dry/logic/operations/unary'
-require 'dry/logic/evaluator'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/unary"
+require "dry/logic/evaluator"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -10,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
 
@@ -49,11 +51,11 @@ module Dry
           rule[evaluator[hash]]
         end
 
-        def ast(input = nil)
-          if input
-            [type, [path, rule.ast(evaluator[input])]]
-          else
+        def ast(input = Undefined)
+          if input.equal?(Undefined) || !input.is_a?(Hash)
             [type, [path, rule.ast]]
+          else
+            [type, [path, rule.ast(evaluator[input])]]
           end
         end
 

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

@@ -1,5 +1,7 @@
-require 'dry/logic/operations/unary'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/unary"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -10,7 +12,11 @@ module Dry
         end
 
         def call(input)
-          Result.new(!rule[input], id) { ast(input) }
+          Result.new(rule.(input).failure?, id) { ast(input) }
+        end
+
+        def [](input)
+          !rule[input]
         end
       end
     end

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

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

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

@@ -1,5 +1,7 @@
-require 'dry/logic/operations/abstract'
-require 'dry/logic/result'
+# frozen_string_literal: true
+
+require "dry/logic/operations/abstract"
+require "dry/logic/result"
 
 module Dry
   module Logic
@@ -27,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,4 +1,6 @@
-require 'dry/logic/operations/abstract'
+# frozen_string_literal: true
+
+require "dry/logic/operations/abstract"
 
 module Dry
   module Logic

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

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

data/lib/dry/logic/operators.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
     module Operators
       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,6 +1,8 @@
-require 'bigdecimal'
-require 'bigdecimal/util'
-require 'date'
+# frozen_string_literal: true
+
+require "bigdecimal"
+require "bigdecimal/util"
+require "date"
 
 module Dry
   module Logic
@@ -11,12 +13,13 @@ module Dry
         end
 
         def type?(type, input)
-          input.kind_of?(type)
+          input.is_a?(type)
         end
 
-        def none?(input)
+        def nil?(input)
           input.nil?
         end
+        alias_method :none?, :nil?
 
         def key?(name, input)
           input.key?(name)
@@ -56,11 +59,9 @@ module Dry
         end
 
         def number?(input)
-          begin
-            true if Float(input)
-          rescue ArgumentError, TypeError
-            false
-          end
+          true if Float(input)
+        rescue ArgumentError, TypeError
+          false
         end
 
         def int?(input)
@@ -113,7 +114,7 @@ module Dry
 
         def size?(size, input)
           case size
-          when Integer then size == input.size
+          when Integer then size.equal?(input.size)
           when Range, Array then size.include?(input.size)
           else
             raise ArgumentError, "+#{size}+ is not supported type for size? predicate."
@@ -128,13 +129,30 @@ module Dry
           input.size <= num
         end
 
+        def bytesize?(size, input)
+          case size
+          when Integer then size.equal?(input.bytesize)
+          when Range, Array then size.include?(input.bytesize)
+          else
+            raise ArgumentError, "+#{size}+ is not supported type for bytesize? predicate."
+          end
+        end
+
+        def min_bytesize?(num, input)
+          input.bytesize >= num
+        end
+
+        def max_bytesize?(num, input)
+          input.bytesize <= num
+        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
 
@@ -147,15 +165,13 @@ module Dry
         end
 
         def includes?(value, input)
-          begin
-            if input.respond_to?(:include?)
-              input.include?(value)
-            else
-              false
-            end
-          rescue TypeError
+          if input.respond_to?(:include?)
+            input.include?(value)
+          else
             false
           end
+        rescue TypeError
+          false
         end
 
         def excludes?(value, input)
@@ -182,20 +198,48 @@ module Dry
           value.equal?(false)
         end
 
-        if RUBY_VERSION < '2.4'
-          def format?(regex, input)
-            !regex.match(input).nil?
-          end
-        else
-          def format?(regex, input)
-            regex.match?(input)
-          end
+        def format?(regex, 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 = /\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
+
         def predicate(name, &block)
           define_singleton_method(name, &block)
         end