params_validator 0.1.1 → 0.2.0

data/README.md

@@ -19,7 +19,7 @@ Basic usage:
         render :text => 'Error', :status => :bad_request
       end
 
-      validate_params_for :index, { :count => { :with => [:type_integer] } }
+      validate_params_for :index, { :count => { :_with => [:type_integer] } }
       def index
         @articles = Article.limit(params[:count])
       end
@@ -29,7 +29,7 @@ Basic usage:
 
 ### TypeInteger
 
-    validate_params_for :index, { :count => { :with => [:type_integer] } }
+    validate_params_for :index, { :count => { :_with => [:type_integer] } }
 
 **Valid:**
 
@@ -43,7 +43,7 @@ Basic usage:
 
 ### TypeFloat
 
-    validate_params_for :index, { :position => { :with => [:type_float] } }
+    validate_params_for :index, { :position => { :_with => [:type_float] } }
 
 **Valid:**
 
@@ -58,7 +58,7 @@ Basic usage:
 
 ### TypeString
 
-    validate_params_for :index, { :name => { :with => [:type_string] } }
+    validate_params_for :index, { :name => { :_with => [:type_string] } }
 
 **Valid:**
 
@@ -72,7 +72,7 @@ Basic usage:
 
 ### TypeHash
 
-    validate_params_for :index, { :options => { :with => [:type_hash] } }
+    validate_params_for :index, { :options => { :_with => [:type_hash] } }
 
 **Valid:**
 
@@ -85,7 +85,7 @@ Basic usage:
 
 ### TypeArray
 
-    validate_params_for :index, { :ids => { :with => [:type_array] } }
+    validate_params_for :index, { :ids => { :_with => [:type_array] } }
 
 **Valid:**
 
@@ -98,7 +98,7 @@ Basic usage:
 
 ### Presence
 
-    validate_params_for :search, { :q => { :with => [:presence] } }
+    validate_params_for :search, { :q => { :_with => [:presence] } }
 
 **Valid:**
 

data/lib/params_validator/filter.rb

@@ -5,16 +5,10 @@ module ParamsValidator
     def self.validate_params(params, definition)
       errors = {}
       definition.each do |field, validation_definition|
-        validation_definition[:with].each do |validator_name|
-          camelized_validator_name = self.camelize(validator_name)
-          begin
-            validator = constantize("ParamsValidator::Validator::#{camelized_validator_name}")
-            unless validator.valid?(params[field.to_s])
-              errors[field] = validator.error_message
-            end
-          rescue NameError
-            raise InvalidValidatorException.new(validator_name)
-          end
+        errors = validate_field(field, params, validation_definition, errors)
+
+        validation_definition.reject {|k,v| k == :_with }.each do |nested_field, nested_validation_definition|
+          errors = validate_field(nested_field, params[field.to_s], nested_validation_definition, errors)
         end
       end
       if errors.count > 0
@@ -23,6 +17,25 @@ module ParamsValidator
         raise exception
       end
     end
+
+    private
+
+    def self.validate_field(field, params, validation_definition, errors)
+      return errors unless validation_definition.has_key? :_with
+      validation_definition[:_with].each do |validator_name|
+        camelized_validator_name = self.camelize(validator_name)
+        begin
+          validator = constantize("ParamsValidator::Validator::#{camelized_validator_name}")
+          value = params.is_a?(Hash) ? params[field.to_s] : nil
+          unless validator.valid?(value)
+            errors[field] = validator.error_message
+          end
+        rescue NameError
+          raise InvalidValidatorException.new(validator_name)
+        end
+      end
+      errors
+    end
   end
 end
 

data/lib/params_validator/validator/type.rb

@@ -1,63 +1,50 @@
 module ParamsValidator
   module Validator
-    module TypeInteger
-      def self.error_message; "is not of type integer"; end
 
-      def self.valid?(value)
-        return true unless Presence.valid?(value)
+    private
+
+    module Base
+      private
+      def define_type_validator(type_name, &block)
+        @type_name = type_name
+        @block = block
 
-        begin
-          Integer(value)
-          true
-        rescue
-          false
+        def self.error_message
+          "is not of type #{@type_name.to_s.downcase}"
+        end
+
+        def self.valid?(value)
+          return true unless Presence.valid?(value)
+          return !!@block.call(value) rescue false
         end
       end
     end
 
-    module TypeFloat
-      def self.error_message; "is not of type float"; end
+    public
 
-      def self.valid?(value)
-        return true unless Presence.valid?(value)
+    module TypeInteger
+      extend Base
+      define_type_validator('integer') { |value| Integer(value) }
+    end
 
-        begin
-          Float(value)
-          true
-        rescue
-          false
-        end
-      end
+    module TypeFloat
+      extend Base
+      define_type_validator('float') { |value| Float(value) }
     end
 
     module TypeString
-      def self.error_message; "is not of type string"; end
-
-      def self.valid?(value)
-        return true unless Presence.valid?(value)
-
-        value.kind_of? String
-      end
+      extend Base
+      define_type_validator('string') { |value| value.kind_of? String }
     end
 
     module TypeArray
-      def self.error_message; "is not of type array"; end
-
-      def self.valid?(value)
-        return true unless Presence.valid?(value)
-
-        value.kind_of? Array
-      end
+      extend Base
+      define_type_validator('array') { |value| value.kind_of? Array }
     end
 
     module TypeHash
-      def self.error_message; "is not of type hash"; end
-
-      def self.valid?(value)
-        return true unless Presence.valid?(value)
-
-        value.kind_of? Hash
-      end
+      extend Base
+      define_type_validator('hash') { |value| value.kind_of? Hash }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70244496983080 !ruby/object:Gem::Requirement
+  requirement: &70160878293820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244496983080
+  version_requirements: *70160878293820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244496981740 !ruby/object:Gem::Requirement
+  requirement: &70160878293300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70244496981740
+  version_requirements: *70160878293300
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70244496980260 !ruby/object:Gem::Requirement
+  requirement: &70160878292800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70244496980260
+  version_requirements: *70160878292800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70244496978500 !ruby/object:Gem::Requirement
+  requirement: &70160878292320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70244496978500
+  version_requirements: *70160878292320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70244496977340 !ruby/object:Gem::Requirement
+  requirement: &70160878291840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244496977340
+  version_requirements: *70160878291840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70244496976340 !ruby/object:Gem::Requirement
+  requirement: &70160878291320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70244496976340
+  version_requirements: *70160878291320
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70244496975260 !ruby/object:Gem::Requirement
+  requirement: &70160878290780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244496975260
+  version_requirements: *70160878290780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70244497000340 !ruby/object:Gem::Requirement
+  requirement: &70160878290240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244497000340
+  version_requirements: *70160878290240
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70244496998380 !ruby/object:Gem::Requirement
+  requirement: &70160878289720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244496998380
+  version_requirements: *70160878289720
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70244496996880 !ruby/object:Gem::Requirement
+  requirement: &70160878305580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244496996880
+  version_requirements: *70160878305580
 description: 
 email: christof@chdorner.me
 executables: []
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1545211467612620897
+      hash: 464833905745855690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: