dry-logic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c06d53e8a80811c9bb63f5bc9538c87d9de6a6
-  data.tar.gz: 24d21638462c0dc1ce8cf1c685df35133d8d4c06
+  metadata.gz: 5d49a2ea6e71727f4ae69320aa0619c2ebd96325
+  data.tar.gz: 71414bb0ff667758b7a95fb0379025bd55465b2e
 SHA512:
-  metadata.gz: 6e554a728aa438a6293611ef53f7ac404932114a4ec91acee86295808d0ed39ce92e9e5afa2d1bdd5e1892bdddb949a3b6cb78b8bf61017457738e1ba4374465
-  data.tar.gz: d7294c09046932acc67f0778dacfa9f3e86d6bb3d37b864fb10e7e52c0630fff9a9e2095f287704c5ca7cdd636c05856b281a453ac09af334941954d2a5f0c43
+  metadata.gz: b49f6272d981acc3fe076096ab9beb5c0d8aa57c5956ca88603d6187bd64e0285ec6bda802d4bc9f39b44927b71bc8a095834ea78e91dcee2d2816483bb9c071
+  data.tar.gz: a1f2dbdd21ddf76e986036aacc3949433103335f842ae2ee3bcd603716c744b214800ed47129a0a23aa3564b13a65c914edaab8417dfde1b7046dd3c3127cb9f

data/CHANGELOG.md

@@ -1,9 +1,23 @@
+# v0.1.2 2016-01-27
+
+### Added
+
+* Support for resolving input from `Rule::Result` (solnic)
+
+### Changed
+
+* `Check` and `Result` carry original input(s) (solnic)
+
+[Compare v0.1.2...v0.1.3](https://github.com/dryrb/dry-logic/compare/v0.1.2...v0.1.3)
+
 # v0.1.2 2016-01-19
 
 ### Fixed
 
 * `xor` returns wrapped results when used against another result-rule (solnic)
 
+[Compare v0.1.1...v0.1.2](https://github.com/dryrb/dry-logic/compare/v0.1.1...v0.1.2)
+
 # v0.1.1 2016-01-18
 
 ### Added

data/lib/dry/logic/result.rb

@@ -23,15 +23,37 @@ module Dry
 
         def to_ary
           indices = value.map { |v| v.failure? ? value.index(v) : nil }.compact
-          [:input, [rule.name, input, value.values_at(*indices).map(&:to_ary)]]
+          [:input, [name, input, value.values_at(*indices).map(&:to_ary)]]
         end
       end
 
       class Result::Value < Result
+        def to_ary
+          [:input, [name, input, [rule.to_ary]]]
+        end
+        alias_method :to_a, :to_ary
+      end
+
+      class Result::LazyValue < Result
         def to_ary
           [:input, [rule.name, input, [rule.to_ary]]]
         end
         alias_method :to_a, :to_ary
+
+        def input
+          success? ? rule.evaluate_input(@input) : @input
+        end
+      end
+
+      class Result::Wrapped < Result::Value
+        def to_ary
+          [:input, [rule.name, rule.evaluate_input(input), [rule.to_ary]]]
+        end
+        alias_method :to_a, :to_ary
+
+        def wrapped?
+          true
+        end
       end
 
       class Result::Verified < Result
@@ -59,28 +81,6 @@ module Dry
         end
       end
 
-      class Result::LazyValue < Result
-        def to_ary
-          [:input, [rule.name, input, [rule.to_ary]]]
-        end
-        alias_method :to_a, :to_ary
-
-        def input
-          success? ? rule.evaluate_input(@input) : @input
-        end
-      end
-
-      class Result::Wrapped < Result
-        def to_ary
-          [:input, [name, nil, [rule.to_ary]]]
-        end
-        alias_method :to_a, :to_ary
-
-        def wrapped?
-          true
-        end
-      end
-
       def initialize(input, value, rule)
         @input = input
         @value = value
@@ -104,7 +104,7 @@ module Dry
         self.class.new(input, !value, rule)
       end
 
-      def >(other)
+      def then(other)
         if success?
           other.(input)
         else

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

@@ -1,10 +1,27 @@
 module Dry
   module Logic
     class Rule::Check < Rule
-      alias_method :result, :predicate
+      attr_reader :keys
 
-      def call(*args)
-        Logic.Result(nil, result.(*args), self)
+      class Unary < Rule::Check
+        def evaluate_input(*)
+          predicate.input
+        end
+      end
+
+      class Binary < Rule::Check
+        def evaluate_input(result)
+          keys.map { |key| result[key].input }
+        end
+      end
+
+      def initialize(name, predicate, keys)
+        super(name, predicate)
+        @keys = keys
+      end
+
+      def call(result)
+        Logic.Result(evaluate_input(result), predicate.(result), self)
       end
 
       def type

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

@@ -22,7 +22,7 @@ module Dry
 
     class Rule::Implication < Rule::Composite
       def call(*args)
-        left.(*args) > right
+        left.(*args).then(right)
       end
 
       def type

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

@@ -12,6 +12,10 @@ module Dry
         end
       end
 
+      def evaluate_input(result)
+        result[name].input
+      end
+
       def type
         :res
       end

data/lib/dry/logic/rule_compiler.rb

@@ -10,7 +10,7 @@ module Dry
       end
 
       def call(ast)
-        ast.map { |node| visit(node) }
+        ast.to_ary.map { |node| visit(node) }
       end
 
       def visit(node)
@@ -19,8 +19,10 @@ module Dry
       end
 
       def visit_check(node)
-        name, predicate = node
-        Rule::Check.new(name, visit(predicate))
+        name, predicate, keys = node
+        check_keys = keys ? keys : [name]
+        klass = check_keys.size == 1 ? Rule::Check::Unary : Rule::Check::Binary
+        klass.new(name, visit(predicate), check_keys)
       end
 
       def visit_res(node)
@@ -28,6 +30,18 @@ module Dry
         Rule::Result.new(name, visit(predicate))
       end
 
+      def visit_args(nodes)
+        nodes.map { |node| visit(node) }
+      end
+
+      def visit_res_arg(name)
+        predicates[name].input
+      end
+
+      def visit_arg(value)
+        value
+      end
+
       def visit_not(node)
         visit(node).negation
       end
@@ -59,7 +73,12 @@ module Dry
 
       def visit_predicate(node)
         name, args = node
-        predicates[name].curry(*args)
+
+        if args[0] == :args
+          predicates[name].curry(*visit(args))
+        else
+          predicates[name].curry(*args)
+        end
       end
 
       def visit_and(node)

data/lib/dry/logic/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Logic
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

data/spec/unit/rule/check_spec.rb

@@ -1,5 +1,7 @@
 RSpec.describe Rule::Check do
-  subject(:rule) { Rule::Check.new(:name, other.(input).curry(predicate)) }
+  subject(:rule) do
+    Rule::Check::Unary.new(:name, other.(input).curry(predicate), [:name])
+  end
 
   include_context 'predicates'
 
@@ -8,21 +10,21 @@ RSpec.describe Rule::Check do
   end
 
   describe '#call' do
-    context 'when a given predicate passed' do
+    context 'when then given predicate passed' do
       let(:input) { 'Jane' }
       let(:predicate) { :filled? }
 
       it 'returns a success' do
-        expect(rule.()).to be_success
+        expect(rule.('Jane')).to be_success
       end
     end
 
-    context 'when a given predicate did not pass' do
+    context 'when the given predicate did not pass' do
       let(:input) { nil }
       let(:predicate) { :filled? }
 
       it 'returns a failure' do
-        expect(rule.()).to be_failure
+        expect(rule.(nil)).to be_failure
       end
     end
   end

data/spec/unit/rule/result_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Dry::Logic::Rule::Result do
     it 'evaluates successful input for the ast' do
       expect(rule.(name: is_str.('jane')).to_ary).to eql([
         :input, [
-          :name, nil, [[:res, [:name, [:predicate, [:min_size?, [4]]]]]]
+          :name, 'jane', [[:res, [:name, [:predicate, [:min_size?, [4]]]]]]
         ]
       ])
     end
@@ -44,7 +44,7 @@ RSpec.describe Dry::Logic::Rule::Result do
     it 'evaluates input for the ast' do
       expect(conjunction.(name: is_str.('john')).to_ary).to eql([
         :input, [
-          :name, nil, [[:res, [:name, [:predicate, [:eql?, ["jane"]]]]]]
+          :name, 'john', [[:res, [:name, [:predicate, [:eql?, ['jane']]]]]]
         ]
       ])
     end
@@ -63,7 +63,7 @@ RSpec.describe Dry::Logic::Rule::Result do
 
       expect(result.to_ary).to eql([
         :input, [
-          :name, nil, [[:res, [:name, [:predicate, [:min_size?, [4]]]]]]
+          :name, 'john', [[:res, [:name, [:predicate, [:min_size?, [4]]]]]]
         ]
       ])
     end
@@ -83,7 +83,7 @@ RSpec.describe Dry::Logic::Rule::Result do
 
       expect(result.to_ary).to eql([
         :input, [
-          :name, nil, [[:res, [:name, [:predicate, [:eql?, ['jane']]]]]]
+          :name, 'john', [[:res, [:name, [:predicate, [:eql?, ['jane']]]]]]
         ]
       ])
     end

data/spec/unit/rule_compiler_spec.rb

@@ -7,7 +7,10 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
     { key?: predicate,
       attr?: predicate,
       filled?: predicate,
-      email: val_rule.('email').curry(:filled?) }
+      gt?: predicate,
+      email: val_rule.('email').curry(:filled?),
+      left: res_left_rule,
+      right: double(input: 312) }
   }
 
   let(:predicate) { double(:predicate).as_null_object }
@@ -16,8 +19,9 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
   let(:not_key_rule) { Rule::Key.new(:email, predicate).negation }
   let(:attr_rule) { Rule::Attr.new(:email, predicate) }
   let(:val_rule) { Rule::Value.new(:email, predicate) }
-  let(:check_rule) { Rule::Check.new(:email, predicates[:email]) }
+  let(:check_rule) { Rule::Check::Unary.new(:email, predicates[:email], [:email]) }
   let(:res_rule) { Rule::Result.new(:email, predicates[:email]) }
+  let(:res_left_rule) { Rule::Result.new(:left, predicate) }
   let(:and_rule) { key_rule & val_rule }
   let(:or_rule) { key_rule | val_rule }
   let(:xor_rule) { key_rule ^ val_rule }
@@ -48,6 +52,16 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
     expect(rules).to eql([res_rule])
   end
 
+  it 'compiles result rules with res args' do
+    ast = [[:res, [:left, [:predicate, [:gt?, [:args, [[:res_arg, :right]]]]]]]]
+
+    expect(predicate).to receive(:curry).with(312)
+
+    rules = compiler.(ast)
+
+    expect(rules).to eql([res_left_rule])
+  end
+
   it 'compiles attr rules' do
     ast = [[:attr, [:email, [:predicate, [:attr?, predicate]]]]]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container