dry-validation 0.8.0 → 0.9.0

data/spec/integration/schema/nested_schemas_spec.rb

@@ -0,0 +1,200 @@
+RSpec.describe Schema, 'nested schemas' do
+  context 'with a 2-level deep schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:meta).schema do
+          required(:info).schema do
+            required(:details).filled
+            required(:meta).filled
+          end
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(meta: { info: { details: 'Krakow', meta: 'foo' }})).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: { info: ['is missing'] }
+      )
+    end
+
+    it 'fails when 2-level key is missing' do
+      expect(schema.(meta: { info: {} }).messages).to eql(
+        meta: { info: { details: ['is missing'], meta: ['is missing'] } }
+      )
+    end
+
+    it 'fails when 1-level key has invalid value' do
+      expect(schema.(meta: { info: nil, meta: 'foo' }).messages).to eql(
+        meta: { info: ['must be a hash'] }
+      )
+    end
+
+    it 'fails when 2-level key has invalid value' do
+      expect(schema.(meta: { info: { details: nil, meta: 'foo' } }).messages).to eql(
+        meta: { info: { details: ['must be filled'] } }
+      )
+    end
+  end
+
+  context 'when duplicated key names are used in 2 subsequent levels' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:meta).schema do
+          required(:meta).filled
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(meta: { meta: 'data' })).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 filled'] }
+      )
+    end
+  end
+
+  context 'when duplicated key names are used in 2 subsequent levels as schemas' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        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: 'this is fine' } })).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 is missing' do
+      expect(schema.(meta: { meta: {} }).messages).to eql(
+        meta: { meta: { data: ['is missing'] } }
+      )
+    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
+
+  context 'with `each` + schema inside another schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:meta).schema do
+          required(:data).each do
+            schema do
+              required(:info).schema do
+                required(:name).filled
+              end
+            end
+          end
+        end
+      end
+    end
+
+    it 'passes when data is valid' do
+      expect(schema.(meta: { data: [{ info: { name: 'oh hai' } }] })).to be_success
+    end
+
+    it 'fails when root key is missing' do
+      expect(schema.({}).messages).to eql(meta: ['is missing'])
+    end
+
+    it 'fails when root key value is invalid' do
+      expect(schema.(meta: '').messages).to eql(meta: ['must be a hash'])
+    end
+
+    it 'fails when 1-level key is missing' do
+      expect(schema.(meta: {}).messages).to eql(meta: { data: ['is missing'] })
+    end
+
+    it 'fails when 1-level key has invalid value' do
+      expect(schema.(meta: { data: '' }).messages).to eql(meta: { data: ['must be an array'] })
+    end
+
+    it 'fails when 1-level key has value with a missing key' do
+      expect(schema.(meta: { data: [{}] }).messages).to eql(
+        meta: { data: { 0 => { info: ['is missing'] } } }
+      )
+    end
+
+    it 'fails when 1-level key has value with an incorrect type' do
+      expect(schema.(meta: { data: [{ info: ''}] }).messages).to eql(
+        meta: { data: { 0 => { info: ['must be a hash'] } } }
+      )
+    end
+
+    it 'fails when 1-level key has value with a key with an invalid value' do
+      expect(schema.(meta: { data: [{ info: { name: '' } }] }).messages).to eql(
+        meta: { data: { 0 => { info: { name: ['must be filled'] } } } }
+      )
+    end
+  end
+
+  context 'with 2-level `each` + schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:data).each do
+          schema do
+            required(:tags).each do
+              required(:name).filled
+            end
+          end
+        end
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(data: [{ tags: [{ name: 'red' }, { name: 'blue' }] }])).to be_success
+    end
+
+    it 'fails when 1-level element is not valid' do
+      expect(schema.(data: [{}]).messages).to eql(
+        data: { 0 => { tags: ['is missing'] } }
+      )
+    end
+
+    it 'fails when 2-level element is not valid' do
+      expect(schema.(data: [{ tags: [{ name: 'red' }, { name: '' }] }]).messages).to eql(
+        data: { 0 => { tags: { 1 => { name: ['must be filled'] } } } }
+      )
+    end
+  end
+end

data/spec/integration/schema/nested_values_spec.rb

@@ -37,7 +37,9 @@ RSpec.describe Schema, 'using nested values' do
   end
 
   it 'fails when offers is true and newsletter is true' do
-    expect(schema.(settings: { offers: true, newsletter: true }, email: 'jane@doe').messages).to eql(
+    input = { settings: { offers: true, newsletter: true }, email: 'jane@doe' }
+
+    expect(schema.(input).messages).to eql(
       settings: { newsletter: ['must be false'] }
     )
   end

data/spec/integration/schema/option_with_default_spec.rb

@@ -1,30 +1,64 @@
-RSpec.describe Dry::Validation::Schema, 'defining an option with default value' do
-  subject(:schema) do
-    Dry::Validation.Schema do
-      configure do
-        option :db, -> { DB }
-
-        def unique?(name, value)
-          DB.none? { |item| item[name] == value }
-        end
-      end
+RSpec.describe Dry::Validation::Schema, 'defining schema context with option API' do
+  shared_context 'valid schema with :db option' do
+    before do
+      DB = [{ email: 'jane@doe' }]
+    end
 
-      required(:email) { filled? & unique?(:email) }
+    after do
+      Object.send(:remove_const, :DB)
     end
-  end
 
-  before do
-    DB = [{ email: 'jane@doe' }]
+    it 'uses external dependency set by option with a default value' do
+      expect(schema.db).to be(DB)
+
+      expect(schema.(email: 'jade@doe', contact: { email: 'jade2@doe' })).to be_success
+      expect(schema.(email: 'jane@doe', contact: { email: 'jane2@doe' })).to be_failure
+      expect(schema.(email: 'jade@doe', contact: { email: 'jane@doe' })).to be_failure
+    end
   end
 
-  after do
-    Object.send(:remove_const, :DB)
+
+  context 'with a default value' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          option :db, -> { DB }
+
+          def unique?(name, value)
+            db.none? { |item| item[name] == value }
+          end
+        end
+
+        required(:email).filled(unique?: :email)
+
+        required(:contact).schema do
+          required(:email).filled(unique?: :email)
+        end
+      end
+    end
+
+    include_context 'valid schema with :db option'
   end
 
-  it 'uses external dependency set by option with a default value' do
-    expect(schema.db).to be(DB)
+  context 'without a default value' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          option :db
+
+          def unique?(name, value)
+            db.none? { |item| item[name] == value }
+          end
+        end
+
+        required(:email).filled(unique?: :email)
+
+        required(:contact).schema do
+          required(:email).filled(unique?: :email)
+        end
+      end.with(db: DB)
+    end
 
-    expect(schema.(email: 'jade@doe')).to be_success
-    expect(schema.(email: 'jane@doe')).to be_failure
+    include_context 'valid schema with :db option'
   end
 end

data/spec/integration/schema/predicates/size/fixed_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 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 3']
         end
       end
@@ -135,7 +135,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 3']
             end
           end
@@ -183,8 +183,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
@@ -233,7 +233,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 3']
             end
           end
@@ -284,7 +284,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 3']
             end
           end
@@ -332,8 +332,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
@@ -382,7 +382,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 3']
             end
           end

data/spec/integration/schema/predicates/size/range_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 within 2 - 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 within 2 - 3']
         end
       end
@@ -182,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 within 2 - 3']
             end
           end
@@ -282,7 +280,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 +328,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
@@ -380,7 +378,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

data/spec/unit/error_compiler_spec.rb

@@ -2,6 +2,6 @@ RSpec.describe ErrorCompiler, '#call' do
   subject(:error_compiler) { ErrorCompiler.new({}) }
 
   it 'returns an empty hash when there are no errors' do
-    expect(error_compiler.([])).to be(ErrorCompiler::DEFAULT_RESULT)
+    expect(error_compiler.([])).to be_empty
   end
 end

data/spec/unit/hint_compiler_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe HintCompiler, '#call' do
           [:val, p(:key?, :height)],
           [
             :or, [
-              [:attr, [:height, p(:none?)]],
+              [:key, [:height, p(:none?)]],
               [
                 :and, [
                   [:key, [:height, p(:int?)]],
@@ -43,7 +43,7 @@ RSpec.describe HintCompiler, '#call' do
   end
 
   it 'returns hint messages for given rules' do
-    expect(compiler.call).to eql(
+    expect(compiler.call.to_h).to eql(
       age: ['must be greater than 18'],
       height: ['must be greater than 180'],
     )