dry-logic 0.6.1 → 1.0.6

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/logic/operations/unary'
 require 'dry/logic/evaluator'
 require 'dry/logic/result'
@@ -15,7 +17,7 @@ module Dry
             keys = options.fetch(:keys)
             evaluator = Evaluator::Set.new(keys)
 
-            super(rule, options.merge(evaluator: evaluator))
+            super(rule, **options, evaluator: evaluator)
           end
         end
 

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

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

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 = /\A[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}\z/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
@@ -114,7 +116,7 @@ module Dry
 
         def define_fixed_application
           parameters = unapplied_args.join(', ')
-          application = "@predicate[#{ (curried_args + unapplied_args).join(', ') }]"
+          application = "@predicate[#{(curried_args + unapplied_args).join(', ')}]"
 
           module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
             def call(#{parameters})

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.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-logic
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -94,28 +94,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Predicate logic with rule composition
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- benchmarks/rule_application.rb
-- benchmarks/setup.rb
-- bin/console
 - dry-logic.gemspec
-- examples/basic.rb
 - lib/dry-logic.rb
 - lib/dry/logic.rb
 - lib/dry/logic/appliable.rb
@@ -142,65 +131,14 @@ files:
 - lib/dry/logic/rule/predicate.rb
 - lib/dry/logic/rule_compiler.rb
 - lib/dry/logic/version.rb
-- spec/integration/result_spec.rb
-- spec/integration/rule_spec.rb
-- spec/shared/predicates.rb
-- spec/shared/rule.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/operations/and_spec.rb
-- spec/unit/operations/attr_spec.rb
-- spec/unit/operations/check_spec.rb
-- spec/unit/operations/each_spec.rb
-- spec/unit/operations/implication_spec.rb
-- spec/unit/operations/key_spec.rb
-- spec/unit/operations/negation_spec.rb
-- spec/unit/operations/or_spec.rb
-- spec/unit/operations/set_spec.rb
-- spec/unit/operations/xor_spec.rb
-- spec/unit/predicates/array_spec.rb
-- spec/unit/predicates/attr_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/case_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/even_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/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_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
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/predicates/true_spec.rb
-- spec/unit/predicates/type_spec.rb
-- spec/unit/predicates_spec.rb
-- spec/unit/rule/predicate_spec.rb
-- spec/unit/rule_compiler_spec.rb
-- spec/unit/rule_spec.rb
-homepage: https://github.com/dry-rb/dry-logic
+homepage: https://dry-rb.org/gems/dry-logic
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-logic/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-logic
+  bug_tracker_uri: https://github.com/dry-rb/dry-logic/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -209,7 +147,7 @@ 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:
   - - ">="
@@ -220,59 +158,4 @@ rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Predicate logic with rule composition
-test_files:
-- spec/integration/result_spec.rb
-- spec/integration/rule_spec.rb
-- spec/shared/predicates.rb
-- spec/shared/rule.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/operations/and_spec.rb
-- spec/unit/operations/attr_spec.rb
-- spec/unit/operations/check_spec.rb
-- spec/unit/operations/each_spec.rb
-- spec/unit/operations/implication_spec.rb
-- spec/unit/operations/key_spec.rb
-- spec/unit/operations/negation_spec.rb
-- spec/unit/operations/or_spec.rb
-- spec/unit/operations/set_spec.rb
-- spec/unit/operations/xor_spec.rb
-- spec/unit/predicates/array_spec.rb
-- spec/unit/predicates/attr_spec.rb
-- spec/unit/predicates/bool_spec.rb
-- spec/unit/predicates/case_spec.rb
-- spec/unit/predicates/date_spec.rb
-- spec/unit/predicates/date_time_spec.rb
-- spec/unit/predicates/decimal_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/even_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/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_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
-- spec/unit/predicates/str_spec.rb
-- spec/unit/predicates/time_spec.rb
-- spec/unit/predicates/true_spec.rb
-- spec/unit/predicates/type_spec.rb
-- spec/unit/predicates_spec.rb
-- spec/unit/rule/predicate_spec.rb
-- spec/unit/rule_compiler_spec.rb
-- spec/unit/rule_spec.rb
+test_files: []