dry-logic 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 554db40a47bc9eaa08659c38fd706fd15317f703
-  data.tar.gz: cdf04c815e657c282eef1c0d28d8923ba6b4dc12
+SHA256:
+  metadata.gz: 1a6ff887f61b513496991a96d7903685886ab29dae71cb4f75185cd7866fd4b2
+  data.tar.gz: 9e063f346341b395ac21645f84319e619af19151e62bd97413badf246440d353
 SHA512:
-  metadata.gz: fa2ff6136f6407d523dcb8f5dee97c7f01da3aa71ebde81ce05ac92ab1408db9909d9e997cf81b46ad2bb8120000cdbe84c456b3866f22d37259674883445721
-  data.tar.gz: 3b6148d888eb2fb6ab6c8e87f3dedbee81feb13a310c7256abc06de9e8643555bf671b9d215045fc00db5c8a09e1b35f6ac1e57e57a6f91d09ca509eee14aa7a
+  metadata.gz: f643a0238e3b67c91c83af1e90cb4398279b4c01957ce663a5186ae8437a87e94c9d9cb2f7a2aabca1c7edb47be28a531317a044e58e270ffff59c44e6a9ccf5
+  data.tar.gz: 17b0ff20fc5c41258a537ad0c57e959cd3359765801261157772a62ee5d1ce525c15bca2ce92c8ee624b1fda67a5cf6cbf4228af552cf99efc8e8428026dbccb

data/.gitignore

@@ -2,7 +2,6 @@
 coverage
 /.bundle
 vendor/bundle
-bin/
 tmp/
 .idea/
 Gemfile.lock

data/.travis.yml

@@ -1,31 +1,30 @@
 language: ruby
-dist: trusty
-sudo: false
 cache: bundler
-bundler_args: --without console tools
+sudo: false
+bundler_args: --without benchmarks tools
+before_install: gem update --system
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+after_script:
+  - "[ -d coverage ] && ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 script:
-  - bundle exec rake spec
-after_success:
-  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
+  - bundle exec rake
 rvm:
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.10.0
-  - ruby-head
+  - 2.6.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+  - jruby-9.2.5.0
 env:
   global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
     - COVERAGE=true
-matrix:
-  allow_failures:
-    - rvm: ruby-head
 notifications:
   email: false
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    on_success: change # options: [always|never|change] default: always
+    on_failure: always # options: [always|never|change] default: always
+    on_start: false # default: false

data/CHANGELOG.md

