dry-logic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed31141ff3e52c81a9afce4397631ce26372a7e
-  data.tar.gz: ee8d692843523fc91d4e9f6d28a03e4e749362b5
+  metadata.gz: 9042bd42bf10c567eb88dc6e830ebface1daf974
+  data.tar.gz: dc92016f7c8a14ddd0db49f33d0818130cc9cada
 SHA512:
-  metadata.gz: 61463a874fb6281033cba937136a44131df14b59b1fab36532786f47f698eeaa96fbca1cdcc8235ee93b69d66e85da5230bd2c15094720c102024ee01355bc0b
-  data.tar.gz: 48f375ae23737143a1aea7ba6494f47de0aa86548278f66dedd45333473a177f1a3704e0451777ef1b128669e68006fee952ccf10634f0f928ec28fe5942f738
+  metadata.gz: 049784897429ec2b7064da4217cd508d6557bdf4a3c9208e716a608d43c03b9f449a782cef01df03a1786ecb11216f2208ed576eaf1ef8ff93cd92a66ce347af
+  data.tar.gz: 64b6dbcd4d3e5b9e06f6b50fb1c1bfd6bd7b856d01b67f2357e46f93a0f716f600bce868b0aec0bd83d9a0e5a8141583aaf18a01a5a119766044f792c93a7467

data/CHANGELOG.md

@@ -1,3 +1,12 @@
-# v0.1.0 to-be-released
+# v0.1.1 2016-01-18
+
+### Added
+
+* `Rule::Attr` which can be applied to a data object with attr readers (SunnyMagadan)
+* `Rule::Result` which can be applied to a result object (solnic)
+
+[Compare v0.1.0...v0.1.1](https://github.com/dryrb/dry-logic/compare/v0.1.0...v0.1.1)
+
+# v0.1.0 2016-01-11
 
 Code extracted from dry-validation 0.4.1

data/lib/dry/logic/predicates.rb

@@ -23,6 +23,10 @@ module Dry
         input.key?(name)
       end
 
+      predicate(:attr?) do |name, input|
+        input.respond_to?(name)
+      end
+
       predicate(:empty?) do |input|
         case input
         when String, Array, Hash then input.empty?
@@ -121,6 +125,14 @@ module Dry
         left.eql?(right)
       end
 
+      predicate(:true?) do |value|
+        value === true
+      end
+
+      predicate(:false?) do |value|
+        value === false
+      end
+
       predicate(:format?) do |regex, input|
         !regex.match(input).nil?
       end

data/lib/dry/logic/result.rb

@@ -42,7 +42,7 @@ module Dry
           @predicate_id = predicate_id
         end
 
-        def call
+        def call(*)
           Logic.Result(input, success?, rule)
         end
 
@@ -56,6 +56,24 @@ 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
+      end
+
       def initialize(input, value, rule)
         @input = input
         @value = value
@@ -63,7 +81,7 @@ module Dry
         @name = rule.name
       end
 
-      def call
+      def call(*)
         self
       end
 

data/lib/dry/logic/rule.rb

@@ -81,11 +81,13 @@ module Dry
 end
 
 require 'dry/logic/rule/key'
+require 'dry/logic/rule/attr'
 require 'dry/logic/rule/value'
 require 'dry/logic/rule/each'
 require 'dry/logic/rule/set'
 require 'dry/logic/rule/composite'
 require 'dry/logic/rule/check'
+require 'dry/logic/rule/result'
 require 'dry/logic/rule/group'
 
 require 'dry/logic/result'

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

@@ -0,0 +1,21 @@
+module Dry
+  module Logic
+    class Rule::Attr < Rule
+      def self.new(name, predicate)
+        super(name, predicate.curry(name))
+      end
+
+      def type
+        :attr
+      end
+
+      def evaluate_input(input)
+        input.public_send(name)
+      end
+
+      def call(input)
+        Logic::Result::LazyValue.new(input, predicate.(input), self)
+      end
+    end
+  end
+end

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

@@ -3,8 +3,8 @@ module Dry
     class Rule::Check < Rule
       alias_method :result, :predicate
 
-      def call(*)
-        Logic.Result(nil, result.call, self)
+      def call(*args)
+        Logic.Result(nil, result.(*args), self)
       end
 
       def type

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

@@ -0,0 +1,16 @@
+module Dry
+  module Logic
+    class Rule::Result < Rule
+      def call(input)
+        result = input[name]
+        return result unless result.success?
+        result_input = result.input
+        Result::Wrapped.new(input, predicate.(result_input), self)
+      end
+
+      def type
+        :res
+      end
+    end
+  end
+end

data/lib/dry/logic/rule_compiler.rb

@@ -23,6 +23,11 @@ module Dry
         Rule::Check.new(name, visit(predicate))
       end
 
+      def visit_res(node)
+        name, predicate = node
+        Rule::Result.new(name, visit(predicate))
+      end
+
       def visit_not(node)
         visit(node).negation
       end
@@ -32,6 +37,11 @@ module Dry
         Rule::Key.new(name, visit(predicate))
       end
 
+      def visit_attr(node)
+        name, predicate = node
+        Rule::Attr.new(name, visit(predicate))
+      end
+
       def visit_val(node)
         name, predicate = node
         Rule::Value.new(name, visit(predicate))

data/lib/dry/logic/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Logic
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/shared/predicates.rb

@@ -17,6 +17,8 @@ RSpec.shared_examples 'predicates' do
 
   let(:key?) { Dry::Logic::Predicates[:key?] }
 
+  let(:attr?) { Dry::Logic::Predicates[:attr?] }
+
   let(:eql?) { Dry::Logic::Predicates[:eql?] }
 end
 

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 begin
   require 'byebug'
 rescue LoadError; end

data/spec/unit/predicates/attr_spec.rb

@@ -0,0 +1,29 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#attr?' do
+    let(:predicate_name) { :attr? }
+
+    context 'when value responds to the attr name' do
+      let(:arguments_list) do
+        [
+          [:name, Struct.new(:name).new('John')],
+          [:age, Struct.new(:age).new(18)]
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with value does not respond to the attr name' do
+      let(:arguments_list) do
+        [
+          [:name, Struct.new(:age).new(18)],
+          [:age, Struct.new(:name).new('Jill')]
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/bool_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Dry::Logic::Predicates do
       it_behaves_like 'a passing predicate'
     end
 
-    context 'with value is not an integer' do
+    context 'when value is not a bool' do
       let(:arguments_list) do
         [
           [''],

data/spec/unit/predicates/false_spec.rb

@@ -0,0 +1,35 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#false?' do
+    let(:predicate_name) { :false? }
+
+    context 'when value is a date' do
+      let(:arguments_list) do
+        [[false]]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when value is not false' do
+      let(:arguments_list) do
+        [
+          [true],
+          [''],
+          [[]],
+          [{}],
+          [nil],
+          [:symbol],
+          [String],
+          [1],
+          [0],
+          ['true'],
+          ['false']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/true_spec.rb

@@ -0,0 +1,35 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#true?' do
+    let(:predicate_name) { :true? }
+
+    context 'when value is a date' do
+      let(:arguments_list) do
+        [[true]]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with value is not true' do
+      let(:arguments_list) do
+        [
+          [false],
+          [''],
+          [[]],
+          [{}],
+          [nil],
+          [:symbol],
+          [String],
+          [1],
+          [0],
+          ['true'],
+          ['false']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/rule/attr_spec.rb

@@ -0,0 +1,29 @@
+require 'dry/logic/rule'
+
+RSpec.describe Dry::Logic::Rule::Attr do
+  include_context 'predicates'
+
+  let(:model) { Struct.new(:name) }
+
+  subject(:rule) { described_class.new(:name, attr?) }
+
+  describe '#call' do
+    it 'applies predicate to the value' do
+      expect(rule.(model.new(name: 'Jane'))).to be_success
+      expect(rule.(nil)).to be_failure
+    end
+  end
+
+  describe '#and' do
+    let(:other) { Dry::Logic::Rule::Value.new(:name, str?) }
+
+    it 'returns conjunction rule where value is passed to the right' do
+      present_and_string = rule.and(other)
+
+      expect(present_and_string.(model.new('Jane'))).to be_success
+
+      expect(present_and_string.(nil)).to be_failure
+      expect(present_and_string.(model.new(1))).to be_failure
+    end
+  end
+end

data/spec/unit/rule/result_spec.rb

@@ -0,0 +1,33 @@
+require 'dry/logic/rule/result'
+
+RSpec.describe Dry::Logic::Rule::Result do
+  subject(:rule) { Dry::Logic::Rule::Result.new(:name, min_size?.curry(4)) }
+
+  include_context 'predicates'
+
+  let(:is_str) { Dry::Logic::Rule::Value.new(:name, str?) }
+  let(:is_jane) { Dry::Logic::Rule::Result.new(:name, eql?.curry('jane')) }
+
+  describe '#call' do
+    it 'returns result of a predicate' do
+      expect(rule.(name: is_str.('jane'))).to be_success
+      expect(rule.(name: is_str.('jan'))).to be_failure
+      expect(rule.(name: is_str.(nil))).to be_failure
+    end
+
+    it 'evaluates input for the ast' do
+      expect(rule.(name: is_str.('jane')).to_ary).to eql([
+        :input, [
+          :name, nil, [[:res, [:name, [:predicate, [:min_size?, [4]]]]]]
+        ]
+      ])
+    end
+  end
+
+  describe '#and' do
+    it 'returns result of a conjunction' do
+      expect(rule.and(is_jane).(name: is_str.('jane'))).to be_success
+      expect(rule.and(is_jane).(name: is_str.('john'))).to be_failure
+    end
+  end
+end

data/spec/unit/rule_compiler_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
 
   let(:predicates) {
     { key?: predicate,
+      attr?: predicate,
       filled?: predicate,
       email: val_rule.('email').curry(:filled?) }
   }
@@ -13,8 +14,10 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
 
   let(:key_rule) { Rule::Key.new(:email, predicate) }
   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(:res_rule) { Rule::Result.new(:email, predicates[:email]) }
   let(:and_rule) { key_rule & val_rule }
   let(:or_rule) { key_rule | val_rule }
   let(:xor_rule) { key_rule ^ val_rule }
@@ -37,6 +40,21 @@ RSpec.describe Dry::Logic::RuleCompiler, '#call' do
     expect(rules).to eql([check_rule])
   end
 
+  it 'compiles result rules' do
+    ast = [[:res, [:email, [:predicate, [:email, [:filled?]]]]]]
+
+    rules = compiler.(ast)
+
+    expect(rules).to eql([res_rule])
+  end
+
+  it 'compiles attr rules' do
+    ast = [[:attr, [:email, [:predicate, [:attr?, predicate]]]]]
+
+    rules = compiler.(ast)
+
+    expect(rules).to eql([attr_rule])
+  end
 
   it 'compiles negated rules' do
     ast = [[:not, [:key, [:email, [:predicate, [:key?, predicate]]]]]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -112,11 +112,13 @@ files:
 - lib/dry/logic/predicates.rb
 - lib/dry/logic/result.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/group.rb
 - lib/dry/logic/rule/key.rb
+- lib/dry/logic/rule/result.rb
 - lib/dry/logic/rule/set.rb
 - lib/dry/logic/rule/value.rb
 - lib/dry/logic/rule_compiler.rb
@@ -125,6 +127,7 @@ files:
 - spec/shared/predicates.rb
 - spec/spec_helper.rb
 - spec/unit/predicate_spec.rb
+- spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
 - spec/unit/predicates/date_spec.rb
 - spec/unit/predicates/date_time_spec.rb
@@ -132,6 +135,7 @@ files:
 - spec/unit/predicates/empty_spec.rb
 - spec/unit/predicates/eql_spec.rb
 - spec/unit/predicates/exclusion_spec.rb
+- spec/unit/predicates/false_spec.rb
 - spec/unit/predicates/filled_spec.rb
 - spec/unit/predicates/float_spec.rb
 - spec/unit/predicates/format_spec.rb
@@ -148,6 +152,8 @@ files:
 - spec/unit/predicates/size_spec.rb
 - spec/unit/predicates/str_spec.rb
 - spec/unit/predicates/time_spec.rb
+- spec/unit/predicates/true_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
@@ -155,6 +161,7 @@ files:
 - spec/unit/rule/group_spec.rb
 - spec/unit/rule/implication_spec.rb
 - spec/unit/rule/key_spec.rb
+- spec/unit/rule/result_spec.rb
 - spec/unit/rule/set_spec.rb
 - spec/unit/rule/value_spec.rb
 - spec/unit/rule_compiler_spec.rb
@@ -186,6 +193,7 @@ test_files:
 - spec/shared/predicates.rb
 - spec/spec_helper.rb
 - spec/unit/predicate_spec.rb
+- spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
 - spec/unit/predicates/date_spec.rb
 - spec/unit/predicates/date_time_spec.rb
@@ -193,6 +201,7 @@ test_files:
 - spec/unit/predicates/empty_spec.rb
 - spec/unit/predicates/eql_spec.rb
 - spec/unit/predicates/exclusion_spec.rb
+- spec/unit/predicates/false_spec.rb
 - spec/unit/predicates/filled_spec.rb
 - spec/unit/predicates/float_spec.rb
 - spec/unit/predicates/format_spec.rb
@@ -209,6 +218,8 @@ test_files:
 - spec/unit/predicates/size_spec.rb
 - spec/unit/predicates/str_spec.rb
 - spec/unit/predicates/time_spec.rb
+- spec/unit/predicates/true_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
@@ -216,6 +227,7 @@ test_files:
 - spec/unit/rule/group_spec.rb
 - spec/unit/rule/implication_spec.rb
 - spec/unit/rule/key_spec.rb
+- spec/unit/rule/result_spec.rb
 - spec/unit/rule/set_spec.rb
 - spec/unit/rule/value_spec.rb
 - spec/unit/rule_compiler_spec.rb