client_side_validations 3.1.0 → 3.1.1

data/lib/client_side_validations/action_view/form_builder.rb

@@ -78,33 +78,33 @@ module ClientSideValidations::ActionView::Helpers
   private
 
     def apply_client_side_validators(method, options = {})
-      if @options[:validate] && options[:validate] != false && validators = filter_validators(@object.client_side_validation_hash[method], options[:validate])
+      if @options[:validate] && options[:validate] != false && validators = filter_validators(method, options[:validate])
         options.merge!("data-validate" => true)
         @options[:validators].merge!("#{@object_name}[#{method}]#{options[:multiple] ? "[]" : nil}" => validators)
       end
     end
 
-    def filter_validators(validators, filters)
-      if validators
-        filtered_validators = validators.inject({}) do |filtered_validators, validator|
-          filtered_validators[validator.first] = validator.last
+    def filter_validators(method, filters)
+      if validators = @object.client_side_validation_hash[method]
+        unfiltered_validators = validators.inject({}) do |unfiltered_validators, validator|
+          unfiltered_validators[validator.first] = validator.last
           if has_filter_for_validator?(validator, filters)
             if filter_validator?(validator, filters)
-              filtered_validators.delete(validator.first)
-            elsif force_validator_despite_conditional?(validator, filters) && !can_run_validator?(validator)
-              filtered_validators.delete(validator.first)
+              unfiltered_validators.delete(validator.first)
+            elsif force_validator_despite_conditional?(validator, filters) && !can_run_validator?(validator, method)
+              unfiltered_validators.delete(validator.first)
             end
           else
-            if validator.last.key?(:if) || validator.last.key?(:unless)
-              filtered_validators.delete(validator.first)
+            if (conditional = (validator.last[:if] || validator.last[:unless])) && conditional.is_a?(Symbol) && !conditional_method_is_change_method?(conditional, method)
+              unfiltered_validators.delete(validator.first)
             end
           end
-          filtered_validators[validator.first].delete(:if) if filtered_validators[validator.first]
-          filtered_validators[validator.first].delete(:unless) if filtered_validators[validator.first]
-          filtered_validators
+          unfiltered_validators[validator.first].delete(:if)     if unfiltered_validators[validator.first]
+          unfiltered_validators[validator.first].delete(:unless) if unfiltered_validators[validator.first]
+          unfiltered_validators
         end
 
-        filtered_validators.empty? ? nil : filtered_validators
+        unfiltered_validators.empty? ? nil : unfiltered_validators
       end
     end
 
@@ -120,33 +120,38 @@ module ClientSideValidations::ActionView::Helpers
       filters == true || filters[validator.first] == true
     end
 
-    def can_run_validator?(validator)
+    def can_run_validator?(validator, method)
       result        = true
-      if_result     = can_run_if_validator?(validator.last[:if])
-      unless_result = can_run_unless_validator?(validator.last[:unless])
+      if_result     = run_if_validator(validator.last[:if], method)
+      unless_result = run_unless_validator(validator.last[:unless], method)
       result        = result && if_result unless if_result.nil?
       result        = result && unless_result unless unless_result.nil?
       result
     end
 
-    def can_run_if_validator?(conditional)
+    def run_if_validator(conditional, method)
       if conditional
         if conditional.is_a?(Symbol)
-          !!@object.send(conditional)
+          conditional_method_is_change_method?(conditional, method) ? true : !!@object.send(conditional)
         else
           !!conditional.call(@object)
         end
       end
     end
 
-    def can_run_unless_validator?(conditional)
+    def run_unless_validator(conditional, method)
       if conditional
         if conditional.is_a?(Symbol)
-          !@object.send(conditional)
+          conditional_method_is_change_method?(conditional, method) ? true : !@object.send(conditional)
         else
           !conditional.call(@object)
         end
       end
     end
+
+    def conditional_method_is_change_method?(conditional, method)
+      conditional.to_sym == "#{method}_changed?".to_sym
+    end
   end
 end
+

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/test/action_view/cases/test_helpers.rb

@@ -346,7 +346,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters
+  def test_conditional_validators_should_be_filtered
     hash = {
       :cost => {
         :presence => {
@@ -379,7 +379,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validators_should_be_filtered
+  def test_conditional_validator_filters_being_forced
     hash = {
       :cost => {
         :presence => {
@@ -400,8 +400,44 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @post.stubs(:can_validate?).returns(true)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
-      concat f.text_field(:cost)
-      concat f.text_field(:title)
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {:presence => {:message => "can't be blank"}}
+    }
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(true)
+    @post.stubs(:can_validate?).returns(false)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
     end
 
     validators = {}
@@ -412,7 +448,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced
+  def test_conditional_validator_filters_being_forced_individually
     hash = {
       :cost => {
         :presence => {
@@ -433,8 +469,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @post.stubs(:can_validate?).returns(true)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
-      concat f.text_field(:cost, :validate => true)
-      concat f.text_field(:title, :validate => true)
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
     end
 
     validators = {
@@ -448,7 +484,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_and_not_meeting_condition
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
     hash = {
       :cost => {
         :presence => {
@@ -469,8 +505,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @post.stubs(:can_validate?).returns(false)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
-      concat f.text_field(:cost, :validate => true)
-      concat f.text_field(:title, :validate => true)
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
     end
 
     validators = {}
@@ -481,18 +517,18 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_individually
+  def test_conditional_validator_filters_being_forced_with_procs
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => :cannot_validate?
+          :unless => Proc.new { |post| post.cannot_validate? }
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => :can_validate?
+          :if => Proc.new { |post| post.can_validate? }
         }
       }
     }
@@ -502,8 +538,8 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     @post.stubs(:can_validate?).returns(true)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
-      concat f.text_field(:cost, :validate => { :presence => true })
-      concat f.text_field(:title, :validate => { :presence => true })
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
     end
 
     validators = {
@@ -517,58 +553,57 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
+  def test_conditional_validator_ignored_when_using_changed_helpers
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => :cannot_validate?
+          :unless => :cost_changed?
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => :can_validate?
+          :if => :title_changed?
         }
       }
     }
 
     @post.title = nil
-    @post.stubs(:cannot_validate?).returns(true)
-    @post.stubs(:can_validate?).returns(false)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
-      concat f.text_field(:cost, :validate => { :presence => true })
-      concat f.text_field(:title, :validate => { :presence => true })
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
     end
 
-    validators = {}
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {:presence => {:message => "can't be blank"}}
+    }
     expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
-      %{<input id="post_cost" name="post[cost]" size="30" type="text" />} +
-      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
     end
     assert_equal expected, output_buffer
   end
 
-  def test_conditional_validator_filters_being_forced_with_procs
+  def test_conditional_validator_ignored_when_using_changed_helpers_and_forcing_validators
     hash = {
       :cost => {
         :presence => {
           :message => "can't be blank",
-          :unless => Proc.new { |post| post.cannot_validate? }
+          :unless => :cost_changed?
         }
       },
       :title => {
         :presence => {
           :message => "can't be blank",
-          :if => Proc.new { |post| post.can_validate? }
+          :if => :title_changed?
         }
       }
     }
 
     @post.title = nil
-    @post.stubs(:cannot_validate?).returns(false)
-    @post.stubs(:can_validate?).returns(true)
     @post.stubs(:client_side_validation_hash).returns(hash)
     form_for(@post, :validate => true) do |f|
       concat f.text_field(:cost, :validate => true)

data/vendor/assets/javascripts/rails.validations.js

@@ -1,5 +1,5 @@
 /*!
- * Rails 3 Client Side Validations - v3.1.0
+ * Rails 3 Client Side Validations - v3.1.1
  * https://github.com/bcardarlela/client_side_validations
  *
  * Copyright (c) 2011 Brian Cardarella

metadata

@@ -2,7 +2,7 @@
 name: client_side_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -04:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.9.3
 signing_key: 
 specification_version: 3
 summary: Client Side Validations