validate 1.1 → 1.2

data/lib/validate/hash.rb

@@ -0,0 +1,21 @@
+
+require 'validate'
+
+class Hash
+
+  # Validates the hash using either a pre-compiled validation, or by parsing
+  # the block passed.
+  #
+  def validates?(validations=nil, &block)
+    validations = ::Validate::Parser.parse(&block) unless validations
+    @validator = ::Validate::Validator.new(validations)
+    @validator.validates?(self)
+  end
+
+  # Returns any failures from the last run validations.
+  #
+  def failures
+    return [] unless @validator
+    @validator.failures
+  end
+end

data/lib/validate/parser.rb

@@ -15,7 +15,7 @@ module Validate
   #     validates_type_of :tier, is: Numeric
   #   end
   #
-  class BlockParsingContext
+  class Parser
 
     def self.parse(&block)
       # execute block, return array of validation methods called
@@ -23,6 +23,10 @@ module Validate
       context.instance_exec(&block)
       context.validations
     end
+  end
+
+
+  class BlockParsingContext
 
     def initialize
       @validations = []
@@ -35,7 +39,7 @@ module Validate
       raise NoMethodError.new("Undefined validation method: #{method}...") unless ValidationMethods.new.respond_to?(method)
       opts = args.pop if args.last.is_a?(::Hash)
       children = if block
-        BlockParsingContext.parse(&block)
+        Parser.parse(&block)
       end
       @validations << {
         name: method,
@@ -52,7 +56,7 @@ module Validate
     #   end
     #
     def run_when(condition, &block)
-      validations = BlockParsingContext.parse(&block)
+      validations = Parser.parse(&block)
       validations.map do |v|
         v[:opts] ||= {}
         v[:opts][:when] = condition

data/lib/validate/validations.rb

@@ -46,6 +46,7 @@ module Validate
     #
     #   validates_inclusion_of :type, in: %w(paid free)
     #
+    fails_because_key { "was not of in #{opts[:in].inspect}." }
     def validates_inclusion_of(obj, field, opts, validator)
       opts[:in].include?(obj[field])
     end
@@ -54,6 +55,7 @@ module Validate
     #
     #   validates_numericality_of :amount
     #
+    fails_because_key 'was not Numeric.'
     def validates_numericality_of(obj, field, opts, validator)
       obj[field].is_a?(Numeric)
     end
@@ -62,6 +64,7 @@ module Validate
     #
     #   validates_value_of :field, is: 'something'
     #
+    fails_because_key { "was not of in #{opts[:is].inspect}." }
     def validates_value_of(obj, field, opts, validator)
       obj.include?(field) && obj[field] == opts[:is]
     end
@@ -73,6 +76,7 @@ module Validate
     #     validates_numericality_of :amount
     #   end
     #
+    fails_because_key { ['failed validation with errors:', validator.failures] }
     def validates_child_hash(obj, field, opts, validator)
       return false unless obj[field].respond_to?(:to_hash)
       hash = obj[field].to_hash
@@ -89,6 +93,7 @@ module Validate
     #     validates_type_of :self, is: String
     #   end
     #
+    fails_because_key 'contained at least one element which failed validation.'
     def validates_array(obj, field, opts, validator)
       return false unless obj[field].respond_to?(:to_a)
       array = obj[field].to_a
@@ -101,6 +106,7 @@ module Validate
     #
     #  validates_regex :field, matches: /^hello/
     #
+    fails_because_key { "did not match regex #{opts[:matches].inspect}." }
     def validates_regex(obj, field, opts, validator)
       return false unless obj[field].respond_to?(:=~)
       0 == (obj[field] =~ opts[:matches])

data/lib/validate/version.rb

@@ -1,4 +1,4 @@
 
 module Validate
-  VERSION = '1.1'
+  VERSION = '1.2'
 end

data/lib/validate.rb

@@ -12,7 +12,7 @@ module Validate
     #
     def validations(&block)
       return @validator unless block
-      validations = BlockParsingContext.parse(&block)
+      validations = Parser.parse(&block)
       @validator = Validator.new(validations)
     end
   end

data/spec/validate_spec.rb

@@ -513,6 +513,37 @@ describe Validate do
       test.validates?.should == false
     end
   end
+
+
+  context Hash do
+
+    before do
+      require 'validate/hash'
+      @compiled_validation = Validate::Parser.parse do
+        validates_presence_of 'name', when: -> { true }
+      end
+    end
+
+    it 'should validate a valid object' do
+      hash = {"name" => :hello}
+      hash.validates?(@compiled_validation).should == true
+      hash.failures.should == []
+    end
+
+    it 'should fail to validate an invalid object' do
+      hash = {"not_name" => :hello}
+      hash.validates?(@compiled_validation).should == false
+      hash.failures.should == [{"name"=>"was not present."}]
+    end
+
+    it 'should validate a valid object, when compiling on the fly' do
+      hash = {"name" => :hello}
+      hash.validates? do
+        validates_presence_of 'name', when: -> { true }
+      end.should == true
+      hash.failures.should == []
+    end
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,6 +40,7 @@ files:
 - README.md
 - Rakefile
 - lib/validate.rb
+- lib/validate/hash.rb
 - lib/validate/kongo.rb
 - lib/validate/parser.rb
 - lib/validate/validations.rb