@@ -1,25 +1,37 @@
+# v0.5.0 2019-01-29
+
+### Added
+
+- `:nil?` predicate (`none?` is now an alias) (solnic)
+
+### Fixed
+
+- `Operation::Key#ast` will now return a correct AST with non-Undefined inputs (solnic)
+
+[Compare v0.4.2...v0.5.0](https://github.com/dry-rb/dry-logic/compare/v0.4.2...v0.5.0)
+
 # v0.4.2 2017-09-15
 
 ### Added
 
-* New `:case?` predicate matches a value against the given object with `#===` (flash-gordon)
-* New `:is?` predicate checks objects identity (using `#equal?`) (flash-gordon)
+- New `:case?` predicate matches a value against the given object with `#===` (flash-gordon)
+- New `:is?` predicate checks objects identity (using `#equal?`) (flash-gordon)
 
 ### Fixed
 
-* A bug with using custom predicates within a standalone module in `dry-validation` (flash-gordon)
+- A bug with using custom predicates within a standalone module in `dry-validation` (flash-gordon)
 
-[Compare v0.4.1...v0.4.2(https://github.com/dry-rb/dry-logic/compare/v0.4.1...v0.4.2)
+[Compare v0.4.1...v0.4.2](https://github.com/dry-rb/dry-logic/compare/v0.4.1...v0.4.2)
 
 # v0.4.1 2017-01-23
 
 ### Changed
 
-* Predicates simply reuse other predicate methods instead of referring to them via `#[]` (georgemillo)
+- Predicates simply reuse other predicate methods instead of referring to them via `#[]` (georgemillo)
 
 ### Fixed
 
-* Warnings on MRI 2.4.0 are gone (jtippett)
+- Warnings on MRI 2.4.0 are gone (jtippett)
 
 [Compare v0.4.0...v0.4.1](https://github.com/dry-rb/dry-logic/compare/v0.4.0...v0.4.1)
 
@@ -29,25 +41,25 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* `Rule#[]` which applies a rule and always returns `true` or `false` (solnic)
-* `Rule#bind` which returns a rule with its predicate bound to a given object (solnic)
-* `Rule#eval_args` which evaluates unbound-methods-args in the context of a given object (solnic)
-* `Logic.Rule` builder function (solnic)
-* Nice `#inspect` on rules and operation objects (solnic)
+- `Rule#[]` which applies a rule and always returns `true` or `false` (solnic)
+- `Rule#bind` which returns a rule with its predicate bound to a given object (solnic)
+- `Rule#eval_args` which evaluates unbound-methods-args in the context of a given object (solnic)
+- `Logic.Rule` builder function (solnic)
+- Nice `#inspect` on rules and operation objects (solnic)
 
 ### Changed
 
-* [BRAEKING] New result API (solnic)
-* [BREAKING] `Predicate` is now `Rule::Predicate` (solnic)
-* [BREAKING] `Rule::Conjunction` is now `Operation::And` (solnic)
-* [BREAKING] `Rule::Disjunction` is now `Operation::Or` (solnic)
-* [BREAKING] `Rule::ExlusiveDisjunction` is now `Operation::Xor` (solnic)
-* [BREAKING] `Rule::Implication` is now `Operation::Implication` (solnic)
-* [BREAKING] `Rule::Set` is now `Operation::Set` (solnic)
-* [BREAKING] `Rule::Each` is now `Operation::Each` (solnic)
-* [BREAKING] `Rule.new` accepts a predicate function as its first arg now (solnic)
-* [BREAKING] `Rule#name` is now `Rule#id` (solnic)
-* `Rule#parameters` is public now (solnic)
+- [BRAEKING] New result API (solnic)
+- [BREAKING] `Predicate` is now `Rule::Predicate` (solnic)
+- [BREAKING] `Rule::Conjunction` is now `Operation::And` (solnic)
+- [BREAKING] `Rule::Disjunction` is now `Operation::Or` (solnic)
+- [BREAKING] `Rule::ExlusiveDisjunction` is now `Operation::Xor` (solnic)
+- [BREAKING] `Rule::Implication` is now `Operation::Implication` (solnic)
+- [BREAKING] `Rule::Set` is now `Operation::Set` (solnic)
+- [BREAKING] `Rule::Each` is now `Operation::Each` (solnic)
+- [BREAKING] `Rule.new` accepts a predicate function as its first arg now (solnic)
+- [BREAKING] `Rule#name` is now `Rule#id` (solnic)
+- `Rule#parameters` is public now (solnic)
 
 [Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-logic/compare/v0.3.0...v0.4.0)
 
@@ -55,14 +67,14 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* `:type?` predicate imported from dry-types (solnic)
-* `Rule#curry` interface (solnic)
+- `:type?` predicate imported from dry-types (solnic)
+- `Rule#curry` interface (solnic)
 
 ### Changed
 
-* Predicates AST now includes information about args (names & possible values) (fran-worley + solnic)
-* Predicates raise errors when they are called with invalid arity (fran-worley + solnic)
-* Rules no longer evaluate input twice when building result objects (solnic)
+- Predicates AST now includes information about args (names & possible values) (fran-worley + solnic)
+- Predicates raise errors when they are called with invalid arity (fran-worley + solnic)
+- Rules no longer evaluate input twice when building result objects (solnic)
 
 [Compare v0.2.3...v0.3.0](https://github.com/dry-rb/dry-logic/compare/v0.2.3...v0.3.0)
 
@@ -70,12 +82,12 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* `not_eql?`, `includes?`, `excludes?` predicates (fran-worley)
+- `not_eql?`, `includes?`, `excludes?` predicates (fran-worley)
 
 ### Changed
 
-* Renamed `inclusion?` to `included_in?` and deprecated `inclusion?` (fran-worley)
-* Renamed `exclusion?` to `excluded_from?` and deprecated `exclusion?` (fran-worley)
+- Renamed `inclusion?` to `included_in?` and deprecated `inclusion?` (fran-worley)
+- Renamed `exclusion?` to `excluded_from?` and deprecated `exclusion?` (fran-worley)
 
 [Compare v0.2.2...v0.2.3](https://github.com/dry-rb/dry-logic/compare/v0.2.2...v0.2.3)
 
@@ -83,7 +95,7 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* `number?`, `odd?`, `even?` predicates (fran-worley)
+- `number?`, `odd?`, `even?` predicates (fran-worley)
 
 [Compare v0.2.1...v0.2.2](https://github.com/dry-rb/dry-logic/compare/v0.2.1...v0.2.2)
 
@@ -91,13 +103,13 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Fixed
 
-* Result AST for `Rule::Each` correctly maps elements with eql inputs (solnic)
+- Result AST for `Rule::Each` correctly maps elements with eql inputs (solnic)
 
 # v0.2.0 2016-03-11
 
 ### Changed
 
-* Entire AST has been redefined (solnic)
+- Entire AST has been redefined (solnic)
 
 [Compare v0.1.4...v0.2.0](https://github.com/dry-rb/dry-logic/compare/v0.1.4...v0.2.0)
 
@@ -105,7 +117,7 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* Support for hash-names in `Check` and `Result` which can properly resolve input
+- 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/dry-rb/dry-logic/compare/v0.1.3...v0.1.4)
@@ -114,11 +126,11 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Added
 
-* Support for resolving input from `Rule::Result` (solnic)
+- Support for resolving input from `Rule::Result` (solnic)
 
 ### Changed
 
-* `Check` and `Result` carry original input(s) (solnic)
+- `Check` and `Result` carry original input(s) (solnic)
 
 [Compare v0.1.2...v0.1.3](https://github.com/dry-rb/dry-logic/compare/v0.1.2...v0.1.3)
 
@@ -126,7 +138,7 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### Fixed
 
-* `xor` returns wrapped results when used against another result-rule (solnic)
+- `xor` returns wrapped results when used against another result-rule (solnic)
 
 [Compare v0.1.1...v0.1.2](https://github.com/dry-rb/dry-logic/compare/v0.1.1...v0.1.2)
 
@@ -134,9 +146,9 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 ### 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)
-* `true?` and `false?` predicates (solnic)
+- `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)
+- `true?` and `false?` predicates (solnic)
 
 [Compare v0.1.0...v0.1.1](https://github.com/dry-rb/dry-logic/compare/v0.1.0...v0.1.1)
 

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'codeclimate-test-reporter', platform: :mri
   gem 'simplecov', require: false, platform: :mri
 end
 

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-logic
 [travis]: https://travis-ci.org/dry-rb/dry-logic
-[gemnasium]: https://gemnasium.com/dry-rb/dry-logic
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-logic
 [coveralls]: https://coveralls.io/r/dry-rb/dry-logic
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-logic
@@ -9,7 +8,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-logic.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-logic.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-logic.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-logic/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-logic/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-logic.svg?branch=master)][inchpages]

data/bin/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require 'dry/logic'
+require 'dry/logic/predicates'
+
+include Dry::Logic
+
+require "irb"
+IRB.start

data/dry-logic.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 

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

@@ -49,11 +49,11 @@ module Dry
           rule[evaluator[hash]]
         end
 
-        def ast(input = nil)
-          if input
-            [type, [path, rule.ast(evaluator[input])]]
-          else
+        def ast(input = Undefined)
+          if input.equal?(Undefined) || !input.is_a?(Hash)
             [type, [path, rule.ast]]
+          else
+            [type, [path, rule.ast(evaluator[input])]]
           end
         end
 

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

@@ -10,7 +10,11 @@ module Dry
         end
 
         def call(input)
-          Result.new(!rule[input], id) { ast(input) }
+          Result.new(rule.(input).failure?, id) { ast(input) }
+        end
+
+        def [](input)
+          !rule[input]
         end
       end
     end

data/lib/dry/logic/predicates.rb

@@ -14,9 +14,10 @@ module Dry
           input.kind_of?(type)
         end
 
-        def none?(input)
+        def nil?(input)
           input.nil?
         end
+        alias_method :none?, :nil?
 
         def key?(name, input)
           input.key?(name)

data/lib/dry/logic/rule_compiler.rb

@@ -1,5 +1,7 @@
 require 'dry/core/constants'
+
 require 'dry/logic/rule'
+require 'dry/logic/rule/predicate'
 
 module Dry
   module Logic

data/lib/dry/logic/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Logic
-    VERSION = '0.4.2'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/spec/shared/predicates.rb

@@ -1,7 +1,7 @@
 require 'dry/logic/predicates'
 
 RSpec.shared_examples 'predicates' do
-  let(:none?) { Dry::Logic::Predicates[:none?] }
+  let(:nil?) { Dry::Logic::Predicates[:nil?] }
 
   let(:array?) { Dry::Logic::Predicates[:array?] }
 

data/spec/unit/operations/key_spec.rb

@@ -92,6 +92,20 @@ RSpec.describe Operations::Key do
     end
   end
 
+  describe '#ast' do
+    it 'returns ast without the input' do
+      expect(operation.ast).to eql(
+        [:key, [:user, [:predicate, [:key?, [[:name, :age], [:input, Undefined]]]]]]
+      )
+    end
+
+    it 'returns ast with the input' do
+      expect(operation.ast(user: 'jane')).to eql(
+        [:key, [:user, [:predicate, [:key?, [[:name, :age], [:input, 'jane']]]]]]
+      )
+    end
+  end
+
   describe '#and' do
     subject(:operation) do
       Operations::Key.new(Rule::Predicate.new(str?), name: [:user, :name])

data/spec/unit/operations/negation_spec.rb

@@ -10,6 +10,15 @@ RSpec.describe Operations::Negation do
       expect(operation.('19')).to be_success
       expect(operation.(17)).to be_failure
     end
+
+    context 'double negation' do
+      subject(:double_negation) { Operations::Negation.new(operation) }
+
+      it 'works as rule' do
+        expect(double_negation.('19')).to be_failure
+        expect(double_negation.(17)).to be_success
+      end
+    end
   end
 
   describe '#to_ast' do

data/spec/unit/operations/or_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe Operations::Or do
 
   include_context 'predicates'
 
-  let(:left) { Rule::Predicate.new(none?) }
+  let(:left) { Rule::Predicate.new(nil?) }
   let(:right) { Rule::Predicate.new(gt?).curry(18) }
 
   let(:other) do
@@ -22,7 +22,7 @@ RSpec.describe Operations::Or do
     it 'returns ast' do
       expect(operation.to_ast).to eql(
         [:or, [
-          [:predicate, [:none?, [[:input, Undefined]]]],
+          [:predicate, [:nil?, [[:input, Undefined]]]],
           [:predicate, [:gt?, [[:num, 18], [:input, Undefined]]]]]
         ]
       )
@@ -31,7 +31,7 @@ RSpec.describe Operations::Or do
     it 'returns result ast' do
       expect(operation.(17).to_ast).to eql(
         [:or, [
-          [:predicate, [:none?, [[:input, 17]]]],
+          [:predicate, [:nil?, [[:input, 17]]]],
           [:predicate, [:gt?, [[:num, 18], [:input, 17]]]]]
         ]
       )
@@ -40,7 +40,7 @@ RSpec.describe Operations::Or do
     it 'returns failure result ast' do
       expect(operation.with(id: :age).(17).to_ast).to eql(
         [:failure, [:age, [:or, [
-          [:predicate, [:none?, [[:input, 17]]]],
+          [:predicate, [:nil?, [[:input, 17]]]],
           [:predicate, [:gt?, [[:num, 18], [:input, 17]]]]]
         ]]]
       )
@@ -67,7 +67,7 @@ RSpec.describe Operations::Or do
 
   describe '#to_s' do
     it 'returns string representation' do
-      expect(operation.to_s).to eql('none? OR gt?(18)')
+      expect(operation.to_s).to eql('nil? OR gt?(18)')
     end
   end
 end

data/spec/unit/predicates/none_spec.rb

@@ -1,8 +1,8 @@
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do
-  describe '#none?' do
-    let(:predicate_name) { :none? }
+  describe '#nil?' do
+    let(:predicate_name) { :nil? }
 
     context 'when value is nil' do
       let(:arguments_list) { [[nil]] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -119,6 +119,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
 - dry-logic.gemspec
 - examples/basic.rb
 - lib/dry-logic.rb
@@ -220,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition