hash_validator 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e9643ea0272321ae3212a9c811044f18fcbf3a2
-  data.tar.gz: eedaa6b41b8e3c812fa9cc49c9282d7ac59cac07
+  metadata.gz: d3f14e426a06042aa90d83cd7addfc6453f759e4
+  data.tar.gz: 7fd7178c50fc0491bf276696b2c42b1cca24d3a7
 SHA512:
-  metadata.gz: 603d75b24833ba30bc6b9a8a6b730fd90b88ca00515c1cdaa157290b42424c801c7fc4fd84ea8ce8f992fb44ddbcdf4d8004399c5c193c48b899b89fbb55acbb
-  data.tar.gz: 52e365ac0b3e587c38519634db61e84737bf75526836f56aadbf7a9a2b7430adda18851de718a00bc4c31509ab3ae63c8cb803cef0674ff0c77f41dddb20d554
+  metadata.gz: 44fc5928ebd086077dac64d7a53e91a3c14b144e9831b07389aa5b086ffdd63f6271659ae3fc3bc695e73d6d06767077147e48748ddcf32bb149b82aa1fdbe97
+  data.tar.gz: 2589013673495b01ac126c5a250528059e69c5f0610003d9db0ab5c852d3b837a51efd2eb18d22f3b81058a2b07acf292db0c199ad9da637a363ddc5ff171fc1

data/README.md

@@ -116,6 +116,19 @@ validator.valid?  # => true
 validator.errors  # => {}
 ```
 
+## Multiple validators
+
+Multiple validators can be applied to a single key, e.g.
+
+```ruby
+HashValidator.validate(
+  { foo: 73 },
+  { foo: HashValidator.multiple('numeric', 1..100) }
+)
+```
+
+This is particularly useful when defining custom validators.
+
 ## Contributing
 
 1. Fork it

data/lib/hash_validator.rb

@@ -10,6 +10,10 @@ module HashValidator
   def self.many(validation)
     Validations::Many.new(validation)
   end
+
+  def self.multiple(*validations)
+    Validations::Multiple.new(validations)
+  end
 end
 
 require 'hash_validator/base'

data/lib/hash_validator/validations.rb

@@ -6,3 +6,4 @@ end
 # Load validators
 require 'hash_validator/validations/optional'
 require 'hash_validator/validations/many'
+require 'hash_validator/validations/multiple'

data/lib/hash_validator/validations/multiple.rb

@@ -0,0 +1,8 @@
+module HashValidator::Validations
+  class Multiple
+    attr_reader :validations
+    def initialize(validations)
+      @validations = validations
+    end
+  end
+end

data/lib/hash_validator/validators.rb

@@ -35,3 +35,4 @@ require 'hash_validator/validators/regex_validator'
 require 'hash_validator/validators/lambda_validator'
 require 'hash_validator/validators/optional_validator'
 require 'hash_validator/validators/many_validator'
+require 'hash_validator/validators/multiple_validator'

data/lib/hash_validator/validators/base.rb

@@ -18,7 +18,7 @@ class HashValidator::Validator::Base
     "#{self.name} required"
   end
 
-  def validate(key, value, validations, errors)
+  def validate(*)
     raise StandardError.new('validate should not be called directly on BaseValidator')
   end
 end

data/lib/hash_validator/validators/boolean_validator.rb

@@ -3,7 +3,7 @@ class HashValidator::Validator::BooleanValidator < HashValidator::Validator::Bas
     super('boolean')  # The name of the validator
   end
 
-  def validate(key, value, validations, errors)
+  def validate(key, value, _validations, errors)
     unless [TrueClass, FalseClass].include?(value.class)
       errors[key] = presence_error_message
     end

data/lib/hash_validator/validators/email_validator.rb

@@ -7,11 +7,11 @@ class HashValidator::Validator::EmailValidator < HashValidator::Validator::Base
     'is not a valid email'
   end
 
-  def validate(key, value, validations, errors)
+  def validate(key, value, _validations, errors)
     unless value.is_a?(String) && value.include?("@")
       errors[key] = presence_error_message
     end
   end
 end
 
-HashValidator.append_validator(HashValidator::Validator::EmailValidator.new)
+HashValidator.append_validator(HashValidator::Validator::EmailValidator.new)

data/lib/hash_validator/validators/hash_validator.rb

@@ -20,7 +20,7 @@ class HashValidator::Validator::HashValidator < HashValidator::Validator::Base
     validations.each do |v_key, v_value|
       HashValidator.validator_for(v_value).validate(v_key, value[v_key], v_value, errors)
     end
-    
+
     if HashValidator::Base.strict?
       value.keys.each do |k|
         errors[k] = 'key not expected' unless validations[k]
@@ -28,7 +28,7 @@ class HashValidator::Validator::HashValidator < HashValidator::Validator::Base
     end
 
     # Cleanup errors (remove any empty nested errors)
-    errors.delete_if { |k,v| v.empty? }
+    errors.delete_if { |_,v| v.empty? }
   end
 end
 

data/lib/hash_validator/validators/multiple_validator.rb

@@ -0,0 +1,27 @@
+module HashValidator
+  module Validator
+    class MultipleValidator < Base
+      def initialize
+        super('_multiple')  # The name of the validator, underscored as it won't usually be directly invoked (invoked through use of validator)
+      end
+
+      def should_validate?(validation)
+        validation.is_a?(Validations::Multiple)
+      end
+
+      def validate(key, value, validations, errors)
+        multiple_errors = []
+
+        validations.validations.each do |validation|
+          validation_error = {}
+          ::HashValidator.validator_for(validation).validate(key, value, validation, validation_error)
+          multiple_errors << validation_error[key] if validation_error[key]
+        end
+
+        errors[key] = multiple_errors.join(', ') if multiple_errors.any?
+      end
+    end
+  end
+end
+
+HashValidator.append_validator(HashValidator::Validator::MultipleValidator.new)

data/lib/hash_validator/validators/presence_validator.rb

@@ -7,7 +7,7 @@ class HashValidator::Validator::PresenceValidator < HashValidator::Validator::Ba
     'is required'
   end
 
-  def validate(key, value, validations, errors)
+  def validate(key, value, _validations, errors)
     if value.nil?
       errors[key] = presence_error_message
     end

data/lib/hash_validator/validators/simple_validator.rb

@@ -12,7 +12,7 @@ class HashValidator::Validator::SimpleValidator < HashValidator::Validator::Base
     self.lambda = lambda
   end
 
-  def validate(key, value, validations, errors)
+  def validate(key, value, _validations, errors)
     unless lambda.call(value)
       errors[key] = presence_error_message
     end

data/lib/hash_validator/version.rb

@@ -1,3 +1,3 @@
 module HashValidator
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/spec/hash_validator_spec.rb

@@ -239,6 +239,22 @@ describe HashValidator do
           expect(v.errors).to eq({ bar: 'string required', user: { likes: 'enumerable required' } })
         end
       end
+
+      describe 'multiple validations' do
+        let(:validations) {{ foo: 'numeric', user: { age: HashValidator.multiple('numeric', 1..100) } }}
+
+        it 'should validate a complex hash' do
+          v = validate(complex_hash, validations)
+          expect(v.valid?).to eq true
+          expect(v.errors).to be_empty
+        end
+
+        it 'should not validate a complex hash 2' do
+          v = validate(invalid_complex_hash, validations)
+          expect(v.valid?).to eq false
+          expect(v.errors).to eq({ user: { age: 'numeric required, value from list required' } })
+        end
+      end
     end
   end
 end

data/spec/validators/multiple_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe HashValidator::Validator::Base do
+  let(:validator)  { HashValidator::Validator::MultipleValidator.new }
+  let(:errors)     { Hash.new }
+
+  def multiple(*validations)
+    HashValidator::Validations::Multiple.new(validations)
+  end
+
+  describe '#should_validate?' do
+    it 'should validate an Multiple validation' do
+      expect(validator.should_validate?(multiple('numeric', 1..10))).to eq true
+    end
+
+    it 'should not validate other things' do
+      expect(validator.should_validate?('string')).to eq false
+      expect(validator.should_validate?('array')).to eq false
+      expect(validator.should_validate?(nil)).to eq false
+    end
+  end
+
+  describe '#validate' do
+    it 'should accept an empty collection of validators' do
+      validator.validate(:key, 73, multiple(), errors)
+
+      expect(errors).to be_empty
+    end
+
+    it 'should accept an collection of validators' do
+      validator.validate(:key, 73, multiple('numeric', 1..100), errors)
+
+      expect(errors).to be_empty
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_validator
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/hash_validator/base.rb
 - lib/hash_validator/validations.rb
 - lib/hash_validator/validations/many.rb
+- lib/hash_validator/validations/multiple.rb
 - lib/hash_validator/validations/optional.rb
 - lib/hash_validator/validators.rb
 - lib/hash_validator/validators/base.rb
@@ -94,6 +95,7 @@ files:
 - lib/hash_validator/validators/hash_validator.rb
 - lib/hash_validator/validators/lambda_validator.rb
 - lib/hash_validator/validators/many_validator.rb
+- lib/hash_validator/validators/multiple_validator.rb
 - lib/hash_validator/validators/optional_validator.rb
 - lib/hash_validator/validators/presence_validator.rb
 - lib/hash_validator/validators/regex_validator.rb
@@ -109,6 +111,7 @@ files:
 - spec/validators/in_enumerable_spec.rb
 - spec/validators/lambda_spec.rb
 - spec/validators/many_spec.rb
+- spec/validators/multiple_spec.rb
 - spec/validators/optional_spec.rb
 - spec/validators/presence_spec.rb
 - spec/validators/regexp_spec.rb
@@ -149,6 +152,7 @@ test_files:
 - spec/validators/in_enumerable_spec.rb
 - spec/validators/lambda_spec.rb
 - spec/validators/many_spec.rb
+- spec/validators/multiple_spec.rb
 - spec/validators/optional_spec.rb
 - spec/validators/presence_spec.rb
 - spec/validators/regexp_spec.rb