dry-validation 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c5757cf4c0d97231cb5077aa617a731ae8b77c
-  data.tar.gz: bb77ddf24b5108592e5ab92961bff80caefb20e6
+  metadata.gz: 0630ad4e7946a89c0562c0f064220eaa186e2157
+  data.tar.gz: 10200a87ef1ea0910e3c7acd490f36529df7e6b8
 SHA512:
-  metadata.gz: 78c62e2a2585215397e12cb0621497e1b4332750b61501534b0e1f643f7d5ea7f82e05f3c64b9977a313acf87466c8031ec160e3706794b34ce90c1fe8a7300a
-  data.tar.gz: 1a9685102ac167001c910e617dee87cea45f6413d105f5231e93790bc3dad0c7199e67a0d838b294185520e26a5475ab56f9b13df08be92e5880a630b129ca20
+  metadata.gz: e829d8b8a77b5ab749700b4a6340684503745008b39985a82bbdd604e00e4ab3e1c41ebbdfda37e1594de822cbc2457bfe88a58a625cfa2d3c51d0fd4ebf9c52
+  data.tar.gz: 59a24f1ee1d3036f9c6ed2232e2b809b2aa62529916b7e0c0a8490286569992cada68e9324e47b2776eecef144857ddd5cc44803f5da66fcf3572ca5ca253a36

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-# v0.3.0 to-be-released
+# v0.3.1 2015-12-08
+
+### Added
+
+* Support for `Range` and `Array` as an argument in `size?` predicate (solnic)
+
+### Fixed
+
+* Error compiler returns an empty hash rather than a nil when there are no errors (solnic)
+
+[Compare v0.3.0...v0.3.1](https://github.com/dryrb/dry-validation/compare/v0.3.0...v0.3.1)
+
+# v0.3.0 2015-12-07
 
 ### Added
 

data/lib/dry/validation.rb

@@ -6,6 +6,9 @@ require 'dry-container'
 # a common task in Ruby
 module Dry
   module Validation
+    def self.messages_paths
+      Messages::Abstract.config.paths
+    end
   end
 end
 

data/lib/dry/validation/error_compiler.rb

@@ -3,13 +3,15 @@ module Dry
     class ErrorCompiler
       attr_reader :messages, :options
 
+      DEFAULT_RESULT = {}.freeze
+
       def initialize(messages, options = {})
         @messages = messages
         @options = options
       end
 
       def call(ast)
-        ast.map { |node| visit(node) }.reduce(:merge)
+        ast.map { |node| visit(node) }.reduce(:merge) || DEFAULT_RESULT
       end
 
       def with(options)

data/lib/dry/validation/messages/abstract.rb

@@ -1,12 +1,15 @@
+require 'pathname'
 require 'thread_safe/cache'
 
 module Dry
   module Validation
     module Messages
       class Abstract
+        DEFAULT_PATH = Pathname(__dir__).join('../../../../config/errors.yml').realpath.freeze
+
         extend Dry::Configurable
 
-        setting :path, Pathname(__dir__).join('../../../../config/errors.yml').realpath.freeze
+        setting :paths, [DEFAULT_PATH]
         setting :root, 'errors'.freeze
         setting :lookup_options, [:root, :predicate, :rule, :val_type, :arg_type].freeze
 

data/lib/dry/validation/messages/i18n.rb

@@ -6,7 +6,7 @@ module Dry
     class Messages::I18n < Messages::Abstract
       attr_reader :t
 
-      ::I18n.load_path << config.path
+      ::I18n.load_path.concat(config.paths)
 
       def initialize
         @t = I18n.method(:t)
@@ -17,7 +17,7 @@ module Dry
       end
 
       def key?(key, options)
-        I18n.exists?(key, options.fetch(:locale, I18n.default_locale))
+        ::I18n.exists?(key, options.fetch(:locale, I18n.default_locale))
       end
     end
   end

data/lib/dry/validation/messages/yaml.rb

@@ -12,8 +12,8 @@ module Dry
         config.root = 'en.errors'.freeze
       end
 
-      def self.load(path = config.path)
-        new(load_file(path))
+      def self.load(paths = config.paths)
+        new(paths.map { |path| load_file(path) }.reduce(:merge))
       end
 
       def self.load_file(path)

data/lib/dry/validation/predicates.rb

@@ -88,8 +88,13 @@ module Dry
         !self[:lt?].(num, input)
       end
 
-      predicate(:size?) do |num, input|
-        input.size == num
+      predicate(:size?) do |size, input|
+        case size
+        when Fixnum then size == input.size
+        when Range, Array then size.include?(input.size)
+        else
+          raise ArgumentError, "+#{size}+ is not supported type for size? predicate"
+        end
       end
 
       predicate(:min_size?) do |num, input|

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.1'.freeze
   end
 end

data/spec/integration/custom_error_messages_spec.rb

@@ -1,7 +1,19 @@
-RSpec.describe Dry::Validation, 'with custom messages' do
+require 'dry/validation/messages/i18n'
+
+RSpec.describe Dry::Validation do
   subject(:validation) { schema.new }
 
-  describe 'defining schema' do
+  shared_context 'schema with customized messages' do
+    describe '#messages' do
+      it 'returns compiled error messages' do
+        expect(validation.(email: '').messages).to match_array([
+          [:email, [['Please provide your email', '']]]
+        ])
+      end
+    end
+  end
+
+  context 'yaml' do
     let(:schema) do
       Class.new(Dry::Validation::Schema) do
         configure do |config|
@@ -12,12 +24,27 @@ RSpec.describe Dry::Validation, 'with custom messages' do
       end
     end
 
-    describe '#messages' do
-      it 'returns compiled error messages' do
-        expect(validation.(email: '').messages).to match_array([
-          [:email, [['Please provide your email', '']]]
-        ])
+    include_context 'schema with customized messages'
+  end
+
+  context 'i18n' do
+    context 'with custom messages set globally' do
+      before do
+        I18n.load_path << SPEC_ROOT.join('fixtures/locales/en.yml')
+        I18n.backend.load_translations
       end
+
+      let(:schema) do
+        Class.new(Dry::Validation::Schema) do
+          configure do |config|
+            config.messages = :i18n
+          end
+
+          key(:email, &:filled?)
+        end
+      end
+
+      include_context 'schema with customized messages'
     end
   end
 end

data/spec/integration/localized_error_messages_spec.rb

@@ -1,9 +1,11 @@
+require 'dry/validation/messages/i18n'
+
 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.load_path.concat(%w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") })
     I18n.backend.load_translations
   end
 

data/spec/integration/messages/i18n_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Messages::I18n do
 
   before do
     I18n.config.available_locales_set << :pl
-    I18n.load_path << %w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") }
+    I18n.load_path.concat(%w(en pl).map { |l| SPEC_ROOT.join("fixtures/locales/#{l}.yml") })
     I18n.backend.load_translations
   end
 

data/spec/shared/predicates.rb

@@ -16,8 +16,8 @@ RSpec.shared_examples 'a passing predicate' do
   let(:predicate) { Dry::Validation::Predicates[predicate_name] }
 
   it do
-    arguments_list.each do |args|
-      expect(predicate.call(*args)).to be true
+    arguments_list.each do |(left, right)|
+      expect(predicate.call(left, right)).to be(true)
     end
   end
 end
@@ -26,8 +26,8 @@ RSpec.shared_examples 'a failing predicate' do
   let(:predicate) { Dry::Validation::Predicates[predicate_name] }
 
   it do
-    arguments_list.each do |args|
-      expect(predicate.call(*args)).to be false
+    arguments_list.each do |(left, right)|
+      expect(predicate.call(left, right)).to be(false)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'i18n'
 require 'dry-validation'
 
 begin
@@ -16,4 +15,11 @@ include Dry::Validation
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
+
+  config.after do
+    if defined?(I18n)
+      I18n.load_path = Dry::Validation.messages_paths.dup
+      I18n.backend.reload!
+    end
+  end
 end

data/spec/unit/error_compiler_spec.rb

@@ -0,0 +1,7 @@
+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)
+  end
+end

data/spec/unit/predicates/size_spec.rb

@@ -7,43 +7,49 @@ RSpec.describe Dry::Validation::Predicates do
     context 'when value size is equal to n' do
       let(:arguments_list) do
         [
-          [2, [1, 2]],
+          [[8], 2],
           [4, 'Jill'],
           [2, { 1 => 'st', 2 => 'nd' }],
-          [8, 1],
-          [5, 1..5]
+          [8, 8],
+          [1..8, 5]
         ]
       end
 
       it_behaves_like 'a passing predicate'
     end
 
-    context 'when value size is less than n' do
+    context 'when value size is greater than n' do
       let(:arguments_list) do
         [
-          [3, [1, 2]],
+          [[1, 2], 3],
           [5, 'Jill'],
           [3, { 1 => 'st', 2 => 'nd' }],
-          [9, 1],
-          [6, 1..5]
+          [1, 9],
+          [1..5, 6]
         ]
       end
 
       it_behaves_like 'a failing predicate'
     end
 
-    context 'with value size is greater than n' do
+    context 'with value size is less than n' do
       let(:arguments_list) do
         [
-          [1, [1, 2]],
+          [[1, 2], 1],
           [3, 'Jill'],
           [1, { 1 => 'st', 2 => 'nd' }],
-          [7, 1],
-          [4, 1..5]
+          [1, 7],
+          [1..5, 4]
         ]
       end
 
       it_behaves_like 'a failing predicate'
     end
+
+    context 'with an unsupported size' do
+      it 'raises an error' do
+        expect { Predicates[:size?].call('oops', 1) }.to raise_error(ArgumentError, /oops/)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -191,6 +191,7 @@ files:
 - 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
@@ -264,6 +265,7 @@ test_files:
 - 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