dry-logic 0.3.0 → 0.4.0

data/spec/unit/rule_spec.rb

@@ -0,0 +1,94 @@
+RSpec.describe Dry::Logic::Rule do
+  subject(:rule) { Rule.new(predicate, options) }
+
+  let(:predicate) { -> { true } }
+  let(:options) { {} }
+
+  it_behaves_like Dry::Logic::Rule
+
+  describe '.new' do
+    it 'accepts an :id' do
+      expect(Rule.new(predicate, id: :check_num).id).to be(:check_num)
+    end
+  end
+
+  describe 'with a function returning truthy value' do
+    it 'is successful for valid input' do
+      expect(Rule.new(-> val { val }).('true')).to be_success
+    end
+
+    it 'is not successful for invalid input' do
+      expect(Rule.new(-> val { val }).(nil)).to be_failure
+    end
+  end
+
+  describe '#ast' do
+    it 'returns predicate node with :id' do
+      expect(Rule.new(-> value { true }).with(id: :email?).ast('oops')).to eql(
+        [:predicate, [:email?, [[:value, 'oops']]]]
+      )
+    end
+
+    it 'returns predicate node with undefined args' do
+      expect(Rule.new(-> value { true }).with(id: :email?).ast).to eql(
+        [:predicate, [:email?, [[:value, Undefined]]]]
+      )
+    end
+  end
+
+  describe '#type' do
+    it 'returns rule type' do
+      expect(rule.type).to be(:rule)
+    end
+  end
+
+  describe '#bind' do
+    let(:bound) { rule.with(id: :bound).bind(object) }
+
+    context 'with an unbound method' do
+      let(:predicate) { klass.instance_method(:test?) }
+      let(:klass) { Class.new { def test?; true; end } }
+      let(:object) { klass.new }
+
+      it 'returns a new rule with its predicate bound to a specific object' do
+        expect(bound.()).to be_success
+      end
+
+      it 'carries id' do
+        expect(bound.id).to be(:bound)
+      end
+    end
+
+    context 'with an arbitrary block' do
+      let(:predicate) { -> value { value == expected } }
+      let(:object) { Class.new { def expected; 'test'; end }.new }
+
+      it 'returns a new with its predicate executed in the context of the provided object' do
+        expect(bound.('test')).to be_success
+        expect(bound.('oops')).to be_failure
+      end
+
+      it 'carries id' do
+        expect(bound.id).to be(:bound)
+      end
+
+      it 'stores arity' do
+        expect(bound.options[:arity]).to be(rule.arity)
+      end
+
+      it 'stores parameters' do
+        expect(bound.options[:parameters]).to eql(rule.parameters)
+      end
+    end
+  end
+
+  describe '#eval_args' do
+    let(:options) { { args: [1, klass.instance_method(:num), :foo] } }
+    let(:klass) { Class.new { def num; 7; end } }
+    let(:object) { klass.new }
+
+    it 'evaluates args in the context of the provided object' do
+      expect(rule.eval_args(object).args).to eql([1, 7, :foo])
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -107,30 +121,45 @@ files:
 - examples/basic.rb
 - lib/dry-logic.rb
 - lib/dry/logic.rb
+- lib/dry/logic/appliable.rb
 - lib/dry/logic/evaluator.rb
-- lib/dry/logic/predicate.rb
-- lib/dry/logic/predicate_set.rb
+- lib/dry/logic/operations.rb
+- lib/dry/logic/operations/abstract.rb
+- lib/dry/logic/operations/and.rb
+- lib/dry/logic/operations/attr.rb
+- lib/dry/logic/operations/binary.rb
+- lib/dry/logic/operations/check.rb
+- lib/dry/logic/operations/each.rb
+- lib/dry/logic/operations/implication.rb
+- lib/dry/logic/operations/key.rb
+- lib/dry/logic/operations/negation.rb
+- lib/dry/logic/operations/or.rb
+- lib/dry/logic/operations/set.rb
+- lib/dry/logic/operations/unary.rb
+- lib/dry/logic/operations/xor.rb
+- lib/dry/logic/operators.rb
 - lib/dry/logic/predicates.rb
 - lib/dry/logic/result.rb
-- lib/dry/logic/result/each.rb
-- lib/dry/logic/result/multi.rb
-- lib/dry/logic/result/named.rb
-- lib/dry/logic/result/set.rb
-- lib/dry/logic/result/value.rb
 - lib/dry/logic/rule.rb
-- lib/dry/logic/rule/attr.rb
-- lib/dry/logic/rule/check.rb
-- lib/dry/logic/rule/composite.rb
-- lib/dry/logic/rule/each.rb
-- lib/dry/logic/rule/key.rb
-- lib/dry/logic/rule/negation.rb
-- lib/dry/logic/rule/set.rb
-- lib/dry/logic/rule/value.rb
+- lib/dry/logic/rule/predicate.rb
 - lib/dry/logic/rule_compiler.rb
 - lib/dry/logic/version.rb
+- spec/integration/result_spec.rb
+- spec/integration/rule_spec.rb
 - spec/shared/predicates.rb
+- spec/shared/rule.rb
 - spec/spec_helper.rb
-- spec/unit/predicate_spec.rb
+- spec/support/mutant.rb
+- spec/unit/operations/and_spec.rb
+- spec/unit/operations/attr_spec.rb
+- spec/unit/operations/check_spec.rb
+- spec/unit/operations/each_spec.rb
+- spec/unit/operations/implication_spec.rb
+- spec/unit/operations/key_spec.rb
+- spec/unit/operations/negation_spec.rb
+- spec/unit/operations/or_spec.rb
+- spec/unit/operations/set_spec.rb
+- spec/unit/operations/xor_spec.rb
 - spec/unit/predicates/array_spec.rb
 - spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
@@ -165,17 +194,10 @@ files:
 - spec/unit/predicates/time_spec.rb
 - spec/unit/predicates/true_spec.rb
 - spec/unit/predicates/type_spec.rb
-- spec/unit/rule/attr_spec.rb
-- spec/unit/rule/check_spec.rb
-- spec/unit/rule/conjunction_spec.rb
-- spec/unit/rule/disjunction_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/exclusive_disjunction_spec.rb
-- spec/unit/rule/implication_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
+- spec/unit/predicates_spec.rb
+- spec/unit/rule/predicate_spec.rb
 - spec/unit/rule_compiler_spec.rb
+- spec/unit/rule_spec.rb
 homepage: https://github.com/dryrb/dry-logic
 licenses:
 - MIT
@@ -201,9 +223,22 @@ signing_key:
 specification_version: 4
 summary: Predicate logic with rule composition
 test_files:
+- spec/integration/result_spec.rb
+- spec/integration/rule_spec.rb
 - spec/shared/predicates.rb
+- spec/shared/rule.rb
 - spec/spec_helper.rb
-- spec/unit/predicate_spec.rb
+- spec/support/mutant.rb
+- spec/unit/operations/and_spec.rb
+- spec/unit/operations/attr_spec.rb
+- spec/unit/operations/check_spec.rb
+- spec/unit/operations/each_spec.rb
+- spec/unit/operations/implication_spec.rb
+- spec/unit/operations/key_spec.rb
+- spec/unit/operations/negation_spec.rb
+- spec/unit/operations/or_spec.rb
+- spec/unit/operations/set_spec.rb
+- spec/unit/operations/xor_spec.rb
 - spec/unit/predicates/array_spec.rb
 - spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
@@ -238,15 +273,7 @@ test_files:
 - spec/unit/predicates/time_spec.rb
 - spec/unit/predicates/true_spec.rb
 - spec/unit/predicates/type_spec.rb
-- spec/unit/rule/attr_spec.rb
-- spec/unit/rule/check_spec.rb
-- spec/unit/rule/conjunction_spec.rb
-- spec/unit/rule/disjunction_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/exclusive_disjunction_spec.rb
-- spec/unit/rule/implication_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
+- spec/unit/predicates_spec.rb
+- spec/unit/rule/predicate_spec.rb
 - spec/unit/rule_compiler_spec.rb
-has_rdoc: 
+- spec/unit/rule_spec.rb

data/lib/dry/logic/predicate.rb

@@ -1,100 +0,0 @@
-module Dry
-  module Logic
-    def self.Predicate(block)
-      case block
-      when Method then Predicate.new(block.name, &block)
-      when UnboundMethod then Predicate.new(block.name, fn: block)
-      else raise ArgumentError, 'predicate needs an :id'
-      end
-    end
-
-    class Predicate
-      Undefined = Class.new {
-        def inspect
-          "undefined"
-        end
-        alias_method :to_s, :inspect
-      }.new.freeze
-
-      include Dry::Equalizer(:id, :args)
-
-      attr_reader :id, :args, :fn, :arity
-
-      class Curried < Predicate
-        def call(*args)
-          all_args = @args + args
-
-          if all_args.size == arity
-            super(*args)
-          else
-            curry(*args)
-          end
-        end
-        alias_method :[], :call
-      end
-
-      def initialize(id, args: [], fn: nil, arity: nil, &block)
-        @id = id
-        @args = args
-        @fn = fn || block
-        @arity = arity || @fn.arity
-      end
-
-      #as long as we keep track of the args, we don't actually need to curry the proc...
-      #if we never curry the proc then fn.arity & fn.parameters stay intact
-      def curry(*args)
-        if args.size > 0
-          all_args = @args + args
-          size = all_args.size
-
-          if size <= arity
-            Curried.new(id, args: all_args, fn: fn, arity: arity)
-          else
-            raise_arity_error(all_args.size)
-          end
-        else
-          self
-        end
-      end
-
-      # @api public
-      def bind(object)
-        self.class.new(id, *args, &fn.bind(object))
-      end
-
-      #enables a rule to call with its params & have them ignored if the
-      #predicate doesn't need them.
-      #if @args.size == arity then we should ignore called args
-      def call(*args)
-        all_args = @args + args
-        size = all_args.size
-
-        if size == arity
-          fn.(*all_args)
-        else
-          raise_arity_error(size)
-        end
-      end
-      alias_method :[], :call
-
-      def parameters
-        fn.parameters
-      end
-
-      def to_ast
-        [:predicate, [id, args_with_names]]
-      end
-      alias_method :to_a, :to_ast
-
-      private
-
-      def args_with_names
-        parameters.map(&:last).zip(args + Array.new(arity - args.size, Undefined))
-      end
-
-      def raise_arity_error(args_size)
-        raise ArgumentError, "wrong number of arguments (#{args_size} for #{arity})"
-      end
-    end
-  end
-end

data/lib/dry/logic/predicate_set.rb

@@ -1,23 +0,0 @@
-require 'dry/logic/predicate'
-require 'dry-container'
-
-module Dry
-  module Logic
-    module PredicateSet
-      module Methods
-        def predicate(name, &block)
-          register(name) { Predicate.new(name, &block) }
-        end
-
-        def import(predicate_set)
-          merge(predicate_set)
-        end
-      end
-
-      def self.extended(other)
-        super
-        other.extend(Methods, Dry::Container::Mixin)
-      end
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-module Dry
-  module Logic
-    class Result::Each < Result::Multi
-      def to_ast
-        failed_rules = failures.map { |idx, el| [:el, [idx, el.to_ast]] }
-        [:result, [input, [:each, failed_rules]]]
-      end
-
-      def success?
-        response.values.all?(&:success?)
-      end
-
-      def failures
-        response.each_with_object({}) { |(idx, res), hash|
-          hash[idx] = res if res.failure?
-        }
-      end
-    end
-  end
-end

data/lib/dry/logic/result/multi.rb

@@ -1,14 +0,0 @@
-module Dry
-  module Logic
-    class Result::Multi < Result
-      def success?
-        success.all?(&:success?)
-      end
-
-      def failures
-        indices = success.map { |v| v.failure? ? success.index(v) : nil }.compact
-        success.values_at(*indices)
-      end
-    end
-  end
-end

data/lib/dry/logic/result/named.rb

@@ -1,17 +0,0 @@
-module Dry
-  module Logic
-    class Result::Named < Result::Value
-      def name
-        rule.name
-      end
-
-      def to_ast
-        if response.respond_to?(:to_ast) && !response.is_a?(Result)
-          response.to_ast
-        else
-          [:input, [rule.name, super]]
-        end
-      end
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-module Dry
-  module Logic
-    class Result::Set < Result::Multi
-      def to_ast
-        failed_rules = failures.map { |el| el.to_ast }
-        [:result, [input, [:set, failed_rules]]]
-      end
-    end
-  end
-end

data/lib/dry/logic/result/value.rb

@@ -1,17 +0,0 @@
-module Dry
-  module Logic
-    class Result::Value < Result
-      def to_ast
-        if response.respond_to?(:to_ast)
-          response.to_ast
-        else
-          [:result, [input, rule.to_ast]]
-        end
-      end
-
-      def input
-        rule.input != Predicate::Undefined ? rule.input : super
-      end
-    end
-  end
-end