dry-validation 0.11.2 → 0.12.0

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

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

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.11.2'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

data/spec/extensions/monads/result_spec.rb

@@ -6,12 +6,13 @@ RSpec.describe Dry::Validation::Result do
   context 'with valid input' do
     let(:input) { { name: 'Jane' } }
 
-    describe '#to_either' do
-      it 'returns a Right instance' do
-        either = result.to_either
+    describe '#to_monad' do
+      it 'returns a Success value' do
+        monad = result.to_monad
 
-        expect(either).to be_right
-        expect(either.value).to eql(name: 'Jane')
+        expect(monad).to be_a Dry::Monads::Result
+        expect(monad).to be_a_success
+        expect(monad.value!).to eql(name: 'Jane')
       end
     end
   end
@@ -19,19 +20,20 @@ RSpec.describe Dry::Validation::Result do
   context 'with invalid input' do
     let(:input) { { name: '' } }
 
-    describe '#to_either' do
-      it 'returns a Left instance' do
-        either = result.to_either
+    describe '#to_monad' do
+      it 'returns a Failure value' do
+        monad = result.to_monad
 
-        expect(either).to be_left
-        expect(either.value).to eql(name: ['must be filled', 'length must be within 2 - 4'])
+        expect(monad).to be_a_failure
+        expect(monad.failure).to eql(name: ['must be filled', 'length must be within 2 - 4'])
       end
 
       it 'returns full messages' do
-        either = result.to_either(full: true)
+        monad = result.to_monad(full: true)
 
-        expect(either).to be_left
-        expect(either.value).to eql(name: ['name must be filled', 'name length must be within 2 - 4'])
+        expect(monad).to be_a Dry::Monads::Result
+        expect(monad).to be_a_failure
+        expect(monad.failure).to eql(name: ['name must be filled', 'name length must be within 2 - 4'])
       end
     end
   end

data/spec/integration/messages/i18n_spec.rb

@@ -80,8 +80,6 @@ RSpec.describe Messages::I18n do
       end
 
       it 'returns a message for a predicate in the default_locale' do
-        pending 'FIXME: this got broken for some reason, probably an I18n issue'
-
         message = messages[:even?, rule: :some_number]
 
         expect(I18n.locale).to eql(:pl)

data/spec/integration/{form → params}/predicates/array_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Array' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { array? { each { int? } } }
       end
     end
@@ -73,7 +73,7 @@ RSpec.describe 'Predicates: Array' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { array? { each { int? } } }
       end
     end
@@ -146,7 +146,7 @@ RSpec.describe 'Predicates: Array' do
   context 'as macro' do
     context 'with required' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           required(:foo).each(:int?)
         end
       end
@@ -194,7 +194,7 @@ RSpec.describe 'Predicates: Array' do
 
     context 'with optional' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           optional(:foo).each(:int?)
         end
       end
@@ -242,7 +242,7 @@ RSpec.describe 'Predicates: Array' do
   end
 
   context 'with maybe macro' do
-    subject(:schema) { Dry::Validation.Form { required(:foo).maybe(:array?) } }
+    subject(:schema) { Dry::Validation.Params { required(:foo).maybe(:array?) } }
 
     context 'with empty string' do
       let(:input) { { 'foo' => '' } }

data/spec/integration/{form → params}/predicates/empty_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Empty' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { empty? }
       end
     end
@@ -57,7 +57,7 @@ RSpec.describe 'Predicates: Empty' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { empty? }
       end
     end
@@ -115,7 +115,7 @@ RSpec.describe 'Predicates: Empty' do
     context 'with required' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).value(:empty?)
           end
         end
@@ -171,7 +171,7 @@ RSpec.describe 'Predicates: Empty' do
 
       context 'with filled' do
         it "raises error" do
-          expect { Dry::Validation.Form do
+          expect { Dry::Validation.Params do
             required(:foo).filled(:empty?)
           end }.to raise_error InvalidSchemaError
         end
@@ -179,7 +179,7 @@ RSpec.describe 'Predicates: Empty' do
 
       context 'with maybe' do
         it "raises error" do
-          expect { Dry::Validation.Form do
+          expect { Dry::Validation.Params do
             required(:foo).maybe(:empty?)
           end }.to raise_error InvalidSchemaError
         end
@@ -189,7 +189,7 @@ RSpec.describe 'Predicates: Empty' do
     context 'with optional' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).value(:empty?)
           end
         end
@@ -245,7 +245,7 @@ RSpec.describe 'Predicates: Empty' do
 
       context 'with filled' do
         it "raises error" do
-          expect { Dry::Validation.Form do
+          expect { Dry::Validation.Params do
             optional(:foo).filled(:empty?)
           end }.to raise_error InvalidSchemaError
         end
@@ -253,7 +253,7 @@ RSpec.describe 'Predicates: Empty' do
 
       context 'with maybe' do
         it "raises error" do
-          expect { Dry::Validation.Form do
+          expect { Dry::Validation.Params do
             optional(:foo).maybe(:empty?)
           end }.to raise_error InvalidSchemaError
         end

data/spec/integration/{form → params}/predicates/eql_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Eql' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { eql?('23') }
       end
     end
@@ -41,7 +41,7 @@ RSpec.describe 'Predicates: Eql' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { eql?('23') }
       end
     end
@@ -83,7 +83,7 @@ RSpec.describe 'Predicates: Eql' do
     context 'with required' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).value(eql?: '23')
           end
         end
@@ -123,7 +123,7 @@ RSpec.describe 'Predicates: Eql' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).filled(eql?: '23')
           end
         end
@@ -163,7 +163,7 @@ RSpec.describe 'Predicates: Eql' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).maybe(eql?: '23')
           end
         end
@@ -205,7 +205,7 @@ RSpec.describe 'Predicates: Eql' do
     context 'with optional' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).value(eql?: '23')
           end
         end
@@ -245,7 +245,7 @@ RSpec.describe 'Predicates: Eql' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).filled(eql?: '23')
           end
         end
@@ -285,7 +285,7 @@ RSpec.describe 'Predicates: Eql' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).maybe(eql?: '23')
           end
         end

data/spec/integration/{form → params}/predicates/even_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Even' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { int? & even? }
       end
     end
@@ -57,7 +57,7 @@ RSpec.describe 'Predicates: Even' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { int? & even? }
       end
     end
@@ -115,7 +115,7 @@ RSpec.describe 'Predicates: Even' do
     context 'with required' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).value(:int?, :even?)
           end
         end
@@ -171,7 +171,7 @@ RSpec.describe 'Predicates: Even' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).filled(:int?, :even?)
           end
         end
@@ -227,7 +227,7 @@ RSpec.describe 'Predicates: Even' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).maybe(:int?, :even?)
           end
         end
@@ -285,7 +285,7 @@ RSpec.describe 'Predicates: Even' do
     context 'with optional' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).value(:int?, :even?)
           end
         end
@@ -341,7 +341,7 @@ RSpec.describe 'Predicates: Even' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).filled(:int?, :even?)
           end
         end
@@ -397,7 +397,7 @@ RSpec.describe 'Predicates: Even' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).maybe(:int?, :even?)
           end
         end

data/spec/integration/{form → params}/predicates/excluded_from_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Excluded From' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { excluded_from?(%w(1 3 5)) }
       end
     end
@@ -57,7 +57,7 @@ RSpec.describe 'Predicates: Excluded From' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { excluded_from?(%w(1 3 5)) }
       end
     end
@@ -115,7 +115,7 @@ RSpec.describe 'Predicates: Excluded From' do
     context 'with required' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).value(excluded_from?: %w(1 3 5))
           end
         end
@@ -171,7 +171,7 @@ RSpec.describe 'Predicates: Excluded From' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).filled(excluded_from?: %w(1 3 5))
           end
         end
@@ -227,7 +227,7 @@ RSpec.describe 'Predicates: Excluded From' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).maybe(excluded_from?: %w(1 3 5))
           end
         end
@@ -285,7 +285,7 @@ RSpec.describe 'Predicates: Excluded From' do
     context 'with optional' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).value(excluded_from?: %w(1 3 5))
           end
         end
@@ -341,7 +341,7 @@ RSpec.describe 'Predicates: Excluded From' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).filled(excluded_from?: %w(1 3 5))
           end
         end
@@ -397,7 +397,7 @@ RSpec.describe 'Predicates: Excluded From' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).maybe(excluded_from?: %w(1 3 5))
           end
         end

data/spec/integration/{form → params}/predicates/excludes_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe 'Predicates: Excludes' do
   context 'with required' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         required(:foo) { array? { each { int? } & excludes?(1) } }
       end
     end
@@ -49,7 +49,7 @@ RSpec.describe 'Predicates: Excludes' do
 
   context 'with optional' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         optional(:foo) { array? { each { int? } & excludes?(1) } }
       end
     end
@@ -99,7 +99,7 @@ RSpec.describe 'Predicates: Excludes' do
     context 'with required' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).value(excludes?: "foo")
           end
         end
@@ -147,7 +147,7 @@ RSpec.describe 'Predicates: Excludes' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).filled(excludes?: 'foo')
           end
         end
@@ -195,7 +195,7 @@ RSpec.describe 'Predicates: Excludes' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             required(:foo).maybe(excludes?: 'foo')
           end
         end
@@ -245,7 +245,7 @@ RSpec.describe 'Predicates: Excludes' do
     context 'with optional' do
       context 'with value' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).value(excludes?: '1')
           end
         end
@@ -293,7 +293,7 @@ RSpec.describe 'Predicates: Excludes' do
 
       context 'with filled' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).filled(excludes?: 'foo')
           end
         end
@@ -341,7 +341,7 @@ RSpec.describe 'Predicates: Excludes' do
 
       context 'with maybe' do
         subject(:schema) do
-          Dry::Validation.Form do
+          Dry::Validation.Params do
             optional(:foo).maybe(excludes?: 'foo')
           end
         end