client_side_validations 3.2.0.beta.4 → 3.2.0.beta.5

data/client_side_validations.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '~> 3.2.0'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'm'
 
   # For QUnit testing
   s.add_development_dependency 'sinatra', '~> 1.0'

data/lib/client_side_validations/action_view/form_helper.rb

@@ -51,9 +51,9 @@ module ClientSideValidations::ActionView::Helpers
       options[:html][:validate] = true if options[:validate]
     end
 
-    def fields_for(record_or_name_or_array, *args, &block)
+    def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
       output = super
-      @validators.merge!(args.last[:validators]) if @validators
+      @validators.merge!(options[:validators]) if @validators
       output
     end
 
@@ -95,7 +95,7 @@ module ClientSideValidations::ActionView::Helpers
         end
 
         content_tag(:script) do
-          "//<![CDATA[\nwindow.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};\n//]]>".html_safe
+          "//<![CDATA[\nif(window.ClientSideValidations==undefined)window.ClientSideValidations={};if(window.ClientSideValidations.forms==undefined)window.ClientSideValidations.forms={};window.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};\n//]]>".html_safe
         end
       end
     end

data/lib/client_side_validations/active_model.rb

@@ -24,14 +24,14 @@ module ClientSideValidations::ActiveModel
       @client_side_validation_hash ||= _validators.inject({}) do |attr_hash, attr|
         unless [nil, :block].include?(attr[0])
 
-          validator_hash = attr[1].inject({}) do |kind_hash, validator|
+          validator_hash = attr[1].inject(Hash.new { |h,k| h[k] = []}) 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 can_use_for_client_side_validation?(client_side_hash, validator) && uniqueness_validations_allowed_or_not_applicable?(validator)
-              kind_hash.merge!(validator.kind => client_side_hash.except(:on))
-            else
-              kind_hash.merge!({})
+              kind_hash[validator.kind] << client_side_hash.except(:on)
             end
+
+            kind_hash
           end
 
           if validator_hash.present?

data/lib/client_side_validations/active_model/numericality.rb

@@ -16,6 +16,8 @@ module ClientSideValidations::ActiveModel
         hash[:only_integer] = true
       end
 
+      hash[:allow_blank] = true if options[:allow_nil]
+
       OPTION_MAP.each do |option, message_type|
         if count = options[option]
           hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(:count => count))

data/lib/client_side_validations/active_record/uniqueness.rb

@@ -2,9 +2,10 @@ module ClientSideValidations::ActiveRecord
   module Uniqueness
     def client_side_hash(model, attribute)
       hash = {}
-      hash[:message] = model.errors.generate_message(attribute, message_type, options.except(:scope))
+      hash[:message]        = model.errors.generate_message(attribute, message_type, options.except(:scope))
       hash[:case_sensitive] = options[:case_sensitive]
-      hash[:id] = model.id unless model.new_record?
+      hash[:id]             = model.id unless model.new_record?
+      hash[:allow_blank]    = true if options[:allow_blank]
       if options.key?(:scope) && options[:scope].present?
         hash[:scope] = Array.wrap(options[:scope]).inject({}) do |scope_hash, scope_item|
           scope_hash.merge!(scope_item => model.send(scope_item))

data/lib/client_side_validations/middleware.rb

@@ -24,9 +24,11 @@ module ClientSideValidations
       attr_accessor :request, :body, :status
 
       def initialize(env)
-        self.body    = ''
-        self.status  = 200
-        self.request = ActionDispatch::Request.new(env)
+        # Filter out cache buster
+        env['QUERY_STRING'] = env['QUERY_STRING'].split('&').select { |p| !p.match(/^_=/) }.join('&')
+        self.body           = ''
+        self.status         = 200
+        self.request        = ActionDispatch::Request.new(env)
       end
 
       def response

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.0.beta.4'
+  VERSION = '3.2.0.beta.5'
 end

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

@@ -15,8 +15,10 @@
       removeError = function(element) {
         return ClientSideValidations.formBuilders[settings.type].remove(element, settings);
       };
-      form.submit(function() {
-        return form.isValid(settings.validators);
+      form.submit(function(eventData) {
+        if (!form.isValid(settings.validators)) {
+          return eventData.preventDefault();
+        }
       });
       _ref = {
         'ajax:beforeSend': function(eventData) {
@@ -121,9 +123,10 @@
     form.trigger('form:validate:before');
     valid = true;
     form.find('[data-validate="true"]:input:enabled').each(function() {
-      if ($(this).isValid(validators)) {
-        return valid = false;
+      if (!$(this).isValid(validators)) {
+        valid = false;
       }
+      return true;
     });
     if (valid) {
       form.trigger('form:validate:pass');
@@ -135,7 +138,7 @@
   };
 
   validateElement = function(element, validators) {
-    var context, fn, kind, message, valid, _ref;
+    var context, fn, kind, message, valid, validator, _i, _j, _len, _len1, _ref, _ref1;
     element.trigger('element:validate:before');
     if (element.data('changed') !== false) {
       valid = true;
@@ -143,19 +146,37 @@
       context = ClientSideValidations.validators.local;
       for (kind in context) {
         fn = context[kind];
-        if (validators[kind] && (message = fn.call(context, element, validators[kind]))) {
-          element.trigger('element:validate:fail', message).data('valid', false);
-          valid = false;
-          break;
+        if (validators[kind]) {
+          _ref = validators[kind];
+          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            validator = _ref[_i];
+            if (message = fn.call(context, element, validator)) {
+              element.trigger('element:validate:fail', message).data('valid', false);
+              valid = false;
+              break;
+            }
+          }
+          if (!valid) {
+            break;
+          }
         }
       }
       if (valid) {
         context = ClientSideValidations.validators.remote;
         for (kind in context) {
           fn = context[kind];
-          if (validators[kind] && (message = fn.call(context, element, validators[kind]))) {
-            element.trigger('element:validate:fail', message).data('valid', false);
-            valid = false;
+          if (validators[kind]) {
+            _ref1 = validators[kind];
+            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+              validator = _ref1[_j];
+              if (message = fn.call(context, element, validator)) {
+                element.trigger('element:validate:fail', message).data('valid', false);
+                valid = false;
+                break;
+              }
+            }
+          }
+          if (!valid) {
             break;
           }
         }
@@ -166,9 +187,7 @@
       }
     }
     element.trigger('element:validate:after');
-    return (_ref = element.data('valid') === false) != null ? _ref : {
-      "false": true
-    };
+    return element.data('valid') !== false;
   };
 
   $(function() {
@@ -218,11 +237,15 @@
           }
         },
         numericality: function(element, options) {
-          var CHECKS, check, fn, operator;
-          if (!ClientSideValidations.patterns.numericality.test(element.val())) {
+          var CHECKS, check, check_value, fn, form, operator, val;
+          val = jQuery.trim(element.val());
+          if (!ClientSideValidations.patterns.numericality.test(val)) {
+            if (options.allow_blank === true) {
+              return;
+            }
             return options.messages.numericality;
           }
-          if (options.only_integer && !/^[+-]?\d+$/.test(element.val())) {
+          if (options.only_integer && !/^[+-]?\d+$/.test(val)) {
             return options.messages.only_integer;
           }
           CHECKS = {
@@ -232,20 +255,28 @@
             less_than: '<',
             less_than_or_equal_to: '<='
           };
+          form = $(element[0].form);
           for (check in CHECKS) {
             operator = CHECKS[check];
             if (!(options[check] != null)) {
               continue;
             }
-            fn = new Function("return " + (element.val()) + " " + operator + " " + options[check]);
+            if (!isNaN(parseFloat(options[check])) && isFinite(options[check])) {
+              check_value = options[check];
+            } else if (form.find("[name*=" + options[check] + "]").size() === 1) {
+              check_value = form.find("[name*=" + options[check] + "]").val();
+            } else {
+              return;
+            }
+            fn = new Function("return " + val + " " + operator + " " + check_value);
             if (!fn()) {
               return options.messages[check];
             }
           }
-          if (options.odd && !(parseInt(element.val(), 10) % 2)) {
+          if (options.odd && !(parseInt(val, 10) % 2)) {
             return options.messages.odd;
           }
-          if (options.even && (parseInt(element.val(), 10) % 2)) {
+          if (options.even && (parseInt(val, 10) % 2)) {
             return options.messages.even;
           }
         },
@@ -346,6 +377,35 @@
           if (element.val() !== jQuery("#" + (element.attr('id')) + "_confirmation").val()) {
             return options.message;
           }
+        },
+        uniqueness: function(element, options) {
+          var form, matches, name, name_prefix, name_suffix, valid, value;
+          name = element.attr('name');
+          if (/_attributes\]\[\d/.test(name)) {
+            matches = name.match(/^(.+_attributes\])\[\d+\](.+)$/);
+            name_prefix = matches[1];
+            name_suffix = matches[2];
+            value = element.val();
+            if (name_prefix && name_suffix) {
+              form = element.closest('form');
+              valid = true;
+              form.find(':input[name^="' + name_prefix + '"][name$="' + name_suffix + '"]').each(function() {
+                if ($(this).attr('name') !== name) {
+                  if ($(this).val() === value) {
+                    valid = false;
+                    return $(this).data('notLocallyUnique', true);
+                  } else {
+                    if ($(this).data('notLocallyUnique')) {
+                      return $(this).removeData('notLocallyUnique').data('changed', true);
+                    }
+                  }
+                }
+              });
+              if (!valid) {
+                return options.message;
+              }
+            }
+          }
         }
       },
       remote: {
@@ -404,11 +464,12 @@
     formBuilders: {
       'ActionView::Helpers::FormBuilder': {
         add: function(element, settings, message) {
-          var inputErrorField, label, labelErrorField;
-          if (element.data('valid') !== false && !(jQuery("label.message[for='" + (element.attr('id')) + "']")[0] != null)) {
+          var form, inputErrorField, label, labelErrorField;
+          form = $(element[0].form);
+          if (element.data('valid') !== false && !(form.find("label.message[for='" + (element.attr('id')) + "']")[0] != null)) {
             inputErrorField = jQuery(settings.input_tag);
             labelErrorField = jQuery(settings.label_tag);
-            label = jQuery("label[for='" + (element.attr('id')) + "']:not(.message)");
+            label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
             if (element.attr('autofocus')) {
               element.attr('autofocus', false);
             }
@@ -416,16 +477,17 @@
             inputErrorField.find('span#input_tag').replaceWith(element);
             inputErrorField.find('label.message').attr('for', element.attr('id'));
             labelErrorField.find('label.message').attr('for', element.attr('id'));
-            label.replaceWith(labelErrorField);
+            labelErrorField.insertAfter(label);
             labelErrorField.find('label#label_tag').replaceWith(label);
           }
-          return jQuery("label.message[for='" + (element.attr('id')) + "']").text(message);
+          return form.find("label.message[for='" + (element.attr('id')) + "']").text(message);
         },
         remove: function(element, settings) {
-          var errorFieldClass, inputErrorField, label, labelErrorField;
+          var errorFieldClass, form, inputErrorField, label, labelErrorField;
+          form = $(element[0].form);
           errorFieldClass = jQuery(settings.input_tag).attr('class');
           inputErrorField = element.closest("." + (errorFieldClass.replace(" ", ".")));
-          label = jQuery("label[for='" + (element.attr('id')) + "']:not(.message)");
+          label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
           labelErrorField = label.closest("." + errorFieldClass);
           if (inputErrorField[0]) {
             inputErrorField.find("#" + (element.attr('id'))).detach();
@@ -437,7 +499,7 @@
       }
     },
     patterns: {
-      numericality: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/
+      numericality: /^(-|\+)?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/
     },
     callbacks: {
       element: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.4
+  version: 3.2.0.beta.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 467030908926839385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: