veto 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569cf65f25931b9a8ae0f2a357d7163c04195fa8
-  data.tar.gz: c95247aed3ff88dd2e413e5d48c05fa13b6fb63b
+  metadata.gz: 97744d7c933224418b8f716cfb6495ce2561d765
+  data.tar.gz: 14621abaec3c7a5492f679b590239255f40dc614
 SHA512:
-  metadata.gz: 2159bc303f0dd6ba0fa69b3ba497abeec0981893e6b630bd235fe7378207588a22b3d65913fc98a9efd491b67182bd5c1eccedfa436816e3ef18137efec3bec3
-  data.tar.gz: 88f37e7ebc017a26b23dab4303ca28e8abd885286caa5fbc4c7f5f35bf30708c602ddaf39c65e4b8308d060a2e875ba5e8fbf29df93fbaa88e1de2fcedc652cb
+  metadata.gz: ffa5ca8c717a8f3bf1f2b97ce4b9fca1f9068357afcb4213bb0570def26236895679c6adaa836685b9c8584de3c3510e6839ccde71f7e0c052ff992ae1c0dd42
+  data.tar.gz: 2c06f80971bc003ac56b30312d7bfedbf00c6c2d186f734cfdf3997fdd7c93ac8eb0c7e80f806fbb49e300e81dbb4652f6bcfc918c1545b06a42c082ffc2ece5

data/README.md

@@ -41,107 +41,20 @@ class Person
     attr_reader :name, :age, :errors
 end
 
-person = Person.new
-
-# Validation using class methods
+person = Person.new 
 
-PersonValidator.valid?(person) # => false
-PersonValidator.validate!(person) # => # => Veto::InvalidEntity, ["name is not present", "..."]  
+# Validate entity
 
-# Validation using validator instance
-
-validator = PersonValidator.new(person)
-validator.valid? # => false
-validator.validate! # => # => Veto::InvalidEntity, ["name is not present", "..."]  
+validator = PersonValidator.new
+validator.valid?(person) # => false
+validator.validate!(person) # => # => Veto::InvalidEntity, ["name is not present", "..."]  
 validator.errors.full_messages # => ["first name is not present", "..."]
 
 # If entity has errors attr_accessor, errors will be passed to the entity
 
 person.errors # => nil
-PersonValidator.valid?(person) # => false
-person.errors.full_messages # => ["first name is not present", "..."]
-```
-
-### Class Method Usage
-
-The simplest way to validate an entity is to pass it directly to one of the validator's class methods.
-
-#### valid?
-
-Validate an entity by passing it to the `valid?` method.
-
-```ruby
-person = Person.new
-PersonValidator.valid?(person) # => false
-```
-      
-#### validate!
-
-For strict validations, pass the entity to the `validate!` method instead. This method will raise an exception if the validation fails.
-    
-```ruby
-person = Person.new
-PersonValidator.validate!(person) # => Veto::InvalidEntity, ["first name is not present", "..."]    
-```
-
-### Instance Method Usage
-        
-Using a validator instance is also simple, and has some advantages in regards to validation errors (more below). The validation methods available on a validator instance are the same as the class methods.    
-
-#### initialization
-
-When creating a validator instance, the entity you wish to be validated needs to be passed as an argument to the `new` method.
-
-```ruby
-person = Person.new
-validator = PersonValidator.new(person)
-```  
-#### valid?
-
-Calling the `valid?` method on a validator instance will return a boolean response, although the method does not receive  arguments.
-
-```ruby
-person = Person.new
-validator = PersonValidator.new(person)
-validator.valid? # => false
-```   
-
-#### validate!
-
-For strict validations…
-
-```ruby  
-person = Person.new
-validator = PersonValidator.new(person)
-validator.validate! # => Veto::InvalidEntity, ["first name is not present", "..."]
-```
-
-#### errors
-
-The `errors` method will return an errors object. The errors object will contain the error messages generated during the most recent validation.
-
-```ruby
-person = Person.new
-validator = PersonValidator.new(person)
-validator.errors.full_messages # => []
-
-validator.valid? # => false
-validator.errors.full_messages # => ["first name is not present", "..."]
-```
-
-### Errors on Entity
-
-Whether you're validating via validator class methods or a validator instance, if the entity being validated has an `errors` attr_accessor defined, the validator will attempt to populate the entity with an errors object each time it is validated.
-
-```ruby
-class Person
-    attr_accessor :errors, :first_name, :last_name, ...
-end
-
-person = Person.new
-person.errors # => nil
-
-PersonValidator.valid?(person) # => false
+validator = PersonValidator.new
+validator.valid?(person) # => false
 person.errors.full_messages # => ["first name is not present", "..."]
 ```
 

data/lib/veto/blocks/block.rb

@@ -0,0 +1,25 @@
+module Veto
+  class Block
+    def initialize
+      @children = []
+    end
+
+    def call(*args)
+      call_children(*args)
+    end
+
+    def <<(child)
+      @children << child
+    end
+
+    def children
+      @children
+    end
+
+    private
+
+    def call_children(*args)
+      children.each {|child| child.call(*args)}
+    end
+  end
+end

data/lib/veto/blocks/checker.rb

@@ -0,0 +1,28 @@
+module Veto
+  class Checker < Block
+    def self.from_children(children=[])
+      inst = new
+      children.each{|child| inst << child }
+      inst
+    end
+
+    def initialize(&block)
+      super
+      instance_eval(&block) if block_given?
+    end
+
+    def validates(*args)
+      self << ValidatesBlock.build(*args)
+    end
+
+    def validate(*args)
+      self << ValidateBlock.build(*args)
+    end
+
+    def with_options(*args, &block)
+      b = WithOptionsBlock.build(*args)
+      b << self.class.new(&block)
+      self << b
+    end
+  end
+end

data/lib/veto/blocks/conditional_block.rb

@@ -0,0 +1,26 @@
+module Veto
+  class ConditionalBlock < Block
+    def initialize(options={})
+      @options = options
+      super()
+    end
+
+    def call(*args)
+      call_children(*args) if conditions.pass?(*args)
+    end
+
+    def options(hash={})
+      conditions_filter(:reject)
+    end
+
+    private
+
+    def conditions
+      IfUnlessConditions.new(conditions_filter(:select))
+    end
+
+    def conditions_filter(type)
+      @options.send(type){|k,v| [:if, :unless].include?(k)}
+    end
+  end
+end

data/lib/veto/blocks/validate_block.rb

@@ -0,0 +1,18 @@
+module Veto
+  class ValidateBlock < ConditionalBlock
+    def self.build(*args)
+      block = new(*args)
+      block << MethodCheck.new(block.method_name)
+      block
+    end
+
+    def initialize(method_name, options={})
+      @method_name = method_name
+      super(options)
+    end
+
+    def method_name
+      @method_name
+    end
+  end
+end

data/lib/veto/blocks/validates_block.rb

@@ -0,0 +1,51 @@
+module Veto
+  class ValidatesBlock < ConditionalBlock
+    class CheckBlock < ConditionalBlock
+      def self.build(*args)
+        block = new(*args)
+        block << ::Veto::CheckFactory.new(block.type, block.attribute_name, block.options)
+        block
+      end
+
+      def initialize(type, attribute_name, value_or_options=nil)
+        @type = type
+        @attribute_name = attribute_name
+        options =         
+          case value_or_options
+          when TrueClass
+            {}
+          when Hash
+            value_or_options
+          when Range, Array
+            {:in => value_or_options}
+          else
+            {:with => value_or_options}
+          end
+        super(options)
+      end
+
+      def attribute_name
+        @attribute_name
+      end
+
+      def type
+        @type
+      end
+    end
+
+    def self.build(*args)
+      block = new(*args)
+      block.options.each {|k,v| block << CheckBlock.build(k, block.attribute_name, v)}
+      block
+    end
+
+    def initialize(attribute_name, options={})
+      @attribute_name = attribute_name
+      super(options)
+    end
+
+    def attribute_name
+      @attribute_name
+    end
+  end
+end

data/lib/veto/blocks/with_options_block.rb

@@ -0,0 +1,7 @@
+module Veto
+  class WithOptionsBlock < ConditionalBlock
+    def self.build(*args)
+      new(*args)
+    end
+  end
+end

data/lib/veto/check_context_object.rb

@@ -0,0 +1,10 @@
+module Veto
+  class CheckContextObject
+    attr_reader :entity, :context, :errors
+    def initialize(entity, context, errors)
+      @entity = entity
+      @context = context
+      @errors = errors
+    end
+  end
+end

data/lib/veto/checks/attribute_check.rb

@@ -0,0 +1,19 @@
+module Veto
+  class AttributeCheck < Check
+    def initialize(attribute_name, options={})
+      @attribute_name = attribute_name
+      @options = options
+    end
+
+    def call(cco)
+      value = cco.entity.public_send(@attribute_name)
+      check(@attribute_name, value, cco.errors, @options)
+    end
+
+    private
+
+    def check(attribute_name, value, errors, options)
+      raise(NotImplementedError)
+    end
+  end
+end

data/lib/veto/checks/check.rb

@@ -0,0 +1,7 @@
+module Veto
+  class Check
+    def call(cco)
+      raise(NotImplementedError)
+    end
+  end
+end

data/lib/veto/checks/check_factory.rb

@@ -0,0 +1,18 @@
+module Veto
+  class CheckFactory
+    def self.new(type, attribute_name, options={})
+      class_name = "#{camel_case(type.to_s)}Check"
+      begin
+        Veto.const_get(class_name).new(attribute_name, options)
+      rescue NameError => e
+        raise(CheckNotAssigned, "Check not found: ::Veto::#{class_name}")
+      end
+    end
+
+    private
+
+    def self.camel_case(str)
+      str.split('_').map{|w| w.capitalize }.join('')
+    end
+  end
+end

data/lib/veto/{validators/exact_length_validator.rb → checks/exact_length_check.rb}

@@ -1,8 +1,9 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class ExactLengthValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class ExactLengthCheck < AttributeCheck
+
+		private
+
+		def check(attribute, value, errors, options={})
 			exact = options.fetch(:with)
 			message = options.fetch(:message, :exact_length)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/format_validator.rb → checks/format_check.rb}

@@ -1,8 +1,9 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class FormatValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class FormatCheck < AttributeCheck
+
+		private
+
+		def check(attribute, value, errors, options={})
 			pattern = options.fetch(:with)
 			message = options.fetch(:message, :format)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/greater_than_validator.rb → checks/greater_than_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class GreaterThanValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class GreaterThanCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			boundary = options.fetch(:with)		
 			message = options.fetch(:message, :greater_than)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/greater_than_or_equal_to_validator.rb → checks/greater_than_or_equal_to_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class GreaterThanOrEqualToValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class GreaterThanOrEqualToCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			boundary = options.fetch(:with)		
 			message = options.fetch(:message, :greater_than_or_equal_to)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/inclusion_validator.rb → checks/inclusion_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class InclusionValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class InclusionCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			set = options.fetch(:in)
 			inclusion_method = set.respond_to?(:cover?) ? :cover? : :include?
 			message = options.fetch(:message, :inclusion)

data/lib/veto/{validators/integer_validator.rb → checks/integer_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class IntegerValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class IntegerCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			message = options.fetch(:message, :integer)
 			on = options.fetch(:on, attribute)
 			

data/lib/veto/{validators/length_range_validator.rb → checks/length_range_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class LengthRangeValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class LengthRangeCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			range = options.fetch(:in)
 			inclusion_method = range.respond_to?(:cover?) ? :cover? : :include?
 			message = options.fetch(:message, :length_range)

data/lib/veto/{validators/less_than_validator.rb → checks/less_than_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class LessThanValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class LessThanCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			boundary = options.fetch(:with)		
 			message = options.fetch(:message, :less_than)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/less_than_or_equal_to_validator.rb → checks/less_than_or_equal_to_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class LessThanOrEqualToValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class LessThanOrEqualToCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			boundary = options.fetch(:with)		
 			message = options.fetch(:message, :less_than_or_equal_to)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/max_length_validator.rb → checks/max_length_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class MaxLengthValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class MaxLengthCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			max = options.fetch(:with)
 			message = options.fetch(:message, :max_length)
 			on = options.fetch(:on, attribute)

data/lib/veto/checks/method_check.rb

@@ -0,0 +1,17 @@
+module Veto
+  class MethodCheck < Check
+    def initialize(method_name)
+      @method_name = method_name
+    end
+
+    def call(cco)
+      cco.context.send(@method_name, cco.entity)
+    end
+
+    private
+
+    def check(attribute_name, value, errors, options)
+      raise(NotImplementedError)
+    end
+  end
+end

data/lib/veto/{validators/min_length_validator.rb → checks/min_length_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class MinLengthValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class MinLengthCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			min = options.fetch(:with)
 			message = options.fetch(:message, :min_length)
 			on = options.fetch(:on, attribute)

data/lib/veto/{validators/not_null_validator.rb → checks/not_null_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class NotNullValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class NotNullCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			message = options.fetch(:message, :not_null)
 			on = options.fetch(:on, attribute)
 			

data/lib/veto/{validators/numeric_validator.rb → checks/numeric_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class NumericValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class NumericCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			message = options.fetch(:message, :numeric)
 			on = options.fetch(:on, attribute)
 			

data/lib/veto/{validators/presence_validator.rb → checks/presence_check.rb}

@@ -1,8 +1,6 @@
-require 'veto/validators/attribute_validator'
-
 module Veto
-	class PresenceValidator < AttributeValidator
-		def validate entity, attribute, value, errors, options={}
+	class PresenceCheck < AttributeCheck
+		def check(attribute, value, errors, options={})
 			msg = options.fetch(:message, :presence)
 			on = options.fetch(:on, attribute)
 			v = value.is_a?(String) ? value.gsub(/\s+/, '') : value

data/lib/veto/conditions/condition.rb

@@ -0,0 +1,7 @@
+module Veto
+  class Condition
+    def pass?(*args)
+      raise(NotImplementedError)
+    end
+  end
+end

data/lib/veto/conditions/condition_factory.rb

@@ -0,0 +1,18 @@
+module Veto
+  class ConditionFactory
+    def self.new(condition_option)
+      condition_class = 
+        case condition_option
+        when String
+          EntityEvalCondition
+        when Symbol
+          ContextMethodCondition
+        when Proc
+          ProcCondition
+        else
+          PrimativeCondition
+        end
+      condition_class.new(condition_option)
+    end
+  end
+end

data/lib/veto/conditions/conditions.rb

@@ -0,0 +1,21 @@
+module Veto
+  class Conditions < Condition
+    extend Forwardable
+
+    def_delegators :conditions, :each, :size
+
+    def initialize(options_list=[])
+      @options_list = options_list
+    end
+
+    private
+
+    def conditions
+      options_list.map{|options| ConditionFactory.new(options) }
+    end
+
+    def options_list
+      [*@options_list]
+    end
+  end
+end

data/lib/veto/conditions/context_method_condition.rb

@@ -0,0 +1,11 @@
+module Veto
+  class ContextMethodCondition < Condition
+    def initialize(symbol)
+      @symbol = symbol
+    end
+
+    def pass?(cco)
+      !!cco.context.send(@symbol, cco.entity)
+    end
+  end
+end

data/lib/veto/conditions/entity_eval_condition.rb

@@ -0,0 +1,11 @@
+module Veto
+  class EntityEvalCondition < Condition
+    def initialize(eval_string)
+      @eval_string = eval_string
+    end
+
+    def pass?(cco)
+      !!cco.entity.instance_eval(@eval_string)
+    end
+  end
+end

data/lib/veto/conditions/if_conditions.rb

@@ -0,0 +1,8 @@
+module Veto
+  class IfConditions < Conditions
+    def pass?(*args)
+      conditions.each {|c| return(false) unless c.pass?(*args) } 
+      true
+    end
+  end
+end

data/lib/veto/conditions/if_unless_conditions.rb

@@ -0,0 +1,21 @@
+module Veto
+  class IfUnlessConditions < Condition
+    def initialize(options)
+      @options = options
+    end
+
+    def pass?(*args)
+      if_conditions.pass?(*args) && unless_conditions.pass?(*args)
+    end
+
+    private
+
+    def if_conditions
+      IfConditions.new(@options[:if])
+    end
+
+    def unless_conditions
+      UnlessConditions.new(@options[:unless])
+    end
+  end
+end

data/lib/veto/conditions/passing_condition.rb

@@ -0,0 +1,7 @@
+module Veto
+  class PassingCondition < Condition
+    def pass?(*args)
+      true
+    end
+  end
+end