client_side_validations 3.0.12 → 3.0.13

data/client_side_validations.gemspec

@@ -23,20 +23,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mongoid', '~> 2.0.0'
   s.add_development_dependency 'mongo_mapper','~>0.9.0'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simple_form'
-  s.add_development_dependency 'formtastic'
+  s.add_development_dependency 'simple_form', '~> 1.5.0'
+  s.add_development_dependency 'formtastic', '~> 1.2.0'
 
   # For QUnit testing
   s.add_development_dependency 'sinatra', '~> 1.0'
   s.add_development_dependency 'shotgun'
   s.add_development_dependency 'thin'
   s.add_development_dependency 'json'
-
-  ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
-  if ruby_minor_version == 8
-    s.add_development_dependency 'minitest'
-    s.add_development_dependency 'ruby-debug'
-  elsif ruby_minor_version == 9
-    s.add_development_dependency 'ruby-debug19'
-  end
 end

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/active_record/middleware.rb

@@ -1,7 +1,10 @@
+require 'debugger'
+
 module ClientSideValidations::ActiveRecord
   class Middleware
 
     def self.is_unique?(klass, attribute, value, params)
+      value = type_cast_value(klass, attribute, value)
       column = klass.columns_hash[attribute.to_s]
       value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if column.text?
 
@@ -23,11 +26,18 @@ module ClientSideValidations::ActiveRecord
         relation = relation.and(t.primary_key.not_eq(params[:id])) if params[:id]
       end
 
-      (params[:scope] || {}).each do |key, value|
-        relation = relation.and(t[key].eq(value))
+      (params[:scope] || {}).each do |attribute, value|
+        value = type_cast_value(klass, attribute, value)
+        relation = relation.and(t[attribute].eq(value))
       end
 
       !klass.where(relation).exists?
     end
+
+    private
+
+    def self.type_cast_value(klass, attribute, value)
+      klass.columns_hash[attribute].type_cast(value)
+    end
   end
 end

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.0.12'
+  VERSION = '3.0.13'
 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/test/active_record/cases/test_middleware.rb

@@ -171,5 +171,20 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
-end
 
+  def test_uniqueness_when_value_must_be_typecast
+    User.create(:active => false)
+    get '/validators/uniqueness.json', { 'user[active]' => 'false', 'case_sensitive' => true }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+
+  def test_uniqueness_when_scope_is_given_and_value_must_be_typecast
+    User.create(:email => 'user@test.com', :active => true)
+    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'active' => 'true' }, 'case_sensitive' => true }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+end

data/test/active_record/models/user.rb

@@ -1,4 +1,4 @@
-users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, email TEXT, title VARCHAR(5));}
+users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, email TEXT, title VARCHAR(5), active BOOLEAN);}
 ActiveRecord::Base.connection.execute(users_table)
 
 class User < ActiveRecord::Base

data/test/base_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler'
 Bundler.setup
-require 'ruby-debug'
 require 'test/unit'
 require 'mocha'
 

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

@@ -1,5 +1,5 @@
 /*!
- * Rails 3 Client Side Validations - v3.0.12
+ * Rails 3 Client Side Validations - v3.0.13
  * https://github.com/bcardarlela/client_side_validations
  *
  * Copyright (c) 2011 Brian Cardarella
@@ -7,77 +7,76 @@
  * http://www.opensource.org/licenses/mit-license.php
  */
 
