dry-validation 0.1.0 → 1.8.0

data/lib/dry/validation.rb

@@ -1,12 +1,60 @@
-require 'dry-equalizer'
-require 'dry-configurable'
-require 'dry-container'
+# frozen_string_literal: true
 
-# A collection of micro-libraries, each intended to encapsulate
-# a common task in Ruby
+require "dry/validation/constants"
+require "dry/validation/contract"
+require "dry/validation/macros"
+
+# Main namespace
+#
+# @api public
 module Dry
+  # Main library namespace
+  #
+  # @api public
   module Validation
+    extend Dry::Core::Extensions
+    extend Macros::Registrar
+
+    register_extension(:monads) do
+      require "dry/validation/extensions/monads"
+    end
+
+    register_extension(:hints) do
+      require "dry/validation/extensions/hints"
+    end
+
+    register_extension(:predicates_as_macros) do
+      require "dry/validation/extensions/predicates_as_macros"
+    end
+
+    # Define a contract and build its instance
+    #
+    # @example
+    #   my_contract = Dry::Validation.Contract do
+    #     params do
+    #       required(:name).filled(:string)
+    #     end
+    #   end
+    #
+    #   my_contract.call(name: "Jane")
+    #
+    # @param [Hash] options Contract options
+    #
+    # @see Contract
+    #
+    # @return [Contract]
+    #
+    # @api public
+    #
+    def self.Contract(options = EMPTY_HASH, &block)
+      Contract.build(options, &block)
+    end
+
+    # This is needed by Macros::Registrar
+    #
+    # @api private
+    def self.macros
+      Macros
+    end
   end
 end
-
-require 'dry/validation/schema'

data/lib/dry-validation.rb

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

metadata

@@ -1,64 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.8.0
 platform: ruby
 authors:
-- Andy Holland
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,81 +140,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Validation library
 email:
-- andyholland1991@aol.com
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - config/errors.yml
 - dry-validation.gemspec
-- examples/basic.rb
-- examples/nested.rb
-- examples/rule_ast.rb
 - lib/dry-validation.rb
 - lib/dry/validation.rb
-- lib/dry/validation/error.rb
-- lib/dry/validation/error_compiler.rb
-- lib/dry/validation/messages.rb
-- lib/dry/validation/predicate.rb
-- lib/dry/validation/predicate_set.rb
-- lib/dry/validation/predicates.rb
+- lib/dry/validation/config.rb
+- lib/dry/validation/constants.rb
+- lib/dry/validation/contract.rb
+- lib/dry/validation/contract/class_interface.rb
+- lib/dry/validation/evaluator.rb
+- lib/dry/validation/extensions/hints.rb
+- lib/dry/validation/extensions/monads.rb
+- lib/dry/validation/extensions/predicates_as_macros.rb
+- lib/dry/validation/failures.rb
+- lib/dry/validation/function.rb
+- lib/dry/validation/macro.rb
+- lib/dry/validation/macros.rb
+- lib/dry/validation/message.rb
+- lib/dry/validation/message_set.rb
+- lib/dry/validation/messages/resolver.rb
 - lib/dry/validation/result.rb
 - lib/dry/validation/rule.rb
-- lib/dry/validation/rule_compiler.rb
-- lib/dry/validation/schema.rb
-- lib/dry/validation/schema/definition.rb
-- lib/dry/validation/schema/key.rb
-- lib/dry/validation/schema/rule.rb
-- lib/dry/validation/schema/value.rb
+- lib/dry/validation/schema_ext.rb
+- lib/dry/validation/values.rb
 - lib/dry/validation/version.rb
-- rakelib/rubocop.rake
-- spec/fixtures/errors.yml
-- spec/integration/custom_error_messages_spec.rb
-- spec/integration/custom_predicates_spec.rb
-- spec/integration/validation_spec.rb
-- spec/shared/predicates.rb
-- spec/spec_helper.rb
-- spec/unit/error_compiler_spec.rb
-- spec/unit/predicate_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
-- spec/unit/predicates/filled_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/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/nil_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
-- spec/unit/rule_compiler_spec.rb
-homepage: https://github.com/dryrb/dry-validation
+homepage: https://dry-rb.org/gems/dry-validation
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-validation/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-validation
+  bug_tracker_uri: https://github.com/dry-rb/dry-validation/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,47 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: A simple validation library
-test_files:
-- spec/fixtures/errors.yml
-- spec/integration/custom_error_messages_spec.rb
-- spec/integration/custom_predicates_spec.rb
-- spec/integration/validation_spec.rb
-- spec/shared/predicates.rb
-- spec/spec_helper.rb
-- spec/unit/error_compiler_spec.rb
-- spec/unit/predicate_spec.rb
-- spec/unit/predicates/empty_spec.rb
-- spec/unit/predicates/eql_spec.rb
-- spec/unit/predicates/exclusion_spec.rb
-- spec/unit/predicates/filled_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/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/nil_spec.rb
-- spec/unit/predicates/size_spec.rb
-- spec/unit/predicates/str_spec.rb
-- spec/unit/rule/each_spec.rb
-- spec/unit/rule/key_spec.rb
-- spec/unit/rule/set_spec.rb
-- spec/unit/rule/value_spec.rb
-- spec/unit/rule_compiler_spec.rb
-has_rdoc: 
+summary: Validation library
+test_files: []

data/.gitignore

@@ -1,8 +0,0 @@
-.DS_Store
-coverage
-/.bundle
-vendor/bundle
-bin/
-tmp/
-.idea/
-Gemfile.lock

data/.rspec

@@ -1,3 +0,0 @@
---color
---require spec_helper
---order random

data/.rubocop.yml

@@ -1,16 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 100
-
-Style/Documentation:
-  Enabled: false
-
-Lint/HandleExceptions:
-  Exclude:
-    - rakelib/*.rake
-
-Style/FileName:
-  Exclude:
-    - lib/dry-validation.rb

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-10-30 01:32:46 +0000 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-bundler_args: --without console
-script:
-  - bundle exec rake spec
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - rbx-2
-  - jruby-9000
-  - ruby-head
-  - jruby-head
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/19098b4253a72c9796db
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

data/Gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :tools do
-  gem 'rubocop'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'byebug', platform: :mri
-end

data/Rakefile

@@ -1,12 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task default: :spec
-
-desc 'Run all specs in spec directory'
-RSpec::Core::RakeTask.new(:spec)

data/examples/basic.rb

@@ -1,21 +0,0 @@
-require 'dry-validation'
-
-class Schema < Dry::Validation::Schema
-  key(:email) { |email| email.filled? }
-
-  key(:age) do |age|
-    age.int? & age.gt?(18)
-  end
-end
-
-schema = Schema.new
-
-errors = schema.messages(email: 'jane@doe.org', age: 19)
-
-puts errors.inspect
-# []
-
-errors = schema.messages(email: nil, age: 19)
-
-puts errors.inspect
-# [[:email, ["email must be filled"]]]

data/examples/nested.rb

@@ -1,30 +0,0 @@
-require 'dry-validation'
-
-class Schema < Dry::Validation::Schema
-  key(:address) do |address|
-    address.key(:city) do |city|
-      city.min_size?(3)
-    end
-
-    address.key(:street) do |street|
-      street.filled?
-    end
-
-    address.key(:country) do |country|
-      country.key(:name, &:filled?)
-      country.key(:code, &:filled?)
-    end
-  end
-end
-
-schema = Schema.new
-
-errors = schema.messages({})
-
-puts errors.inspect
-#<Dry::Validation::Error::Set:0x007fc4f89c4360 @errors=[#<Dry::Validation::Error:0x007fc4f89c4108 @result=#<Dry::Validation::Result::Value success?=false input=nil rule=#<Dry::Validation::Rule::Key name=:address predicate=#<Dry::Validation::Predicate id=:key?>>>>]>
-
-errors = schema.messages(address: { city: 'NYC' })
-
-puts errors.inspect
-#<Dry::Validation::Error::Set:0x007fd151189b18 @errors=[#<Dry::Validation::Error:0x007fd151188e20 @result=#<Dry::Validation::Result::Set success?=false input={:city=>"NYC"} rule=#<Dry::Validation::Rule::Set name=:address predicate=[#<Dry::Validation::Rule::Conjunction left=#<Dry::Validation::Rule::Key name=:city predicate=#<Dry::Validation::Predicate id=:key?>> right=#<Dry::Validation::Rule::Value name=:city predicate=#<Dry::Validation::Predicate id=:min_size?>>>, #<Dry::Validation::Rule::Conjunction left=#<Dry::Validation::Rule::Key name=:street predicate=#<Dry::Validation::Predicate id=:key?>> right=#<Dry::Validation::Rule::Value name=:street predicate=#<Dry::Validation::Predicate id=:filled?>>>, #<Dry::Validation::Rule::Conjunction left=#<Dry::Validation::Rule::Key name=:country predicate=#<Dry::Validation::Predicate id=:key?>> right=#<Dry::Validation::Rule::Set name=:country predicate=[#<Dry::Validation::Rule::Conjunction left=#<Dry::Validation::Rule::Key name=:name predicate=#<Dry::Validation::Predicate id=:key?>> right=#<Dry::Validation::Rule::Value name=:name predicate=#<Dry::Validation::Predicate id=:filled?>>>, #<Dry::Validation::Rule::Conjunction left=#<Dry::Validation::Rule::Key name=:code predicate=#<Dry::Validation::Predicate id=:key?>> right=#<Dry::Validation::Rule::Value name=:code predicate=#<Dry::Validation::Predicate id=:filled?>>>]>>]>>>]>

data/examples/rule_ast.rb

@@ -1,33 +0,0 @@
-require 'dry-validation'
-
-ast = [
-  [
-    :and,
-    [
-      [:key, [:age, [:predicate, [:key?, []]]]],
-      [
-        :and,
-        [
-          [:val, [:age, [:predicate, [:filled?, []]]]],
-          [:val, [:age, [:predicate, [:gt?, [18]]]]]
-        ]
-      ]
-    ]
-  ]
-]
-
-compiler = Dry::Validation::RuleCompiler.new(Dry::Validation::Predicates)
-
-rules = compiler.call(ast)
-
-puts rules.inspect
-# [
-#   #<Dry::Validation::Rule::Conjunction
-#     left=#<Dry::Validation::Rule::Key name=:age predicate=#<Dry::Validation::Predicate id=:key?>>
-#     right=#<Dry::Validation::Rule::Conjunction
-#       left=#<Dry::Validation::Rule::Value name=:age predicate=#<Dry::Validation::Predicate id=:filled?>>
-#       right=#<Dry::Validation::Rule::Value name=:age predicate=#<Dry::Validation::Predicate id=:gt?>>>>
-# ]
-
-puts rules.map(&:to_ary).inspect
-# [[:and, [:key, [:age, [:predicate, [:key?, [:age]]]]], [[:and, [:val, [:age, [:predicate, [:filled?, []]]]], [[:val, [:age, [:predicate, [:gt?, [18]]]]]]]]]]

data/lib/dry/validation/error.rb

@@ -1,43 +0,0 @@
-module Dry
-  module Validation
-    class Error
-      class Set
-        include Enumerable
-
-        attr_reader :errors
-
-        def initialize
-          @errors = []
-        end
-
-        def each(&block)
-          errors.each(&block)
-        end
-
-        def empty?
-          errors.empty?
-        end
-
-        def <<(error)
-          errors << error
-        end
-
-        def to_ary
-          errors.map { |error| error.to_ary }
-        end
-        alias_method :to_a, :to_ary
-      end
-
-      attr_reader :result
-
-      def initialize(result)
-        @result = result
-      end
-
-      def to_ary
-        [:error, result.to_ary]
-      end
-      alias_method :to_a, :to_ary
-    end
-  end
-end

data/lib/dry/validation/error_compiler.rb

@@ -1,116 +0,0 @@
-module Dry
-  module Validation
-    class ErrorCompiler
-      attr_reader :messages
-
-      def initialize(messages)
-        @messages = messages
-      end
-
-      def call(ast)
-        ast.map { |node| visit(node) }
-      end
-
-      def visit(node, *args)
-        __send__(:"visit_#{node[0]}", node[1], *args)
-      end
-
-      def visit_error(error)
-        visit(error)
-      end
-
-      def visit_input(input, *args)
-        name, value, rules = input
-        [name, rules.map { |rule| visit(rule, name, value) }]
-      end
-
-      def visit_key(rule, name, value)
-        _, predicate = rule
-        visit(predicate, value, name)
-      end
-
-      def visit_val(rule, name, value)
-        name, predicate = rule
-        visit(predicate, value, name)
-      end
-
-      def visit_predicate(predicate, value, name)
-        messages.lookup(predicate[0], name, predicate[1][0]) % visit(predicate, value).merge(name: name)
-      end
-
-      def visit_key?(*args, value)
-        { name: args[0][0] }
-      end
-
-      def visit_empty?(*args, value)
-        { value: value }
-      end
-
-      def visit_exclusion?(*args, value)
-        { list: args[0][0].join(', ') }
-      end
-
-      def visit_inclusion?(*args, value)
-        { list: args[0][0].join(', ') }
-      end
-
-      def visit_gt?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_gteq?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_lt?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_lteq?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_int?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_max_size?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_min_size?(*args, value)
-        { num: args[0][0], value: value }
-      end
-
-      def visit_eql?(*args, value)
-        { eql_value: args[0][0], value: value }
-      end
-
-      def visit_size?(*args, value)
-        num = args[0][0]
-
-        if num.is_a?(Range)
-          { left: num.first, right: num.last, value: value }
-        else
-          { num: args[0][0], value: value }
-        end
-      end
-
-      def visit_str?(*args, value)
-        { value: value }
-      end
-
-      def visit_format?(*args, value)
-        {}
-      end
-
-      def visit_nil?(*args, value)
-        {}
-      end
-
-      def visit_filled?(*args)
-        {}
-      end
-    end
-  end
-end