Allowing validation with :if => block

vickeryj · Jun 2, 2008 · a62844b · a62844b
1 parent a0696af
commit a62844b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/sequel/lib/sequel_model/validations.rb b/sequel/lib/sequel_model/validations.rb
@@ -154,7 +154,7 @@ def validates_acceptance_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
         o.errors[a] << opts[:message] unless v == opts[:accept]
       end
@@ -167,7 +167,7 @@ def validates_confirmation_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
         c = o.send(:"#{a}_confirmation")
         o.errors[a] << opts[:message] unless v == c
@@ -196,7 +196,7 @@ def validates_format_of(*atts)
       end
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
         o.errors[a] << opts[:message] unless v.to_s =~ opts[:with]
       end
@@ -211,7 +211,7 @@ def validates_length_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
         if m = opts[:maximum]
           o.errors[a] << (opts[:message] || opts[:too_long]) unless v && v.size <= m
@@ -235,7 +235,7 @@ def validates_numericality_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if (v.nil? && opts[:allow_nil]) || (v.blank? && opts[:allow_blank])
         begin
           if opts[:only_integer]
@@ -256,7 +256,7 @@ def validates_presence_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         o.errors[a] << opts[:message] unless v && !v.blank?
       end
     end
@@ -270,7 +270,7 @@ def validates_uniqueness_of(*atts)
       }.merge!(atts.extract_options!)
 
       validates_each(*atts) do |o, a, v|
-        next if (opts[:if] && !o.send(opts[:if]))
+        next unless o.instance_eval(&if_proc(opts))
         next if v.blank? 
         num_dups = o.class.filter(a => v).count
         allow = if num_dups == 0
@@ -297,5 +297,14 @@ def validates_uniqueness_of(*atts)
     def validations
       @validations ||= Hash.new {|h, k| h[k] = []}
     end
+
+    protected
+    def if_proc(opts)
+      case opts[:if]
+      when Symbol then proc {send opts[:if]}
+      when Proc then opts[:if]
+      else proc {true}
+      end
+    end
   end
 end
diff --git a/sequel/spec/validations_spec.rb b/sequel/spec/validations_spec.rb
@@ -412,6 +412,12 @@ def dont_skip; true; end
     @m.value = 'a'
     @m.should be_valid
   end
+
+  specify "should validate with :if => block" do
+    @c.validates_presence_of :value, :if => proc {false}
+
+    @m.should be_valid
+  end
 end
 
 context "Superclass validations" do