dry-logic 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c0b350baaf47853027db9d61e790c195ced412ff40a9ecaac56b6588172da3
-  data.tar.gz: 966f1daee610a4eea2eae78743e8e17f0e57084b1106fd3f033483329895a4a1
+  metadata.gz: 828bea190b3733a29b940d0fa6bbb1270bb12ee6bbbef77d1ce6bbfd7ff11a27
+  data.tar.gz: 319087e0aa57490d3a0bbff76efd6b01119a55135de7dbe0829d64cfee604d82
 SHA512:
-  metadata.gz: 98002481f3e8cc83affa67ff7b3f8e69b22836f0737112bba1d4c656f39cbc06d9657bdb7865326fb9b6531660a9fd260b60d18d2062d9d149a97f25154a3974
-  data.tar.gz: cc6163b44e7e2ef296901e35085fa42290ad8b4b936237e26409f7f71d90041e12472322319d3dc8553fb46dcf532b2747b68b1d3a5cd46e81bb94fb298cf56c
+  metadata.gz: 5e3d3d3d7c486aec5e4c01ebc15f90ba485dfe4d10086c11a732ea3ffac5749de02b4ecc0fb0beafe8bcc593fa07286c1c8c30f2973baaf70598a3f212e949eb
+  data.tar.gz: beb0445b376e9e8f545615d69af4c7cc1ad76db1ac55de9bd54784d8ff914165afec81ce174843efac5cffeda8bba494bca9e686d75052f00dee87abbfef03b3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.7 2020-08-13
+
+
+### Added
+
+- A new `uri?` predicate that you can use to verify `URI` strings, ie `uri?("https", "https://dry-rb.org")` (@nerburish)
+- New predicates: `uuid_v1?`, `uuid_v2?`, `uuid_v3?` and `uuid_v5?` (via #75) (@jamesbrauman)
+
+
+[Compare v1.0.6...v1.0.7](https://github.com/dry-rb/dry-logic/compare/v1.0.6...v1.0.7)
+
 ## 1.0.6 2020-02-10
 
 

data/lib/dry-logic.rb

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

data/lib/dry/logic.rb

@@ -7,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/evaluator.rb

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

data/lib/dry/logic/operations.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-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/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/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/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'
+require "dry/logic/operators"

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

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
@@ -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

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

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
 
@@ -206,11 +206,36 @@ module Dry
           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

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)

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

@@ -49,9 +49,9 @@ module Dry
 
         def name
           if constant?
-            'Constant'
+            "Constant"
           else
-            arity_str = variable_arity? ? 'VariableArity' : "#{arity}Arity"
+            arity_str = variable_arity? ? "VariableArity" : "#{arity}Arity"
             curried_str = curried? ? "#{curried}Curried" : EMPTY_STRING
 
             "#{arity_str}#{curried_str}"
@@ -61,9 +61,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)
@@ -94,9 +94,9 @@ module Dry
         def define_splat_application
           application =
             if curried?
-              "@predicate[#{curried_args.join(', ')}, *input]"
+              "@predicate[#{curried_args.join(", ")}, *input]"
             else
-              '@predicate[*input]'
+              "@predicate[*input]"
             end
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
@@ -115,8 +115,8 @@ module Dry
         end
 
         def define_fixed_application
-          parameters = unapplied_args.join(', ')
-          application = "@predicate[#{(curried_args + unapplied_args).join(', ')}]"
+          parameters = unapplied_args.join(", ")
+          application = "@predicate[#{(curried_args + unapplied_args).join(", ")}]"
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
             def call(#{parameters})

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/logic/rule'
+require "dry/logic/rule"
 
 module Dry
   module Logic
@@ -19,9 +19,9 @@ module Dry
 
       def to_s
         if args.size > 0
-          "#{name}(#{args.map(&:inspect).join(', ')})"
+          "#{name}(#{args.map(&:inspect).join(", ")})"
         else
-          "#{name}"
+          name.to_s
         end
       end
 

data/lib/dry/logic/rule_compiler.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/core/constants'
+require "dry/core/constants"
 
-require 'dry/logic/rule'
-require 'dry/logic/rule/predicate'
+require "dry/logic/rule"
+require "dry/logic/rule/predicate"
 
 module Dry
   module Logic

data/lib/dry/logic/version.rb

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

metadata

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