dry-validation 0.2.0 → 0.3.0

data/spec/integration/localized_error_messages_spec.rb

@@ -0,0 +1,52 @@
+RSpec.describe Dry::Validation, 'with localized messages' do
+  subject(:validation) { schema.new }
+
+  before do
+    I18n.config.available_locales_set << :pl
+    I18n.load_path = %w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") }
+    I18n.backend.load_translations
+  end
+
+  describe 'defining schema' do
+    context 'without a namespace' do
+      let(:schema) do
+        Class.new(Dry::Validation::Schema) do
+          configure do |config|
+            config.messages = :i18n
+          end
+
+          key(:email) { |email| email.filled? }
+        end
+      end
+
+      describe '#messages' do
+        it 'returns localized error messages' do
+          expect(validation.(email: '').messages(locale: :pl)).to match_array([
+            [:email, [['Proszę podać adres email', '']]]
+          ])
+        end
+      end
+    end
+
+    context 'with a namespace' do
+      let(:schema) do
+        Class.new(Dry::Validation::Schema) do
+          configure do |config|
+            config.messages = :i18n
+            config.namespace = :user
+          end
+
+          key(:email) { |email| email.filled? }
+        end
+      end
+
+      describe '#messages' do
+        it 'returns localized error messages' do
+          expect(validation.(email: '').messages(locale: :pl)).to match_array([
+            [:email, [['Hej user! Dawaj ten email no!', '']]]
+          ])
+        end
+      end
+    end
+  end
+end

data/spec/integration/messages/i18n_spec.rb

@@ -0,0 +1,71 @@
+require 'dry/validation/messages/i18n'
+
+RSpec.describe Messages::I18n do
+  subject(:messages) { Messages::I18n.new }
+
+  before do
+    I18n.config.available_locales_set << :pl
+    I18n.load_path << %w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") }
+    I18n.backend.load_translations
+  end
+
+  describe '#[]' do
+    context 'with the default locale' do
+      it 'returns a message for a predicate' do
+        message = messages[:filled?, rule: :name]
+
+        expect(message).to eql("%{name} must be filled")
+      end
+
+      it 'returns a message for a specific rule' do
+        message = messages[:filled?, rule: :email]
+
+        expect(message).to eql("Please provide your email")
+      end
+
+      it 'returns a message for a specific val type' do
+        message = messages[:size?, rule: :pages, val_type: String]
+
+        expect(message).to eql("%{name} length must be %{num}")
+      end
+
+      it 'returns a message for a specific rule and its default arg type' do
+        message = messages[:size?, rule: :pages]
+
+        expect(message).to eql("%{name} size must be %{num}")
+      end
+
+      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("%{name} size must be within %{left} - %{right}")
+      end
+    end
+
+    context 'with a different locale' do
+      it 'returns a message for a predicate' do
+        message = messages[:filled?, rule: :name, locale: :pl]
+
+        expect(message).to eql("%{name} nie może być pusty")
+      end
+
+      it 'returns a message for a specific rule' do
+        message = messages[:filled?, rule: :email, locale: :pl]
+
+        expect(message).to eql("Proszę podać adres email")
+      end
+
+      it 'returns a message for a specific rule and its default arg type' do
+        message = messages[:size?, rule: :pages, locale: :pl]
+
+        expect(message).to eql("wielkość musi być równa %{num}")
+      end
+
+      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}")
+      end
+    end
+  end
+end

data/spec/integration/rule_groups_spec.rb

@@ -0,0 +1,35 @@
+RSpec.describe Dry::Validation::Schema do
+  subject(:validation) { schema.new }
+
+  describe 'defining schema with rule groups' do
+    let(:schema) do
+      Class.new(Dry::Validation::Schema) do
+        confirmation(:password)
+      end
+    end
+
+    describe '#call' do
+      it 'returns empty errors when password matches confirmation' do
+        expect(validation.(password: 'foo', password_confirmation: 'foo')).to be_empty
+      end
+
+      it 'returns error for a failed group rule' do
+        expect(validation.(password: 'foo', password_confirmation: 'bar')).to match_array([
+          [:error, [
+            :input, [
+              :password_confirmation,
+              ["foo", "bar"],
+              [[:group, [:password_confirmation, [:predicate, [:eql?, []]]]]]]]
+          ]
+        ])
+      end
+
+      it 'returns errors for the dependent predicates, not the group rule, when any of the dependent predicates fail' do
+        expect(validation.(password: '', password_confirmation: '')).to match_array([
+          [:error, [:input, [:password, "", [[:val, [:password, [:predicate, [:filled?, []]]]]]]]],
+          [:error, [:input, [:password_confirmation, "", [[:val, [:password_confirmation, [:predicate, [:filled?, []]]]]]]]]
+        ])
+      end
+    end
+  end
+end

data/spec/integration/schema_form_spec.rb

@@ -22,17 +22,19 @@ RSpec.describe Dry::Validation::Schema::Form do
           end
         end
 
-        optional(:phone_number) { |phone_number| phone_number.none? | phone_number.str? }
+        optional(:phone_number) do |phone_number|
+          phone_number.none? | (phone_number.int? & phone_number.gt?(0))
+        end
       end
     end
 
     describe '#messages' do
       it 'returns compiled error messages' do
-        result = validation.messages('email' => '', 'age' => '19')
+        result = validation.('email' => '', 'age' => '19')
 
-        expect(result).to match_array([
-          [:email, ["email must be filled"]],
-          [:address, ["address is missing"]]
+        expect(result.messages).to match_array([
+          [:email, [['email must be filled', '']]],
+          [:address, [['address is missing', nil]]]
         ])
 
         expect(result.params).to eql(email: '', age: 19)
@@ -74,7 +76,7 @@ RSpec.describe Dry::Validation::Schema::Form do
         result = validation.(
           'email' => 'jane@doe.org',
           'age' => '19',
-          'phone_number' => 12,
+          'phone_number' => '12',
           'address' => {
             'city' => 'NYC',
             'street' => 'Street 1/2',
@@ -82,9 +84,7 @@ RSpec.describe Dry::Validation::Schema::Form do
           }
         )
 
-        expect(result).to match_array([
-          [:error, [:input, [:phone_number, 12, [[:val, [:phone_number, [:predicate, [:str?, []]]]]]]]],
-        ])
+        expect(result).to be_empty
 
         expect(result.params).to eql(
           email: 'jane@doe.org', age: 19, phone_number: 12,

data/spec/integration/schema_spec.rb

@@ -46,8 +46,8 @@ RSpec.describe Dry::Validation::Schema do
 
     describe '#messages' do
       it 'returns compiled error messages' do
-        expect(validation.messages(attrs.merge(email: ''))).to match_array([
-          [:email, ["email must be filled"]]
+        expect(validation.(attrs.merge(email: '')).messages).to match_array([
+          [:email, [['email must be filled', '']]]
         ])
       end
     end

data/spec/shared/predicates.rb

@@ -8,6 +8,8 @@ RSpec.shared_examples 'predicates' do
   let(:min_size?) { Dry::Validation::Predicates[:min_size?] }
 
   let(:key?) { Dry::Validation::Predicates[:key?] }
+
+  let(:eql?) { Dry::Validation::Predicates[:eql?] }
 end
 
 RSpec.shared_examples 'a passing predicate' do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'i18n'
 require 'dry-validation'
 
 begin

data/spec/unit/rule/group_spec.rb

@@ -0,0 +1,12 @@
+RSpec.describe Rule::Group do
+  include_context 'predicates'
+
+  subject(:rule) { Rule::Group.new([:pass, :pass_confirm], eql?) }
+
+  describe '#call' do
+    it 'calls predicate with result values' do
+      expect(rule.('foo', 'foo')).to be_success
+      expect(rule.('foo', 'bar')).to be_failure
+    end
+  end
+end

data/spec/unit/schema_spec.rb

@@ -0,0 +1,35 @@
+require 'dry/validation/messages/i18n'
+
+RSpec.describe Schema do
+  describe '.messages' do
+    context 'with default setting' do
+      let(:schema) do
+        Class.new(Schema)
+      end
+
+      it 'returns default yaml messages' do
+        expect(schema.messages).to be_instance_of(Messages::YAML)
+      end
+    end
+
+    context 'with i18n setting' do
+      let(:schema) do
+        Class.new(Schema) { configure { config.messages = :i18n } }
+      end
+
+      it 'returns default i18n messages' do
+        expect(schema.messages).to be_instance_of(Messages::I18n)
+      end
+    end
+
+    context 'with an invalid setting' do
+      let(:schema) do
+        Class.new(Schema) { configure { config.messages = :oops } }
+      end
+
+      it 'returns default i18n messages' do
+        expect { schema.messages }.to raise_error(RuntimeError, /oops/)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -152,6 +152,10 @@ files:
 - lib/dry/validation/error_compiler.rb
 - lib/dry/validation/input_type_compiler.rb
 - lib/dry/validation/messages.rb
+- lib/dry/validation/messages/abstract.rb
+- lib/dry/validation/messages/i18n.rb
+- lib/dry/validation/messages/namespaced.rb
+- lib/dry/validation/messages/yaml.rb
 - lib/dry/validation/predicate.rb
 - lib/dry/validation/predicate_set.rb
 - lib/dry/validation/predicates.rb
@@ -159,7 +163,9 @@ files:
 - lib/dry/validation/rule.rb
 - lib/dry/validation/rule/composite.rb
 - lib/dry/validation/rule/each.rb
+- lib/dry/validation/rule/group.rb
 - lib/dry/validation/rule/key.rb
+- lib/dry/validation/rule/result.rb
 - lib/dry/validation/rule/set.rb
 - lib/dry/validation/rule/value.rb
 - lib/dry/validation/rule_compiler.rb
@@ -172,15 +178,19 @@ files:
 - lib/dry/validation/schema/value.rb
 - lib/dry/validation/version.rb
 - rakelib/rubocop.rake
-- spec/fixtures/errors.yml
+- spec/fixtures/locales/en.yml
+- spec/fixtures/locales/pl.yml
 - spec/integration/custom_error_messages_spec.rb
 - spec/integration/custom_predicates_spec.rb
+- spec/integration/error_compiler_spec.rb
+- spec/integration/localized_error_messages_spec.rb
+- spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
+- spec/integration/rule_groups_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
 - spec/shared/predicates.rb
 - spec/spec_helper.rb
-- spec/unit/error_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb
 - spec/unit/predicate_spec.rb
 - spec/unit/predicates/bool_spec.rb
@@ -209,11 +219,13 @@ files:
 - spec/unit/rule/conjunction_spec.rb
 - spec/unit/rule/disjunction_spec.rb
 - spec/unit/rule/each_spec.rb
+- spec/unit/rule/group_spec.rb
 - spec/unit/rule/implication_spec.rb
 - spec/unit/rule/key_spec.rb
 - spec/unit/rule/set_spec.rb
 - spec/unit/rule/value_spec.rb
 - spec/unit/rule_compiler_spec.rb
+- spec/unit/schema_spec.rb
 homepage: https://github.com/dryrb/dry-validation
 licenses:
 - MIT
@@ -239,15 +251,19 @@ signing_key:
 specification_version: 4
 summary: A simple validation library
 test_files:
-- spec/fixtures/errors.yml
+- spec/fixtures/locales/en.yml
+- spec/fixtures/locales/pl.yml
 - spec/integration/custom_error_messages_spec.rb
 - spec/integration/custom_predicates_spec.rb
+- spec/integration/error_compiler_spec.rb
+- spec/integration/localized_error_messages_spec.rb
+- spec/integration/messages/i18n_spec.rb
 - spec/integration/optional_keys_spec.rb
+- spec/integration/rule_groups_spec.rb
 - spec/integration/schema_form_spec.rb
 - spec/integration/schema_spec.rb
 - spec/shared/predicates.rb
 - spec/spec_helper.rb
-- spec/unit/error_compiler_spec.rb
 - spec/unit/input_type_compiler_spec.rb
 - spec/unit/predicate_spec.rb
 - spec/unit/predicates/bool_spec.rb
@@ -276,9 +292,11 @@ test_files:
 - spec/unit/rule/conjunction_spec.rb
 - spec/unit/rule/disjunction_spec.rb
 - spec/unit/rule/each_spec.rb
+- spec/unit/rule/group_spec.rb
 - spec/unit/rule/implication_spec.rb
 - spec/unit/rule/key_spec.rb
 - spec/unit/rule/set_spec.rb
 - spec/unit/rule/value_spec.rb
 - spec/unit/rule_compiler_spec.rb
+- spec/unit/schema_spec.rb
 has_rdoc: 

data/spec/fixtures/errors.yml

@@ -1,4 +0,0 @@
-user:
-  attributes:
-    email:
-      filled?: "%{name} can't be blank"