client_side_validations 4.2.0 → 6.0.0

data/lib/client_side_validations/active_record/middleware.rb

@@ -6,16 +6,23 @@ module ClientSideValidations
       end
 
       def self.unique?(klass, attribute, value, params)
-        klass = find_topmost_superclass(klass)
-        column = klass.columns_hash[attribute.to_s]
-        value = type_cast_value(column, value)
-        value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if value.is_a?(String)
+        klass      = find_topmost_superclass(klass)
+        connection = klass.connection
+        column     = klass.columns_hash[attribute.to_s]
+        value      = type_cast_value(connection, column, value)
 
-        t = klass.arel_table
+        sql      = sql_statement(klass, connection, attribute, value, params)
+        relation = Arel::Nodes::SqlLiteral.new(sql)
 
+        klass.where(relation).empty?
+      end
+
+      def self.sql_statement(klass, connection, attribute, value, params)
         sql = []
+        t   = klass.arel_table
+
         if params[:case_sensitive] == 'true'
-          sql << 'BINARY' if t.engine.connection.adapter_name =~ /^mysql/i
+          sql << 'BINARY' if connection.adapter_name =~ /^mysql/i
           sql << t[attribute].eq(value).to_sql
         else
           escaped_value = value.gsub(/[%_]/, '\\\\\0')
@@ -25,19 +32,21 @@ module ClientSideValidations
         sql << "AND #{t[klass.primary_key].not_eq(params[:id]).to_sql}" if params[:id]
 
         (params[:scope] || {}).each do |scope_attribute, scope_value|
-          scope_value = type_cast_value(klass.columns_hash[scope_attribute], scope_value)
+          scope_value = type_cast_value(connection, klass.columns_hash[scope_attribute], scope_value)
           sql << "AND #{t[scope_attribute].eq(scope_value).to_sql}"
         end
 
-        relation = Arel::Nodes::SqlLiteral.new(sql.join(' '))
-        !klass.where(relation).exists?
+        sql.join ' '
       end
 
-      def self.type_cast_value(column, value)
-        if column.respond_to?(:type_cast)
-          column.type_cast(value)
+      def self.type_cast_value(connection, column, value)
+        type  = connection.lookup_cast_type_from_column(column)
+        value = type.deserialize(value)
+
+        if column.limit && value.is_a?(String)
+          value.mb_chars[0, column.limit]
         else
-          column.type_cast_from_database(value)
+          value
         end
       end
 

data/lib/client_side_validations/active_record.rb

@@ -2,11 +2,10 @@ require 'client_side_validations/active_model'
 require 'client_side_validations/middleware'
 require 'client_side_validations/active_record/middleware'
 
-%w(uniqueness).each do |validator|
-  require "client_side_validations/active_record/#{validator}"
-  validator.capitalize!
-  ActiveRecord::Validations.const_get("#{validator}Validator").send :include, ClientSideValidations::ActiveRecord.const_get(validator)
-end
-
 ActiveRecord::Base.send(:include, ClientSideValidations::ActiveModel::Validations)
 ClientSideValidations::Middleware::Uniqueness.register_orm(ClientSideValidations::ActiveRecord::Middleware)
+
+%w(Uniqueness).each do |validator|
+  require "client_side_validations/active_record/#{validator.downcase}"
+  ActiveRecord::Validations.const_get("#{validator}Validator").send :include, ClientSideValidations::ActiveRecord.const_get(validator)
+end

data/lib/client_side_validations/generators.rb

@@ -1,9 +1,13 @@
 module ClientSideValidations
   module Generators
-    ASSETS = []
+    @@assets = []
 
     def self.register_assets(klass)
-      ASSETS.push(*klass.assets)
+      @@assets.concat(klass.assets)
+    end
+
+    def self.assets
+      @@assets
     end
   end
 end

data/lib/client_side_validations/middleware.rb

@@ -8,7 +8,7 @@ module ClientSideValidations
       end
 
       def call(env)
-        matches = %r{\A/validators/(\w+)\z}.match(env['PATH_INFO'])
+        matches = %r{\A/?#{ClientSideValidations::Config.root_path}/validators\/(\w+)\z}.match(env['PATH_INFO'])
         if matches
           process_request(matches.captures.first, env)
         else
@@ -58,8 +58,8 @@ module ClientSideValidations
     end
 
     class Uniqueness < Base
-      IGNORE_PARAMS = %w(case_sensitive id scope)
-      REGISTERED_ORMS = []
+      IGNORE_PARAMS = %w(case_sensitive id scope).freeze
+      @@registered_orms = []
       class NotValidatable < StandardError; end
 
       def response
@@ -83,7 +83,7 @@ module ClientSideValidations
       end
 
       def self.registered_orms
-        REGISTERED_ORMS
+        @@registered_orms
       end
 
       def registered_orms
@@ -98,7 +98,7 @@ module ClientSideValidations
         middleware_class        = nil
 
         unless Array.wrap(klass._validators[attribute.to_sym]).find { |v| v.kind == :uniqueness }
-          fail NotValidatable
+          raise NotValidatable
         end
 
         registered_orms.each do |orm|

data/lib/client_side_validations/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '4.2.0'.freeze
+  VERSION = '6.0.0'.freeze
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -9,8 +9,6 @@ module ClientSideValidations
         end
       end
 
-      private
-
       def self.asset_directory
         if asset_pipeline_enabled?
           "app#{Rails.configuration.assets.prefix}/javascripts"
@@ -19,16 +17,8 @@ module ClientSideValidations
         end
       end
 
-      def asset_directory
-        CopyAssetsGenerator.asset_directory
-      end
-
       def self.assets
-        ASSETS
-      end
-
-      def assets
-        CopyAssetsGenerator.assets
+        ClientSideValidations::Generators.assets
       end
 
       def self.asset_file_names
@@ -40,15 +30,25 @@ module ClientSideValidations
         defined?(Sprockets).present?
       end
 
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
-      end
-
       def self.installation_message
         "Copies #{asset_file_names} to #{asset_directory}"
       end
 
       desc installation_message
+
+      private
+
+      def asset_directory
+        CopyAssetsGenerator.asset_directory
+      end
+
+      def assets
+        CopyAssetsGenerator.assets
+      end
+
+      def asset_pipeline_enabled?
+        self.class.asset_pipeline_enabled?
+      end
     end
   end
 end

data/lib/generators/client_side_validations/install_generator.rb

@@ -8,8 +8,6 @@ module ClientSideValidations
         copy_file 'initializer.rb', 'config/initializers/client_side_validations.rb'
       end
 
-      private
-
       def self.installation_message
         "Copies initializer into config/initializers and #{super.downcase}"
       end

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

@@ -1,3 +1,10 @@
+
+/*!
+ * Client Side Validations - v6.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,
     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; };
@@ -49,7 +56,7 @@
       for (validator_name in validators) {
         validator = validators[validator_name];
         if (validator_name.match("\\[" + captures[1] + "\\].*\\[\\]\\[" + captures[2] + "\\]$")) {
-          name = name.replace(/\[[\da-z_]+\]\[(\w+)\]$/g, "[][$1]");
+          name = name.replace(/\[[\da-z_]+\]\[(\w+)\]$/g, '[][$1]');
         }
       }
     }
@@ -111,7 +118,7 @@
     };
     if (element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
       destroyInputName = element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
-      if ($("input[name='" + destroyInputName + "']").val() === "1") {
+      if ($("input[name='" + destroyInputName + "']").val() === '1') {
         passElement();
         return afterValidate();
       }
@@ -184,25 +191,25 @@
         'submit.ClientSideValidations': function(eventData) {
           if (!$form.isValid(form.ClientSideValidations.settings.validators)) {
             eventData.preventDefault();
-            return eventData.stopImmediatePropagation();
+            eventData.stopImmediatePropagation();
           }
         },
         'ajax:beforeSend.ClientSideValidations': function(eventData) {
           if (eventData.target === this) {
-            return $form.isValid(form.ClientSideValidations.settings.validators);
+            $form.isValid(form.ClientSideValidations.settings.validators);
           }
         },
         'form:validate:after.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.form.after($form, eventData);
+          ClientSideValidations.callbacks.form.after($form, eventData);
         },
         'form:validate:before.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.form.before($form, eventData);
+          ClientSideValidations.callbacks.form.before($form, eventData);
         },
         'form:validate:fail.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.form.fail($form, eventData);
+          ClientSideValidations.callbacks.form.fail($form, eventData);
         },
         'form:validate:pass.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.form.pass($form, eventData);
+          ClientSideValidations.callbacks.form.pass($form, eventData);
         }
       };
       for (event in ref) {
@@ -220,28 +227,28 @@
       $form = $(form);
       ref = {
         'focusout.ClientSideValidations': function() {
-          return $(this).isValid(form.ClientSideValidations.settings.validators);
+          $(this).isValid(form.ClientSideValidations.settings.validators);
         },
         'change.ClientSideValidations': function() {
-          return $(this).data('changed', true);
+          $(this).data('changed', true);
         },
         'element:validate:after.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.element.after($(this), eventData);
+          ClientSideValidations.callbacks.element.after($(this), eventData);
         },
         'element:validate:before.ClientSideValidations': function(eventData) {
-          return ClientSideValidations.callbacks.element.before($(this), eventData);
+          ClientSideValidations.callbacks.element.before($(this), eventData);
         },
         'element:validate:fail.ClientSideValidations': function(eventData, message) {
           var element;
           element = $(this);
-          return ClientSideValidations.callbacks.element.fail(element, message, function() {
+          ClientSideValidations.callbacks.element.fail(element, message, function() {
             return form.ClientSideValidations.addError(element, message);
           }, eventData);
         },
         'element:validate:pass.ClientSideValidations': function(eventData) {
           var element;
           element = $(this);
-          return ClientSideValidations.callbacks.element.pass(element, function() {
+          ClientSideValidations.callbacks.element.pass(element, function() {
             return form.ClientSideValidations.removeError(element);
           }, eventData);
         }
@@ -253,7 +260,7 @@
         }).on(event, binding);
       }
       $input.filter(':checkbox').on('change.ClientSideValidations', function() {
-        return $(this).isValid(form.ClientSideValidations.settings.validators);
+        $(this).isValid(form.ClientSideValidations.settings.validators);
       });
       return $input.filter('[id$=_confirmation]').each(function() {
         var confirmationElement, element, ref1, results;
@@ -262,10 +269,10 @@
         if (element[0]) {
           ref1 = {
             'focusout.ClientSideValidations': function() {
-              return element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+              element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
             },
             'keyup.ClientSideValidations': function() {
-              return element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
+              element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
             }
           };
           results = [];
@@ -325,7 +332,7 @@
         }
       },
       numericality: function(element, options) {
-        var CHECKS, check, check_value, fn, form, operator, val;
+        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, {
@@ -335,7 +342,7 @@
           }
           return options.messages.numericality;
         }
-        val = val.replace(new RegExp("\\" + ClientSideValidations.number_format.delimiter, 'g'), "").replace(new RegExp("\\" + ClientSideValidations.number_format.separator, 'g'), ".");
+        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;
         }
@@ -352,14 +359,11 @@
           if (!(options[check] != null)) {
             continue;
           }
-          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 {
+          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 + " " + check_value);
+          fn = new Function("return " + val + " " + operator + " " + checkValue);
           if (!fn()) {
             return options.messages[check];
           }
@@ -465,7 +469,9 @@
         }
       },
       confirmation: function(element, options) {
-        if (element.val() !== $("#" + (element.attr('id')) + "_confirmation").val()) {
+        var regex;
+        regex = new RegExp("^" + (element.val()) + "$", options.case_sensitive ? '' : 'i');
+        if (!regex.test($("#" + (element.attr('id')) + "_confirmation").val())) {
           return options.message;
         }
       },
@@ -480,7 +486,7 @@
           if (name_prefix && name_suffix) {
             form = element.closest('form');
             valid = true;
-            form.find(':input[name^="' + name_prefix + '"][name$="' + name_suffix + '"]').each(function() {
+            form.find(":input[name^=\"" + name_prefix + "\"][name$=\"" + name_suffix + "\"]").each(function() {
               if ($(this).attr('name') !== name) {
                 if ($(this).val() === value) {
                   valid = false;
@@ -544,7 +550,7 @@
           name = element.attr('name');
         }
         if (options['class']) {
-          name = options['class'] + '[' + name.split('[')[1];
+          name = options['class'] + "[" + (name.split('[')[1]);
         }
         data[name] = element.val();
         if ($.ajax({
@@ -646,7 +652,9 @@
     }
   };
 
-  $(document).bind((window.Turbolinks ? 'page:change' : 'ready'), function() {
+  window.ClientSideValidations.event = (window.Turbolinks != null) && window.Turbolinks.supported ? window.Turbolinks.EVENTS != null ? 'page:change' : 'turbolinks:load' : 'ready';
+
+  $(document).bind(window.ClientSideValidations.event, function() {
     ClientSideValidations.disableValidators();
     return $(ClientSideValidations.selectors.forms).validate();
   });