client_side_validations 3.2.1 → 3.2.2

data/lib/client_side_validations/action_view/form_builder.rb

@@ -86,7 +86,7 @@ module ClientSideValidations::ActionView::Helpers
     def time_zone_select_with_client_side_validations(method, priority_zones = nil, options = {}, html_options = {})
       build_validation_options(method, html_options.merge(:name => options[:name]))
       html_options.delete(:validate)
-      time_zone_select_without_client_side_validations(method, priority_zones = nil, options, html_options)
+      time_zone_select_without_client_side_validations(method, priority_zones, options, html_options)
     end
 
   private

data/lib/client_side_validations/action_view/form_helper.rb

@@ -51,7 +51,15 @@ module ClientSideValidations::ActionView::Helpers
 
     def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
       output = super
-      @validators.merge!(options[:validators]) if @validators
+      if @validators
+        options[:validators].each do |key, value|
+          if @validators.key?(key)
+            @validators[key].merge! value
+          else
+            @validators[key] = value
+          end
+        end
+      end
       output
     end
 
@@ -114,8 +122,16 @@ module ClientSideValidations::ActionView::Helpers
           end
         end
 
+        if ClientSideValidations::Config.number_format_with_locale and defined?(I18n)
+          number_format = I18n.t("number.format").extract!(:separator, :delimiter)
+        else
+          number_format = {:separator=>".", :delimiter=>","}
+        end
+        patterns = {:numericality=>"/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/"}
+
+
         content_tag(:script) do
-          "//<![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
+          "//<![CDATA[\nif(window.ClientSideValidations===undefined)window.ClientSideValidations={};window.ClientSideValidations.disabled_validators=#{ClientSideValidations::Config.disabled_validators.to_json};window.ClientSideValidations.number_format=#{number_format.to_json};if(window.ClientSideValidations.patterns===undefined)window.ClientSideValidations.patterns = {};window.ClientSideValidations.patterns.numericality=#{patterns[:numericality]};if(window.ClientSideValidations.remote_validators_prefix===undefined)window.ClientSideValidations.remote_validators_prefix='#{(ClientSideValidations::Config.root_path||"").sub(/\/+\Z/,'')}';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

@@ -70,7 +70,9 @@ module ClientSideValidations::ActiveModel
         result = result && validator.kind != :block
 
         if validator.options[:if] || validator.options[:unless]
-          if result = can_force_validator?(attr, validator, force)
+          if validator.options[:if] && validator.options[:if] =~ /changed\?/
+            result = true
+          else result = can_force_validator?(attr, validator, force)
             if validator.options[:if]
               result = result && run_conditional(validator.options[:if])
             end
@@ -84,12 +86,11 @@ module ClientSideValidations::ActiveModel
       result
     end
 
-    def run_conditional(method_name_or_proc)
-      case method_name_or_proc
-      when Proc
-        method_name_or_proc.call(self)
+    def run_conditional(method_name_value_or_proc)
+      if method_name_value_or_proc.respond_to?(:call)
+        method_name_value_or_proc.call(self)
       else
-        self.send(method_name_or_proc)
+        self.send(method_name_value_or_proc)
       end
     end
 
@@ -125,11 +126,7 @@ module ClientSideValidations::ActiveModel
           false
         end
       else
-        if (validator.options[:if] || validator.options[:unless]) =~ /changed\?/
-          true
-        else
-          false
-        end
+        false
       end
     end
   end

data/lib/client_side_validations/config.rb

@@ -2,8 +2,12 @@ module ClientSideValidations
   module Config
     class << self
       attr_accessor :disabled_validators
+      attr_accessor :number_format_with_locale
+      attr_accessor :root_path
     end
 
     self.disabled_validators = []
+    self.number_format_with_locale = false
+    self.root_path = nil
   end
 end

data/lib/client_side_validations/version.rb

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

data/lib/generators/templates/client_side_validations/initializer.rb

@@ -3,6 +3,9 @@
 # Uncomment to disable uniqueness validator, possible security issue
 # ClientSideValidations::Config.disabled_validators = [:uniqueness]
 
+# Uncomment to validate number format with current I18n locale
+# ClientSideValidations::Config.number_format_with_locale = true
+
 # Uncomment the following block if you want each input field to have the validation messages attached.
 # ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
 #   unless html_tag =~ /^<label/

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

@@ -5,28 +5,32 @@
   $ = jQuery;
 
   $.fn.disableClientSideValidations = function() {
-    return ClientSideValidations.disable(this);
+    ClientSideValidations.disable(this);
+    return this;
   };
 
   $.fn.enableClientSideValidations = function() {
     this.filter(ClientSideValidations.selectors.forms).each(function() {
       return ClientSideValidations.enablers.form(this);
     });
-    return this.filter(ClientSideValidations.selectors.inputs).each(function() {
+    this.filter(ClientSideValidations.selectors.inputs).each(function() {
       return ClientSideValidations.enablers.input(this);
     });
+    return this;
   };
 
   $.fn.resetClientSideValidations = function() {
-    return this.filter(ClientSideValidations.selectors.forms).each(function() {
+    this.filter(ClientSideValidations.selectors.forms).each(function() {
       return ClientSideValidations.reset(this);
     });
+    return this;
   };
 
   $.fn.validate = function() {
-    return this.filter(ClientSideValidations.selectors.forms).each(function() {
+    this.filter(ClientSideValidations.selectors.forms).each(function() {
       return $(this).enableClientSideValidations();
     });
+    return this;
   };
 
   $.fn.isValid = function(validators) {
@@ -40,7 +44,7 @@
   };
 
   validatorsFor = function(name, validators) {
-    name = name.replace(/_attributes\]\[\d+\]/g, "_attributes][]");
+    name = name.replace(/_attributes\]\[\w+\]\[(\w+)\]/g, "_attributes][][$1]");
     return validators[name] || {};
   };
 
@@ -48,7 +52,7 @@
     var valid;
     form.trigger('form:validate:before.ClientSideValidations');
     valid = true;
-    form.find(':input:enabled:visible[data-validate]').each(function() {
+    form.find(ClientSideValidations.selectors.validate_inputs).each(function() {
       if (!$(this).isValid(validators)) {
         valid = false;
       }
@@ -114,10 +118,6 @@
     return afterValidate();
   };
 
-  $(function() {
-    return $(ClientSideValidations.selectors.forms).validate();
-  });
-
   if (window.ClientSideValidations === void 0) {
     window.ClientSideValidations = {};
   }
@@ -128,6 +128,7 @@
 
   window.ClientSideValidations.selectors = {
     inputs: ':input:not(button):not([type="submit"])[name]:visible:enabled',
+    validate_inputs: ':input:enabled:visible[data-validate]',
     forms: 'form[data-validate]'
   };
 
@@ -135,7 +136,6 @@
     var $form, key;
     $form = $(form);
     ClientSideValidations.disable(form);
-    ClientSideValidations.disable($form.find(':input'));
     for (key in form.ClientSideValidations.settings.validators) {
       form.ClientSideValidations.removeError($form.find("[name='" + key + "']"));
     }
@@ -146,11 +146,15 @@
     var $target;
     $target = $(target);
     $target.off('.ClientSideValidations');
-    $target.removeData('valid');
-    $target.removeData('changed');
-    return $target.filter(':input').each(function() {
-      return $(this).removeAttr('data-validate');
-    });
+    if ($target.is('form')) {
+      return ClientSideValidations.disable($target.find(':input'));
+    } else {
+      $target.removeData('valid');
+      $target.removeData('changed');
+      return $target.filter(':input').each(function() {
+        return $(this).removeAttr('data-validate');
+      });
+    }
   };
 
   window.ClientSideValidations.enablers = {
@@ -280,7 +284,7 @@
         var _ref;
         switch (element.attr('type')) {
           case 'checkbox':
-            if (!element.attr('checked')) {
+            if (!element.prop('checked')) {
               return options.message;
             }
             break;
@@ -310,7 +314,9 @@
         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) {
+          if (options.allow_blank === true && this.presence(element, {
+            message: options.messages.numericality
+          })) {
             return;
           }
           return options.messages.numericality;
@@ -338,6 +344,7 @@
           } else {
             return;
           }
+          val = val.replace(new RegExp("\\" + ClientSideValidations.number_format.delimiter, 'g'), "").replace(new RegExp("\\" + ClientSideValidations.number_format.separator, 'g'), ".");
           fn = new Function("return " + val + " " + operator + " " + check_value);
           if (!fn()) {
             return options.messages[check];
@@ -526,8 +533,11 @@
           name = options['class'] + '[' + name.split('[')[1];
         }
         data[name] = element.val();
+        if (ClientSideValidations.remote_validators_prefix == null) {
+          ClientSideValidations.remote_validators_prefix = "";
+        }
         if (jQuery.ajax({
-          url: '/validators/uniqueness',
+          url: "" + ClientSideValidations.remote_validators_prefix + "/validators/uniqueness",
           data: data,
           async: false,
           cache: false
@@ -538,6 +548,24 @@
     }
   };
 
+  window.ClientSideValidations.disableValidators = function() {
+    var func, validator, _ref, _results;
+    if (window.ClientSideValidations.disabled_validators === void 0) {
+      return;
+    }
+    _ref = window.ClientSideValidations.validators.remote;
+    _results = [];
+    for (validator in _ref) {
+      func = _ref[validator];
+      if (window.ClientSideValidations.disabled_validators.indexOf(validator) !== -1) {
+        _results.push(delete window.ClientSideValidations.validators.remote[validator]);
+      } else {
+        _results.push(void 0);
+      }
+    }
+    return _results;
+  };
+
   window.ClientSideValidations.formBuilders = {
     'ActionView::Helpers::FormBuilder': {
       add: function(element, settings, message) {
@@ -599,4 +627,9 @@
     }
   };
 
+  $(function() {
+    ClientSideValidations.disableValidators();
+    return $(ClientSideValidations.selectors.forms).validate();
+  });
+
 }).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,18 +221,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1004765606605133609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1004765606605133609
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -240,3 +234,4 @@ signing_key:
 specification_version: 3
 summary: Client Side Validations
 test_files: []
+has_rdoc: