dry-logic 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092fd6393e21a754ce653a7b24dfdcb2dacb719723b9e3bb6607c2ba73962bde'
-  data.tar.gz: 3b3a2407f0cdf5f4d17c3bae1888f32d8c63ca666cecc5d6266ee4604ce6f551
+  metadata.gz: 6a09361d1d78293fe7254b7c92dd29b26df899630db88cf5aa9c8a99b369eb38
+  data.tar.gz: 8aa9c03d77c492207dbef23a8b06d10f698e0f54def07e356847e4116eb9ca69
 SHA512:
-  metadata.gz: a0ddca4a58b60a896077cc5c1d4b66e4c54470fb4182475e343bc90e3cdb6ec0e913784fc0c992c6e247532cfcdd50c2d47f48f467f443b71cab0f92fbf5d6da
-  data.tar.gz: a164d2b12242437c48d035e0cb139b1a24373d1d79f074d6b718fb81e7a6303f23cfc85c352fbfe8fdd9adf9602e44049d0bdcb15689d376b43a5b56fce549a6
+  metadata.gz: 5780b5badd5db51a5bd8f8c275cf114a786d0860be4c949a88327b243476a779a020d4e3323e2561fa96ba87382e64b63cdc473b10ce346d13ea533fc67b1936
+  data.tar.gz: 649e7727b08808abf58378ffaa191796945070e45f2bf5c502b560f7c1a33506d5e17d55cef52c52827431d145bb1907bbc81622ff64870428cfdbd0afec3bdb

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# v1.0.3 2019-08-01
+
+### Added
+
+* `bytesize?` predicate (@bmalinconico)
+* `min_bytesize?` predicate (@bmalinconico)
+* `max_bytesize? predicate (@bmalinconico)
+
+### Changed
+
+* Min ruby version was set to `>= 2.4.0` (@flash-gordon)
+
+[Compare v1.0.2...v1.0.3](https://github.com/dry-rb/dry-logic/compare/v1.0.2...v1.0.3)
+
+# v1.0.2 2019-06-14
+
+Re-pushed 1.0.1 after dry-schema 1.2.0 release.
+
+[Compare v1.0.1...v1.0.2](https://github.com/dry-rb/dry-logic/compare/v1.0.1...v1.0.2)
+
 # v1.0.1 2019-06-04 (yanked)
 
 ### Added

data/README.md

@@ -1,5 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-logic
-[travis]: https://travis-ci.org/dry-rb/dry-logic
+[travis]: https://travis-ci.com/dry-rb/dry-logic
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-logic
 [chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-logic
@@ -7,7 +7,7 @@
 # dry-logic [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![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]
+[![Build Status](https://travis-ci.com/dry-rb/dry-logic.svg?branch=master)][travis]
 [![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/dry-logic.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-core', '~> 0.2'

data/lib/dry/logic/predicates.rb

@@ -59,11 +59,9 @@ module Dry
         end
 
         def number?(input)
-          begin
-            true if Float(input)
-          rescue ArgumentError, TypeError
-            false
-          end
+          true if Float(input)
+        rescue ArgumentError, TypeError
+          false
         end
 
         def int?(input)
@@ -116,7 +114,7 @@ module Dry
 
         def size?(size, input)
           case size
-          when Integer then size == input.size
+          when Integer then size.equal?(input.size)
           when Range, Array then size.include?(input.size)
           else
             raise ArgumentError, "+#{size}+ is not supported type for size? predicate."
@@ -131,6 +129,23 @@ module Dry
           input.size <= num
         end
 
+        def bytesize?(size, input)
+          case size
+          when Integer then size.equal?(input.bytesize)
+          when Range, Array then size.include?(input.bytesize)
+          else
+            raise ArgumentError, "+#{size}+ is not supported type for bytesize? predicate."
+          end
+        end
+
+        def min_bytesize?(num, input)
+          input.bytesize >= num
+        end
+
+        def max_bytesize?(num, input)
+          input.bytesize <= num
+        end
+
         def inclusion?(list, input)
           ::Kernel.warn 'inclusion is deprecated - use included_in instead.'
           included_in?(list, input)
@@ -150,15 +165,13 @@ module Dry
         end
 
         def includes?(value, input)
-          begin
-            if input.respond_to?(:include?)
-              input.include?(value)
-            else
-              false
-            end
-          rescue TypeError
+          if input.respond_to?(:include?)
+            input.include?(value)
+          else
             false
           end
+        rescue TypeError
+          false
         end
 
         def excludes?(value, input)
@@ -185,14 +198,8 @@ module Dry
           value.equal?(false)
         end
 
-        if RUBY_VERSION < '2.4'
-          def format?(regex, input)
-            !regex.match(input).nil?
-          end
-        else
-          def format?(regex, input)
-            regex.match?(input)
-          end
+        def format?(regex, input)
+          regex.match?(input)
         end
 
         def case?(pattern, input)

data/lib/dry/logic/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Logic
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

data/spec/unit/predicates/bytesize_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#bytesize?' do
+    let(:predicate_name) { :bytesize? }
+
+    context 'when value size is equal to n' do
+      let(:arguments_list) do
+        [
+          [4, 'こa'],
+          [1..8, 'こa']
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when value size is greater than n' do
+      let(:arguments_list) do
+        [
+          [3, 'こa'],
+          [1..3, 'こa']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+
+    context 'with value size is less than n' do
+      let(:arguments_list) do
+        [
+          [5, 'こa'],
+          [5..10, 'こa']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+
+    context 'with an unsupported size' do
+      it 'raises an error' do
+        expect { Predicates[:bytesize?].call('oops', 1) }.to raise_error(ArgumentError, /oops/)
+      end
+    end
+  end
+end

data/spec/unit/predicates/hash_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#hash?' do
+    let(:predicate_name) { :hash? }
+
+    context 'when value is a hash' do
+      let(:arguments_list) do
+        [
+          [{}],
+          [foo: :bar],
+          [Hash.new]
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when value is not a hash' do
+      let(:arguments_list) do
+        [
+          [''],
+          [[]],
+          [nil],
+          [:symbol],
+          [String],
+          [1],
+          [1.0],
+          [true],
+          [Array.new],
+          [Hash]
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/max_bytesize_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#max_bytesize?' do
+    let(:predicate_name) { :max_bytesize? }
+
+    context 'when value size is less than n' do
+      let(:arguments_list) do
+        [
+          [5, 'こa']
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when value size is equal to n' do
+      let(:arguments_list) do
+        [
+          [5, 'こab']
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with value size is greater than n' do
+      let(:arguments_list) do
+        [
+          [5, 'こabc']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

data/spec/unit/predicates/min_bytesize_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'dry/logic/predicates'
+
+RSpec.describe Dry::Logic::Predicates do
+  describe '#min_bytesize?' do
+    let(:predicate_name) { :min_bytesize? }
+
+    context 'when value size is greater than n' do
+      let(:arguments_list) do
+        [
+          [3, 'こa']
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'when value size is equal to n' do
+      let(:arguments_list) do
+        [
+          [5, 'こab']
+        ]
+      end
+
+      it_behaves_like 'a passing predicate'
+    end
+
+    context 'with value size is less than n' do
+      let(:arguments_list) do
+        [
+          [5, 'こ']
+        ]
+      end
+
+      it_behaves_like 'a failing predicate'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -161,6 +161,7 @@ files:
 - spec/unit/predicates/array_spec.rb
 - spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
+- spec/unit/predicates/bytesize_spec.rb
 - spec/unit/predicates/case_spec.rb
 - spec/unit/predicates/date_spec.rb
 - spec/unit/predicates/date_time_spec.rb
@@ -176,13 +177,16 @@ files:
 - spec/unit/predicates/format_spec.rb
 - spec/unit/predicates/gt_spec.rb
 - spec/unit/predicates/gteq_spec.rb
+- spec/unit/predicates/hash_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
 - spec/unit/predicates/lteq_spec.rb
+- spec/unit/predicates/max_bytesize_spec.rb
 - spec/unit/predicates/max_size_spec.rb
+- spec/unit/predicates/min_bytesize_spec.rb
 - spec/unit/predicates/min_size_spec.rb
 - spec/unit/predicates/none_spec.rb
 - spec/unit/predicates/not_eql_spec.rb
@@ -211,14 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition
@@ -242,6 +246,7 @@ test_files:
 - spec/unit/predicates/array_spec.rb
 - spec/unit/predicates/attr_spec.rb
 - spec/unit/predicates/bool_spec.rb
+- spec/unit/predicates/bytesize_spec.rb
 - spec/unit/predicates/case_spec.rb
 - spec/unit/predicates/date_spec.rb
 - spec/unit/predicates/date_time_spec.rb
@@ -257,13 +262,16 @@ test_files:
 - spec/unit/predicates/format_spec.rb
 - spec/unit/predicates/gt_spec.rb
 - spec/unit/predicates/gteq_spec.rb
+- spec/unit/predicates/hash_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
 - spec/unit/predicates/lteq_spec.rb
+- spec/unit/predicates/max_bytesize_spec.rb
 - spec/unit/predicates/max_size_spec.rb
+- spec/unit/predicates/min_bytesize_spec.rb
 - spec/unit/predicates/min_size_spec.rb
 - spec/unit/predicates/none_spec.rb
 - spec/unit/predicates/not_eql_spec.rb