dry-logic 0.6.1 → 1.0.5

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/binary'
 require 'dry/logic/result'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/unary'
 require 'dry/logic/evaluator'
 require 'dry/logic/result'
@@ -10,13 +12,13 @@ module Dry
 
         attr_reader :path
 
-        def self.new(rules, options)
+        def self.new(rules, **options)
           if options[:evaluator]
             super
           else
             name = options.fetch(:name)
             eval = options.fetch(:evaluator, evaluator(name))
-            super(rules, options.merge(evaluator: eval, path: name))
+            super(rules, **options, evaluator: eval, path: name)
           end
         end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/unary'
 require 'dry/logic/result'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/binary'
 require 'dry/logic/result'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/abstract'
 require 'dry/logic/result'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/abstract'
 
 module Dry

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/binary'
 require 'dry/logic/result'
 

data/lib/dry/logic/operators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
     module Operators

data/lib/dry/logic/predicates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'date'
@@ -57,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)
@@ -114,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."
@@ -129,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)
@@ -148,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)
@@ -183,20 +198,23 @@ 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)
+          !input.nil? && regex.match?(input)
         end
 
         def case?(pattern, input)
           pattern === input
         end
 
+        def uuid_v4?(input)
+          uuid_v4_format = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+          format?(uuid_v4_format, input)
+        end
+
+        def respond_to?(method, input)
+          input.respond_to?(method)
+        end
+
         def predicate(name, &block)
           define_singleton_method(name, &block)
         end

data/lib/dry/logic/result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/constants'
 
 module Dry

data/lib/dry/logic/rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'concurrent/map'
 require 'dry/core/constants'
 require 'dry/equalizer'
@@ -66,11 +68,11 @@ module Dry
 
       def bind(object)
         if predicate.respond_to?(:bind)
-          self.class.build(predicate.bind(object), options)
+          self.class.build(predicate.bind(object), **options)
         else
           self.class.build(
             -> *args { object.instance_exec(*args, &predicate) },
-            options.merge(arity: arity, parameters: parameters)
+            **options, arity: arity, parameters: parameters
           )
         end
       end
@@ -80,7 +82,7 @@ module Dry
       end
 
       def with(new_opts)
-        self.class.build(predicate, options.merge(new_opts))
+        self.class.build(predicate, **options, **new_opts)
       end
 
       def parameters

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
     class Rule

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/rule'
 
 module Dry

data/lib/dry/logic/rule_compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/constants'
 
 require 'dry/logic/rule'

data/lib/dry/logic/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dry
   module Logic
-    VERSION = '0.6.1'.freeze
+    VERSION = '1.0.5'
   end
 end

data/spec/integration/result_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Result do
   include_context 'predicates'
 

data/spec/integration/rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry-logic'
 
 RSpec.describe 'Rules' do

data/spec/shared/predicates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/predicates'
 
 RSpec.shared_examples 'predicates' do

data/spec/shared/rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples_for Dry::Logic::Rule do
   let(:arity) { 2 }
   let(:predicate) { double(:predicate, arity: arity, name: predicate_name) }

data/spec/spec_helper.rb

@@ -1,13 +1,9 @@
-if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
-  require 'yaml'
-  rubies = YAML.load(File.read(File.join(__dir__, '..', '.travis.yml')))['rvm']
-  latest_mri = rubies.select { |v| v =~ /\A\d+\.\d+.\d+\z/ }.max
-
-  if RUBY_VERSION == latest_mri
-    require 'simplecov'
-    SimpleCov.start do
-      add_filter '/spec/'
-    end
+# frozen_string_literal: true
+
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
   end
 end
 

data/spec/support/mutant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mutant
   class Selector
     class Expression < self

data/spec/unit/operations/and_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::And do
   subject(:operation) { Operations::And.new(left, right) }
 

data/spec/unit/operations/attr_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Attr do
   subject(:operation) { Operations::Attr.new(Rule::Predicate.build(str?), name: :name) }
 

data/spec/unit/operations/check_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Check do
   include_context 'predicates'
 

data/spec/unit/operations/each_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Each do
   subject(:operation) { Operations::Each.new(is_string) }
 

data/spec/unit/operations/implication_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Implication do
   subject(:operation) { Operations::Implication.new(left, right) }
 

data/spec/unit/operations/key_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Key do
   subject(:operation) { Operations::Key.new(predicate, name: :user) }
 

data/spec/unit/operations/negation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Negation do
   subject(:operation) { Operations::Negation.new(is_int) }
 

data/spec/unit/operations/or_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Or do
   subject(:operation) { Operations::Or.new(left, right) }
 

data/spec/unit/operations/set_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Set do
   subject(:operation) { Operations::Set.new(is_int, gt_18) }
 

data/spec/unit/operations/xor_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Operations::Xor do
   subject(:operation) { Operations::Xor.new(left, right) }
 

data/spec/unit/predicates/array_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do

data/spec/unit/predicates/attr_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do

data/spec/unit/predicates/bool_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'dry/logic/predicates'
 
 RSpec.describe Dry::Logic::Predicates do
   describe '#bool?' do
     let(:predicate_name) { :bool? }
 
-    context 'when value is a date' do
+    context 'when value is a boolean' do
       let(:arguments_list) do
         [[true], [false]]
       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