dry-logic 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35900556fff5ca088cf3f66f319d770c4e15ba1f91a2298a1db096498ea01fb4
-  data.tar.gz: 942707a00d2f4424d2cd737e042877af2b15cf8a621564b463c254b98a72f9df
+  metadata.gz: 1e3f807ddbab8319c1c039978115800a4f8c6d41b337815cdaf6226563716a3d
+  data.tar.gz: 79cb10c28f23ebc523c15f4cd3da9657aeeb9923f7ed778bfaaa10c5dd59824c
 SHA512:
-  metadata.gz: 37f3b82b384a0b34b51f966665e5b74c7b9834e25a02ca6f096d7bfac4b0de100d023341aeba212ddee1c8b9a1e5a2281c25db6ba66058b9884cc926f95520e1
-  data.tar.gz: 174ec949de041f18c8a8b95b2e8db5c483e949e30be69da09f02032a29d2ee7ff3f823d44269e63b45c8ac201f75c4c1b520a02f2c6fbf6435dd725c729eba72
+  metadata.gz: ad9c5d83eb742610eddb8ea47be7a31cffcfee956223d08a1f595c90b02289d16b78e0dfe4b7ff48cf3fec7b79a586aab148a8e00afc67a9b8e0a6600f8687cc
+  data.tar.gz: 1df8067e98f4b90ff921a1d0eccaef3e29aa1b819337110cb2b20deb2e60215433118d2ba30bd54f41e5dec634b76a65d52c18fd924992c62ba4735a5fbd97a1

data/CHANGELOG.md

@@ -1,8 +1,32 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.2.0 2021-04-26
+
+
+### Added
+
+- Add predicate and operation builder DSL (@oleander)
+
+
+[Compare v1.1.1...v1.2.0](https://github.com/dry-rb/dry-logic/compare/v1.1.1...v1.2.0)
+
+## 1.1.1 2021-04-14
+
+
+### Fixed
+
+- Fixed a crash under jruby caused by arg splatting in Binary operations (@flash-gordon)
+
+
+[Compare v1.1.0...v1.1.1](https://github.com/dry-rb/dry-logic/compare/v1.1.0...v1.1.1)
+
 ## 1.1.0 2020-12-26
 
 
+### Fixed
+
+- Nested `Check` operations no longer crash under MRI 3.0 (@oleander)
+
 ### Changed
 
 - Switched to equalizer from dry-core (@solnic)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 dry-rb team
+Copyright (c) 2015-2021 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/lib/dry/logic/builder.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require "dry/logic"
+require "singleton"
+require "delegate"
+
+module Dry
+  module Logic
+    autoload :Operations, "dry/logic/operations"
+    autoload :Predicates, "dry/logic/predicates"
+    module Builder
+      IGNORED_OPERATIONS = %i[
+        Abstract
+        Binary
+        Unary
+      ].freeze
+
+      IGNORED_PREDICATES = [
+        :predicate
+      ].freeze
+
+      # Predicate and operation builder
+      #
+      # @block [Proc]
+      # @return [Builder::Result]
+      # @example Check if input is zero
+      #   is_zero = Dry::Logic::Builder.call do
+      #     negation { lt?(0) ^ gt?(0) }
+      #   end
+      #
+      #   p is_zero.call(1) # => false
+      #   p is_zero.call(0) # => true
+      #   p is_zero.call(-1) # => false
+      def call(&context)
+        Context.instance.call(&context)
+      end
+      module_function :call
+      alias_method :build, :call
+      public :call, :build
+
+      class Context
+        include Dry::Logic
+        include Singleton
+
+        module Predicates
+          include Logic::Predicates
+        end
+
+        # @see Builder#call
+        def call(&context)
+          instance_eval(&context)
+        end
+
+        # Defines custom predicate
+        #
+        # @name [Symbol] Name of predicate
+        # @Context [Proc]
+        def predicate(name, &context)
+          if singleton_class.method_defined?(name)
+            singleton_class.undef_method(name)
+          end
+
+          prerdicate = Rule::Predicate.new(context)
+
+          define_singleton_method(name) do |*args|
+            prerdicate.curry(*args)
+          end
+        end
+
+        # Defines methods for operations and predicates
+        def initialize
+          Operations.constants(false).each do |name|
+            next if IGNORED_OPERATIONS.include?(name)
+
+            operation = Operations.const_get(name)
+
+            define_singleton_method(name.downcase) do |*args, **kwargs, &block|
+              operation.new(*call(&block), *args, **kwargs)
+            end
+          end
+
+          Predicates::Methods.instance_methods(false).each do |name|
+            unless IGNORED_PREDICATES.include?(name)
+              predicate(name, &Predicates[name])
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,10 @@ module Dry
 
         attr_reader :right
 
-        def initialize(*rules, **options)
+        def initialize(left, right, **options)
           super
-          @left, @right = rules
+          @left = left
+          @right = right
         end
 
         def ast(input = Undefined)

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

@@ -12,7 +12,7 @@ module Dry
 
         def self.new(rule, **options)
           if options[:evaluator]
-            super(rule, options)
+            super(rule, **options)
           else
             keys = options.fetch(:keys)
             evaluator = Evaluator::Set.new(keys)

data/lib/dry/logic/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Logic
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -100,6 +100,7 @@ files:
 - lib/dry-logic.rb
 - lib/dry/logic.rb
 - lib/dry/logic/appliable.rb
+- lib/dry/logic/builder.rb
 - lib/dry/logic/evaluator.rb
 - lib/dry/logic/operations.rb
 - lib/dry/logic/operations/abstract.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition