client_side_validations 3.2.6 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45901353d1622b2e772baa28710eba7455927cf2
-  data.tar.gz: 1029d710ab65f47ad806ed3509948586882d0e92
+  metadata.gz: 38fd5c8616f9660f50a6a43b5ae101489458fed8
+  data.tar.gz: 2462d48679c9fe78adf342c81463ad119856c6c1
 SHA512:
-  metadata.gz: 6f02c2df76f05b36265271ba582bc35cd0fd38859c72f1b96a002a012c8017750d8efa4563d8262dd44cd595cebfb55f5defe2240fd8a9b3f1e3cf1597b5c762
-  data.tar.gz: 79bbcab6259cdcecbbca630b2557575e229ce7fb8123aaa64c61a6d5887a8b9d9bf7736ddc9acb8b507413761a9d6a200eecd8a467e294cb9c7db6bccb59bd2c
+  metadata.gz: 109b26253fa04aa9989f449bc0fce107a42bf87e69926229589253dc45720f32973972aa7cd82f461846cfa1c73441eddeae19d0057977d54d3797fc2f808802
+  data.tar.gz: 6648217c328aef0e74e88be8aaa5111a9d22df5eeb4c3a5ce48ab45f6792a64d2b01433be5b5bd592b93d3e504d1f2a1822a9db4c4decfdd4b3dc7049c2b8344

data/lib/client_side_validations/active_record/middleware.rb

@@ -13,31 +13,23 @@ module ClientSideValidations::ActiveRecord
 
       t = klass.arel_table
 
+      sql = []
       if params[:case_sensitive] == 'true'
-        if t.engine.connection.adapter_name =~ /^mysql/i
-          relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql}")
-        else
-          relation = t[attribute].eq(value)
-        end
+        sql << 'BINARY' if t.engine.connection.adapter_name =~ /^mysql/i
+        sql << t[attribute].eq(value).to_sql
       else
-        relation = t[attribute].matches(value)
+        escaped_value = value.gsub(/[%_]/, '\\\\\0')
+        sql << "#{t[attribute].matches(escaped_value).to_sql} ESCAPE '\\'"
       end
 
-      if relation.is_a?(Arel::Nodes::SqlLiteral)
-        relation = Arel::Nodes::SqlLiteral.new("BINARY #{t[attribute].eq(value).to_sql} AND #{t[klass.primary_key].not_eq(params[:id]).to_sql}")
-      else
-        relation = relation.and(t[klass.primary_key].not_eq(params[:id])) if params[:id]
-      end
+      sql << "AND #{t[klass.primary_key].not_eq(params[:id]).to_sql}" if params[:id]
 
       (params[:scope] || {}).each do |attribute, value|
-        value    = type_cast_value(klass, attribute, value)
-        if relation.is_a?(Arel::Nodes::SqlLiteral)
-          relation =  Arel::Nodes::SqlLiteral.new("#{relation} AND #{t[attribute].eq(value).to_sql}")
-        else
-          relation = relation.and(t[attribute].eq(value))
-        end
+        value = type_cast_value(klass, attribute, value)
+        sql << "AND #{t[attribute].eq(value).to_sql}"
       end
 
+      relation = Arel::Nodes::SqlLiteral.new(sql.join(' '))
       !klass.where(relation).exists?
     end
 

data/lib/client_side_validations/middleware.rb

@@ -19,7 +19,7 @@ module ClientSideValidations
       end
 
       def process_request(validation, env)
-        if disabled_validators.include?(validation)
+        if disabled_validators.include?(validation.downcase)
           error_resp
         else
           klass_name = validation.camelize
@@ -31,7 +31,7 @@ module ClientSideValidations
       end
 
       def disabled_validators
-        ClientSideValidations::Config.disabled_validators.map(&:to_s)
+        ClientSideValidations::Config.disabled_validators.map { |v| v.to_s.downcase }
       end
 
       def error_resp

data/lib/client_side_validations/version.rb

@@ -1,3 +1,3 @@
 module ClientSideValidations
-  VERSION = '3.2.6'
+  VERSION = '3.2.7'
 end

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

@@ -1,6 +1,6 @@
 (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; };
+    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;
 
@@ -89,14 +89,14 @@
       return element.trigger('element:validate:after.ClientSideValidations').data('valid') !== false;
     };
     executeValidators = function(context) {
-      var fn, kind, message, valid, validator, _i, _len, _ref;
+      var fn, i, kind, len, message, ref, valid, validator;
       valid = true;
       for (kind in context) {
         fn = context[kind];
         if (validators[kind]) {
-          _ref = validators[kind];
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            validator = _ref[_i];
+          ref = validators[kind];
+          for (i = 0, len = ref.length; i < len; i++) {
+            validator = ref[i];
             if (message = fn.call(context, element, validator)) {
               valid = failElement(message);
               break;
@@ -167,7 +167,7 @@
 
   window.ClientSideValidations.enablers = {
     form: function(form) {
-      var $form, binding, event, _ref;
+      var $form, binding, event, ref;
       $form = $(form);
       form.ClientSideValidations = {
         settings: window.ClientSideValidations.forms[$form.attr('id')],
@@ -178,7 +178,7 @@
           return ClientSideValidations.formBuilders[form.ClientSideValidations.settings.type].remove(element, form.ClientSideValidations.settings);
         }
       };
-      _ref = {
+      ref = {
         'submit.ClientSideValidations': function(eventData) {
           if (!$form.isValid(form.ClientSideValidations.settings.validators)) {
             eventData.preventDefault();
@@ -203,8 +203,8 @@
           return ClientSideValidations.callbacks.form.pass($form, eventData);
         }
       };
-      for (event in _ref) {
-        binding = _ref[event];
+      for (event in ref) {
+        binding = ref[event];
         $form.on(event, binding);
       }
       return $form.find(ClientSideValidations.selectors.inputs).each(function() {
@@ -212,11 +212,11 @@
       });
     },
     input: function(input) {
-      var $form, $input, binding, event, form, _ref;
+      var $form, $input, binding, event, form, ref;
       $input = $(input);
       form = input.form;
       $form = $(form);
-      _ref = {
+      ref = {
         'focusout.ClientSideValidations': function() {
           return $(this).isValid(form.ClientSideValidations.settings.validators);
         },
@@ -244,8 +244,8 @@
           }, eventData);
         }
       };
-      for (event in _ref) {
-        binding = _ref[event];
+      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);
@@ -255,11 +255,11 @@
         return true;
       });
       return $input.filter('[id$=_confirmation]').each(function() {
-        var confirmationElement, element, _ref1, _results;
+        var confirmationElement, element, ref1, results;
         confirmationElement = $(this);
         element = $form.find("#" + (this.id.match(/(.+)_confirmation/)[1]) + ":input");
         if (element[0]) {
-          _ref1 = {
+          ref1 = {
             'focusout.ClientSideValidations': function() {
               return element.data('changed', true).isValid(form.ClientSideValidations.settings.validators);
             },
@@ -267,12 +267,12 @@
               return 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));
+          results = [];
+          for (event in ref1) {
+            binding = ref1[event];
+            results.push($("#" + (confirmationElement.attr('id'))).on(event, binding));
           }
-          return _results;
+          return results;
         }
       });
     }
@@ -289,7 +289,7 @@
         }
       },
       acceptance: function(element, options) {
-        var _ref;
+        var ref;
         switch (element.attr('type')) {
           case 'checkbox':
             if (!element.prop('checked')) {
@@ -297,7 +297,7 @@
             }
             break;
           case 'text':
-            if (element.val() !== (((_ref = options.accept) != null ? _ref.toString() : void 0) || '1')) {
+            if (element.val() !== (((ref = options.accept) != null ? ref.toString() : void 0) || '1')) {
               return options.message;
             }
         }
@@ -395,7 +395,7 @@
         }
       },
       exclusion: function(element, options) {
-        var lower, message, option, upper, _ref;
+        var lower, message, option, ref, upper;
         message = this.presence(element, options);
         if (message) {
           if (options.allow_blank === true) {
@@ -404,16 +404,16 @@
           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 (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 results;
+          })(), ref) >= 0) {
             return options.message;
           }
         }
@@ -426,7 +426,7 @@
         }
       },
       inclusion: function(element, options) {
-        var lower, message, option, upper, _ref;
+        var lower, message, option, ref, upper;
         message = this.presence(element, options);
         if (message) {
           if (options.allow_blank === true) {
@@ -435,16 +435,16 @@
           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 (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 results;
+          })(), ref) >= 0) {
             return;
           }
           return options.message;
@@ -495,7 +495,7 @@
     },
     remote: {
       uniqueness: function(element, options) {
-        var data, key, message, name, scope_value, scoped_element, scoped_name, _ref;
+        var data, key, message, name, ref, scope_value, scoped_element, scoped_name;
         message = ClientSideValidations.validators.local.presence(element, options);
         if (message) {
           if (options.allow_blank === true) {
@@ -510,9 +510,9 @@
         }
         if (options.scope) {
           data.scope = {};
-          _ref = options.scope;
-          for (key in _ref) {
-            scope_value = _ref[key];
+          ref = options.scope;
+          for (key in ref) {
+            scope_value = ref[key];
             scoped_name = element.attr('name').replace(/\[\w+\]$/, "[" + key + "]");
             scoped_element = jQuery("[name='" + scoped_name + "']");
             jQuery("[name='" + scoped_name + "']:checkbox").each(function() {
@@ -562,21 +562,21 @@
   };
 
   window.ClientSideValidations.disableValidators = function() {
-    var func, validator, _ref, _results;
+    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]);
+    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]);
       } else {
-        _results.push(void 0);
+        results.push(void 0);
       }
     }
-    return _results;
+    return results;
   };
 
   window.ClientSideValidations.formBuilders = {

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Client Side Validations
@@ -197,17 +197,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Client Side Validations