dry-logic 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092fd6393e21a754ce653a7b24dfdcb2dacb719723b9e3bb6607c2ba73962bde'
-  data.tar.gz: 3b3a2407f0cdf5f4d17c3bae1888f32d8c63ca666cecc5d6266ee4604ce6f551
+  metadata.gz: 828bea190b3733a29b940d0fa6bbb1270bb12ee6bbbef77d1ce6bbfd7ff11a27
+  data.tar.gz: 319087e0aa57490d3a0bbff76efd6b01119a55135de7dbe0829d64cfee604d82
 SHA512:
-  metadata.gz: a0ddca4a58b60a896077cc5c1d4b66e4c54470fb4182475e343bc90e3cdb6ec0e913784fc0c992c6e247532cfcdd50c2d47f48f467f443b71cab0f92fbf5d6da
-  data.tar.gz: a164d2b12242437c48d035e0cb139b1a24373d1d79f074d6b718fb81e7a6303f23cfc85c352fbfe8fdd9adf9602e44049d0bdcb15689d376b43a5b56fce549a6
+  metadata.gz: 5e3d3d3d7c486aec5e4c01ebc15f90ba485dfe4d10086c11a732ea3ffac5749de02b4ecc0fb0beafe8bcc593fa07286c1c8c30f2973baaf70598a3f212e949eb
+  data.tar.gz: beb0445b376e9e8f545615d69af4c7cc1ad76db1ac55de9bd54784d8ff914165afec81ce174843efac5cffeda8bba494bca9e686d75052f00dee87abbfef03b3

data/CHANGELOG.md

