veto 0.1.3 → 1.0.0

data/spec/validator_spec.rb

@@ -1,119 +1,228 @@
 require 'spec_helper'
-require 'veto/validator'
 
 describe Veto::Validator do
-	let(:entity){ stub }
-	let(:validator_class) { Class.new{ include Veto::Validator } }
-	let(:validator) { validator_class.new(entity) } 
-
-	describe '::builder' do
-		it 'returns builder' do
-			validator_class.send(:builder).must_be_instance_of Veto::Builder
-		end
-	end
-
-	describe '::with_options' do
-		it 'delegates to builder' do
-			builder = stub
-			validator_class.expects(:builder).returns(builder)
-			builder.expects(:with_options).with('args')
-			validator_class.with_options('args')
-		end
-	end
-
-	describe '::validates' do
-		it 'delegates to builder' do
-			builder = stub
-			validator_class.expects(:builder).returns(builder)
-			builder.expects(:validates).with('args')
-			validator_class.validates('args')
-		end	
-	end
-
-	describe '::validate' do
-		it 'delegates to builder' do
-			builder = stub
-			validator_class.expects(:builder).returns(builder)
-			builder.expects(:validate).with('args')
-			validator_class.validate('args')
-		end	
-	end
-
-	describe '::validate_with' do
-		it 'adds validator to validators array' do
-			validator = stub
-			validator_class.validate_with validator
-			validator_class.validators.must_equal [validator]
-		end
-
-		it 'adds validators to validators array' do
-			validator = stub
-			validator_class.validate_with [validator, validator]
-			validator_class.validators.must_equal [validator, validator]
-		end
-	end
-
-	describe '::validators' do
-		it 'returns validators list' do
-			validator_class.validators.must_equal []
-		end
-	end
-
-	describe '::valid?' do
-		it 'initializes new instance and delegates to instance method' do
-			validator_class.expects(:new).with(entity).returns(entity)
-			entity.expects(:valid?)
-			validator_class.valid?(entity)
-		end
-	end
-
-	describe '::validate!' do
-		it 'initializes new instance and delegates to instance method' do
-			validator_class.expects(:new).with(entity).returns(entity)
-			entity.expects(:validate!)
-			validator_class.validate!(entity)
-		end
-	end
-
-	describe '#valid?' do
-		context 'when entity is valid' do
-			it 'returns true' do
-				errors = stub(:empty? => true)
-				validator.expects(:errors => errors)
-				validator.valid?.must_equal true
-			end
-		end
-
-		context 'when entity is invalid' do
-			it 'returns false' do
-				errors = stub(:empty? => false)
-				validator.expects(:errors => errors)
-				validator.valid?.must_equal false
-			end
-		end
-	end
-
-	describe '#validate!' do
-		context 'when entity is valid' do
-			it 'returns true' do
-				validator.expects(:valid?).returns(true)
-				validator.validate!.must_be_nil
-			end
-		end
-
-		context 'when entity is invalid' do
-			it 'returns false' do
-				errors = stub(:full_messages => '')
-				validator.expects(:valid?).returns(false)
-				validator.expects(:errors => errors)
-				proc { validator.validate! }.must_raise ::Veto::InvalidEntity
-			end
-		end
-	end
-
-	describe '#errors' do
-		it 'returns errors object' do
-			validator.errors.must_be_instance_of Veto::Errors
-		end
-	end
+  describe 'general usage' do
+    context 'when validation fails' do
+      it 'it can generate errors' do
+        entity = stub(:name => nil)
+        validator = new_validator(:validates, :name, :presence => true)
+        validator.valid?(entity)
+        validator.errors[:name].must_equal(["is not present"])
+      end
+
+      it 'it can validate entity strictly' do
+        entity = stub(:name => nil)
+        validator = new_validator(:validates, :name, :presence => true)
+        proc { validator.validate!(entity) }.must_raise(Veto::InvalidEntity)
+      end
+    end
+
+    def new_validator(*args)
+      klass = Class.new{ include Veto.validator }
+      klass.send(*args)
+      klass.new
+    end
+  end
+
+  describe 'validates dsl' do
+    context 'when group conditions pass' do
+      context 'when check conditions pass' do
+        it 'assign errors' do
+          entity = stub(:name => nil)
+          validator = new_validator(:validates, :name, :presence => {:if => true}, :if => true)
+          validator.valid?(entity)
+          validator.errors[:name].must_equal(["is not present"])
+        end
+      end
+
+      context 'when check conditions fail' do
+        it 'does not assign errors' do
+          entity = stub(:name => nil)
+          validator = new_validator(:validates, :name, :presence => {:if => false}, :if => true)
+          validator.valid?(entity)
+          validator.errors.must_be_empty
+        end
+      end
+    end
+
+    context 'when group conditions fail' do
+      it 'assign errors' do
+        entity = stub(:name => nil)
+        validator = new_validator(:validates, :name, :presence => {:if => true}, :if => false)
+        validator.valid?(entity)
+        validator.errors.must_be_empty
+      end
+    end
+
+    describe 'attribute validation' do
+      it 'assign errors' do
+        entity = stub(:isbn => '23432-53444-3234234')
+        validator = new_validator(:validates, :isbn, :exact_length => 13)
+        validator.valid?(entity)
+        validator.errors[:isbn].must_equal(["is not 13 characters"])
+      end
+    end
+
+    describe 'format check' do
+      context 'when value matches format' do
+        it 'assigns no errors' do
+          entity = stub(:first_name => 'john')
+          validator = new_validator(:validates, :first_name, :format => /[A-Za-z]+/)
+          validator.valid?(entity)
+          validator.errors.must_be_empty
+        end
+      end
+
+      context 'when value does not match format' do
+        it 'assigns errors' do
+          entity = stub(:first_name => 'john')
+          validator = new_validator(:validates, :first_name, :format => /[0-9]+/)
+          validator.valid?(entity)
+          validator.errors[:first_name].must_equal(["is not valid"])
+        end
+      end
+    end
+
+    def new_validator(*args)
+      klass = Class.new{ include Veto.validator }
+      klass.send(*args)
+      klass.new
+    end
+  end
+
+  describe 'validate dsl' do
+    context 'when conditions pass' do
+      context 'when check passes' do
+        it 'does not assign errors' do
+          entity = stub(:validate? => true, :first_name => 'John')
+          validator = new_validator
+          validator.valid?(entity)
+          validator.errors.must_be_empty
+        end
+      end
+
+      context 'when check fails' do
+        it 'assigns errors' do
+          entity = stub(:validate? => true, :first_name => 'Bob')
+          validator = new_validator
+          validator.valid?(entity)
+          validator.errors.must_equal(:first_name=>["is has wrong length"])
+        end
+      end
+    end
+
+    context 'when conditions fail' do
+      it 'does not assign errors' do
+        entity = stub(:validate? => false, :first_name => 'John')
+        validator = new_validator
+        validator.valid?(entity)
+        validator.errors.must_be_empty
+      end
+    end
+
+    def new_validator
+      Class.new {
+        include Veto.validator
+
+        validate :validate_first_name_length, :if => 'validate?'
+
+        def validate_first_name_length(entity)
+          errors.add(:first_name, 'is has wrong length') unless entity.first_name.size == 4
+        end
+      }.new
+    end
+  end
+
+  describe 'with_options dsl' do
+    context 'when conditions pass' do
+      it 'runs checks inside block' do
+        entity = stub(:validate? => true, :first_name => nil, :last_name => nil)
+        validator = new_validator
+        validator.valid?(entity)
+        validator.errors.must_equal(:first_name=>["is not present"], :last_name=>["is not present"])
+      end
+    end
+
+    context 'when conditions fail' do
+      it 'does not run checks inside block' do
+        entity = stub(:validate? => false, :first_name => nil, :last_name => nil)
+        validator = new_validator
+        validator.valid?(entity)
+        validator.errors.must_be_empty
+      end
+    end
+
+    def new_validator
+      Class.new {
+        include Veto.validator
+
+        with_options :if => 'validate?' do
+          validates :first_name, :presence => true
+          validates :last_name, :presence => true
+        end
+      }.new
+    end
+  end
+
+  describe 'custom validator' do
+    it 'uses custom validator' do
+      validator = Class.new {
+        include Veto.validator
+
+        class EmailCheck < ::Veto::AttributeCheck
+          def check(attribute_name, value, errors, options)
+            unless value.to_s =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+              errors.add(attribute_name, "is not a valid email address")
+            end
+          end
+        end
+
+        validates :email_address, :email => true
+      }.new
+
+      entity = stub(:email_address => 123)
+      validator.valid?(entity)
+      validator.errors.must_equal(:email_address=>["is not a valid email address"])
+    end
+  end
+
+  describe 'validator descendents/inheritence' do
+    it 'inherits superclass validation rules' do
+      super_class = Class.new{
+        include Veto.validator
+
+        validate :create_superclass_error
+
+        def create_superclass_error(entity)
+          errors.add(:base, "superclass error")
+        end
+      }
+
+      sub_class1 = Class.new(super_class){
+
+        validate :create_subclass_error
+
+        def create_subclass_error(entity)
+          errors.add(:base, "subclass1 error")
+        end
+      }
+
+      sub_class2 = Class.new(super_class){
+
+        validate :create_subclass_error
+
+        def create_subclass_error(entity)
+          errors.add(:base, "subclass2 error")
+        end
+      }
+
+      validator = sub_class1.new
+      validator.valid?(stub)
+      validator.errors.must_equal(:base=>["superclass error", "subclass1 error"])
+
+      validator = sub_class2.new
+      validator.valid?(stub)
+      validator.errors.must_equal(:base=>["superclass error", "subclass2 error"])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veto
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,55 +80,80 @@ files:
 - README.md
 - Rakefile
 - lib/veto.rb
-- lib/veto/attribute_validator_factory.rb
-- lib/veto/builder.rb
-- lib/veto/conditions.rb
-- lib/veto/conditions_evaluator.rb
+- lib/veto/blocks/block.rb
+- lib/veto/blocks/checker.rb
+- lib/veto/blocks/conditional_block.rb
+- lib/veto/blocks/validate_block.rb
+- lib/veto/blocks/validates_block.rb
+- lib/veto/blocks/with_options_block.rb
+- lib/veto/check_context_object.rb
+- lib/veto/checks/attribute_check.rb
+- lib/veto/checks/check.rb
+- lib/veto/checks/check_factory.rb
+- lib/veto/checks/exact_length_check.rb
+- lib/veto/checks/format_check.rb
+- lib/veto/checks/greater_than_check.rb
+- lib/veto/checks/greater_than_or_equal_to_check.rb
+- lib/veto/checks/inclusion_check.rb
+- lib/veto/checks/integer_check.rb
+- lib/veto/checks/length_range_check.rb
+- lib/veto/checks/less_than_check.rb
+- lib/veto/checks/less_than_or_equal_to_check.rb
+- lib/veto/checks/max_length_check.rb
+- lib/veto/checks/method_check.rb
+- lib/veto/checks/min_length_check.rb
+- lib/veto/checks/not_null_check.rb
+- lib/veto/checks/numeric_check.rb
+- lib/veto/checks/presence_check.rb
+- lib/veto/conditions/condition.rb
+- lib/veto/conditions/condition_factory.rb
+- lib/veto/conditions/conditions.rb
+- lib/veto/conditions/context_method_condition.rb
+- lib/veto/conditions/entity_eval_condition.rb
+- lib/veto/conditions/if_conditions.rb
+- lib/veto/conditions/if_unless_conditions.rb
+- lib/veto/conditions/passing_condition.rb
+- lib/veto/conditions/primative_condition.rb
+- lib/veto/conditions/proc_condition.rb
+- lib/veto/conditions/unless_conditions.rb
 - lib/veto/configuration.rb
 - lib/veto/errors.rb
 - lib/veto/exceptions.rb
 - lib/veto/model.rb
 - lib/veto/validator.rb
-- lib/veto/validators/abstract_validator.rb
-- lib/veto/validators/attribute_validator.rb
-- lib/veto/validators/custom_method_validator.rb
-- lib/veto/validators/exact_length_validator.rb
-- lib/veto/validators/format_validator.rb
-- lib/veto/validators/greater_than_or_equal_to_validator.rb
-- lib/veto/validators/greater_than_validator.rb
-- lib/veto/validators/inclusion_validator.rb
-- lib/veto/validators/integer_validator.rb
-- lib/veto/validators/length_range_validator.rb
-- lib/veto/validators/less_than_or_equal_to_validator.rb
-- lib/veto/validators/less_than_validator.rb
-- lib/veto/validators/max_length_validator.rb
-- lib/veto/validators/min_length_validator.rb
-- lib/veto/validators/not_null_validator.rb
-- lib/veto/validators/numeric_validator.rb
-- lib/veto/validators/presence_validator.rb
 - lib/veto/version.rb
-- spec/attribute_validator_factory_spec.rb
-- spec/builder_spec.rb
-- spec/conditions_evaluator_spec.rb
-- spec/conditions_spec.rb
+- spec/blocks/block_spec.rb
+- spec/blocks/check_block_spec.rb
+- spec/blocks/conditional_block_spec.rb
+- spec/blocks/validate_block_spec.rb
+- spec/blocks/validates_block_spec.rb
+- spec/checks/exact_length_check_spec.rb
+- spec/checks/format_validator_spec.rb
+- spec/checks/greater_than_check_spec.rb
+- spec/checks/greater_than_or_equal_to_check_spec.rb
+- spec/checks/inclusion_check_spec.rb
+- spec/checks/integer_check_spec.rb
+- spec/checks/length_range_check_spec.rb
+- spec/checks/less_than_check_spec.rb
+- spec/checks/less_than_or_equal_to_check_spec.rb
+- spec/checks/max_length_check_spec.rb
+- spec/checks/method_check_spec.rb
+- spec/checks/min_length_check_spec.rb
+- spec/checks/not_null_check_spec.rb
+- spec/checks/numeric_check_spec.rb
+- spec/checks/presence_check_spec.rb
+- spec/conditions/condition_factory_spec.rb
+- spec/conditions/conditions_spec.rb
+- spec/conditions/context_method_condition_spec.rb
+- spec/conditions/entity_eval_condition_spec.rb
+- spec/conditions/if_conditions_spec.rb
+- spec/conditions/if_unless_conditions_spec.rb
+- spec/conditions/primative_condition_spec.rb
+- spec/conditions/proc_condition_spec.rb
+- spec/conditions/unless_conditions_spec.rb
 - spec/configuration/message_spec.rb
-- spec/configuration_spec.rb
-- spec/errors_spec.rb
-- spec/model_spec.rb
 - spec/spec_helper.rb
-- spec/system/validator_spec.rb
 - spec/validator_spec.rb
-- spec/validators/exact_length_validator_spec.rb
-- spec/validators/format_validator_spec.rb
-- spec/validators/inclusion_validator_spec.rb
-- spec/validators/integer_validator_spec.rb
-- spec/validators/length_range_validator_spec.rb
-- spec/validators/max_length_validator_spec.rb
-- spec/validators/min_length_validator_spec.rb
-- spec/validators/not_null_validator_spec.rb
-- spec/validators/numeric_validator_spec.rb
-- spec/validators/presence_validator_spec.rb
-- spec/veto_spec.rb
 - veto.gemspec
 homepage: http://github.com/kodio/veto
 licenses:
@@ -155,25 +180,35 @@ signing_key:
 specification_version: 4
 summary: Validations for plain ruby objects
 test_files:
-- spec/attribute_validator_factory_spec.rb
-- spec/builder_spec.rb
-- spec/conditions_evaluator_spec.rb
-- spec/conditions_spec.rb
+- spec/blocks/block_spec.rb
+- spec/blocks/check_block_spec.rb
+- spec/blocks/conditional_block_spec.rb
+- spec/blocks/validate_block_spec.rb
+- spec/blocks/validates_block_spec.rb
+- spec/checks/exact_length_check_spec.rb
+- spec/checks/format_validator_spec.rb
+- spec/checks/greater_than_check_spec.rb
+- spec/checks/greater_than_or_equal_to_check_spec.rb
+- spec/checks/inclusion_check_spec.rb
+- spec/checks/integer_check_spec.rb
+- spec/checks/length_range_check_spec.rb
+- spec/checks/less_than_check_spec.rb
+- spec/checks/less_than_or_equal_to_check_spec.rb
+- spec/checks/max_length_check_spec.rb
+- spec/checks/method_check_spec.rb
+- spec/checks/min_length_check_spec.rb
+- spec/checks/not_null_check_spec.rb
+- spec/checks/numeric_check_spec.rb
+- spec/checks/presence_check_spec.rb
+- spec/conditions/condition_factory_spec.rb
+- spec/conditions/conditions_spec.rb
+- spec/conditions/context_method_condition_spec.rb
+- spec/conditions/entity_eval_condition_spec.rb
+- spec/conditions/if_conditions_spec.rb
+- spec/conditions/if_unless_conditions_spec.rb
+- spec/conditions/primative_condition_spec.rb
+- spec/conditions/proc_condition_spec.rb
+- spec/conditions/unless_conditions_spec.rb
 - spec/configuration/message_spec.rb
-- spec/configuration_spec.rb
-- spec/errors_spec.rb
-- spec/model_spec.rb
 - spec/spec_helper.rb
-- spec/system/validator_spec.rb
 - spec/validator_spec.rb
-- spec/validators/exact_length_validator_spec.rb
-- spec/validators/format_validator_spec.rb
-- spec/validators/inclusion_validator_spec.rb
-- spec/validators/integer_validator_spec.rb
-- spec/validators/length_range_validator_spec.rb
-- spec/validators/max_length_validator_spec.rb
-- spec/validators/min_length_validator_spec.rb
-- spec/validators/not_null_validator_spec.rb
-- spec/validators/numeric_validator_spec.rb
-- spec/validators/presence_validator_spec.rb
-- spec/veto_spec.rb

data/lib/veto/attribute_validator_factory.rb

@@ -1,36 +0,0 @@
-require 'veto/validators/exact_length_validator'
-require 'veto/validators/format_validator'
-require 'veto/validators/greater_than_validator'
-require 'veto/validators/greater_than_or_equal_to_validator'
-require 'veto/validators/inclusion_validator'
-require 'veto/validators/integer_validator'
-require 'veto/validators/length_range_validator'
-require 'veto/validators/less_than_validator'
-require 'veto/validators/less_than_or_equal_to_validator'
-require 'veto/validators/max_length_validator'
-require 'veto/validators/min_length_validator'
-require 'veto/validators/not_null_validator'
-require 'veto/validators/numeric_validator'
-require 'veto/validators/presence_validator'
-
-module Veto
-	class AttributeValidatorFactory
-		def self.new_validator type, attribute, options={}
-			klass_name = "#{camel_case(type.to_s)}Validator"
-
-			begin
-			  klass = Veto.const_get(klass_name)
-			rescue NameError => e
-			  raise(ArgumentError, "Validator not found: ::Veto::#{klass_name}")
-			end
-
-			klass.new(attribute, options)
-		end
-
-		private
-
-		def self.camel_case(str)
-			str.split('_').map{|w| w.capitalize }.join('')
-		end
-	end
-end

data/lib/veto/builder.rb

@@ -1,65 +0,0 @@
-require 'veto/conditions'
-require 'veto/attribute_validator_factory'
-require 'veto/validators/custom_method_validator'
-
-module Veto			
-	class Builder
-		attr_reader :context, :conditions_context
-
-		def initialize context, conditions_context={}, &block
-			@context = context
-			@conditions_context = conditions_context
-			instance_eval(&block) if block_given?
-		end
-
-		def with_options conditions={}, &block
-			mc = ::Veto::Conditions.merge(conditions_context, conditions)
-			::Veto::Builder.new(context, mc, &block)
-		end
-
-		def validates attribute, options={}
-			a = attribute
-			c = ::Veto::Conditions.select(options)
-			mc = ::Veto::Conditions.merge(conditions_context, c)
-			o = ::Veto::Conditions.reject(options)
-			vs = o.map do |t, vopts|
-				vo = case vopts
-				when TrueClass
-					{}
-				when Hash
-					vopts
-				when Range, Array
-					{ :in => vopts }
-				else
-					{ :with => vopts }
-				end
-
-				vc = ::Veto::Conditions.select(vo)
-				mvc = ::Veto::Conditions.merge(mc, vc)
-				mvo = vo.merge(mvc)
-				::Veto::AttributeValidatorFactory.new_validator(t, a, mvo)
-			end
-			validate_with vs
-		end
-
-		def validate *method_names
-			if method_names.last.is_a?(Hash)
-				c = method_names.last
-				mns = method_names[0..-2]
-			else
-				c = {}
-				mns = method_names
-			end
-
-			mc = ::Veto::Conditions.merge(conditions_context, c)
-			vs = mns.map do |mn|
-				::Veto::CustomMethodValidator.new(mn, mc)
-			end
-			validate_with vs
-		end
-
-		def validate_with *args
-			context.validate_with *args
-		end
-	end
-end

data/lib/veto/conditions.rb

@@ -1,23 +0,0 @@
-module Veto
-	class Conditions
-		CONDITION_KEYS = [:if, :unless].freeze
-
-		def self.reject hash={}
-			hash.reject{|k,v| CONDITION_KEYS.include?(k) }
-		end
-
-		def self.select hash={}
-			hash.select{|k,v| CONDITION_KEYS.include?(k) }
-		end
-
-		def self.merge dest_hash, source_hash
-			CONDITION_KEYS.inject({}) do |m, k|
-				c = []
-				c << dest_hash[k]
-				c << source_hash[k]
-				m[k] = c.flatten.compact
-				m
-			end
-		end
-	end
-end