client_side_validations 11.1.3 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb05711ee69d3edec166fdb2e15b5478a865f7c2952b88d169d5517089a4d2c7
-  data.tar.gz: c522d25ac8c086a9718308a98f1524b9c937b2b795fd3a0f47a78d21470e55a9
+  metadata.gz: 3363fadd705aaa2465892b932a0c12c0d39b3281cb513db4a995bb1f2f6014e5
+  data.tar.gz: 1e307e3dffee20217b2d2b1860f6d3d2ef51cdd9cefc6a1a35081af51ae47451
 SHA512:
-  metadata.gz: e896daa042d1266d87d459bb97f6c21536d7f94e19cea43f238f548eaaa8020255842e6b6ec8901d21a25187e9ca4d88b91cb64357063f7a9efac476aa8eaad4
-  data.tar.gz: 28deac80645181f6cd01efd510bb14409d5fe220a789bba7300ae5c70d2af7d74260a5ecfa46d8f130711eb1f01a7437e5652c27fdbe30b40ca8e805d48eb28e
+  metadata.gz: a01830948811607a0bc6edbbb097d33ab9e36926f3fef83f7e1ea6b7a0b70e76a48a8e2bf8e3b5497a35ba8fa7e24fa2f8a6c35c9d966eb353ff1904112d0023
+  data.tar.gz: ef4cf650a6a33552a189436a502aa16ed878b761554c43198117be63a0192d7f31e2c28a5f7f8b3155798eda2b6015196b22f5730e7a390753a0cd6d9896e36e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 12.0.0 / 2018-12-12
+
+* [FEATURE] Drop the deprecated tokenizer support in length validator
+* [ENHANCEMENT] Do not use `New Function` ([#733](https://github.com/DavyJonesLocker/client_side_validations/issues/733))
+* [ENHANCEMENT] Remove 'g' flag from RegExp conversions ([#750](https://github.com/DavyJonesLocker/client_side_validations/issues/750))
+* [ENHANCEMENT] Update dependencies
+
 ## 11.1.3 / 2018-09-08
 
 * [ENHANCEMENT] Test against jQuery 3.3.1 by default

data/lib/client_side_validations/action_view/form_builder.rb

@@ -24,7 +24,7 @@ module ClientSideValidations
 
         def client_side_form_settings(_options, form_helper)
           {
-            type: self.class.to_s,
+            type:      self.class.to_s,
             input_tag: form_helper.class.field_error_proc.call(%(<span id="input_tag" />),  Struct.new(:error_message, :tag_id).new([], '')),
             label_tag: form_helper.class.field_error_proc.call(%(<label id="label_tag" />), Struct.new(:error_message, :tag_id).new([], ''))
           }

data/lib/client_side_validations/action_view/form_helper.rb

@@ -14,6 +14,7 @@ module ClientSideValidations
           # 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] ||= {}
 
           # Moving the switch statement to another method to
@@ -58,6 +59,7 @@ module ClientSideValidations
           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
@@ -133,7 +135,7 @@ module ClientSideValidations
           csv_options = {
             html_settings: builder.client_side_form_settings(options, self),
             number_format: number_format,
-            validators: construct_validators
+            validators:    construct_validators
           }
 
           html_options['data-client-side-validations'] = csv_options.to_json

data/lib/client_side_validations/active_model.rb

@@ -105,6 +105,7 @@ module ClientSideValidations
 
       def validator_turned_off?(attr, validator, force)
         return true if ::ClientSideValidations::Config.disabled_validators.include?(validator.kind)
+
         case force
         when FalseClass
           true
@@ -147,6 +148,7 @@ module ClientSideValidations
 
         if options[:in].respond_to?(:call)
           return unless force
+
           options[:in] = options[:in].call(model)
         end
 

data/lib/client_side_validations/active_model/format.rb

@@ -7,10 +7,12 @@ module ClientSideValidations
         options = self.options.dup
         if options[:with].respond_to?(:call)
           return unless force
+
           options[:with] = options[:with].call(model)
           build_client_side_hash(model, attribute, options)
         elsif options[:without].respond_to?(:call)
           return unless force
+
           options[:without] = options[:without].call(model)
           build_client_side_hash(model, attribute, options)
         else

data/lib/client_side_validations/active_model/length.rb

@@ -26,8 +26,7 @@ module ClientSideValidations
 
       def options_hash(options)
         hash = { messages: {} }
-        hash[:js_tokenizer] = options[:js_tokenizer] if options[:js_tokenizer]
-        hash[:allow_blank]  = true if options[:allow_nil] || options[:allow_blank]
+        hash[:allow_blank] = true if options[:allow_nil] || options[:allow_blank]
         hash
       end
     end

data/lib/client_side_validations/active_model/numericality.rb

@@ -19,6 +19,7 @@ module ClientSideValidations
 
           if count.respond_to?(:call)
             next unless force
+
             count = count.call(model)
           end
 

data/lib/client_side_validations/core_ext/regexp.rb

@@ -4,7 +4,7 @@ require 'js_regex'
 
 class Regexp
   def as_json(*)
-    JsRegex.new(self, options: 'g').to_h
+    JsRegex.new(self).to_h
   end
 
   def to_json(options = nil)

data/lib/client_side_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClientSideValidations
-  VERSION = '11.1.3'.freeze
+  VERSION = '12.0.0'.freeze
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -5,6 +5,7 @@ module ClientSideValidations
     class CopyAssetsGenerator < Rails::Generators::Base
       def copy_javascript_asset
         return unless self.class == CopyAssetsGenerator || !asset_pipeline_enabled?
+
         assets.each do |asset|
           source_paths << asset[:path]
           copy_file asset[:file], "#{asset_directory}/#{asset[:file]}"

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

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v11.1.3 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v12.0.0 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2018 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
  */
@@ -363,7 +363,7 @@
           }
         },
         numericality: function(element, options) {
-          var $form, CHECKS, check, checkValue, fn, number_format, operator, val;
+          var $form, NUMERICALITY_CHECKS, check, checkValue, check_function, number_format, val;
           if (options.allow_blank === true && this.presence(element, {
             message: options.messages.numericality
           })) {
@@ -378,15 +378,25 @@
           if (!ClientSideValidations.patterns.numericality["default"].test(val)) {
             return options.messages.numericality;
           }
-          CHECKS = {
-            greater_than: '>',
-            greater_than_or_equal_to: '>=',
-            equal_to: '==',
-            less_than: '<',
-            less_than_or_equal_to: '<='
+          NUMERICALITY_CHECKS = {
+            greater_than: function(a, b) {
+              return a > b;
+            },
+            greater_than_or_equal_to: function(a, b) {
+              return a >= b;
+            },
+            equal_to: function(a, b) {
+              return a === b;
+            },
+            less_than: function(a, b) {
+              return a < b;
+            },
+            less_than_or_equal_to: function(a, b) {
+              return a <= b;
+            }
           };
-          for (check in CHECKS) {
-            operator = CHECKS[check];
+          for (check in NUMERICALITY_CHECKS) {
+            check_function = NUMERICALITY_CHECKS[check];
             if (!(options[check] != null)) {
               continue;
             }
@@ -394,8 +404,7 @@
             if ((checkValue == null) || checkValue === '') {
               return;
             }
-            fn = new Function("return " + val + " " + operator + " " + checkValue);
-            if (!fn()) {
+            if (!check_function(parseFloat(val), parseFloat(checkValue))) {
               return options.messages[check];
             }
           }
@@ -407,13 +416,18 @@
           }
         },
         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: '<='
+          var LENGTH_CHECKS, blankOptions, check, check_function, length, message;
+          length = element.val().length;
+          LENGTH_CHECKS = {
+            is: function(a, b) {
+              return a === b;
+            },
+            minimum: function(a, b) {
+              return a >= b;
+            },
+            maximum: function(a, b) {
+              return a <= b;
+            }
           };
           blankOptions = {};
           blankOptions.message = options.is ? options.messages.is : options.minimum ? options.messages.minimum : void 0;
@@ -424,14 +438,12 @@
             }
             return message;
           }
-          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];
+          for (check in LENGTH_CHECKS) {
+            check_function = LENGTH_CHECKS[check];
+            if (options[check]) {
+              if (!check_function(length, parseInt(options[check]))) {
+                return options.messages[check];
+              }
             }
           }
         },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 11.1.3
+  version: 12.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -163,14 +163,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement