dry-validation 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314845939a2cffa9f1539ca496a6c8e28ee3e0c79e8d53c3c3c165018de1eab8
-  data.tar.gz: fb0ee3dafaa196343d5e57127bbb2bc5b783fc8705e6c00b90c39893fa2e0d2e
+  metadata.gz: 6ae84a30ea54b0e41206d6bca9ca4b7c9a579b865d3c4ca205f4a762e2756c74
+  data.tar.gz: af35e1f8f6a8888b24439078ab5baf069dc46f6ecf60ff539cc818989c2fd997
 SHA512:
-  metadata.gz: de6234d7457bc03e2a7008d57eaaff497b2fb1ea5fd822dddfa124cb5f56a5b674d76b65fe48ebe4e21dc9808411f9fcf7d93583bef0dffb8aeae067c352a290
-  data.tar.gz: 88fc65c6103bbc8fe3e7789dfe7aa1db71f6ff1882e34d6acf2c2d8ad8d3577e0ab8e36349c0d0eaaf933159d76e47602491cb35c50aff8fca1e0cf62280280c
+  metadata.gz: ee96f24719da71e1d21526d8786576a5e01637e79950b00f7bc24fcba334fa741cdd55631f3eba8aff682146321a6a87bba13704face8d9b2e4034964070a60d
+  data.tar.gz: '092f8d1d7ce01fe4676bc992af82fddf9e25f919a1147b5992e8a87048b12f3067adc5d96105d03e884ec33138dc8c64ce4a1bbcce555c15c19590d5fdff6ec0'

data/.travis.yml

@@ -11,7 +11,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4.1
-  - jruby-9.1.5.0
+  - jruby-9.1.13.0
 env:
   global:
     - COVERAGE=true

data/CHANGELOG.md

@@ -1,7 +1,17 @@
+# v0.12.0 2018-05-31
+
+### Changed
+
+* Code updated to work with `dry-types` 0.13.1 and `dry-struct` 0.5.0, these are now minimal supported versions (flash-gordon)
+* [BREAKING] `Form` was renamed to `Params` to be consistent with the latest changes from `dry-types`. You can `require 'dry/validation/compat/form'` to use the previous names but it will be removed in the next version (flash-gordon)
+
+[Compare v0.11.1...v0.12.0](https://github.com/dry-rb/dry-validation/compare/v0.11.0...v0.12.0)
+
 # v0.11.1 2017-09-15
 
 ### Changed
 
+* `Result#to_either` was renamed to `#to_monad`, the previous name is kept for backward compatibility (flash-gordon)
 * [internal] fix warnings from dry-types v0.12.0
 
 [Compare v0.11.0...v0.11.1](https://github.com/dry-rb/dry-validation/compare/v0.11.0...v0.11.1)

data/Gemfile

@@ -2,23 +2,25 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'dry-logic', git: 'https://github.com/dry-rb/dry-logic', branch: 'master'
+
 group :test do
   gem 'i18n', require: false
   platform :mri do
     gem 'codeclimate-test-reporter', require: false
     gem 'simplecov', require: false
   end
-  gem 'dry-monads', '< 1.0', require: false
+  gem 'dry-monads', '>= 0.4.0', require: false
   gem 'dry-struct', require: false
 end
 
 group :tools do
-  gem 'byebug', platform: :mri
-  gem 'pry'
+  gem 'pry-byebug', platform: :mri
+  gem 'pry', platform: :jruby
 
   unless ENV['TRAVIS']
-    gem 'mutant', github: 'mbj/mutant'
-    gem 'mutant-rspec', github: 'mbj/mutant'
+    gem 'mutant', git: 'https://github.com/mbj/mutant'
+    gem 'mutant-rspec', git: 'https://github.com/mbj/mutant'
   end
 end
 

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-validation
 [travis]: https://travis-ci.org/dry-rb/dry-validation
-[gemnasium]: https://gemnasium.com/dry-rb/dry-validation
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-validation
 [coveralls]: https://coveralls.io/r/dry-rb/dry-validation
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-validation
@@ -9,11 +8,14 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-validation.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-validation.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-validation.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-validation/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-validation/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-validation.svg?branch=master)][inchpages]
 
