client_side_validations 3.0.1 → 3.0.2

data/lib/client_side_validations/active_model.rb

@@ -22,7 +22,7 @@ module ClientSideValidations::ActiveModel
         validator_hash = attr[1].inject({}) do |kind_hash, validator|
           client_side_hash = validator.client_side_hash(self, attr[0])
           # Yeah yeah, #new_record? is not part of ActiveModel :p
-          if ((self.respond_to?(:new_record?) && client_side_hash[:on] == (self.new_record? ? :create : :update)) || client_side_hash[:on].nil?)
+          if (can_use_for_client_side_validation?(client_side_hash, validator))
             kind_hash.merge!(validator.kind => client_side_hash.except(:on))
           else
             kind_hash.merge!({})
@@ -32,6 +32,12 @@ module ClientSideValidations::ActiveModel
         attr_hash.merge!(attr[0] => validator_hash)
       end.delete_if { |key, value| value.blank? }
     end
+
+    private
+
+    def can_use_for_client_side_validation?(client_side_hash, validator)
+      ((self.respond_to?(:new_record?) && client_side_hash[:on] == (self.new_record? ? :create : :update)) || client_side_hash[:on].nil?) && !validator.options.key?(:if) && !validator.options.key?(:unless)
+    end
   end
 end
 

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/test/active_model/cases/test_validations.rb

@@ -137,5 +137,15 @@ class ActiveModel::ValidationsTest < ClientSideValidations::ActiveModelTestBase
     expected_hash = {}
     assert_equal expected_hash, person.client_side_validation_hash
   end
+
+  def test_validators_with_if_or_unless_are_ignored
+    person = new_person do |p|
+      p.validates_presence_of :first_name, :if     => Proc.new { |p| true }
+      p.validates_presence_of :last_name,  :unless => Proc.new { |p| true }
+    end
+
+    expected_hash = {}
+    assert_equal expected_hash, person.client_side_validation_hash
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - Brian Cardarella