dry-validation 0.9.5 → 0.10.0

data/spec/integration/result_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Dry::Validation::Result do
   subject(:result) { schema.(input) }
 
-  let(:schema) { Dry::Validation.Schema { required(:name).filled(:str?) } }
+  let(:schema) { Dry::Validation.Schema { required(:name).filled(:str?, size?: 2..4) } }
 
   context 'with valid input' do
     let(:input) { { name: 'Jane' } }
@@ -42,17 +42,39 @@ RSpec.describe Dry::Validation::Result do
 
     describe '#messages' do
       it 'returns a hash with error messages' do
-        expect(result.messages).to eql(name: ['must be filled'])
+        expect(result.messages).to eql(
+          name: ['must be filled', 'length must be within 2 - 4']
+        )
       end
 
       it 'with full: true returns full messages' do
-        expect(result.messages(full: true)).to eql(name: ['name must be filled'])
+        expect(result.messages(full: true)).to eql(
+          name: ['name must be filled', 'name length must be within 2 - 4']
+        )
+      end
+    end
+
+    describe '#errors' do
+      let(:input) { { name: '' } }
+
+      it 'returns failure messages' do
+        expect(result.errors).to eql(name: ['must be filled'])
+      end
+    end
+
+    describe '#hints' do
+      let(:input) { { name: '' } }
+
+      it 'returns hint messages' do
+        expect(result.hints).to eql(name: ['length must be within 2 - 4'])
       end
     end
 
     describe '#message_set' do
       it 'returns message set' do
-        expect(result.message_set.to_h).to eql(name: ['must be filled'])
+        expect(result.message_set.to_h).to eql(
+          name: ['must be filled', 'length must be within 2 - 4']
+        )
       end
     end
   end

data/spec/integration/schema/check_with_nested_el_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'Check depending on a nested value from a hash' do
         end
       end
 
-      rule(red: [[:tag, :color, :value]]) do |value|
+      rule(tag: [[:tag, :color, :value]]) do |value|
         value.eql?('red')
       end
     end

data/spec/integration/schema/check_with_nth_el_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe 'Check depending on nth element in an array' do
     Dry::Validation.Schema do
       required(:tags).each(:str?)
 
-      rule(red: [[:tags, 0]]) do |value|
+      rule(tags: [[:tags, 0]]) do |value|
         value.eql?('red')
       end
     end

data/spec/integration/schema/defining_base_schema_spec.rb

@@ -1,3 +1,6 @@
+require 'dry/validation/messages/i18n'
+require 'i18n'
+
 RSpec.describe 'Defining base schema class' do
   subject(:schema) do
     Dry::Validation.Schema(BaseSchema) do

data/spec/integration/schema/dynamic_predicate_args_spec.rb

@@ -1,18 +1,43 @@
 RSpec.describe Dry::Validation::Schema, 'dynamic predicate args' do
-  subject(:schema) do
-    Dry::Validation.Schema do
-      configure do
-        def data
-          %w(a b c)
+  context 'with base rules' 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
 
-      required(:letter).filled(included_in?: data)
+    it 'evaluates predicate arguments' do
+      expect(schema.(letter: 'a')).to be_success
+      expect(schema.(letter: 'f')).to be_failure
     end
   end
 
-  it 'evaluates predicate arguments' do
-    expect(schema.(letter: 'a')).to be_success
-    expect(schema.(letter: 'f')).to be_failure
+  context 'with high-level rules' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          def data
+            %w(a b c)
+          end
+        end
+
+        required(:letter).filled(:str?)
+
+        rule(valid_letter: [:letter]) do |letter|
+          letter.included_in?(data)
+        end
+      end
+    end
+
+    it 'evaluates predicate arguments' do
+      expect(schema.(letter: 'a')).to be_success
+      expect(schema.(letter: 'f')).to be_failure
+    end
   end
 end

data/spec/integration/schema/form/defining_base_schema_spec.rb

@@ -0,0 +1,41 @@
+require 'dry/validation/messages/i18n'
+require 'i18n'
+
+RSpec.describe 'Defining base schema class' do
+  subject(:schema) do
+    Dry::Validation.Form(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' => '').messages).to eql(
+      name: ['must be filled'], email: ['is missing', 'must be an email']
+    )
+  end
+end

data/spec/integration/schema/json_spec.rb

@@ -154,6 +154,7 @@ RSpec.describe Dry::Validation::Schema::JSON, 'defining a schema' do
 
     it 'fails when nested schema fails' do
       result = schema.(delivery: true, address: { city: 'NYC', zipcode: 'foo' })
+
       expect(result.messages).to eql(
         address: { zipcode: ['must be an integer'] }
       )

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

@@ -110,4 +110,30 @@ RSpec.describe 'Macros #input' do
       )
     end
   end
+
+  context 'using a custom predicate' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          def valid_keys?(input)
+            input.size == 2 || input.size == 1
+          end
+        end
+
+        input :hash?, :valid_keys?
+
+        required(:foo).filled
+        optional(:bar).filled
+      end
+    end
+
+    it 'passes when input is valid' do
+      expect(schema.(foo: 'bar')).to be_successful
+      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')).to be_failure
+    end
+  end
 end

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

@@ -67,7 +67,8 @@ RSpec.describe 'Macros / rule' do
 
     it 'fails when rules failed' do
       expect(schema.(x: 2).messages).to eql(
-        x: ['must be greater than 3', 'must be greater than 5']
+        a: ['must be greater than 3'],
+        b: ['must be greater than 5']
       )
     end
   end

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