@@ -1,39 +1,112 @@
-# v1.0.1 2019-06-04 (yanked)
+## 1.0.7 2020-08-13
+
+
+### Added
+
+- A new `uri?` predicate that you can use to verify `URI` strings, ie `uri?("https", "https://dry-rb.org")` (@nerburish)
+- New predicates: `uuid_v1?`, `uuid_v2?`, `uuid_v3?` and `uuid_v5?` (via #75) (@jamesbrauman)
+
+
+[Compare v1.0.6...v1.0.7](https://github.com/dry-rb/dry-logic/compare/v1.0.6...v1.0.7)
+
+## 1.0.6 2020-02-10
+
+
+### Fixed
+
+- Made the regexp used by `uuid_v4?` more secure (@kml)
+
+
+[Compare v1.0.5...v1.0.6](https://github.com/dry-rb/dry-logic/compare/v1.0.5...v1.0.6)
+
+## 1.0.5 2019-11-07
+
+
+### Fixed
+
+- Make `format?` tolerant to `nil` values. It already worked like that before, but starting Ruby 2.7 it would produce warnings. Now it won't. Don't rely on this behavior, it's only added to make tests pass in dry-schema. Use explicit type checks instead (@flash-gordon)
+
+
+[Compare v1.0.4...v1.0.5](https://github.com/dry-rb/dry-logic/compare/v1.0.4...v1.0.5)
+
+## 1.0.4 2019-11-06
+
+
+### Fixed
+
+- Fix keyword warnings (@flash-gordon)
+
+
+[Compare v1.0.3...v1.0.4](https://github.com/dry-rb/dry-logic/compare/v1.0.3...v1.0.4)
+
+## 1.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)
+
+## 1.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)
+
+## 1.0.1 2019-06-04
+
+This release was removed from rubygems because it broke dry-schema.
 
 ### Added
 
 - `uuid_v4?` predicate (radar)
 - `respond_to?` predicate (waiting-for-dev)
 
+
 [Compare v1.0.0...v1.0.1](https://github.com/dry-rb/dry-logic/compare/v1.0.0...v1.0.1)
 
-This release was removed from rubygems because it broke dry-schema.
+## 1.0.0 2019-04-23
+
 
-# v1.0.0 2019-04-23
+### Changed
 
-* Version bump to `1.0.0` (flash-gordon)
+- Version bump to `1.0.0` (flash-gordon)
 
 [Compare v0.6.1...v1.0.0](https://github.com/dry-rb/dry-logic/compare/v0.6.1...v1.0.0)
 
-# v0.6.1 2019-04-18
+## 0.6.1 2019-04-18
+
+
+### Fixed
+
+- Fix a regression in dry-validation 0.x for argument-less predicates (flash-gordon)
 
-* Fix a regression in dry-validation 0.x for argument-less predicates (flash-gordon)
 
 [Compare v0.6.0...v0.6.1](https://github.com/dry-rb/dry-logic/compare/v0.6.0...v0.6.1)
 
-# v0.6.0 2019-04-04
+## 0.6.0 2019-04-04
+
 
 ### Added
 
-* Generating hints can be disabled by building `Operations::And` with `hints: false` option set (solnic)
+- Generating hints can be disabled by building `Operations::And` with `hints: false` option set (solnic)
 
 ### Changed
 
-* `Rule` construction has been optimized so that currying and application is multiple-times faster (flash-gordon)
+- `Rule` construction has been optimized so that currying and application is multiple-times faster (flash-gordon)
 
 [Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-logic/compare/v0.5.0...v0.6.0)
 
-# v0.5.0 2019-01-29
+## 0.5.0 2019-01-29
+
 
 ### Added
 
@@ -43,9 +116,11 @@ This release was removed from rubygems because it broke dry-schema.
 
 - `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
+## 0.4.2 2017-09-15
+
 
 ### Added
 
@@ -56,21 +131,23 @@ This release was removed from rubygems because it broke dry-schema.
 
 - 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)
 
-# v0.4.1 2017-01-23
+## 0.4.1 2017-01-23
 
-### Changed
-
-- Predicates simply reuse other predicate methods instead of referring to them via `#[]` (georgemillo)
 
 ### Fixed
 
 - Warnings on MRI 2.4.0 are gone (jtippett)
 
+### Changed
+
+- Predicates simply reuse other predicate methods instead of referring to them via `#[]` (georgemillo)
+
 [Compare v0.4.0...v0.4.1](https://github.com/dry-rb/dry-logic/compare/v0.4.0...v0.4.1)
 
-# v0.4.0 2016-09-21
+## 0.4.0 2016-09-21
 
 This is a partial rewrite focused on internal clean up and major performance improvements. This is also the beginning of the work to make this library first-class rather than "just" a rule backend for dry-validation and dry-types.
 
@@ -98,7 +175,8 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 [Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-logic/compare/v0.3.0...v0.4.0)
 
-# v0.3.0 2016-07-01
+## 0.3.0 2016-07-01
+
 
 ### Added
 
@@ -113,7 +191,8 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 [Compare v0.2.3...v0.3.0](https://github.com/dry-rb/dry-logic/compare/v0.2.3...v0.3.0)
 
-# v0.2.3 2016-05-11
+## 0.2.3 2016-05-11
+
 
 ### Added
 
@@ -126,21 +205,28 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 [Compare v0.2.2...v0.2.3](https://github.com/dry-rb/dry-logic/compare/v0.2.2...v0.2.3)
 
-# v0.2.2 2016-03-30
+## 0.2.2 2016-03-30
+
 
 ### Added
 
 - `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)
 
-# v0.2.1 2016-03-20
+## 0.2.1 2016-03-20
+
 
 ### Fixed
 
 - Result AST for `Rule::Each` correctly maps elements with eql inputs (solnic)
 
-# v0.2.0 2016-03-11
+
+[Compare v0.2.0...v0.2.1](https://github.com/dry-rb/dry-logic/compare/v0.2.0...v0.2.1)
+
+## 0.2.0 2016-03-11
+
 
 ### Changed
 
@@ -148,16 +234,19 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 [Compare v0.1.4...v0.2.0](https://github.com/dry-rb/dry-logic/compare/v0.1.4...v0.2.0)
 
-# v0.1.4 2016-01-27
+## 0.1.4 2016-01-27
+
 
 ### Added
 
 - 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)
 
-# v0.1.3 2016-01-27
+## 0.1.3 2016-01-27
+
 
 ### Added
 
@@ -169,15 +258,18 @@ This is a partial rewrite focused on internal clean up and major performance imp
 
 [Compare v0.1.2...v0.1.3](https://github.com/dry-rb/dry-logic/compare/v0.1.2...v0.1.3)
 
-# v0.1.2 2016-01-19
+## 0.1.2 2016-01-19
+
 
 ### Fixed
 
 - `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)
 
-# v0.1.1 2016-01-18
+## 0.1.1 2016-01-18
+
 
 ### Added
 
@@ -185,8 +277,9 @@ This is a partial rewrite focused on internal clean up and major performance imp
 - `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)
 
-# v0.1.0 2016-01-11
+## 0.1.0 2016-01-11
 
 Code extracted from dry-validation 0.4.1

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Ruby Object Mapper
+Copyright (c) 2015-2020 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,30 +1,28 @@
 [gem]: https://rubygems.org/gems/dry-logic
-[travis]: https://travis-ci.org/dry-rb/dry-logic
-[codeclimate]: https://codeclimate.com/github/dry-rb/dry-logic
+[actions]: https://github.com/dry-rb/dry-logic/actions
+[codacy]: https://www.codacy.com/gh/dry-rb/dry-logic
 [chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-logic
 
 # 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]
-[![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]
+[![CI Status](https://github.com/dry-rb/dry-logic/workflows/ci/badge.svg)][actions]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3ac6ea12c2dd42beb36dc3abe63d9606)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/3ac6ea12c2dd42beb36dc3abe63d9606)][codacy]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-logic.svg?branch=master)][inchpages]
 
-Predicate logic and rule composition used by:
-
-* [dry-types](https://github.com/dry-rb/dry-types) for constrained types
-* [dry-schema](https://github.com/dry-rb/dry-schema) and [dry-validation](https://github.com/dry-rb/dry-validation) for composing validation rules
-* your project...?
-
 ## Links
 
-* [Documentation](http://dry-rb.org/gems/dry-logic)
+* [User documentation](http://dry-rb.org/gems/dry-logic)
+* [API documentation](http://rubydoc.info/gems/dry-logic)
+
+## Supported Ruby versions
 
-## Contributing
+This library officially supports the following Ruby versions:
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/dry-rb/dry-logic.
+* MRI >= `2.4`
+* jruby >= `9.2`
 
 ## License
 

data/dry-logic.gemspec

@@ -1,25 +1,38 @@
 # frozen_string_literal: true
+# this file is managed by dry-rb/devtools project
 
-require File.expand_path('../lib/dry/logic/version', __FILE__)
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'dry/logic/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'dry-logic'
-  spec.version       = Dry::Logic::VERSION
-  spec.authors       = ['Piotr Solnica']
-  spec.email         = ['piotr.solnica@gmail.com']
-  spec.summary       = 'Predicate logic with rule composition'
-  spec.homepage      = 'https://github.com/dry-rb/dry-logic'
+  spec.authors       = ["Piotr Solnica"]
+  spec.email         = ["piotr.solnica@gmail.com"]
   spec.license       = 'MIT'
+  spec.version       = Dry::Logic::VERSION.dup
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.summary       = "Predicate logic with rule composition"
+  spec.description   = spec.summary
+  spec.homepage      = 'https://dry-rb.org/gems/dry-logic'
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-logic.gemspec", "lib/**/*"]
+  spec.bindir        = 'bin'
+  spec.executables   = []
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'dry-core', '~> 0.2'
-  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-logic/blob/master/CHANGELOG.md'
+  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-logic'
+  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-logic/issues'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.required_ruby_version = ">= 2.4.0"
+
+  # to update dependencies edit project.yml
+  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_runtime_dependency "dry-core", "~> 0.2"
+  spec.add_runtime_dependency "dry-equalizer", "~> 0.2"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/dry-logic.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/logic'
+require "dry/logic"

data/lib/dry/logic.rb

@@ -7,5 +7,5 @@ module Dry
   end
 end
 
-require 'dry/logic/rule/predicate'
-require 'dry/logic/operations'
+require "dry/logic/rule/predicate"
+require "dry/logic/operations"

data/lib/dry/logic/evaluator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
+require "dry/equalizer"
 
 module Dry
   module Logic

data/lib/dry/logic/operations.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'dry/logic/operations/and'
-require 'dry/logic/operations/or'
-require 'dry/logic/operations/xor'
-require 'dry/logic/operations/implication'
-require 'dry/logic/operations/negation'
+require "dry/logic/operations/and"
+require "dry/logic/operations/or"
+require "dry/logic/operations/xor"
+require "dry/logic/operations/implication"
+require "dry/logic/operations/negation"
 
-require 'dry/logic/operations/key'
-require 'dry/logic/operations/attr'
-require 'dry/logic/operations/each'
-require 'dry/logic/operations/set'
-require 'dry/logic/operations/check'
+require "dry/logic/operations/key"
+require "dry/logic/operations/attr"
+require "dry/logic/operations/each"
+require "dry/logic/operations/set"
+require "dry/logic/operations/check"
 
-require 'dry/logic/operators'
+require "dry/logic/operators"

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/core/constants'
-require 'dry/equalizer'
-require 'dry/logic/operators'
+require "dry/core/constants"
+require "dry/equalizer"
+require "dry/logic/operators"
 
 module Dry
   module Logic
@@ -26,15 +26,15 @@ module Dry
         end
 
         def curry(*args)
-          new(rules.map { |rule| rule.curry(*args) }, options)
+          new(rules.map { |rule| rule.curry(*args) }, **options)
         end
 
         def new(rules, **new_options)
-          self.class.new(*rules, options.merge(new_options))
+          self.class.new(*rules, **options, **new_options)
         end
 
         def with(new_options)
-          new(rules, options.merge(new_options))
+          new(rules, **options, **new_options)
         end
 
         def to_ast