dry-logic 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25000a6e80f51337190d6dc64bf1566bdcceafd
-  data.tar.gz: bfd9743a8aa9b6cc7f3bc95788120acfec5b9ee6
+  metadata.gz: 95bd134452791d94fdaf05fc2afc746040800e47
+  data.tar.gz: c1a47707cec851ac223ba9a7ce5dcbe46d0f2e9e
 SHA512:
-  metadata.gz: fb98dba1f9b5c22af3dd9fe729193246cc2df3af90302cce7ab1c5b81d5c5f189192e25673aadbb82c8ac26eabb79054d496328ccbbab1d0b6340be0cccd7624
-  data.tar.gz: 590203f2b2e3788bf3d7e2d5039d445162060e0fa0a2b6978e7f17a33212e7b54fceb1d41e7aafa4ecfcee815a26eaf5756b2cdc68d0b6426f9f335937e2b54d
+  metadata.gz: b8d2c782c82ee06c6f434c3aa768c85fc6ba4d35ec2196d2e4318d8870ff84368284a6774ebe1ee6db82681cd8c5551be971d86e59a56251f6547750ed43f520
+  data.tar.gz: 03d4dad7d29603a97541db67089f27b3d44a36114592273e5e6d6a102785186021bdc3070da72a11d675a0e5b2d10b1e0b85ac287db24d59d1745e5250783d0c

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 sudo: false
 cache: bundler
-bundler_args: --without console
+bundler_args: --without console tools
 script:
   - bundle exec rake spec
 rvm:

data/CHANGELOG.md

