dry-validation 0.9.5 → 0.10.0

data/spec/integration/schema/predicates/odd_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) { odd? }
       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) { odd? }
       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(:odd?)
           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(:odd?)
           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(:odd?)
           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(:odd?)
           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(:odd?)
           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(:odd?)
           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
 

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

@@ -34,7 +34,6 @@ RSpec.describe 'Predicates: Size' do
       context 'with blank input' do
         let(:input) { { foo: '' } }
 
-        #see: https://github.com/dry-rb/dry-validation/issues/121
         it 'is not successful' do
           expect(result).to be_failing ['length must be 3']
         end
@@ -184,7 +183,6 @@ RSpec.describe 'Predicates: Size' do
             let(:input) { { foo: '' } }
 
             it 'is not successful' do
-              pending
               expect(result).to be_failing ['must be filled', 'length must be 3']
             end
           end
@@ -333,7 +331,6 @@ RSpec.describe 'Predicates: Size' do
             let(:input) { { foo: '' } }
 
             it 'is not successful' do
-              pending
               expect(result).to be_failing ['must be filled', 'length must be 3']
             end
           end

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

@@ -181,7 +181,6 @@ RSpec.describe 'Predicates: Size' do
             let(:input) { { foo: '' } }
 
             it 'is not successful' do
-              pending
               expect(result).to be_failing ['must be filled', 'length must be within 2 - 3']
             end
           end
@@ -329,7 +328,6 @@ RSpec.describe 'Predicates: Size' do
             let(:input) { { foo: '' } }
 
             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/schema/predicates/type_spec.rb

@@ -388,4 +388,26 @@ RSpec.describe 'Predicates: Type' do
       end
     end
   end
+
+  context 'with a custom class' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        required(:foo).value(type?: CustomClass)
+      end
+    end
+
+    around do |example|
+      CustomClass = Class.new
+      example.run
+      Object.send(:remove_const, :CustomClass)
+    end
+
+    it 'it succeeds with valid input' do
+      expect(schema.(foo: CustomClass.new)).to be_success
+    end
+
+    it 'it fails with invalid input' do
+      expect(schema.(foo: 'oops')).to be_failing ["must be #{CustomClass}"]
+    end
+  end
 end

data/spec/integration/schema/using_types_spec.rb

@@ -23,58 +23,31 @@ RSpec.describe Dry::Validation::Schema, 'defining schema using dry types' do
   end
 
   it 'passes when input is valid' do
-    expect(schema.(email: 'jane@doe', age: 19, country: 'Australia')).to be_success
-    expect(schema.(email: 'jane@doe', age: nil, country: 'Poland')).to be_success
+    expect(schema.call(email: 'jane@doe', age: 19, country: 'Australia')).to be_success
+    expect(schema.call(email: 'jane@doe', age: nil, country: 'Poland')).to be_success
   end
 
   it 'fails when input is not valid' do
-    expect(schema.(email: '', age: 19, country: 'New Zealand')).to_not be_success
-    expect(schema.(email: 'jane@doe', age: 17)).to_not be_success
-    expect(schema.(email: 'jane@doe', age: '19')).to_not be_success
+    expect(schema.call(email: '', age: 19, country: 'New Zealand')).to_not be_success
+    expect(schema.call(email: 'jane@doe', age: 17)).to_not be_success
+    expect(schema.call(email: 'jane@doe', age: '19')).to_not be_success
   end
 
   it 'correctly responds to messages' do
-    expect(schema.({}).messages).to eq(
-      age: ["is missing", "must be greater than 18"],
-      country: ["is missing", "must be one of: Australia, Poland"],
-      email: ["is missing", "must be String"],
+    expect(schema.call({}).messages).to eq(
+      age: ['is missing', 'must be Integer', 'must be greater than 18'],
+      country: ['is missing', 'must be String', 'must be one of: Australia, Poland'],
+      email: ['is missing', 'must be String']
     )
   end
 
   it 'fails when sum-type rule did not pass' do
-    result = schema.(email: 'jane@doe', age: 19, country: 'Australia', admin: 'foo')
+    result = schema.call(email: 'jane@doe', age: 19, country: 'Australia', admin: 'foo')
     expect(result.messages).to eql(
-      admin: ['must be FalseClass', 'must be TrueClass']
+      admin: ['must be TrueClass or must be FalseClass']
     )
   end
 
-  context "structs" do
-    subject(:schema) do
-      Dry::Validation.Schema do
-        required(:person).filled(Person)
-      end
-    end
-
-    class Name < Dry::Types::Value
-      attribute :given_name, Dry::Types['strict.string']
-      attribute :family_name, Dry::Types['strict.string']
-    end
-
-    class Person < Dry::Types::Value
-      attribute :name, Name
-    end
-
-    it 'handles nested structs' do
-      expect(schema.(person: { name: { given_name: 'Tim', family_name: 'Cooper' } })).to be_success
-    end
-
-    it 'fails when input is not valid' do
-      expect(schema.(person: {name: {given_name: 'Tim'}}).messages).to eq(
-        person: { name: { family_name: ["is missing"] } }
-      )
-    end
-  end
-
   context 'custom coercions' do
     subject(:schema) do
       Dry::Validation.Schema do
@@ -85,7 +58,7 @@ RSpec.describe Dry::Validation::Schema, 'defining schema using dry types' do
     end
 
     it 'applies custom types to input prior validation' do
-      result = schema.(email: ' jane@doe.org  ')
+      result = schema.call(email: ' jane@doe.org  ')
 
       expect(result).to be_success
       expect(result.to_h).to eql(email: 'jane@doe.org')
@@ -102,7 +75,7 @@ RSpec.describe Dry::Validation::Schema, 'defining schema using dry types' do
     end
 
     it 'applies custom types to input prior validation' do
-      result = schema.(quantity: '2', percentage: '0.5', switch: '0')
+      result = schema.call(quantity: '2', percentage: '0.5', switch: '0')
 
       expect(result).to be_success
       expect(result.to_h).to eql(quantity: 2, percentage: BigDecimal('0.5'), switch: false)
@@ -117,7 +90,7 @@ RSpec.describe Dry::Validation::Schema, 'defining schema using dry types' do
     end
 
     it 'applies type constraint checks to each element' do
-      result = schema.(countries: ['Poland', 'Australia'])
+      result = schema.call(countries: %w(Poland Australia))
 
       expect(result).to be_success
       expect(result.to_h).to eql(countries: %w(Poland Australia))

data/spec/integration/schema/validate_spec.rb

@@ -0,0 +1,83 @@
+RSpec.describe Dry::Validation::Schema, 'arbitrary validation blocks' do
+  context 'with a single value' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          option :email_regex, /@/
+
+          def self.messages
+            super.merge(en: { errors: { email?: '%{value} looks like an invalid email' } })
+          end
+        end
+
+        required(:email).filled
+
+        validate(email?: :email) do |value|
+          email_regex.match(value)
+        end
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(email: 'jane@doe.org')).to be_success
+    end
+
+    it 'returns failure for invalid input' do
+      expect(schema.(email: 'jane')).to be_failure
+    end
+
+    it 'adds correct error message' do
+      expect(schema.(email: 'jane').messages).to eql(
+        email: ['jane looks like an invalid email']
+      )
+    end
+
+    it 'is not executed when deps are invalid' do
+      expect(schema.(email: nil)).to be_failure
+    end
+  end
+
+  context 'with more than one value' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        configure do
+          def self.messages
+            super.merge(en: { errors: { email_required: 'provide email' }})
+          end
+        end
+
+        required(:email).maybe(:str?)
+        required(:newsletter).value(:bool?)
+
+        validate(email_required: %i[newsletter email]) do |newsletter, email|
+          if newsletter == true
+            !email.nil?
+          else
+            true
+          end
+        end
+      end
+    end
+
+    it 'returns success for valid input' do
+      expect(schema.(newsletter: false, email: nil)).to be_success
+      expect(schema.(newsletter: true, email: 'jane@doe.org')).to be_success
+    end
+
+    it 'returns failure for invalid input' do
+      expect(schema.(newsletter: true, email: nil)).to be_failure
+    end
+
+    it 'adds correct error message' do
+      expect(schema.(newsletter: true, email: nil).errors).to eql(
+        email_required: ['provide email']
+      )
+    end
+
+    it 'is not executed when deps are invalid' do
+      expect(schema.(newsletter: 'oops', email: '').errors).to eql(
+        newsletter: ['must be boolean']
+      )
+    end
+  end
+end

data/spec/integration/schema/xor_spec.rb

@@ -13,8 +13,8 @@ RSpec.describe 'Schema with xor rules' do
 
       required(:have_cake).filled
 
-      rule(:be_reasonable) do
-        value(:eat_cake).eql?('yes!') ^ value(:have_cake).eql?('yes!')
+      rule(be_reasonable: %i[eat_cake have_cake]) do |ec, hc|
+        ec.eql?('yes!') ^ hc.eql?('yes!')
       end
     end
   end
@@ -27,9 +27,9 @@ RSpec.describe 'Schema with xor rules' do
     end
 
     it 'fails when both options are selected' do
-      messages = schema.(eat_cake: 'yes!', have_cake: 'yes!').messages[:be_reasonable]
-
-      expect(messages).to eql(['you cannot eat cake and have cake!'])
+      expect(schema.(eat_cake: 'yes!', have_cake: 'yes!').messages).to eql(
+        be_reasonable: ['you cannot eat cake and have cake!']
+      )
     end
   end
 end

data/spec/integration/schema_builders_spec.rb

@@ -4,12 +4,14 @@ RSpec.describe 'Building schemas' do
       predicates = Module.new do
         include Dry::Logic::Predicates
 
-        predicate(:zomg?) { true }
+        def zomg?(*)
+          true
+        end
       end
 
       schema = Dry::Validation.Schema(predicates: predicates, build: false)
 
-      expect(schema.predicates.key?(:zomg?)).to be(true)
+      expect(schema.predicates[:key?]).to be_a(Method)
     end
   end
 end

data/spec/integration/schema_spec.rb

@@ -162,4 +162,12 @@ RSpec.describe Dry::Validation::Schema, 'defining key-based schema' do
       end
     end
   end
+
+  context 'nested keys' do
+    it 'raises error when defining nested keys without `schema` block`' do
+      expect {
+        Dry::Validation.Schema { required(:foo).value { required(:bar).value(:str?) } }
+      }.to raise_error(ArgumentError, /required/)
+    end
+  end
 end

data/spec/shared/message_compiler.rb

@@ -0,0 +1,11 @@
+RSpec.shared_context :message_compiler do
+  subject(:compiler) { Dry::Validation::MessageCompiler.new(messages) }
+
+  let(:messages) do
+    Dry::Validation::Messages.default
+  end
+
+  let(:result) do
+    compiler.public_send(visitor, node)
+  end
+end

data/spec/shared/predicate_helper.rb

@@ -1,13 +1,15 @@
-shared_context 'predicate helper' do
+RSpec.shared_context 'predicate helper' do
   def p(name, *args)
-    predicates[name].curry(*args).to_ast
+    Dry::Logic::Rule::Predicate.new(predicates[name], args: args).to_ast
   end
 
   let!(:predicates) do
     Module.new {
       include Dry::Logic::Predicates
 
-      predicate(:email?) { |value| true }
+      def self.email?(value)
+        true
+      end
     }
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ if RUBY_ENGINE == "rbx"
 end
 
 require 'dry-validation'
+require 'dry/core/constants'
 require 'ostruct'
 
 SPEC_ROOT = Pathname(__dir__)
@@ -18,6 +19,7 @@ Dir[SPEC_ROOT.join('shared/**/*.rb')].each(&method(:require))
 Dir[SPEC_ROOT.join('support/**/*.rb')].each(&method(:require))
 
 include Dry::Validation
+include Dry::Core::Constants
 
 module Types
   include Dry::Types.module
@@ -38,4 +40,17 @@ RSpec.configure do |config|
   end
 
   config.include PredicatesIntegration
+
+  config.before do
+    module Test
+      def self.remove_constants
+        constants.each { |const| remove_const(const)  }
+        self
+      end
+    end
+  end
+
+  config.after do
+    Object.send(:remove_const, Test.remove_constants.name)
+  end
 end