-(function($) {
-  $.fn.validate = function() {
-    return this.filter('form[data-validate]').each(function() {
-      var form = $(this);
-      var settings = window[form.attr('id')];
+(function ($) {
+  $.fn.validate = function () {
+    return this.filter('form[data-validate]').each(function () {
+      var form = $(this),
+          settings = window[form.attr('id')],
+          addError = function (element, message) {
+            clientSideValidations.formBuilders[settings.type].add(element, settings, message);
+          },
+          removeError = function (element) {
+            clientSideValidations.formBuilders[settings.type].remove(element, settings);
+          };
 
       // Set up the events for the form
       form
-        .submit(function() { return form.isValid(settings.validators); })
-        .bind('ajax:beforeSend',      function()          { return form.isValid(settings.validators); })
+        .submit(function () { return form.isValid(settings.validators); })
+        .bind('ajax:beforeSend',      function ()          { return form.isValid(settings.validators); } )
         // Callbacks
-        .bind('form:validate:after',  function(eventData) { clientSideValidations.callbacks.form.after( form, eventData); })
-        .bind('form:validate:before', function(eventData) { clientSideValidations.callbacks.form.before(form, eventData); })
-        .bind('form:validate:fail',   function(eventData) { clientSideValidations.callbacks.form.fail(  form, eventData); })
-        .bind('form:validate:pass',   function(eventData) { clientSideValidations.callbacks.form.pass(  form, eventData); })
+        .bind('form:validate:after',  function (eventData) { clientSideValidations.callbacks.form.after( form, eventData); } )
+        .bind('form:validate:before', function (eventData) { clientSideValidations.callbacks.form.before(form, eventData); } )
+        .bind('form:validate:fail',   function (eventData) { clientSideValidations.callbacks.form.fail(  form, eventData); } )
+        .bind('form:validate:pass',   function (eventData) { clientSideValidations.callbacks.form.pass(  form, eventData); } )
 
         // Set up the events for each validatable form element
         .find('[data-validate]:input:not(:radio)')
-          .live('focusout',                function()          { $(this).isValid(settings.validators); })
-          .live('change',                  function()          { $(this).data('changed', true); })
+          .live('focusout',                function ()          { $(this).isValid(settings.validators); })
+          .live('change',                  function ()          { $(this).data('changed', true); })
           // Callbacks
-          .live('element:validate:after',  function(eventData) { clientSideValidations.callbacks.element.after( $(this), eventData); })
-          .live('element:validate:before', function(eventData) { clientSideValidations.callbacks.element.before($(this), eventData); })
-          .live('element:validate:fail',   function(eventData, message) {
+          .live('element:validate:after',  function (eventData) { clientSideValidations.callbacks.element.after( $(this), eventData); })
+          .live('element:validate:before', function (eventData) { clientSideValidations.callbacks.element.before($(this), eventData); })
+          .live('element:validate:fail',   function (eventData, message) {
             var element = $(this);
-            clientSideValidations.callbacks.element.fail(element, message, function() {
+            clientSideValidations.callbacks.element.fail(element, message, function () {
               addError(element, message);
-            }, eventData) })
-          .live('element:validate:pass',   function(eventData) {
+            }, eventData); })
+          .live('element:validate:pass',   function (eventData) {
             var element = $(this);
-            clientSideValidations.callbacks.element.pass(element, function() {
+            clientSideValidations.callbacks.element.pass(element, function () {
               removeError(element);
-            }, eventData) })
+            }, eventData); })
         // Checkboxes - Live events don't support filter
         .end().find('[data-validate]:checkbox')
-          .live('click', function() { $(this).isValid(settings.validators); })
+          .live('click', function () { $(this).isValid(settings.validators); })
         // Inputs for confirmations
-        .end().find('[id*=_confirmation]').each(function() {
+        .end().find('[id*=_confirmation]').each(function () {
           var confirmationElement = $(this),
               element = form.find('#' + this.id.match(/(.+)_confirmation/)[1] + '[data-validate]:input');
 
           if (element[0]) {
             $('#' + confirmationElement.attr('id'))
-              .live('focusout', function() {
+              .live('focusout', function () {
                 element.data('changed', true).isValid(settings.validators);
               })
-              .live('keyup', function() {
+              .live('keyup', function () {
                 element.data('changed', true).isValid(settings.validators);
-              })
+              });
           }
         });
 
-      var addError = function(element, message) {
-        clientSideValidations.formBuilders[settings.type].add(element, settings, message);
-      }
-
-      var removeError = function(element) {
-        clientSideValidations.formBuilders[settings.type].remove(element, settings);
-      }
     });
-  }
+  };
 
-  $.fn.isValid = function(validators) {
+  $.fn.isValid = function (validators) {
     if ($(this[0]).is('form')) {
       return validateForm($(this[0]), validators);
     } else {
       return validateElement($(this[0]), validators[this[0].name]);
     }
-  }
+  };
 
-  var validateForm = function(form, validators) {
+  var validateForm = function (form, validators) {
     var valid = true;
 
     form.trigger('form:validate:before').find('[data-validate]:input').each(function() {
@@ -92,48 +91,47 @@
 
     form.trigger('form:validate:after');
     return valid;
-  }
-
-  var validateElement = function(element, validators) {
-    element.trigger('element:validate:before');
-
-    if (element.data('changed') !== false) {
-      var valid = true;
-      element.data('changed', false);
-
-      // Because 'length' is defined on the list of validators we cannot call jQuery.each on
-      // the clientSideValidations.validators.all() object
-      for (kind in clientSideValidations.validators.all()) {
-        if (validators[kind] && (message = clientSideValidations.validators.all()[kind](element, validators[kind]))) {
-          element.trigger('element:validate:fail', message).data('valid', false);
-          valid = false;
-          break;
+  },
+    validateElement = function (element, validators) {
+      element.trigger('element:validate:before');
+
+      if (element.data('changed') !== false) {
+        var valid = true;
+        element.data('changed', false);
+
+        // Because 'length' is defined on the list of validators we cannot call jQuery.each on
+        // the clientSideValidations.validators.all() object
+        for (kind in clientSideValidations.validators.all()) {
+          if (validators[kind] && (message = clientSideValidations.validators.all()[kind](element, validators[kind]))) {
+            element.trigger('element:validate:fail', message).data('valid', false);
+            valid = false;
+            break;
+          }
         }
-      }
 
-      if (valid) { element.data('valid', null); element.trigger('element:validate:pass'); }
-    }
+        if (valid) { element.data('valid', null); element.trigger('element:validate:pass'); }
+      }
 
-    element.trigger('element:validate:after');
-    return element.data('valid') === false ? false : true;
-  }
+      element.trigger('element:validate:after');
+      return element.data('valid') === false ? false : true;
+    };
 
   // Main hook
   // If new forms are dynamically introduced into the DOM the .validate() method
   // must be invoked on that form
-  $(function() { $('form[data-validate]').validate(); })
+  $(function () { $('form[data-validate]').validate(); });
 })(jQuery);
 
 var clientSideValidations = {
   validators: {
-    all: function() { return jQuery.extend({}, clientSideValidations.validators.local, clientSideValidations.validators.remote) },
+    all: function() { return jQuery.extend({}, clientSideValidations.validators.local, clientSideValidations.validators.remote); },
     local: {
-      presence: function(element, options) {
+      presence: function (element, options) {
         if (/^\s*$/.test(element.val() || "")) {
           return options.message;
         }
       },
-      acceptance: function(element, options) {
+      acceptance: function (element, options) {
         switch (element.attr('type')) {
           case 'checkbox':
             if (!element.attr('checked')) {
@@ -147,8 +145,8 @@ var clientSideValidations = {
             break;
         }
       },
-      format: function(element, options) {
-        if ((message = this.presence(element, options)) && options.allow_blank == true) {
+      format: function (element, options) {
+        if ((message = this.presence(element, options)) && options.allow_blank === true) {
           return;
         } else if (message) {
           return message;
@@ -160,7 +158,7 @@ var clientSideValidations = {
           }
         }
       },
-      numericality: function(element, options) {
+      numericality: function (element, options) {
         if (!/^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/.test(element.val())) {
           return options.messages.numericality;
         }
@@ -170,82 +168,83 @@ var clientSideValidations = {
         }
 
         var CHECKS = { greater_than: '>', greater_than_or_equal_to: '>=',
-          equal_to: '==', less_than: '<', less_than_or_equal_to: '<=' }
+          equal_to: '==', less_than: '<', less_than_or_equal_to: '<=' };
 
-        for (var check in CHECKS) {
-          if (options[check] != undefined && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
+        for (check in CHECKS) {
+          if (options[check] !== undefined && !(new Function("return " + element.val() + CHECKS[check] + options[check])())) {
             return options.messages[check];
           }
         }
 
-        if (options.odd && !(parseInt(element.val()) % 2)) {
+        if (options.odd && !(parseInt(element.val(), 10) % 2)) {
           return options.messages.odd;
         }
 
-        if (options.even && (parseInt(element.val()) % 2)) {
+        if (options.even && (parseInt(element.val(), 10) % 2)) {
           return options.messages.even;
         }
       },
-      length: function(element, options) {
-        var blankOptions = {};
+      length: function (element, options) {
+        var blankOptions = {},
+            CHECKS = { is: '==', minimum: '>=', maximum: '<=' },
+            tokenizer = options.js_tokenizer || "split('')",
+            tokenized_length = new Function("element", "return (element.val()." + tokenizer + " || '').length;")(element);
         if (options.is) {
           blankOptions.message = options.messages.is;
         } else if (options.minimum) {
           blankOptions.message = options.messages.minimum;
         }
-        if ((message = this.presence(element, blankOptions)) && options.allow_blank == true) {
+        if ((message = this.presence(element, blankOptions)) && options.allow_blank === true) {
           return;
         } else if (message) {
           return message;
         } else {
-          var CHECKS = { is: '==', minimum: '>=', maximum: '<=' }
-          var tokenizer = options.js_tokenizer || "split('')";
-          var tokenized_length = new Function("element", "return (element.val()." + tokenizer + " || '').length;")(element);
-
-          for (var check in CHECKS) {
+          for (check in CHECKS) {
             if (options[check] && !(new Function("return " + tokenized_length + CHECKS[check] + options[check])())) {
               return options.messages[check];
             }
           }
         }
       },
-      exclusion: function(element, options) {
-        if ((message = this.presence(element, options)) && options.allow_blank == true) {
+      exclusion: function (element, options) {
+        var lower = null, upper = null;
+        if ((message = this.presence(element, options)) && options.allow_blank === true) {
           return;
         } else if (message) {
           return message;
         } else {
           if (options['in']) {
-            for (var i = 0; i < options['in'].length; i++) {
+            for (i = 0; i < options['in'].length; i = i + 1) {
               if (options['in'][i] == element.val()) {
                 return options.message;
               }
             }
-          } else if (options['range']) {
-            var lower = options['range'][0],
-                upper = options['range'][1];
+          } else if (options.range) {
+            lower = options.range[0];
+            upper = options.range[1];
             if (element.val() >= lower && element.val() <= upper) {
               return options.message;
             }
           }
         }
       },
-      inclusion: function(element, options) {
-        if ((message = this.presence(element, options)) && options.allow_blank == true) {
+      inclusion: function (element, options) {
+        var lower = null, upper = null;
+        if ((message = this.presence(element, options)) && options.allow_blank === true) {
           return;
         } else if (message) {
           return message;
         } else {
           if (options['in']) {
-            for (var i = 0; i < options['in'].length; i++) {
+            for (i = 0; i < options['in'].length; i = i + 1) {
               if (options['in'][i] == element.val()) {
                 return;
               }
             }
             return options.message;
-          } else if (options['range']) {
-            var lower = options['range'][0],
-                upper = options['range'][1];
+          } else if (options.range) {
+            lower = options.range[0];
+            upper = options.range[1];
 
             if (element.val() >= lower && element.val() <= upper) {
               return;
@@ -255,25 +254,26 @@ var clientSideValidations = {
           }
         }
       },
-      confirmation: function(element, options) {
-        if (element.val() != jQuery('#' + element.attr('id') + '_confirmation').val()) {
+      confirmation: function (element, options) {
+        if (element.val() !== jQuery('#' + element.attr('id') + '_confirmation').val()) {
           return options.message;
         }
       }
     },
     remote: {
-      uniqueness: function(element, options) {
-        var data = {};
-        data['case_sensitive'] = !!options.case_sensitive;
+      uniqueness: function (element, options) {
+        var data = {},
+            name = null;
+        data.case_sensitive = !!options.case_sensitive;
         if (options.id) {
-          data['id'] = options.id;
+          data.id = options.id;
         }
 
         if (options.scope) {
-          data.scope = {}
+          data.scope = {};
           for (key in options.scope) {
-            var scoped_element = jQuery('[name="' + element.attr('name').replace(/\[\w+]$/, '[' + key + ']' + '"]'));
-            if (scoped_element[0] && scoped_element.val() != options.scope[key]) {
+            var scoped_element = jQuery('[name="' + element.attr('name').replace(/\[\w+\]$/, '[' + key + ']' + '"]'));
+            if (scoped_element[0] && scoped_element.val() !== options.scope[key]) {
               data.scope[key] = scoped_element.val();
               scoped_element.unbind('change.' + element.id).bind('change.' + element.id, function() { element.trigger('change'); element.trigger('focusout'); });
             } else {
@@ -286,16 +286,16 @@ var clientSideValidations = {
         // e.g. user[records_attributes][0][title] => records[title]
         // e.g. user[record_attributes][title] => record[title]
         // Server side handles classifying the resource properly
-        if (/_attributes]/.test(element.attr('name'))) {
-          var name = element.attr('name').match(/\[\w+_attributes]/g).pop().match(/\[(\w+)_attributes]/).pop();
-          name += /(\[\w+])$/.exec(element.attr('name'))[1];
+        if (/_attributes\]/.test(element.attr('name'))) {
+          name = element.attr('name').match(/\[\w+_attributes\]/g).pop().match(/\[(\w+)_attributes\]/).pop();
+          name += /(\[\w+\])$/.exec(element.attr('name'))[1];
         } else {
-          var name = element.attr('name');
+          name = element.attr('name');
         }
 
         // Override the name if a nested module class is passed
         if (options['class']) {
-          name = options['class'] + '[' + name.split('[')[1]
+          name = options['class'] + '[' + name.split('[')[1];
         }
         data[name] = element.val();
 
@@ -303,7 +303,7 @@ var clientSideValidations = {
           url: '/validators/uniqueness.json',
           data: data,
           async: false
-        }).status == 200) {
+        }).status === 200) {
           return options.message;
         }
       }
@@ -311,13 +311,13 @@ var clientSideValidations = {
   },
   formBuilders: {
     'ActionView::Helpers::FormBuilder': {
-      add: function(element, settings, message) {
-        if (element.data('valid') !== false && jQuery('label.message[for="' + element.attr('id') + '"]')[0] == undefined) {
+      add: function (element, settings, message) {
+        if (element.data('valid') !== false && jQuery('label.message[for="' + element.attr('id') + '"]')[0] === undefined) {
           var inputErrorField = jQuery(settings.input_tag),
               labelErrorField = jQuery(settings.label_tag),
               label = jQuery('label[for="' + element.attr('id') + '"]:not(.message)');
 
-          if (element.attr('autofocus')) { element.attr('autofocus', false) };
+          if (element.attr('autofocus')) { element.attr('autofocus', false); }
           element.before(inputErrorField);
           inputErrorField.find('span#input_tag').replaceWith(element);
           inputErrorField.find('label.message').attr('for', element.attr('id'));
@@ -327,7 +327,7 @@ var clientSideValidations = {
         }
         jQuery('label.message[for="' + element.attr('id') + '"]').text(message);
       },
-      remove: function(element, settings) {
+      remove: function (element, settings) {
         var errorFieldClass = jQuery(settings.input_tag).attr('class'),
             inputErrorField = element.closest('.' + errorFieldClass),
             label = jQuery('label[for="' + element.attr('id') + '"]:not(.message)'),
@@ -342,63 +342,64 @@ var clientSideValidations = {
       }
     },
     'SimpleForm::FormBuilder': {
-      add: function(element, settings, message) {
+      add: function (element, settings, message) {
         if (element.data('valid') !== false) {
-          var wrapper = element.closest(settings.wrapper_tag);
+          var wrapper = element.closest(settings.wrapper_tag),
+              errorElement = $('<' + settings.error_tag + ' class="' + settings.error_class + '">' + message + '</' + settings.error_tag + '>');
           wrapper.addClass(settings.wrapper_error_class);
-          var errorElement = $('<' + settings.error_tag + ' class="' + settings.error_class + '">' + message + '</' + settings.error_tag + '>');
           wrapper.append(errorElement);
         } else {
           element.parent().find(settings.error_tag + '.' + settings.error_class).text(message);
         }
       },
-      remove: function(element, settings) {
-        var wrapper = element.closest(settings.wrapper_tag + '.' + settings.wrapper_error_class);
+      remove: function (element, settings) {
+        var wrapper = element.closest(settings.wrapper_tag + '.' + settings.wrapper_error_class),
+            errorElement = wrapper.find(settings.error_tag + '.' + settings.error_class);
         wrapper.removeClass(settings.wrapper_error_class);
-        var errorElement = wrapper.find(settings.error_tag + '.' + settings.error_class);
         errorElement.remove();
       }
 
     },
     'Formtastic::SemanticFormBuilder': {
-      add: function(element, settings, message) {
+      add: function (element, settings, message) {
         if (element.data('valid') !== false) {
-          var wrapper = element.closest('li');
+          var wrapper = element.closest('li'),
+              errorElement = jQuery('<p class="' + settings.inline_error_class + '">' + message + '</p>');
           wrapper.addClass('error');
-          var errorElement = $('<p class="' + settings.inline_error_class + '">' + message + '</p>');
           wrapper.append(errorElement);
         } else {
           element.parent().find('p.' + settings.inline_error_class).text(message);
         }
       },
-      remove: function(element, settings) {
-        var wrapper = element.closest('li.error');
+      remove: function (element, settings) {
+        var wrapper = element.closest('li.error'),
+            errorElement = wrapper.find('p.' + settings.inline_error_class);
         wrapper.removeClass('error');
-        var errorElement = wrapper.find('p.' + settings.inline_error_class);
         errorElement.remove();
       }
     },
     'NestedForm::Builder': {
-      add: function(element, settings, message) {
+      add: function (element, settings, message) {
         clientSideValidations.formBuilders['ActionView::Helpers::FormBuilder'].add(element, settings, message);
       },
-      remove: function(element, settings, message) {
+      remove: function (element, settings, message) {
         clientSideValidations.formBuilders['ActionView::Helpers::FormBuilder'].remove(element, settings, message);
       }
     }
   },
   callbacks: {
     element: {
-      after:  function(element, eventData)                    { },
-      before: function(element, eventData)                    { },
-      fail:   function(element, message, addError, eventData) { addError() },
-      pass:   function(element, removeError, eventData)       { removeError() }
+      after:  function (element, eventData)                    { },
+      before: function (element, eventData)                    { },
+      fail:   function (element, message, addError, eventData) { addError(); },
+      pass:   function (element, removeError, eventData)       { removeError(); }
     },
     form: {
-      after:  function(form, eventData) { },
-      before: function(form, eventData) { },
-      fail:   function(form, eventData) { },
-      pass:   function(form, eventData) { }
+      after:  function (form, eventData) { },
+      before: function (form, eventData) { },
+      fail:   function (form, eventData) { },
+      pass:   function (form, eventData) { }
     }
   }
-}
+};
+

metadata

@@ -1,171 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: client_side_validations
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.13
   prerelease: 
-  version: 3.0.12
 platform: ruby
-authors: 
+authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: simple_form
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: formtastic
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: shotgun
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id013
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client Side Validations
-email: 
+email:
 - bcardarella@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - client_side_validations.gemspec
 - lib/client_side_validations.rb
 - lib/client_side_validations/action_view.rb
@@ -277,35 +321,37 @@ files:
 - test/simple_form/cases/helper.rb
 - test/simple_form/cases/test_form_builder.rb
 - test/simple_form/cases/test_form_helper.rb
-has_rdoc: true
 homepage: https://github.com/bcardarella/client_side_validations
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1590299980694445321
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1590299980694445321
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client Side Validations
-test_files: 
+test_files:
 - test/action_view/cases/helper.rb
 - test/action_view/cases/test_helpers.rb
 - test/action_view/cases/test_legacy_helpers.rb