valid 0.1.2 → 0.2.0

data/lib/validation/rule/matches.rb

@@ -0,0 +1,24 @@
+module Validation
+  module Rule
+    class Matches
+      attr_writer :obj
+
+      def initialize(matcher_field)
+        @matcher_field = matcher_field
+      end
+
+      def error_key
+        :matches
+      end
+
+      def params
+        @matcher_field
+      end
+
+      def valid_value?(value)
+        matcher_value = @obj.send(@matcher_field)
+        matcher_value == value
+      end
+    end
+  end
+end

data/lib/validation/validator.rb

@@ -16,18 +16,21 @@ module Validation
 
       begin
         if rule.respond_to?(:each_pair)
-          rule.each_pair do |key, value|
-            r = Validation::Rule.const_get(camelize(key))
-            rules[field] << r.new(value)
-          end
+          add_parameterized_rule(field, rule)
         elsif rule.respond_to?(:each)
           rule.each do |r|
-            r = Validation::Rule.const_get(camelize(r))
-            rules[field] << r.new
+            if r.respond_to?(:each_pair)
+              add_parameterized_rule(field, r)
+            else
+              r = Validation::Rule.const_get(camelize(r)).new
+              add_object_to_rule(r)
+              rules[field] << r
+            end
           end
         else
-          rule = Validation::Rule.const_get(camelize(rule))
-          rules[field] << rule.new
+          rule = Validation::Rule.const_get(camelize(rule)).new
+          add_object_to_rule(rule)
+          rules[field] << rule
         end
       rescue NameError => e
         raise InvalidRule
@@ -56,6 +59,20 @@ module Validation
 
     protected
 
+    def add_parameterized_rule(field, rule)
+      rule.each_pair do |key, value|
+        r = Validation::Rule.const_get(camelize(key)).new(value)
+        add_object_to_rule(r)
+        rules[field] << r
+      end
+    end
+
+    def add_object_to_rule(rule)
+      if rule.respond_to?(:obj=)
+        rule.obj = @obj
+      end
+    end
+
     def camelize(term)
       string = term.to_s
       string = string.sub(/^[a-z\d]*/) { $&.capitalize }

data/lib/validation/version.rb

@@ -0,0 +1,3 @@
+module Validation
+  VERSION = '0.2.0'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -21,10 +21,12 @@ files:
 - lib/validation.rb
 - lib/validation/rule/email.rb
 - lib/validation/rule/not_empty.rb
+- lib/validation/rule/matches.rb
 - lib/validation/rule/numeric.rb
 - lib/validation/rule/length.rb
 - lib/validation/validator.rb
-homepage: https://github.com/zombor/Validator
+- lib/validation/version.rb
+homepage: https://github.com/zombor/validation
 licenses: []
 post_install_message: 
 rdoc_options: []