dry-logic 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d49a2ea6e71727f4ae69320aa0619c2ebd96325
-  data.tar.gz: 71414bb0ff667758b7a95fb0379025bd55465b2e
+  metadata.gz: d99c501f48f756fd19ec5f5c3da47041b704e97a
+  data.tar.gz: a8dd4c89cd7674a65b69a6d441091ba73b514bbc
 SHA512:
-  metadata.gz: b49f6272d981acc3fe076096ab9beb5c0d8aa57c5956ca88603d6187bd64e0285ec6bda802d4bc9f39b44927b71bc8a095834ea78e91dcee2d2816483bb9c071
-  data.tar.gz: a1f2dbdd21ddf76e986036aacc3949433103335f842ae2ee3bcd603716c744b214800ed47129a0a23aa3564b13a65c914edaab8417dfde1b7046dd3c3127cb9f
+  metadata.gz: 68a19a8f78af8a329e47e8b089fef34fb2b9dbdd686840568b328fe755b65f9fbd7e7d9b6324aa78d68d7bba56c61f5c1a97fa51a9f7d89d39e3cc91e7c64503
+  data.tar.gz: e5b68c7f5599a244f9918c5d2bc67b282983dc1e48cbd2deaaeabf55670dbbe5b05a27b5f5d9ce6655cf0de6f202eab50a08cb323e37e535aa0d80951ac60a31

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# v0.1.2 2016-01-27
+# v0.1.4 2016-01-27
+
+### Added
+
+* Support for hash-names in `Check` and `Result` which can properly resolve input
+  from nested results (solnic)
+
+[Compare v0.1.3...v0.1.4](https://github.com/dryrb/dry-logic/compare/v0.1.3...v0.1.4)
+
+# v0.1.3 2016-01-27
 
 ### Added
 

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

@@ -11,7 +11,14 @@ module Dry
 
       class Binary < Rule::Check
         def evaluate_input(result)
-          keys.map { |key| result[key].input }
+          keys.map do |key|
+            if key.is_a?(Hash)
+              parent, child = key.to_a.flatten
+              result[parent].input[child]
+            else
+              result[key].input
+            end
+          end
         end
       end
 

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

@@ -2,18 +2,27 @@ module Dry
   module Logic
     class Rule::Result < Rule
       def call(input)
-        result = input[name]
-        result_input = result.input
+        result = if name.is_a?(Hash)
+                   parent, _ = name.to_a.flatten
+                   input[parent]
+                 else
+                   input[name]
+                 end
 
         if result.success?
-          Result::Wrapped.new(input, predicate.(result_input), self)
+          Result::Wrapped.new(input, predicate.(evaluate_input(input)), self)
         else
           result
         end
       end
 
       def evaluate_input(result)
-        result[name].input
+        if name.is_a?(Hash)
+          parent, child = name.to_a.flatten
+          result[parent].input[child]
+        else
+          result[name].input
+        end
       end
 
       def type

data/lib/dry/logic/version.rb

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

data/spec/shared/predicates.rb

@@ -5,6 +5,8 @@ RSpec.shared_examples 'predicates' do
 
   let(:str?) { Dry::Logic::Predicates[:str?] }
 
+  let(:hash?) { Dry::Logic::Predicates[:hash?] }
+
   let(:int?) { Dry::Logic::Predicates[:int?] }
 
   let(:filled?) { Dry::Logic::Predicates[:filled?] }

data/spec/unit/rule/check_spec.rb

@@ -1,8 +1,4 @@
 RSpec.describe Rule::Check do
-  subject(:rule) do
-    Rule::Check::Unary.new(:name, other.(input).curry(predicate), [:name])
-  end
-
   include_context 'predicates'
 
   let(:other) do
@@ -10,7 +6,11 @@ RSpec.describe Rule::Check do
   end
 
   describe '#call' do
-    context 'when then given predicate passed' do
+    subject(:rule) do
+      Rule::Check::Unary.new(:name, other.(input).curry(predicate), [:name])
+    end
+
+    context 'when the given predicate passed' do
       let(:input) { 'Jane' }
       let(:predicate) { :filled? }
 
@@ -28,4 +28,29 @@ RSpec.describe Rule::Check do
       end
     end
   end
+
+  describe '#call with a nested result' do
+    subject(:rule) do
+      Rule::Check::Binary.new(:address, result, [:user, { user: :address }])
+    end
+
+    let(:other) { Rule::Value.new(:user, hash?) }
+    let(:result) { other.(input).curry(:hash?) }
+    let(:input) { { address: 'Earth' } }
+
+    it 'evaluates the input' do
+      expect(rule.(user: result).to_ary).to eql([
+        :input, [
+          :address, { address: 'Earth' },
+          [
+            [:check, [
+              :address, [
+                :input, [:user, { address: 'Earth' }, [
+                  [:val, [:user, [:predicate, [:hash?, []]]]]]]]
+            ]]
+          ]
+        ]
+      ])
+    end
+  end
 end

data/spec/unit/rule/result_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe Dry::Logic::Rule::Result do
   include_context 'predicates'
 
   let(:is_str) { Dry::Logic::Rule::Value.new(:name, str?) }
+  let(:is_hash) { Dry::Logic::Rule::Value.new(:name, hash?) }
   let(:is_jane) { Dry::Logic::Rule::Result.new(:name, eql?.curry('jane')) }
   let(:is_john) { Dry::Logic::Rule::Result.new(:name, eql?.curry('john')) }
 
@@ -33,6 +34,16 @@ RSpec.describe Dry::Logic::Rule::Result do
     end
   end
 
+  describe '#call with nested result' do
+    subject(:rule) do
+      Dry::Logic::Rule::Result.new({ user: :address }, str?)
+    end
+
+    it 'evaluates the input' do
+      expect(rule.(user: is_hash.(address: 'Earth'))).to be_success
+    end
+  end
+
   describe '#and' do
     let(:conjunction) { rule.and(is_jane) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Piotr Solnica