@@ -111,7 +111,7 @@ RSpec.describe 'Macros #value' do
 
       it 'uses the schema' do
         expect(schema.(data: { foo: '' }).messages).to eql(
-          data: { foo: ['must be filled', 'size must be within 2 - 10'] }
+          data: { foo: ['must be filled', 'length must be within 2 - 10'] }
         )
       end
     end

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

@@ -40,30 +40,7 @@ RSpec.describe 'Macros #when' do
     end
   end
 
-  describe 'with multiple result rules' do
-    subject(:schema) do
-      Dry::Validation.Schema do
-        required(:email).maybe
-        required(:password).maybe
-
-        required(:login).maybe(:bool?).when(:true?) do
-          value(:email).filled?
-          value(:password).filled?
-        end
-      end
-    end
-
-    it 'generates check rule' do
-      expect(schema.(login: false, email: nil, password: nil)).to be_success
-
-      expect(schema.(login: true, email: nil, password: nil).messages).to eql(
-        email: ['must be filled'],
-        password: ['must be filled']
-      )
-    end
-  end
-
-  context "predicate with options" do
+  context 'predicate with options' do
     subject(:schema) do
       Dry::Validation.Schema do
         required(:bar).maybe

data/spec/integration/schema/or_spec.rb

@@ -0,0 +1,87 @@
+RSpec.describe Dry::Validation::Schema, 'OR messages' do
+  context 'with two predicates' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:foo) { str? | int? }
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(foo: 'bar')).to be_success
+      expect(schema.(foo: 321)).to be_success
+    end
+
+    it 'provides OR error message for invalid input where all both sides failed' do
+      expect(schema.(foo: []).errors).to eql(foo: ['must be a string or must be an integer'])
+    end
+  end
+
+  context 'with a predicate and a conjunction of predicates' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:foo) { str? | (int? & gt?(18)) }
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(foo: 'bar')).to be_success
+      expect(schema.(foo: 321)).to be_success
+    end
+
+    it 'provides OR message for invalid input where both sides failed' do
+      expect(schema.(foo: []).errors).to eql(foo: ['must be a string or must be an integer'])
+    end
+
+    it 'provides error messages for invalid input where right side failed' do
+      expect(schema.(foo: 17).errors).to eql(foo: ['must be a string or must be greater than 18'])
+    end
+  end
+
+  context 'with a predicate and an each operation' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:foo) { str? | each(:int?) }
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(foo: 'bar')).to be_success
+      expect(schema.(foo: [1, 2, 3])).to be_success
+    end
+
+    it 'provides OR message for invalid input where both sides failed' do
+      expect(schema.(foo: {}).errors).to eql(foo: ['must be a string or must be an array'])
+    end
+
+    it 'provides error messages for invalid input where right side failed' do
+      expect(schema.(foo: %w(1 2 3)).errors).to eql(
+        foo: {
+          0 => ['must be an integer'],
+          1 => ['must be an integer'],
+          2 => ['must be an integer']
+        }
+      )
+    end
+  end
+
+  context 'with a predicate and a schema' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:foo) { str? | schema { required(:bar).filled } }
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(foo: 'bar')).to be_success
+      expect(schema.(foo: { bar: 'baz' })).to be_success
+    end
+
+    it 'provides OR message for invalid input where both sides failed' do
+      expect(schema.(foo: []).errors).to eql(foo: ['must be a string or must be a hash'])
+    end
+
+    it 'provides error messages for invalid input where right side rules failed' do
+      expect(schema.(foo: { bar: '' }).errors).to eql(foo: { bar: ['must be filled'] })
+    end
+  end
+end

data/spec/integration/schema/predicates/custom_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'Predicates: custom' do
           config.messages_file = 'spec/fixtures/locales/en.yml'
 
           def email?(current)
-            current.match(/\@/)
+            !current.match(/\@/).nil?
           end
         end
 
@@ -39,8 +39,8 @@ RSpec.describe 'Predicates: custom' do
           predicates (Module.new do
             include Dry::Logic::Predicates
 
-            predicate(:email?) do |current|
-              current.match(/@/)
+            def self.email?(current)
+              !current.match(/\@/).nil?
             end
           end)
         end
@@ -97,7 +97,7 @@ RSpec.describe 'Predicates: custom' do
 
     it 'allows groups to define their own custom predicates' do
       expect(result).to_not be_success
-      expect(result.messages.fetch(:details)).to eq(foo: ['must be odd'])
+      expect(result.messages[:details]).to eq(foo: ['must be odd'])
     end
   end
 end

data/spec/integration/schema/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.Schema do
         required(:foo) { 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.Schema do
         optional(:foo) { 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.Schema do
             required(:foo).value(: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.Schema do
             required(:foo).filled(: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.Schema do
             required(:foo).maybe(:even?)
           end
         end
@@ -260,7 +260,7 @@ RSpec.describe 'Predicates: Even' do
           let(:input) { { foo: '' } }
 
           it 'is successful' do
-            expect(result).to be_successful
+            expect { result }.to raise_error(NoMethodError)
           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.Schema do
             optional(:foo).value(: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.Schema do
             optional(:foo).filled(: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.Schema do
             optional(:foo).maybe(:even?)
           end
         end
@@ -430,7 +430,7 @@ RSpec.describe 'Predicates: Even' do
           let(:input) { { foo: '' } }
 
           it 'is successful' do
-            expect(result).to be_successful
+            expect { result }.to raise_error(NoMethodError)
           end
         end