@@ -1,8 +1,22 @@
+# v0.2.3 2016-05-11
+
+### Added
+
+* `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)
+
+[Compare v0.2.2...v0.2.3](https://github.com/dryrb/dry-logic/compare/v0.2.2...v0.2.3)
+
+
 # v0.2.2 2016-03-30
 
 ### Added
 
-* `number?` predicate (fran-worley)
+* `number?`, `odd?`, `even?` predicates (fran-worley)
 
 [Compare v0.2.1...v0.2.2](https://github.com/dryrb/dry-logic/compare/v0.2.1...v0.2.2)
 

data/lib/dry/logic/predicates.rb

@@ -130,17 +130,47 @@ module Dry
       end
 
       predicate(:inclusion?) do |list, input|
-        list.include?(input)
+        ::Kernel.warn 'inclusion is deprecated - use included_in instead.'
+        self[:included_in?].(list, input)
       end
 
       predicate(:exclusion?) do |list, input|
-        !self[:inclusion?].(list, input)
+        ::Kernel.warn 'exclusion is deprecated - use excluded_from instead.'
+        self[:excluded_from?].(list, input)
+      end
+
+      predicate(:included_in?) do |list, input|
+        list.include?(input)
+      end
+
+      predicate(:excluded_from?) do |list, input|
+        !list.include?(input)
+      end
+
+      predicate(:includes?) do |value, input|
+        begin
+          if input.respond_to?(:include?)
+            input.include?(value)
+          else
+            false
+          end
+        rescue TypeError
+          false
+        end
+      end
+
+      predicate(:excludes?) do |value, input|
+        !self[:includes?].(value, input)
       end
 
       predicate(:eql?) do |left, right|
         left.eql?(right)
       end
 
+      predicate(:not_eql?) do |left, right|
+        !left.eql?(right)
+      end
+
       predicate(:true?) do |value|
         value === true
       end

data/lib/dry/logic/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Logic
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

data/spec/unit/predicates/{exclusion_spec.rb → excluded_from_spec.rb}

@@ -1,8 +1,8 @@
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do
-  describe '#exclusion?' do
-    let(:predicate_name) { :exclusion? }
+  describe '#excluded_from?' do
+    let(:predicate_name) { :excluded_from? }
 
     context 'when value is not present in list' do
       let(:arguments_list) do

data/spec/unit/predicates/excludes_spec.rb

@@ -0,0 +1,56 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#excludes?' do
+    let(:predicate_name) { :excludes? }
+
+    context 'with input excludes value' do
+      let(:arguments_list) do
+        [
+          ['Jack', ['Jill', 'John']],
+          [0, 1..2],
+          [3, 1..2],
+          ['foo', 'Hello World'],
+          [:foo, { bar: 0 }],
+          [true, [nil, false]]
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with input of invalid type' do
+      let(:arguments_list) do
+        [
+          [2, 1],
+          [1, nil],
+          ["foo", 1],
+          [1, "foo"],
+          [1..2, "foo"],
+          ["foo", 1..2],
+          [:key, "foo"]
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when input includes value' do
+      let(:arguments_list) do
+        [
+          ['Jill', ['Jill', 'John']],
+          ['John', ['Jill', 'John']],
+          [1, 1..2],
+          [2, 1..2],
+          ['Hello', 'Hello World'],
+          ['World', 'Hello World'],
+          [:bar, { bar: 0 }],
+          [nil, [nil, false]],
+          [false, [nil, false]]
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/{inclusion_spec.rb → included_in_spec.rb}

@@ -1,8 +1,8 @@
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do
-  describe '#inclusion?' do
-    let(:predicate_name) { :inclusion? }
+  describe '#included_in?' do
+    let(:predicate_name) { :included_in? }
 
     context 'when value is present in list' do
       let(:arguments_list) do

data/spec/unit/predicates/includes_spec.rb

@@ -0,0 +1,56 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#includes?' do
+    let(:predicate_name) { :includes? }
+
+    context 'when input includes value' do
+      let(:arguments_list) do
+        [
+          ['Jill', ['Jill', 'John']],
+          ['John', ['Jill', 'John']],
+          [1, 1..2],
+          [2, 1..2],
+          ['Hello', 'Hello World'],
+          ['World', 'Hello World'],
+          [:bar, { bar: 0 }],
+          [nil, [nil, false]],
+          [false, [nil, false]]
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with input of invalid type' do
+      let(:arguments_list) do
+        [
+          [2, 1],
+          [1, nil],
+          ["foo", 1],
+          [1, "foo"],
+          [1..2, "foo"],
+          ["foo", 1..2],
+          [:key, "foo"]
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+
+    context 'with input excludes value' do
+      let(:arguments_list) do
+        [
+          ['Jack', ['Jill', 'John']],
+          [0, 1..2],
+          [3, 1..2],
+          ['foo', 'Hello World'],
+          [:foo, { bar: 0 }],
+          [true, [nil, false]]
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/not_eql_spec.rb

@@ -0,0 +1,21 @@
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates, '#not_eql?' do
+  let(:predicate_name) { :not_eql? }
+
+  context 'when value is equal to the arg' do
+    let(:arguments_list) do
+      [['Foo', 'Foo']]
+    end
+
+    it_behaves_like 'a failing predicate'
+  end
+
+  context 'with value is not equal to the arg' do
+    let(:arguments_list) do
+      [['Bar', 'Foo']]
+    end
+
+    it_behaves_like 'a passing predicate'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -139,14 +139,16 @@ files:
 - spec/unit/predicates/empty_spec.rb
 - spec/unit/predicates/eql_spec.rb
 - spec/unit/predicates/even_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
+- spec/unit/predicates/excluded_from_spec.rb
+- spec/unit/predicates/excludes_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
 - spec/unit/predicates/gt_spec.rb
 - spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/inclusion_spec.rb
+- spec/unit/predicates/included_in_spec.rb
+- spec/unit/predicates/includes_spec.rb
 - spec/unit/predicates/int_spec.rb
 - spec/unit/predicates/key_spec.rb
 - spec/unit/predicates/lt_spec.rb
@@ -154,6 +156,7 @@ files:
 - spec/unit/predicates/max_size_spec.rb
 - spec/unit/predicates/min_size_spec.rb
 - spec/unit/predicates/none_spec.rb
+- spec/unit/predicates/not_eql_spec.rb
 - spec/unit/predicates/number_spec.rb
 - spec/unit/predicates/odd_spec.rb
 - spec/unit/predicates/size_spec.rb
@@ -191,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition
@@ -207,14 +210,16 @@ test_files:
 - spec/unit/predicates/empty_spec.rb
 - spec/unit/predicates/eql_spec.rb
 - spec/unit/predicates/even_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
+- spec/unit/predicates/excluded_from_spec.rb
+- spec/unit/predicates/excludes_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
 - spec/unit/predicates/gt_spec.rb
 - spec/unit/predicates/gteq_spec.rb
-- spec/unit/predicates/inclusion_spec.rb
+- spec/unit/predicates/included_in_spec.rb
+- spec/unit/predicates/includes_spec.rb
 - spec/unit/predicates/int_spec.rb
 - spec/unit/predicates/key_spec.rb
 - spec/unit/predicates/lt_spec.rb
@@ -222,6 +227,7 @@ test_files:
 - spec/unit/predicates/max_size_spec.rb
 - spec/unit/predicates/min_size_spec.rb
 - spec/unit/predicates/none_spec.rb
+- spec/unit/predicates/not_eql_spec.rb
 - spec/unit/predicates/number_spec.rb
 - spec/unit/predicates/odd_spec.rb
 - spec/unit/predicates/size_spec.rb
@@ -239,4 +245,3 @@ test_files:
 - spec/unit/rule/set_spec.rb
 - spec/unit/rule/value_spec.rb
 - spec/unit/rule_compiler_spec.rb
-has_rdoc: