dry-validation 0.11.2 → 0.12.0

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

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

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

@@ -2,7 +2,7 @@ RSpec.describe 'Predicates: Size' do
   context 'Fixed (integer)' do
     context 'with required' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           required(:foo) { size?(3) }
         end
       end
@@ -50,7 +50,7 @@ RSpec.describe 'Predicates: Size' do
 
     context 'with optional' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           optional(:foo) { size?(3) }
         end
       end
@@ -100,7 +100,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with required' do
         context 'with value' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).value(size?: 3)
             end
           end
@@ -148,7 +148,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with filled' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).filled(size?: 3)
             end
           end
@@ -196,7 +196,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with maybe' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).maybe(size?: 3)
             end
           end
@@ -246,7 +246,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with optional' do
         context 'with value' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).value(size?: 3)
             end
           end
@@ -294,7 +294,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with filled' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).filled(size?: 3)
             end
           end
@@ -342,7 +342,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with maybe' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).maybe(size?: 3)
             end
           end

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

@@ -2,7 +2,7 @@ RSpec.describe 'Predicates: Size' do
   context 'Range' do
     context 'with required' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           required(:foo) { size?(2..3) }
         end
       end
@@ -51,7 +51,7 @@ RSpec.describe 'Predicates: Size' do
 
     context 'with optional' do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           optional(:foo) { size?(2..3) }
         end
       end
@@ -102,7 +102,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with required' do
         context 'with value' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).value(size?: 2..3)
             end
           end
@@ -150,7 +150,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with filled' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).filled(size?: 2..3)
             end
           end
@@ -198,7 +198,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with maybe' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               required(:foo).maybe(size?: 2..3)
             end
           end
@@ -248,7 +248,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with optional' do
         context 'with value' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).value(size?: 2..3)
             end
           end
@@ -297,7 +297,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with filled' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).filled(size?: 2..3)
             end
           end
@@ -345,7 +345,7 @@ RSpec.describe 'Predicates: Size' do
 
         context 'with maybe' do
           subject(:schema) do
-            Dry::Validation.Form do
+            Dry::Validation.Params do
               optional(:foo).maybe(size?: 2..3)
             end
           end

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

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

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

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

data/spec/integration/schema/array_schema_spec.rb

@@ -27,13 +27,13 @@ RSpec.describe Dry::Validation::Schema, 'for an array' do
 
   context 'with type specs' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
 
         each do
           schema do
-            required(:prefix, :int).filled
-            required(:value, :int).filled
+            required(:prefix, :integer).filled
+            required(:value, :integer).filled
           end
         end
       end

data/spec/integration/schema/extending_dsl_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe 'Extending DSL' do
   it 'allows configuring custom DSL methods' do
     dsl_ext = Module.new do
       def maybe_int(name, *predicates, &block)
-        required(name, [:nil, :int]).maybe(:int?, *predicates, &block)
+        required(name, [:nil, :integer]).maybe(:int?, *predicates, &block)
       end
     end
 
@@ -12,7 +12,7 @@ RSpec.describe 'Extending DSL' do
 
     schema = Dry::Validation.Schema do
       configure do
-        config.input_processor = :form
+        config.input_processor = :params
         config.type_specs = true
       end
 

data/spec/integration/schema/form_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe Dry::Validation::Schema::Form, 'defining a schema' do
+RSpec.describe 'Dry::Validation::Schema::Form', 'defining a schema' do
+  before(:all) { require 'dry/validation/compat/form' }
+
   subject(:schema) do
     Dry::Validation.Form do
       configure do

data/spec/integration/schema/hash_schema_spec.rb

@@ -22,12 +22,12 @@ RSpec.describe Dry::Validation::Schema, 'for a hash' do
 
   context 'with type specs' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
 
         hash? do
-          required(:prefix, :int).filled
-          required(:value, :int).filled
+          required(:prefix, :integer).filled
+          required(:value, :integer).filled
         end
       end
     end

data/spec/integration/schema/json/explicit_types_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Dry::Validation::Schema::JSON, 'explicit types' do
     subject(:schema) do
       Dry::Validation.JSON do
         configure { config.type_specs = true }
-        required(:bdate, Types::Json::Nil | Types::Json::Date)
+        required(:bdate, Types::JSON::Nil | Types::JSON::Date)
       end
     end
 

data/spec/integration/schema/macros/each_spec.rb

@@ -210,7 +210,7 @@ RSpec.describe 'Macros #each' do
   context 'with inferred predicates and a form schema' do
     context "predicate w/o options" do
       subject(:schema) do
-        Dry::Validation.Form do
+        Dry::Validation.Params do
           required(:songs).each(:str?)
         end
       end

data/spec/integration/schema/{form → params}/defining_base_schema_spec.rb

@@ -3,7 +3,7 @@ require 'i18n'
 
 RSpec.describe 'Defining base schema class' do
   subject(:schema) do
-    Dry::Validation.Form(BaseSchema) do
+    Dry::Validation.Params(BaseSchema) do
       required(:email).filled(:email?)
     end
   end

data/spec/integration/schema/{form → params}/explicit_types_spec.rb

@@ -1,22 +1,35 @@
-RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
+RSpec.describe Dry::Validation::Schema::Params, 'explicit types' do
   context 'single type spec without rules' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:age, :int)
+        required(:age, :integer)
       end
     end
 
-    it 'uses form coercion' do
+    it 'uses params coercion' do
+      expect(schema.('age' => '19').to_h).to eql(age: 19)
+    end
+  end
+
+  context 'integer' do
+    subject(:schema) do
+      Dry::Validation.Params do
+        configure { config.type_specs = true }
+        required(:age, :integer)
+      end
+    end
+
+    it 'uses params coercion' do
       expect(schema.('age' => '19').to_h).to eql(age: 19)
     end
   end
 
   context 'single type spec with rules' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:age, :int).value(:int?, gt?: 18)
+        required(:age, :integer).value(:int?, gt?: 18)
       end
     end
 
@@ -28,26 +41,26 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
 
   context 'single type spec with an array' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:nums, [:int])
+        required(:nums, [:integer])
       end
     end
 
-    it 'uses form coercion' do
+    it 'uses params coercion' do
       expect(schema.(nums: %w(1 2 3)).to_h).to eql(nums: [1, 2, 3])
     end
   end
 
   context 'sum type spec without rules' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:age, [:nil, :int])
+        required(:age, [:nil, :integer])
       end
     end
 
-    it 'uses form coercion' do
+    it 'uses params coercion' do
       expect(schema.('age' => '19').to_h).to eql(age: 19)
       expect(schema.('age' => '').to_h).to eql(age: nil)
     end
@@ -55,9 +68,9 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
 
   context 'sum type spec with rules' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:age, [:nil, :int]).maybe(:int?, gt?: 18)
+        required(:age, [:nil, :integer]).maybe(:int?, gt?: 18)
       end
     end
 
@@ -70,13 +83,13 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
 
   context 'using a type object' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
-        required(:age, Types::Form::Nil | Types::Form::Int)
+        required(:age, Types::Params::Nil | Types::Params::Integer)
       end
     end
 
-    it 'uses form coercion' do
+    it 'uses params coercion' do
       expect(schema.('age' => '').to_h).to eql(age: nil)
       expect(schema.('age' => '19').to_h).to eql(age: 19)
     end
@@ -84,12 +97,12 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
 
   context 'nested schema' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
 
         required(:user).schema do
           required(:email, :string)
-          required(:age, :int)
+          required(:age, :integer)
 
           required(:address).schema do
             required(:street, :string)
@@ -105,7 +118,7 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
       end
     end
 
-    it 'uses form coercion for nested input' do
+    it 'uses params coercion for nested input' do
       input = {
         'user' => {
           'email' => 'jane@doe.org',
@@ -136,7 +149,7 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
 
   context 'nested schema with arrays' do
     subject(:schema) do
-      Dry::Validation.Form do
+      Dry::Validation.Params do
         configure { config.type_specs = true }
 
         required(:song).schema do
@@ -163,7 +176,7 @@ RSpec.describe Dry::Validation::Schema::Form, 'explicit types' do
       expect(result.to_h).to eql(song: { tags: nil })
     end
 
-    it 'uses form coercion for nested input' do
+    it 'uses params coercion for nested input' do
       input = {
         'song' => {
           'title' => 'dry-rb is awesome lala',