+## Status
+
+We're working on a new foundation for dry-validation, called dry-schema. You can see progress in [this PR](https://github.com/dry-rb/dry-schema/pull/3). This will result in a partial rewrite for 1.0.0 version. Currently known bugs/issues will be addressed in 1.0.0, **not in 0.x** due to lack of time. More info about 1.0.0 plans can be found [in this thread](https://discourse.dry-rb.org/t/plans-for-dry-validation-dry-schema-a-new-gem/215/3).
+
 ## Links
 
 * [Documentation](http://dry-rb.org/gems/dry-validation)

data/Rakefile

@@ -8,13 +8,15 @@ require 'rspec/core/rake_task'
 
 desc 'Run all specs in spec directory'
 task :run_specs do
-
-  RSpec::Core::Runner.run(['spec/integration', 'spec/unit'])
+  core_result = RSpec::Core::Runner.run(['spec/integration', 'spec/unit'])
   RSpec.clear_examples
+
   Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:load))
 
   Dry::Validation.load_extensions(:monads, :struct)
-  RSpec::Core::Runner.run(['spec'])
+  ext_result = RSpec::Core::Runner.run(['spec'])
+
+  exit [core_result, ext_result].max
 end
 
 task default: :run_specs

data/benchmarks/benchmark_form_invalid.rb

@@ -28,14 +28,14 @@ schema = Dry::Validation.Schema do
   required(:age).filled(:int?, gt?: 18)
 end
 
-form = Dry::Validation.Form do
+form = Dry::Validation.Params do
   configure do
     config.messages = :i18n
     config.type_specs = true
   end
 
   required(:email, :string).filled
-  required(:age, :int).filled(:int?, gt?: 18)
+  required(:age, :integer).filled(:int?, gt?: 18)
 end
 
 params = { 'email' => '', 'age' => '18' }

data/benchmarks/benchmark_form_valid.rb

@@ -28,14 +28,14 @@ schema = Dry::Validation.Schema do
   required(:age).filled(:int?, gt?: 18)
 end
 
-form = Dry::Validation.Form do
+form = Dry::Validation.Params do
   configure do
     config.messages = :i18n
     config.type_specs = true
   end
 
   required(:email, :string).filled
-  required(:age, :int).filled(:int?, gt?: 18)
+  required(:age, :integer).filled(:int?, gt?: 18)
 end
 
 params = { 'email' => 'foo@bar.baz', 'age' => '19' }

data/dry-validation.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1', '>= 0.1.3'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-types', '~> 0.12.0'
-  spec.add_runtime_dependency 'dry-logic', '~> 0.4.2'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.4', '>= 0.4.0'
+  spec.add_runtime_dependency 'dry-types', '~> 0.13.1'
   spec.add_runtime_dependency 'dry-core', '~> 0.2', '>= 0.2.1'
 
   spec.add_development_dependency 'bundler'

data/examples/{form.rb → params.rb}

@@ -1,6 +1,6 @@
 require 'dry-validation'
 
-schema = Dry::Validation.Form do
+schema = Dry::Validation.Params do
   required(:email).filled
 
   required(:age).filled(:int?, gt?: 18)

data/lib/dry/validation.rb

@@ -24,8 +24,8 @@ module Dry
       end
     end
 
-    def self.Form(base = nil, **options, &block)
-      klass = base ? Schema::Form.configure(Class.new(base)) : Schema::Form
+    def self.Params(base = nil, **options, &block)
+      klass = base ? Schema::Params.configure(Class.new(base)) : Schema::Params
       Validation.Schema(klass, options, &block)
     end
 
@@ -37,7 +37,7 @@ module Dry
 end
 
 require 'dry/validation/schema'
-require 'dry/validation/schema/form'
+require 'dry/validation/schema/params'
 require 'dry/validation/schema/json'
 require 'dry/validation/extensions'
 require 'dry/validation/version'

data/lib/dry/validation/{input_processor_compiler → compat}/form.rb

@@ -1,3 +1,13 @@
+require 'dry/core/deprecations'
+
+Dry::Core::Deprecations.warn('Form was renamed to Params and will be removed in the next version', tag: :'dry-validation')
+
+require 'dry/types/compat/int'
+require 'dry/types/compat/form_types'
+require 'dry/validation/input_processor_compiler/params'
+require 'dry/validation/schema/params'
+
+
 module Dry
   module Validation
     class InputProcessorCompiler::Form < InputProcessorCompiler
@@ -8,7 +18,7 @@ module Dry
         true?: 'form.true',
         false?: 'form.false',
         str?: 'string',
-        int?: 'form.int',
+        int?: 'form.integer',
         float?: 'form.float',
         decimal?: 'form.decimal',
         date?: 'form.date',
@@ -21,7 +31,7 @@ module Dry
       CONST_MAP = {
         NilClass => 'form.nil',
         String => 'string',
-        Integer => 'form.int',
+        Integer => 'form.integer',
         Float => 'form.float',
         BigDecimal => 'form.decimal',
         Array => 'form.array',
@@ -45,5 +55,13 @@ module Dry
         [:form_array, [members, {}]]
       end
     end
+
+    class << self
+      alias_method :Form, :Params
+    end
+
+    Schema::Form = Schema::Params
+
+    Schema::DEFAULT_PROCESSOR_MAP[:form] = InputProcessorCompiler::Form.new
   end
 end

data/lib/dry/validation/extensions/monads.rb

@@ -1,17 +1,18 @@
-require 'dry/monads/either'
+require 'dry/monads/result'
 
 module Dry
   module Validation
     class Result
-      include Dry::Monads::Either::Mixin
+      include Dry::Monads::Result::Mixin
 
-      def to_either(options = EMPTY_HASH)
+      def to_monad(options = EMPTY_HASH)
         if success?
-          Right(output)
+          Success(output)
         else
-          Left(messages(options))
+          Failure(messages(options))
         end
       end
+      alias_method :to_either, :to_monad
     end
   end
 end

data/lib/dry/validation/input_processor_compiler.rb

@@ -1,5 +1,6 @@
 require 'dry/types'
 require 'dry/types/compiler'
+require 'dry/types/compat'
 
 module Dry
   module Validation
@@ -131,4 +132,4 @@ end
 
 require 'dry/validation/input_processor_compiler/sanitizer'
 require 'dry/validation/input_processor_compiler/json'
-require 'dry/validation/input_processor_compiler/form'
+require 'dry/validation/input_processor_compiler/params'

data/lib/dry/validation/input_processor_compiler/params.rb

@@ -0,0 +1,49 @@
+module Dry
+  module Validation
+    class InputProcessorCompiler::Params < InputProcessorCompiler
+      PREDICATE_MAP = {
+        default: 'string',
+        none?: 'params.nil',
+        bool?: 'params.bool',
+        true?: 'params.true',
+        false?: 'params.false',
+        str?: 'string',
+        int?: 'params.integer',
+        float?: 'params.float',
+        decimal?: 'params.decimal',
+        date?: 'params.date',
+        date_time?: 'params.date_time',
+        time?: 'params.time',
+        hash?: 'params.hash',
+        array?: 'params.array'
+      }.freeze
+
+      CONST_MAP = {
+        NilClass => 'params.nil',
+        String => 'string',
+        Integer => 'params.integer',
+        Float => 'params.float',
+        BigDecimal => 'params.decimal',
+        Array => 'params.array',
+        Hash => 'params.hash',
+        Date => 'params.date',
+        DateTime => 'params.date_time',
+        Time => 'params.time',
+        TrueClass => 'params.true',
+        FalseClass => 'params.false'
+      }.freeze
+
+      def identifier
+        :params
+      end
+
+      def hash_node(schema)
+        [:params_hash, [schema, {}]]
+      end
+
+      def array_node(members)
+        [:params_array, [members, {}]]
+      end
+    end
+  end
+end

data/lib/dry/validation/message_compiler.rb

@@ -160,6 +160,8 @@ module Dry
       end
 
       def message_text(rule, template, tokens, opts)
+        original_verbosity = $VERBOSE
+        $VERBOSE = nil
         text = template % tokens
 
         if full?
@@ -168,6 +170,8 @@ module Dry
         else
           text
         end
+      ensure
+        $VERBOSE = original_verbosity
       end
 
       def message_tokens(args)

data/lib/dry/validation/messages/abstract.rb

@@ -78,7 +78,7 @@ module Dry
 
           tokens[:rule] = predicate unless tokens.key?(:rule)
 
-          opts = options.reject { |k, _| config.lookup_options.include?(k) }
+          opts = options.select { |k, _| !config.lookup_options.include?(k) }
 
           path = lookup_paths(tokens).detect do |key|
             key?(key, opts) && get(key, opts).is_a?(String)

data/lib/dry/validation/predicate_registry.rb

@@ -3,6 +3,16 @@ require 'dry/logic/rule/predicate'
 module Dry
   module Validation
     class PredicateRegistry
+      module PredicateDetector
+        def method_added(name)
+          super
+
+          if name.to_s.end_with?('?')
+            registry.update(name => instance_method(name))
+          end
+        end
+      end
+
       attr_reader :predicates
       attr_reader :external
 
@@ -30,17 +40,8 @@ module Dry
         end
       end
 
-      def self.[](klass, predicates)
-        Unbound.new(predicates).tap do |registry|
-          klass.class_eval do
-            def self.method_added(name)
-              super
-              if name.to_s.end_with?('?')
-                registry.update(name => instance_method(name))
-              end
-            end
-          end
-        end
+      def self.[](predicates)
+        Unbound.new(predicates)
       end
 
       def initialize(external, predicates = {})

data/lib/dry/validation/schema/class_interface.rb

@@ -7,6 +7,7 @@ module Dry
     class Schema
       extend Dry::Configurable
       extend TypeSpecs
+      extend PredicateRegistry::PredicateDetector
 
       NOOP_INPUT_PROCESSOR = -> input { input }
 
@@ -23,11 +24,13 @@ module Dry
       setting :input_rule, nil
       setting :dsl_extensions, nil
 
-      setting :input_processor_map, {
+      DEFAULT_PROCESSOR_MAP = {
         sanitizer: InputProcessorCompiler::Sanitizer.new,
         json: InputProcessorCompiler::JSON.new,
-        form: InputProcessorCompiler::Form.new,
-      }.freeze
+        params: InputProcessorCompiler::Params.new,
+      }
+
+      setting :input_processor_map, DEFAULT_PROCESSOR_MAP
 
       setting :type_specs, false
 
@@ -179,7 +182,7 @@ module Dry
       end
 
       def self.set_registry!
-        config.registry = PredicateRegistry[self, config.predicates]
+        config.registry = PredicateRegistry[config.predicates]
       end
     end
   end

data/lib/dry/validation/schema/form.rb

@@ -1,21 +1,9 @@
 require 'dry/validation/schema'
+require 'dry/validation/schema/params'
+require 'dry/types/compat/form_types'
 
 module Dry
   module Validation
-    class Schema::Form < Schema
-      def self.configure(klass = nil, &block)
-        if klass
-          klass.configure do |config|
-            config.input_processor = :form
-            config.hash_type = :symbolized
-          end
-          klass
-        else
-          super(&block)
-        end
-      end
-
-      configure(self)
-    end
+    Schema::Form = Schema::Params
   end
 end