jnunemaker-validatable 1.7.1 → 1.7.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 7
-:patch: 1
+:patch: 2

data/lib/validations/validation_base.rb

@@ -63,7 +63,12 @@ module Validatable
     
     def should_validate?(instance)
       result = validate_this_time?(instance)
-      result &&= instance.instance_eval(&self.if) unless self.if.nil?
+      case self.if
+        when Proc
+          result &&= instance.instance_eval(&self.if)
+        when Symbol, String
+          result &&= instance.instance_eval(self.if.to_s)
+      end
       result
     end
     

data/test/functional/test_validatable.rb

@@ -255,6 +255,42 @@ functional_tests do
     instance = klass.new
     instance.valid?
   end
+  
+  test ':if with symbol should work' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :name, :name_required
+      validates_presence_of :name, :if => :name_required?
+      
+      def name_required?
+        name_required
+      end
+    end
+    instance = klass.new
+    instance.name_required = false
+    assert instance.valid?
+    instance.name_required = true
+    assert !instance.valid?
+    assert_equal "can't be empty", instance.errors.on(:name)
+  end
+  
+  test ':if with string should work' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :name, :name_required
+      validates_presence_of :name, :if => 'name_required?'
+      
+      def name_required?
+        name_required
+      end
+    end
+    instance = klass.new
+    instance.name_required = false
+    assert instance.valid?
+    instance.name_required = true
+    assert !instance.valid?
+    assert_equal "can't be empty", instance.errors.on(:name)
+  end
 
   test "classes only have valid_for_* methods for groups that appear in their validations" do
     class_with_group_one = Class.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-05 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -69,6 +69,7 @@ files:
 - test/unit/test_validation_base.rb
 has_rdoc: true
 homepage: http://github.com/jnunemaker/validatable
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Validatable is a library for adding validations.