client_side_validations 3.2.0 → 3.2.1

data/lib/client_side_validations/action_view/form_builder.rb

@@ -93,7 +93,8 @@ module ClientSideValidations::ActionView::Helpers
 
     def build_validation_options(method, options = {})
       if @options[:validate]
-        name = options[:name] || "#{@object_name}[#{method}]"
+        index = @default_options[:index].present? ? "[#{@default_options[:index]}]" : ''
+        name = options[:name] || "#{@object_name}#{index}[#{method}]"
         child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index])})" : "\\d+"
         name = name.to_s.gsub(/_attributes\]\[#{child_index}\]/, '_attributes][]')
         name = "#{name}#{options[:multiple] ? "[]" : nil}"

data/lib/client_side_validations/action_view/form_helper.rb

@@ -74,7 +74,11 @@ module ClientSideValidations::ActionView::Helpers
           option_hash.merge!(attr[0] => attr[1][:options])
         end
 
-        validation_hash = object_opts[0].client_side_validation_hash(option_hash)
+        if object_opts[0].respond_to?(:client_side_validation_hash)
+          validation_hash = object_opts[0].client_side_validation_hash(option_hash)
+        else
+          validation_hash = {}
+        end
 
         option_hash.each_key do |attr|
           if validation_hash[attr]

data/lib/client_side_validations/active_model/numericality.rb

@@ -16,7 +16,7 @@ module ClientSideValidations::ActiveModel
         hash[:only_integer] = true
       end
 
-      hash[:allow_blank] = true if options[:allow_nil]
+      hash[:allow_blank] = true if options[:allow_nil] || options[:allow_blank]
 
       OPTION_MAP.each do |option, message_type|
         if count = options[option]

data/lib/client_side_validations/active_record/middleware.rb

@@ -14,7 +14,7 @@ module ClientSideValidations::ActiveRecord
       t = klass.arel_table
 
       if params[:case_sensitive] == 'true'
-        if t.engine.connection.instance_variable_get("@config")[:adapter] =~ /^mysql/
+        if t.engine.connection.adapter_name =~ /^mysql/i
           relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql}")
         else
           relation = t[attribute].eq(value)
@@ -24,9 +24,9 @@ module ClientSideValidations::ActiveRecord
       end
 
       if relation.is_a?(Arel::Nodes::SqlLiteral)
-        relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql} AND #{t.primary_key.not_eq(params[:id]).to_sql}")
+        relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql} AND #{t[klass.primary_key].not_eq(params[:id]).to_sql}")
       else
-        relation = relation.and(t.primary_key.not_eq(params[:id])) if params[:id]
+        relation = relation.and(t[klass.primary_key].not_eq(params[:id])) if params[:id]
       end
 
       (params[:scope] || {}).each do |attribute, value|

data/lib/client_side_validations/middleware.rb

@@ -13,7 +13,7 @@ module ClientSideValidations
       def call(env)
         if matches = /^\/validators\/(\w+)$/.match(env['PATH_INFO'])
           if ClientSideValidations::Config.disabled_validators.include?(matches[1].to_sym)
-            [500, {'Content-Type' => 'application/json', 'Content-Length' => 0}, ['']]
+            [500, {'Content-Type' => 'application/json', 'Content-Length' => '0'}, ['']]
           else
             "::ClientSideValidations::Middleware::#{matches[1].camelize}".constantize.new(env).response
           end

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

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

@@ -9,22 +9,22 @@
   };
 
   $.fn.enableClientSideValidations = function() {
-    this.filter('form[data-validate]').each(function() {
+    this.filter(ClientSideValidations.selectors.forms).each(function() {
       return ClientSideValidations.enablers.form(this);
     });
-    return this.filter(':input:not(button)').each(function() {
+    return this.filter(ClientSideValidations.selectors.inputs).each(function() {
       return ClientSideValidations.enablers.input(this);
     });
   };
 
   $.fn.resetClientSideValidations = function() {
-    return this.filter('form[data-validate]').each(function() {
+    return this.filter(ClientSideValidations.selectors.forms).each(function() {
       return ClientSideValidations.reset(this);
     });
   };
 
   $.fn.validate = function() {
-    return this.filter('form[data-validate]').each(function() {
+    return this.filter(ClientSideValidations.selectors.forms).each(function() {
       return $(this).enableClientSideValidations();
     });
   };
@@ -115,7 +115,7 @@
   };
 
   $(function() {
-    return $('form[data-validate]').validate();
+    return $(ClientSideValidations.selectors.forms).validate();
   });
 
   if (window.ClientSideValidations === void 0) {
@@ -126,6 +126,11 @@
     window.ClientSideValidations.forms = {};
   }
 
+  window.ClientSideValidations.selectors = {
+    inputs: ':input:not(button):not([type="submit"])[name]:visible:enabled',
+    forms: 'form[data-validate]'
+  };
+
   window.ClientSideValidations.reset = function(form) {
     var $form, key;
     $form = $(form);
@@ -190,7 +195,7 @@
         binding = _ref[event];
         $form.on(event, binding);
       }
-      return $form.find(':input').each(function() {
+      return $form.find(ClientSideValidations.selectors.inputs).each(function() {
         return ClientSideValidations.enablers.input(this);
       });
     },
@@ -229,15 +234,15 @@
       };
       for (event in _ref) {
         binding = _ref[event];
-        $input.filter(':enabled:not(:radio):not([id$=_confirmation]):visible:not(button)[name]').each(function() {
+        $input.filter(':not(:radio):not([id$=_confirmation])').each(function() {
           return $(this).attr('data-validate', true);
         }).on(event, binding);
       }
-      $input.filter(':checkbox:visible').on('click.ClientSideValidations', function() {
+      $input.filter(':checkbox').on('click.ClientSideValidations', function() {
         $(this).isValid(form.ClientSideValidations.settings.validators);
         return true;
       });
-      return $input.filter('[id$=_confirmation]:visible').each(function() {
+      return $input.filter('[id$=_confirmation]').each(function() {
         var confirmationElement, element, _ref1, _results;
         confirmationElement = $(this);
         element = $form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
@@ -524,7 +529,8 @@
         if (jQuery.ajax({
           url: '/validators/uniqueness',
           data: data,
-          async: false
+          async: false,
+          cache: false
         }).status === 200) {
           return options.message;
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4066478814748043567
+      hash: -1004765606605133609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4066478814748043567
+      hash: -1004765606605133609
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23