client_side_validations 8.0.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed0feff4a513664392a746868722e04d5812444
-  data.tar.gz: b0c93e7e5a06f28666f63241b9a446378ce39376
+  metadata.gz: 9517f4c6685202d257a67fed4948d6ddc6663104
+  data.tar.gz: 2a185c425e483fc2b2776da0715c9312bb6abf0c
 SHA512:
-  metadata.gz: d92f7babb26e804be9a632593c70319dff02af7a9332f185eb6fbc9a894dc16195729eb7df31d50fea765d8c16a1b89f93f9337879347ace22654334e09b87d1
-  data.tar.gz: 6aef78c42b2ab083780fdcdc4379597b6a370e026b5ad7b3b96e84bf85fdc1591457a77c4b5b2bb15c5a0f4c5b3fafef76df31eeaf6d59f846fd80bd9aea51fb
+  metadata.gz: 746dabde16b38f4b5941016d38ada3108ea3884b1c20ae655bf24aa3dddcc4cfd752403c77dfd09beba577180df71ff696f1809b1ac8d12c71d2c24364453f3d
+  data.tar.gz: 7a6527a1c051063414572982dac3c3372e301a04f94b766d56f26b396214110deeda09e7947ea1bbdc1c0a5df81f2277642abe193b17c3ef897b0203c44e4214

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 9.0.0 (2017-01-31)
+
+* Unobtrusive JavaScript
+
 ## 8.0.2 (2017-01-31)
 
 * Under the hood improvements

data/README.md

@@ -72,9 +72,7 @@ Rails `FormBuilders`. Please see the [Plugin wiki page](https://github.com/DavyJ
 (feel free to add your own)
 
 * [SimpleForm](https://github.com/DavyJonesLocker/client_side_validations-simple_form)
-* [Formtastic](https://github.com/DavyJonesLocker/client_side_validations-formtastic)
 * [Mongoid](https://github.com/DavyJonesLocker/client_side_validations-mongoid)
-* [MongoMapper](https://github.com/DavyJonesLocker/client_side_validations-mongo_mapper)
 
 ## Usage ##
 
@@ -98,21 +96,6 @@ In your `FormBuilder` you only need to enable validations:
 
 That should be enough to get you going.
 
-By default the validators will be serialized and embedded in a
-`<script>` tag following the `<form>` tag. If you would like to render
-that `<script>` tag elsewhere you can do this by passing a name to
-`:validate`
-
-```erb
-<%= form_for @user, validate: :user_validators do |f| %>
-```
-
-The `<script`> tag is added to `content_for()` with the name you passed,
-so you can simply render that anywhere you like:
-
-```erb
-<%= yield(:user_validators) %>
-```
 
 ## Conditional Validators ##
 
@@ -187,20 +170,15 @@ You can even turn them off per fieldset:
   ...
 ```
 
-## Understanding the embedded `<script>` tag ##
+## Understanding the client side validations data attribute ##
 
-A rendered form with validations will always have a `<script>` appended
-directly after:
-
-```html
-<script>//<![CDATA[if(window.ClientSideValidations==undefined)window.ClientSideValidations={};if(window.ClientSideValidations.forms==undefined)window.ClientSideValidations.forms={};window.ClientSideValidations.forms['new_person'] = {"type":"ActionView::Helpers::FormBuilder","input_tag":"<div class=\"field_with_errors\"><span id=\"input_tag\" /><label for=\"\" class=\"message\"></label></div>","label_tag":"<div class=\"field_with_errors\"><label id=\"label_tag\" /></div>","validators":{"person[name]":{"inclusion":[{"message":"is not included in the list","in":["Happy"]}]}}};//]]></script>
-```
+A rendered form with validations will always have a `data-client-side-validations` attribute.
 
-This script registers a new form object on `ClientSideValidations.form`. The key is equal to the ID of the form that is rendered. The objects it contains will have different keys depending upon the `FormBuilder` being used. However, `type` and `validators` will always be present.
+The objects it contains will have different keys depending upon the `FormBuilder` being used. However, `html_settings` and `validators` will always be present.
 
-### `type` ###
+### `html_settings` ###
 
-This will always be equal to the class of the `FormBuilder` that did the rendering. The type will be used by the JavaScript to determine how to `add` and `remove` the error messages. If you create a new `FormBuilder` you will need to write your own handlers for adding and removing.
+This will always contain the type to the class of the `FormBuilder` that did the rendering. The type will be used by the JavaScript to determine how to `add` and `remove` the error messages. If you create a new `FormBuilder`, you will need to write your own handlers for adding and removing.
 
 ### `validators` ###
 

data/lib/client_side_validations/action_view.rb

@@ -7,9 +7,7 @@ end
 
 require 'client_side_validations/core_ext'
 require 'client_side_validations/action_view/form_helper'
-require 'client_side_validations/action_view/form_tag_helper'
 require 'client_side_validations/action_view/form_builder'
 
 ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormHelper)
-ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormTagHelper)
 ActionView::Helpers::FormBuilder.send(:prepend, ClientSideValidations::ActionView::Helpers::FormBuilder)

data/lib/client_side_validations/action_view/form_helper.rb

@@ -9,40 +9,29 @@ module ClientSideValidations
         def form_for(record, options = {}, &block)
           return super unless options[:validate]
 
-          turn_off_html5_validations! options
+          # We are not going to use super here, because we need
+          # to inject the csv options in a data attribute in a clean way.
+          # So we basically reimplement the whole form_for method
+          raise ArgumentError, 'Missing block' unless block_given?
+          html_options = options[:html] ||= {}
 
-          case record
-          when String, Symbol
-            raise ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, as: :name) instead.'
-          else
-            object = record.is_a?(Array) ? record.last : record
-            object_name = options[:as] || model_name_from_record_or_class(object).param_key
-          end
+          # Moving the switch statement to another method to
+          # lower complexity
+          object, object_name = check_record(record, options)
 
           @validators = {}
 
-          # Order matters here. Rails mutates the `options` object
-          form = super
+          apply_html_options! options, html_options
 
-          build_bound_validators! options
           builder = instantiate_builder(object_name, object, options)
-          script = client_side_form_settings(options, builder)
+          output  = capture(builder, &block)
+          html_options[:multipart] ||= builder.multipart?
 
-          if assign_script_to_content_for(options[:validate], script)
-            form
-          else
-            form << script
-          end
-        end
-
-        def assign_script_to_content_for(name, script)
-          return false if name == true
-
-          # rubocop:disable OutputSafety
-          content_for name, script.html_safe
-          # rubocop:enable OutputSafety
+          build_bound_validators! options
 
-          true
+          apply_csv_html_options! html_options, options, builder
+          html_options = html_options_for_form(options[:url] || {}, html_options)
+          form_tag_with_body(html_options, output)
         end
 
         def apply_form_for_options!(record, object, options)
@@ -61,6 +50,20 @@ module ClientSideValidations
 
         private
 
+        def check_record(record, options)
+          case record
+          when String, Symbol
+            raise ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, as: :name) instead.'
+          else
+            object = record.is_a?(Array) ? record.last : record
+            raise ArgumentError, 'First argument in form cannot contain nil or be empty' unless object
+            object_name = options[:as] || model_name_from_record_or_class(object).param_key
+            apply_form_for_options!(record, object, options)
+          end
+
+          [object, object_name]
+        end
+
         def build_bound_validators!(options)
           return unless @validators
 
@@ -90,26 +93,35 @@ module ClientSideValidations
           end
         end
 
-        def client_side_form_settings(options, builder)
-          javascript_tag "if(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=#{numericality_patterns};#{"if(window.ClientSideValidations.remote_validators_prefix===undefined)window.ClientSideValidations.remote_validators_prefix='#{ClientSideValidations::Config.root_path.sub(%r{/+\Z}, '')}';" if ClientSideValidations::Config.root_path.present?}if(window.ClientSideValidations.forms===undefined)window.ClientSideValidations.forms={};window.ClientSideValidations.forms['#{options[:html]['id']}'] = #{builder.client_side_form_settings(options, self).merge(validators: construct_validators).to_json};"
-        end
-
         def number_format
-          @number_format ||=
-            if ClientSideValidations::Config.number_format_with_locale && defined?(I18n)
-              I18n.t('number.format').slice :separator, :delimiter
-            else
-              { separator: '.', delimiter: ',' }
-            end
+          if ClientSideValidations::Config.number_format_with_locale && defined?(I18n)
+            I18n.t('number.format').slice :separator, :delimiter
+          else
+            { separator: '.', delimiter: ',' }
+          end
         end
 
-        def numericality_patterns
-          "/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/"
+        def apply_html_options!(options, html_options)
+          # Turn off HTML5 validations
+          html_options[:novalidate] = 'novalidate'
+
+          html_options[:data]   = options.delete(:data)   if options.key?(:data)
+          html_options[:remote] = options.delete(:remote) if options.key?(:remote)
+          html_options[:method] = options.delete(:method) if options.key?(:method)
+          html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.key?(:enforce_utf8)
+          html_options[:authenticity_token] = options.delete(:authenticity_token)
         end
 
-        def turn_off_html5_validations!(options)
-          options[:html] ||= {}
-          options[:html][:novalidate] = 'novalidate'
+        def apply_csv_html_options!(html_options, options, builder)
+          html_options.delete :validate
+
+          csv_options = {
+            html_settings: builder.client_side_form_settings(options, self),
+            number_format: number_format,
+            validators: construct_validators
+          }
+
+          html_options['data-client-side-validations'] = csv_options.to_json
         end
       end
     end

data/lib/client_side_validations/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '8.0.2'.freeze
+  VERSION = '9.0.0'.freeze
 end

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

@@ -1,12 +1,12 @@
 
 /*!
- * Client Side Validations - v8.0.2 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v9.0.0 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2017 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
  */
 
 (function() {
-  var $, validateElement, validateForm, validatorsFor,
+  var $, ClientSideValidations, initializeOnEvent, validateElement, validateForm, validatorsFor,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   $ = jQuery;
@@ -50,6 +50,8 @@
     }
   };
 
+  initializeOnEvent = (window.Turbolinks != null) && window.Turbolinks.supported ? window.Turbolinks.EVENTS != null ? 'page:change' : 'turbolinks:load' : 'ready';
+
   validatorsFor = function(name, validators) {
     var captures, validator, validator_name;
     if (captures = name.match(/\[(\w+_attributes)\].*\[(\w+)\]$/)) {
@@ -135,471 +137,434 @@
     return afterValidate();
   };
 
-  if (window.ClientSideValidations === void 0) {
-    window.ClientSideValidations = {};
-  }
-
-  if (window.ClientSideValidations.forms === void 0) {
-    window.ClientSideValidations.forms = {};
-  }
-
-  window.ClientSideValidations.selectors = {
-    inputs: ':input:not(button):not([type="submit"])[name]:visible:enabled',
-    validate_inputs: ':input:enabled:visible[data-validate]',
-    forms: 'form[data-validate]'
-  };
-
-  window.ClientSideValidations.reset = function(form) {
-    var $form, key;
-    $form = $(form);
-    ClientSideValidations.disable(form);
-    for (key in form.ClientSideValidations.settings.validators) {
-      form.ClientSideValidations.removeError($form.find("[name='" + key + "']"));
-    }
-    return ClientSideValidations.enablers.form(form);
-  };
-
-  window.ClientSideValidations.disable = function(target) {
-    var $target;
-    $target = $(target);
-    $target.off('.ClientSideValidations');
-    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 = {
-    form: function(form) {
-      var $form, binding, event, ref;
-      $form = $(form);
-      form.ClientSideValidations = {
-        settings: window.ClientSideValidations.forms[$form.attr('id')],
-        addError: function(element, message) {
-          return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.type].add(element, form.ClientSideValidations.settings, message);
+  ClientSideValidations = {
+    callbacks: {
+      element: {
+        after: function(element, eventData) {},
+        before: function(element, eventData) {},
+        fail: function(element, message, addError, eventData) {
+          return addError();
         },
-        removeError: function(element) {
-          return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.type].remove(element, form.ClientSideValidations.settings);
+        pass: function(element, removeError, eventData) {
+          return removeError();
         }
-      };
-      ref = {
-        'submit.ClientSideValidations': function(eventData) {
-          if (!$form.isValid(form.ClientSideValidations.settings.validators)) {
-            eventData.preventDefault();
-            eventData.stopImmediatePropagation();
+      },
+      form: {
+        after: function(form, eventData) {},
+        before: function(form, eventData) {},
+        fail: function(form, eventData) {},
+        pass: function(form, eventData) {}
+      }
+    },
+    enablers: {
+      form: function(form) {
+        var $form, binding, event, ref;
+        $form = $(form);
+        form.ClientSideValidations = {
+          settings: $form.data('clientSideValidations'),
+          addError: function(element, message) {
+            return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.html_settings.type].add(element, form.ClientSideValidations.settings.html_settings, message);
+          },
+          removeError: function(element) {
+            return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.html_settings.type].remove(element, form.ClientSideValidations.settings.html_settings);
           }
-        },
-        'ajax:beforeSend.ClientSideValidations': function(eventData) {
-          if (eventData.target === this) {
-            $form.isValid(form.ClientSideValidations.settings.validators);
+        };
+        ref = {
+          'submit.ClientSideValidations': function(eventData) {
+            if (!$form.isValid(form.ClientSideValidations.settings.validators)) {
+              eventData.preventDefault();
+              eventData.stopImmediatePropagation();
+            }
+          },
+          'ajax:beforeSend.ClientSideValidations': function(eventData) {
+            if (eventData.target === this) {
+              $form.isValid(form.ClientSideValidations.settings.validators);
+            }
+          },
+          'form:validate:after.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.form.after($form, eventData);
+          },
+          'form:validate:before.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.form.before($form, eventData);
+          },
+          'form:validate:fail.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.form.fail($form, eventData);
+          },
+          'form:validate:pass.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.form.pass($form, eventData);
           }
-        },
-        'form:validate:after.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.form.after($form, eventData);
-        },
-        'form:validate:before.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.form.before($form, eventData);
-        },
-        'form:validate:fail.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.form.fail($form, eventData);
-        },
-        'form:validate:pass.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.form.pass($form, eventData);
+        };
+        for (event in ref) {
+          binding = ref[event];
+          $form.on(event, binding);
+        }
+        return $form.find(ClientSideValidations.selectors.inputs).each(function() {
+          return ClientSideValidations.enablers.input(this);
+        });
+      },
+      input: function(input) {
+        var $form, $input, binding, event, form, ref;
+        $input = $(input);
+        form = input.form;
+        $form = $(form);
+        ref = {
+          'focusout.ClientSideValidations': function() {
+            $(this).isValid(form.ClientSideValidations.settings.validators);
+          },
+          'change.ClientSideValidations': function() {
+            $(this).data('changed', true);
+          },
+          'element:validate:after.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.element.after($(this), eventData);
+          },
+          'element:validate:before.ClientSideValidations': function(eventData) {
+            ClientSideValidations.callbacks.element.before($(this), eventData);
+          },
+          'element:validate:fail.ClientSideValidations': function(eventData, message) {
+            var element;
+            element = $(this);
+            ClientSideValidations.callbacks.element.fail(element, message, function() {
+              return form.ClientSideValidations.addError(element, message);
+            }, eventData);
+          },
+          'element:validate:pass.ClientSideValidations': function(eventData) {
+            var element;
+            element = $(this);
+            ClientSideValidations.callbacks.element.pass(element, function() {
+              return form.ClientSideValidations.removeError(element);
+            }, eventData);
+          }
+        };
+        for (event in ref) {
+          binding = ref[event];
+          $input.filter(':not(:radio):not([id$=_confirmation])').each(function() {
+            return $(this).attr('data-validate', true);
+          }).on(event, binding);
         }
-      };
-      for (event in ref) {
-        binding = ref[event];
-        $form.on(event, binding);
+        $input.filter(':checkbox').on('change.ClientSideValidations', function() {
+          $(this).isValid(form.ClientSideValidations.settings.validators);
+        });
+        return $input.filter('[id$=_confirmation]').each(function() {
+          var confirmationElement, element, ref1, results;
+          confirmationElement = $(this);
+          element = $form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
+          if (element[0]) {
+            ref1 = {
+              'focusout.ClientSideValidations': function() {
+                element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+              },
+              'keyup.ClientSideValidations': function() {
+                element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+              }
+            };
+            results = [];
+            for (event in ref1) {
+              binding = ref1[event];
+              results.push($("#" + (confirmationElement.attr('id'))).on(event, binding));
+            }
+            return results;
+          }
+        });
       }
-      return $form.find(ClientSideValidations.selectors.inputs).each(function() {
-        return ClientSideValidations.enablers.input(this);
-      });
     },
-    input: function(input) {
-      var $form, $input, binding, event, form, ref;
-      $input = $(input);
-      form = input.form;
-      $form = $(form);
-      ref = {
-        'focusout.ClientSideValidations': function() {
-          $(this).isValid(form.ClientSideValidations.settings.validators);
+    formBuilders: {
+      'ActionView::Helpers::FormBuilder': {
+        add: function(element, settings, message) {
+          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 = $(settings.input_tag);
+            labelErrorField = $(settings.label_tag);
+            label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
+            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'));
+            labelErrorField.find('label.message').attr('for', element.attr('id'));
+            labelErrorField.insertAfter(label);
+            labelErrorField.find('label#label_tag').replaceWith(label);
+          }
+          return form.find("label.message[for='" + (element.attr('id')) + "']").text(message);
         },
-        'change.ClientSideValidations': function() {
-          $(this).data('changed', true);
+        remove: function(element, settings) {
+          var errorFieldClass, form, inputErrorField, label, labelErrorField;
+          form = $(element[0].form);
+          errorFieldClass = $(settings.input_tag).attr('class');
+          inputErrorField = element.closest("." + (errorFieldClass.replace(/\ /g, ".")));
+          label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
+          labelErrorField = label.closest("." + errorFieldClass);
+          if (inputErrorField[0]) {
+            inputErrorField.find("#" + (element.attr('id'))).detach();
+            inputErrorField.replaceWith(element);
+            label.detach();
+            return labelErrorField.replaceWith(label);
+          }
+        }
+      }
+    },
+    patterns: {
+      numericality: function(number_format) {
+        return new RegExp("^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\" + number_format.delimiter + "\\d{3})+)(?:\\" + number_format.separator + "\\d*)?$");
+      }
+    },
+    selectors: {
+      inputs: ':input:not(button):not([type="submit"])[name]:visible:enabled',
+      validate_inputs: ':input:enabled:visible[data-validate]',
+      forms: 'form[data-client-side-validations]'
+    },
+    validators: {
+      all: function() {
+        return $.extend({}, local, remote);
+      },
+      local: {
+        absence: function(element, options) {
+          if (!/^\s*$/.test(element.val() || '')) {
+            return options.message;
+          }
         },
-        'element:validate:after.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.element.after($(this), eventData);
+        presence: function(element, options) {
+          if (/^\s*$/.test(element.val() || '')) {
+            return options.message;
+          }
         },
-        'element:validate:before.ClientSideValidations': function(eventData) {
-          ClientSideValidations.callbacks.element.before($(this), eventData);
+        acceptance: function(element, options) {
+          var ref;
+          switch (element.attr('type')) {
+            case 'checkbox':
+              if (!element.prop('checked')) {
+                return options.message;
+              }
+              break;
+            case 'text':
+              if (element.val() !== (((ref = options.accept) != null ? ref.toString() : void 0) || '1')) {
+                return options.message;
+              }
+          }
         },
-        'element:validate:fail.ClientSideValidations': function(eventData, message) {
-          var element;
-          element = $(this);
-          ClientSideValidations.callbacks.element.fail(element, message, function() {
-            return form.ClientSideValidations.addError(element, message);
-          }, eventData);
+        format: function(element, options) {
+          var message;
+          message = this.presence(element, options);
+          if (message) {
+            if (options.allow_blank === true) {
+              return;
+            }
+            return message;
+          }
+          if (options["with"] && !new RegExp(options["with"].source, options["with"].options).test(element.val())) {
+            return options.message;
+          }
+          if (options.without && new RegExp(options.without.source, options.without.options).test(element.val())) {
+            return options.message;
+          }
         },
-        'element:validate:pass.ClientSideValidations': function(eventData) {
-          var element;
-          element = $(this);
-          ClientSideValidations.callbacks.element.pass(element, function() {
-            return form.ClientSideValidations.removeError(element);
-          }, eventData);
-        }
-      };
-      for (event in ref) {
-        binding = ref[event];
-        $input.filter(':not(:radio):not([id$=_confirmation])').each(function() {
-          return $(this).attr('data-validate', true);
-        }).on(event, binding);
-      }
-      $input.filter(':checkbox').on('change.ClientSideValidations', function() {
-        $(this).isValid(form.ClientSideValidations.settings.validators);
-      });
-      return $input.filter('[id$=_confirmation]').each(function() {
-        var confirmationElement, element, ref1, results;
-        confirmationElement = $(this);
-        element = $form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
-        if (element[0]) {
-          ref1 = {
-            'focusout.ClientSideValidations': function() {
-              element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
-            },
-            'keyup.ClientSideValidations': function() {
-              element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+        numericality: function(element, options) {
+          var $form, CHECKS, check, checkValue, fn, number_format, operator, val;
+          $form = $(element[0].form);
+          val = $.trim(element.val());
+          number_format = $form[0].ClientSideValidations.settings.number_format;
+          if (!ClientSideValidations.patterns.numericality(number_format).test(val)) {
+            if (options.allow_blank === true && this.presence(element, {
+              message: options.messages.numericality
+            })) {
+              return;
             }
-          };
-          results = [];
-          for (event in ref1) {
-            binding = ref1[event];
-            results.push($("#" + (confirmationElement.attr('id'))).on(event, binding));
+            return options.messages.numericality;
           }
-          return results;
-        }
-      });
-    }
-  };
-
-  window.ClientSideValidations.validators = {
-    all: function() {
-      return $.extend({}, ClientSideValidations.validators.local, ClientSideValidations.validators.remote);
-    },
-    local: {
-      absence: function(element, options) {
-        if (!/^\s*$/.test(element.val() || '')) {
-          return options.message;
-        }
-      },
-      presence: function(element, options) {
-        if (/^\s*$/.test(element.val() || '')) {
-          return options.message;
-        }
-      },
-      acceptance: function(element, options) {
-        var ref;
-        switch (element.attr('type')) {
-          case 'checkbox':
-            if (!element.prop('checked')) {
-              return options.message;
+          val = val.replace(new RegExp("\\" + number_format.delimiter, 'g'), '').replace(new RegExp("\\" + number_format.separator, 'g'), '.');
+          if (options.only_integer && !/^[+-]?\d+$/.test(val)) {
+            return options.messages.only_integer;
+          }
+          CHECKS = {
+            greater_than: '>',
+            greater_than_or_equal_to: '>=',
+            equal_to: '==',
+            less_than: '<',
+            less_than_or_equal_to: '<='
+          };
+          for (check in CHECKS) {
+            operator = CHECKS[check];
+            if (!(options[check] != null)) {
+              continue;
             }
-            break;
-          case 'text':
-            if (element.val() !== (((ref = options.accept) != null ? ref.toString() : void 0) || '1')) {
-              return options.message;
+            checkValue = !isNaN(parseFloat(options[check])) && isFinite(options[check]) ? options[check] : $form.find("[name*=" + options[check] + "]").length === 1 ? $form.find("[name*=" + options[check] + "]").val() : void 0;
+            if ((checkValue == null) || checkValue === '') {
+              return;
+            }
+            fn = new Function("return " + val + " " + operator + " " + checkValue);
+            if (!fn()) {
+              return options.messages[check];
             }
-        }
-      },
-      format: function(element, options) {
-        var message;
-        message = this.presence(element, options);
-        if (message) {
-          if (options.allow_blank === true) {
-            return;
-          }
-          return message;
-        }
-        if (options["with"] && !new RegExp(options["with"].source, options["with"].options).test(element.val())) {
-          return options.message;
-        }
-        if (options.without && new RegExp(options.without.source, options.without.options).test(element.val())) {
-          return options.message;
-        }
-      },
-      numericality: function(element, options) {
-        var CHECKS, check, checkValue, fn, form, operator, val;
-        val = $.trim(element.val());
-        if (!ClientSideValidations.patterns.numericality.test(val)) {
-          if (options.allow_blank === true && this.presence(element, {
-            message: options.messages.numericality
-          })) {
-            return;
           }
-          return options.messages.numericality;
-        }
-        val = val.replace(new RegExp("\\" + ClientSideValidations.number_format.delimiter, 'g'), '').replace(new RegExp("\\" + ClientSideValidations.number_format.separator, 'g'), '.');
-        if (options.only_integer && !/^[+-]?\d+$/.test(val)) {
-          return options.messages.only_integer;
-        }
-        CHECKS = {
-          greater_than: '>',
-          greater_than_or_equal_to: '>=',
-          equal_to: '==',
-          less_than: '<',
-          less_than_or_equal_to: '<='
-        };
-        form = $(element[0].form);
-        for (check in CHECKS) {
-          operator = CHECKS[check];
-          if (!(options[check] != null)) {
-            continue;
+          if (options.odd && !(parseInt(val, 10) % 2)) {
+            return options.messages.odd;
           }
-          checkValue = !isNaN(parseFloat(options[check])) && isFinite(options[check]) ? options[check] : form.find("[name*=" + options[check] + "]").length === 1 ? form.find("[name*=" + options[check] + "]").val() : void 0;
-          if ((checkValue == null) || checkValue === '') {
-            return;
+          if (options.even && (parseInt(val, 10) % 2)) {
+            return options.messages.even;
           }
-          fn = new Function("return " + val + " " + operator + " " + checkValue);
-          if (!fn()) {
-            return options.messages[check];
+        },
+        length: function(element, options) {
+          var CHECKS, blankOptions, check, fn, message, operator, tokenized_length, tokenizer;
+          tokenizer = options.js_tokenizer || "split('')";
+          tokenized_length = new Function('element', "return (element.val()." + tokenizer + " || '').length")(element);
+          CHECKS = {
+            is: '==',
+            minimum: '>=',
+            maximum: '<='
+          };
+          blankOptions = {};
+          blankOptions.message = options.is ? options.messages.is : options.minimum ? options.messages.minimum : void 0;
+          message = this.presence(element, blankOptions);
+          if (message) {
+            if (options.allow_blank === true) {
+              return;
+            }
+            return message;
           }
-        }
-        if (options.odd && !(parseInt(val, 10) % 2)) {
-          return options.messages.odd;
-        }
-        if (options.even && (parseInt(val, 10) % 2)) {
-          return options.messages.even;
-        }
-      },
-      length: function(element, options) {
-        var CHECKS, blankOptions, check, fn, message, operator, tokenized_length, tokenizer;
-        tokenizer = options.js_tokenizer || "split('')";
-        tokenized_length = new Function('element', "return (element.val()." + tokenizer + " || '').length")(element);
-        CHECKS = {
-          is: '==',
-          minimum: '>=',
-          maximum: '<='
-        };
-        blankOptions = {};
-        blankOptions.message = options.is ? options.messages.is : options.minimum ? options.messages.minimum : void 0;
-        message = this.presence(element, blankOptions);
-        if (message) {
-          if (options.allow_blank === true) {
-            return;
+          for (check in CHECKS) {
+            operator = CHECKS[check];
+            if (!options[check]) {
+              continue;
+            }
+            fn = new Function("return " + tokenized_length + " " + operator + " " + options[check]);
+            if (!fn()) {
+              return options.messages[check];
+            }
           }
-          return message;
-        }
-        for (check in CHECKS) {
-          operator = CHECKS[check];
-          if (!options[check]) {
-            continue;
+        },
+        exclusion: function(element, options) {
+          var lower, message, option, ref, upper;
+          message = this.presence(element, options);
+          if (message) {
+            if (options.allow_blank === true) {
+              return;
+            }
+            return message;
           }
-          fn = new Function("return " + tokenized_length + " " + operator + " " + options[check]);
-          if (!fn()) {
-            return options.messages[check];
+          if (options["in"]) {
+            if (ref = element.val(), indexOf.call((function() {
+              var i, len, ref1, results;
+              ref1 = options["in"];
+              results = [];
+              for (i = 0, len = ref1.length; i < len; i++) {
+                option = ref1[i];
+                results.push(option.toString());
+              }
+              return results;
+            })(), ref) >= 0) {
+              return options.message;
+            }
           }
-        }
-      },
-      exclusion: function(element, options) {
-        var lower, message, option, ref, upper;
-        message = this.presence(element, options);
-        if (message) {
-          if (options.allow_blank === true) {
-            return;
+          if (options.range) {
+            lower = options.range[0];
+            upper = options.range[1];
+            if (element.val() >= lower && element.val() <= upper) {
+              return options.message;
+            }
           }
-          return message;
-        }
-        if (options["in"]) {
-          if (ref = element.val(), indexOf.call((function() {
-            var i, len, ref1, results;
-            ref1 = options["in"];
-            results = [];
-            for (i = 0, len = ref1.length; i < len; i++) {
-              option = ref1[i];
-              results.push(option.toString());
+        },
+        inclusion: function(element, options) {
+          var lower, message, option, ref, upper;
+          message = this.presence(element, options);
+          if (message) {
+            if (options.allow_blank === true) {
+              return;
             }
-            return results;
-          })(), ref) >= 0) {
-            return options.message;
+            return message;
           }
-        }
-        if (options.range) {
-          lower = options.range[0];
-          upper = options.range[1];
-          if (element.val() >= lower && element.val() <= upper) {
+          if (options["in"]) {
+            if (ref = element.val(), indexOf.call((function() {
+              var i, len, ref1, results;
+              ref1 = options["in"];
+              results = [];
+              for (i = 0, len = ref1.length; i < len; i++) {
+                option = ref1[i];
+                results.push(option.toString());
+              }
+              return results;
+            })(), ref) >= 0) {
+              return;
+            }
             return options.message;
           }
-        }
-      },
-      inclusion: function(element, options) {
-        var lower, message, option, ref, upper;
-        message = this.presence(element, options);
-        if (message) {
-          if (options.allow_blank === true) {
-            return;
-          }
-          return message;
-        }
-        if (options["in"]) {
-          if (ref = element.val(), indexOf.call((function() {
-            var i, len, ref1, results;
-            ref1 = options["in"];
-            results = [];
-            for (i = 0, len = ref1.length; i < len; i++) {
-              option = ref1[i];
-              results.push(option.toString());
+          if (options.range) {
+            lower = options.range[0];
+            upper = options.range[1];
+            if (element.val() >= lower && element.val() <= upper) {
+              return;
             }
-            return results;
-          })(), ref) >= 0) {
-            return;
+            return options.message;
           }
-          return options.message;
-        }
-        if (options.range) {
-          lower = options.range[0];
-          upper = options.range[1];
-          if (element.val() >= lower && element.val() <= upper) {
-            return;
+        },
+        confirmation: function(element, options) {
+          var regex;
+          regex = new RegExp("^" + (element.val()) + "$", options.case_sensitive ? '' : 'i');
+          if (!regex.test($("#" + (element.attr('id')) + "_confirmation").val())) {
+            return options.message;
           }
-          return options.message;
-        }
-      },
-      confirmation: function(element, options) {
-        var regex;
-        regex = new RegExp("^" + (element.val()) + "$", options.case_sensitive ? '' : 'i');
-        if (!regex.test($("#" + (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);
+        },
+        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;
               }
-            });
-            if (!valid) {
-              return options.message;
             }
           }
         }
-      }
+      },
+      remote: {}
     },
-    remote: {}
-  };
-
-  window.ClientSideValidations.remote_validators_url_for = function(validator) {
-    if (ClientSideValidations.remote_validators_prefix != null) {
-      return "//" + window.location.host + "/" + ClientSideValidations.remote_validators_prefix + "/validators/" + validator;
-    } else {
-      return "//" + window.location.host + "/validators/" + validator;
-    }
-  };
-
-  window.ClientSideValidations.disableValidators = function() {
-    var func, ref, results, validator;
-    if (window.ClientSideValidations.disabled_validators === void 0) {
-      return;
-    }
-    ref = window.ClientSideValidations.validators.remote;
-    results = [];
-    for (validator in ref) {
-      func = ref[validator];
-      if (indexOf.call(window.ClientSideValidations.disabled_validators, validator) >= 0) {
-        results.push(delete window.ClientSideValidations.validators.remote[validator]);
+    disable: function(target) {
+      var $target;
+      $target = $(target);
+      $target.off('.ClientSideValidations');
+      if ($target.is('form')) {
+        return ClientSideValidations.disable($target.find(':input'));
       } else {
-        results.push(void 0);
-      }
-    }
-    return results;
-  };
-
-  window.ClientSideValidations.formBuilders = {
-    'ActionView::Helpers::FormBuilder': {
-      add: function(element, settings, message) {
-        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 = $(settings.input_tag);
-          labelErrorField = $(settings.label_tag);
-          label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
-          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'));
-          labelErrorField.find('label.message').attr('for', element.attr('id'));
-          labelErrorField.insertAfter(label);
-          labelErrorField.find('label#label_tag').replaceWith(label);
-        }
-        return form.find("label.message[for='" + (element.attr('id')) + "']").text(message);
-      },
-      remove: function(element, settings) {
-        var errorFieldClass, form, inputErrorField, label, labelErrorField;
-        form = $(element[0].form);
-        errorFieldClass = $(settings.input_tag).attr('class');
-        inputErrorField = element.closest("." + (errorFieldClass.replace(/\ /g, ".")));
-        label = form.find("label[for='" + (element.attr('id')) + "']:not(.message)");
-        labelErrorField = label.closest("." + errorFieldClass);
-        if (inputErrorField[0]) {
-          inputErrorField.find("#" + (element.attr('id'))).detach();
-          inputErrorField.replaceWith(element);
-          label.detach();
-          return labelErrorField.replaceWith(label);
-        }
-      }
-    }
-  };
-
-  window.ClientSideValidations.patterns = {
-    numericality: /^(-|\+)?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d*)?$/
-  };
-
-  window.ClientSideValidations.callbacks = {
-    element: {
-      after: function(element, eventData) {},
-      before: function(element, eventData) {},
-      fail: function(element, message, addError, eventData) {
-        return addError();
-      },
-      pass: function(element, removeError, eventData) {
-        return removeError();
+        $target.removeData('valid');
+        $target.removeData('changed');
+        return $target.filter(':input').each(function() {
+          return $(this).removeAttr('data-validate');
+        });
       }
     },
-    form: {
-      after: function(form, eventData) {},
-      before: function(form, eventData) {},
-      fail: function(form, eventData) {},
-      pass: function(form, eventData) {}
+    reset: function(form) {
+      var $form, key;
+      $form = $(form);
+      ClientSideValidations.disable(form);
+      for (key in form.ClientSideValidations.settings.validators) {
+        form.ClientSideValidations.removeError($form.find("[name='" + key + "']"));
+      }
+      return ClientSideValidations.enablers.form(form);
     }
   };
 
-  window.ClientSideValidations.event = (window.Turbolinks != null) && window.Turbolinks.supported ? window.Turbolinks.EVENTS != null ? 'page:change' : 'turbolinks:load' : 'ready';
-
-  $(document).on(window.ClientSideValidations.event, function() {
-    ClientSideValidations.disableValidators();
+  $(document).on(initializeOnEvent, function() {
     return $(ClientSideValidations.selectors.forms).validate();
   });
 
+  window.ClientSideValidations = ClientSideValidations;
+
 }).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 9.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -270,7 +270,6 @@ files:
 - lib/client_side_validations/action_view.rb
 - lib/client_side_validations/action_view/form_builder.rb
 - lib/client_side_validations/action_view/form_helper.rb
-- lib/client_side_validations/action_view/form_tag_helper.rb
 - lib/client_side_validations/active_model.rb
 - lib/client_side_validations/active_model/absence.rb
 - lib/client_side_validations/active_model/acceptance.rb

data/lib/client_side_validations/action_view/form_tag_helper.rb

@@ -1,16 +0,0 @@
-module ClientSideValidations
-  module ActionView
-    module Helpers
-      module FormTagHelper
-        private
-
-        def html_options_for_form(url_for_options, options)
-          options.stringify_keys!
-          html_options = {}
-          html_options['data-validate'] = options.delete('validate') if options['validate']
-          html_options.merge!(super(url_for_options, options))
-        end
-      end
-    end
-  end
-end