dry-validation 0.8.0 → 0.9.0

data/spec/integration/form/predicates/key_spec.rb

@@ -1,28 +1,20 @@
-#see: https://github.com/dry-rb/dry-validation/issues/127
-
 RSpec.describe 'Predicates: Key' do
   context 'with required' do
-    xit "should raise error" do
-      expect { Dry::Validation.Form do
-        required(:foo) { key? }
-      end }.to raise_error InvalidSchemaError
+    it "raises error" do
+      expect { Dry::Validation.Form { required(:foo) { key? } } }.to raise_error InvalidSchemaError
     end
   end
 
   context 'with optional' do
-    subject(:schema) do
-      xit "should raise error" do
-        expect { Dry::Validation.Form do
-          optional(:foo) { key? }
-        end }.to raise_error InvalidSchemaError
-      end
+    it "raises error" do
+      expect { Dry::Validation.Form { optional(:foo) { key? } } }.to raise_error InvalidSchemaError
     end
   end
 
   context 'as macro' do
     context 'with required' do
       context 'with value' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Form do
             required(:foo).value(:key?)
           end }.to raise_error InvalidSchemaError
@@ -30,7 +22,7 @@ RSpec.describe 'Predicates: Key' do
       end
 
       context 'with filled' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Form do
             required(:foo).filled(:key?)
           end }.to raise_error InvalidSchemaError
@@ -38,7 +30,7 @@ RSpec.describe 'Predicates: Key' do
       end
 
       context 'with maybe' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Form do
             required(:foo).maybe(:key?)
           end }.to raise_error InvalidSchemaError
@@ -48,7 +40,7 @@ RSpec.describe 'Predicates: Key' do
 
     context 'with optional' do
       context 'with value' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Schema do
             optional(:foo).value(:key?)
           end }.to raise_error InvalidSchemaError
@@ -56,7 +48,7 @@ RSpec.describe 'Predicates: Key' do
       end
 
       context 'with filled' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Schema do
             optional(:foo).filled(:key?)
           end }.to raise_error InvalidSchemaError
@@ -64,7 +56,7 @@ RSpec.describe 'Predicates: Key' do
       end
 
       context 'with maybe' do
-        xit "should raise error" do
+        it "raises error" do
           expect { Dry::Validation.Schema do
             optional(:foo).maybe(:key?)
           end }.to raise_error InvalidSchemaError

data/spec/integration/form/predicates/size/fixed_spec.rb

@@ -34,8 +34,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with blank input' do
         let(:input) { { 'foo' => '' } }
 
-        #see: https://github.com/dry-rb/dry-validation/issues/121
-        xit 'is not successful' do
+        it 'is not successful' do
           expect(result).to be_failing ['length must be 3']
         end
       end
@@ -83,8 +82,7 @@ RSpec.describe 'Predicates: Size' do
       context 'with blank input' do
         let(:input) { { 'foo' => '' } }
 
-        #see: https://github.com/dry-rb/dry-validation/issues/121
-        xit 'is not successful' do
+        it 'is not successful' do
           expect(result).to be_failing ['length must be 3']
         end
       end
@@ -134,8 +132,7 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
               expect(result).to be_failing ['length must be 3']
             end
           end
@@ -183,8 +180,8 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
+              pending
               expect(result).to be_failing ['must be filled', 'length must be 3']
             end
           end
@@ -282,8 +279,7 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
               expect(result).to be_failing ['length must be 3']
             end
           end
@@ -331,8 +327,8 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
+              pending
               expect(result).to be_failing ['must be filled', 'length must be 3']
             end
           end

data/spec/integration/form/predicates/size/range_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe 'Predicates: Size' do
         let(:input) { { 'foo' => '' } }
 
         #see: https://github.com/dry-rb/dry-validation/issues/121
-        xit 'is not successful' do
+        it 'is not successful' do
           expect(result).to be_failing ['length must be within 2 - 3']
         end
       end
@@ -84,7 +84,7 @@ RSpec.describe 'Predicates: Size' do
         let(:input) { { 'foo' => '' } }
 
         #see: https://github.com/dry-rb/dry-validation/issues/121
-        xit 'is not successful' do
+        it 'is not successful' do
           expect(result).to be_failing ['length must be within 2 - 3']
         end
       end
@@ -182,8 +182,8 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
+              pending
               expect(result).to be_failing ['must be filled', 'length must be within 2 - 3']
             end
           end
@@ -282,7 +282,7 @@ RSpec.describe 'Predicates: Size' do
             let(:input) { { 'foo' => '' } }
 
             #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
               expect(result).to be_failing ['length must be within 2 - 3']
             end
           end
@@ -330,8 +330,8 @@ RSpec.describe 'Predicates: Size' do
           context 'with blank input' do
             let(:input) { { 'foo' => '' } }
 
-            #see: https://github.com/dry-rb/dry-validation/issues/121
-            xit 'is not successful' do
+            it 'is not successful' do
+              pending
               expect(result).to be_failing ['must be filled', 'length must be within 2 - 3']
             end
           end

data/spec/integration/hints_spec.rb

@@ -103,6 +103,23 @@ RSpec.describe 'Validation hints' do
     end
   end
 
+  context 'with an each rule' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:nums).each(:int?, gt?: 0)
+      end
+    end
+
+    it 'provides hints for each element' do
+      expect(schema.(nums: [1, 'foo', 0]).messages).to eql(
+        nums: {
+          1 => ['must be an integer', 'must be greater than 0'],
+          2 => ['must be greater than 0']
+        }
+      )
+    end
+  end
+
   context 'when the message uses input value' do
     subject(:schema) do
       Dry::Validation.Schema do

data/spec/integration/messages/i18n_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Messages::I18n do
       it 'returns a message for a specific rule and its arg type' do
         message = messages[:size?, rule: :pages, arg_type: Range]
 
-        expect(message).to eql("size must be within %{left} - %{right}")
+        expect(message).to eql("size must be within %{size_left} - %{size_right}")
       end
     end
 
@@ -68,7 +68,7 @@ RSpec.describe Messages::I18n do
       it 'returns a message for a specific rule and its arg type' do
         message = messages[:size?, rule: :pages, arg_type: Range, locale: :pl]
 
-        expect(message).to eql("wielkość musi być między %{left} a %{right}")
+        expect(message).to eql("wielkość musi być między %{size_left} a %{size_right}")
       end
     end
   end

data/spec/integration/schema/check_rules_spec.rb

@@ -28,8 +28,8 @@ RSpec.describe Schema, 'using high-level rules' do
     end
 
     it 'fails when red and blue are not filled ' do
-      expect(schema.(red: nil, blue: nil).messages[:destiny]).to eql(
-        ['you must select either red or blue']
+      expect(schema.(red: nil, blue: nil).messages).to eql(
+        destiny: ['you must select either red or blue']
       )
     end
   end

data/spec/integration/schema/defining_base_schema_spec.rb

@@ -0,0 +1,38 @@
+RSpec.describe 'Defining base schema class' do
+  subject(:schema) do
+    Dry::Validation.Schema(BaseSchema) do
+      required(:email).filled(:email?)
+    end
+  end
+
+  before do
+    class BaseSchema < Dry::Validation::Schema
+      configure do |config|
+        config.messages_file = SPEC_ROOT.join('fixtures/locales/en.yml')
+        config.messages = :i18n
+      end
+
+      def email?(value)
+        true
+      end
+
+      define! do
+        required(:name).filled
+      end
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :BaseSchema)
+  end
+
+  it 'inherits predicates' do
+    expect(schema).to respond_to(:email?)
+  end
+
+  it 'inherits rules' do
+    expect(schema.(name: nil).messages).to eql(
+      name: ['must be filled'], email: ['is missing', 'must be an email']
+    )
+  end
+end

data/spec/integration/schema/dynamic_predicate_args_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe Dry::Validation::Schema, 'dynamic predicate args' do
+  subject(:schema) do
+    Dry::Validation.Schema do
+      configure do
+        def data
+          %w(a b c)
+        end
+      end
+
+      required(:letter).filled(included_in?: data)
+    end
+  end
+
+  it 'evaluates predicate arguments' do
+    expect(schema.(letter: 'a')).to be_success
+    expect(schema.(letter: 'f')).to be_failure
+  end
+end

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

@@ -50,7 +50,7 @@ RSpec.describe 'Macros #each' do
       let(:input) { { foo: [[1,2], "foo"] } }
 
       it 'is not successful' do
-        expect(result).to be_failing({0=>["size must be 3"]})
+        expect(result).to be_failing(0 => ["size must be 3"])
       end
     end
 
@@ -58,7 +58,7 @@ RSpec.describe 'Macros #each' do
       let(:input) { { foo: nil } }
 
       it 'is not successful' do
-        expect(result).to be_failing ["must be an array", "size must be 3"]
+        expect(result).to be_failing ["must be an array"]
       end
     end
   end

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

@@ -1,21 +1,113 @@
 RSpec.describe 'Macros #input' do
-  subject(:schema) do
-    Dry::Validation.Schema do
-      input :hash?
+  context 'with a flat schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        input :hash?
 
-      required(:foo).filled
+        required(:foo).filled
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(foo: "bar")).to be_successful
+    end
+
+    it 'prepends a rule for the input' do
+      expect(schema.(nil).messages).to eql(["must be a hash"])
+    end
+
+    it 'applies other rules when input has expected type' do
+      expect(schema.(foo: '').messages).to eql(foo: ["must be filled"])
     end
   end
 
-  it 'passes when input is valid' do
-    expect(schema.(foo: "bar")).to be_successful
+  context 'with a nested schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        input(:hash?)
+
+        required(:foo).schema do
+          required(:bar).schema do
+            required(:baz).filled
+          end
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(foo: { bar: { baz: "present" }})).to be_successful
+    end
+
+    it 'fails when input has invalid type' do
+      expect(schema.(nil).messages).to eql(["must be a hash"])
+    end
+
+    it 'fails when 1-level key is missing' do
+      expect(schema.(foo: {}).messages).to eql(foo: { bar: ["is missing"] })
+    end
+
+    it 'fails when 2-level key has invalid value' do
+      expect(schema.(foo: { bar: { baz: '' }}).messages).to eql(
+        foo: { bar: { baz: ['must be filled'] } }
+      )
+    end
   end
 
-  it 'prepends a rule for the input' do
-    expect(schema.(nil).messages).to eql(["must be a hash"])
+  context 'when 2 nested schemas are under the same key' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        input :hash?
+
+        required(:meta).schema do
+          required(:meta).schema do
+            required(:data).filled
+          end
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(meta: { meta: { data: 'sutin' } })).to be_success
+    end
+
+    it 'fails when root key is missing' do
+      expect(schema.({}).messages).to eql(meta: ['is missing'])
+    end
+
+    it 'fails when 1-level key is missing' do
+      expect(schema.(meta: {}).messages).to eql(meta: { meta: ['is missing'] })
+    end
+
+    it 'fails when 1-level key value is invalid' do
+      expect(schema.(meta: { meta: '' }).messages).to eql(
+        meta: { meta: ['must be a hash'] }
+      )
+    end
+
+    it 'fails when 2-level key value is invalid' do
+      expect(schema.(meta: { meta: { data: '' } }).messages).to eql(
+        meta: { meta: { data: ['must be filled'] } }
+      )
+    end
   end
 
-  it 'applies other rules when input has expected type' do
-    expect(schema.(foo: '').messages).to eql(foo: ["must be filled"])
+  context 'using more than one predicate' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        input :hash?, size?: 2
+
+        required(:foo).filled
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(foo: "bar", bar: "baz")).to be_successful
+    end
+
+    it 'fails when one of the root-rules fails' do
+      expect(schema.(foo: "bar", bar: "baz", oops: "heh").messages).to eql(
+        ['size must be 2']
+      )
+    end
   end
 end

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

@@ -48,6 +48,36 @@ RSpec.describe 'Macros #maybe' do
     end
   end
 
+  describe 'with an optional key and a block with schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        optional(:employee).maybe do
+          schema do
+            required(:id).filled(:str?)
+          end
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(employee: { id: '1' })).to be_success
+    end
+
+    it 'passes when key is missing' do
+      expect(schema.({})).to be_success
+    end
+
+    it 'passes when value is nil' do
+      expect(schema.(employee: nil)).to be_success
+    end
+
+    it 'fails when value for nested schema is invalid' do
+      expect(schema.(employee: { id: 1 }).messages).to eql(
+        employee: { id: ['must be a string'] }
+      )
+    end
+  end
+
   describe 'with a predicate and a block' do
     subject(:schema) do
       Dry::Validation.Schema do