client_side_validations 16.2.0 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5320f254fa2dd8fd48006b2489a2a13319afbff7c89015011d93dab5ea4634f2
-  data.tar.gz: 111dc6f36d987e5cde360d75baa482e658b3e25145530b49c02a661bc47e40b5
+  metadata.gz: d4bcd7d9d20f8b13d6cc5537d879d8f3f76835501d977a585898ce69ad6a6392
+  data.tar.gz: cb32cc92ff6d52122a7c2990e7c50cf93c4d48fb3a52bfdb51ed5e3cf1c760c2
 SHA512:
-  metadata.gz: 7006a5df563bdd1885dcf2c1afd431f25dbf80bf15a96d9e3889f67c5039d634fec9fe5c92ac2d02a3f38a4df1cb34c573971c480702728b61c5be3b493e3a50
-  data.tar.gz: 8a2288c4e11f543c923ae3a6d76d6c715eea57140ad172916d4bee2b0c960b11cdfdc64436c3df78e2584420a1688b1fed9e371f864fb441d8e7c0027b1285d3
+  metadata.gz: ea2cc5dfe1a81c6b25b7e962ea0d639e44f3e76bf392c5ce1df6db68b4658062236ec6814eb7c3d8cf9335a1f9209e4160b0acdd824b8826d1db7a9ecdde7f50
+  data.tar.gz: 7ecf8d894db6009a43ffb0d7084cf95e1ddd67b824b170efbf3610b2cd00aca208631159bb9510f68cafd4ca028fdf4ccb36f4c9fcb83cde446f07e21edc35b1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 17.0.0 / 2020-05-16
+
+* [FEATURE] Drop Ruby 2.3 support
+* [FEATURE] Do not require `jquery-rails` gem ([#785](https://github.com/DavyJonesLocker/client_side_validations/pull/785))
+* [FEATURE] Add support for many association validations ([#783](https://github.com/DavyJonesLocker/client_side_validations/pull/783))
+* [BUGFIX] Fix Rails generators ([#786](https://github.com/DavyJonesLocker/client_side_validations/pull/786))
+* [BUGFIX] Do not validate dynamically disabled inputs ([#789](https://github.com/DavyJonesLocker/client_side_validations/pull/789))
+* [BUGFIX] Fix removal of error messages ([#790](https://github.com/DavyJonesLocker/client_side_validations/pull/790))
+* [ENHANCEMENT] Test against jQuery 3.5.1
+
 ## 16.2.0 / 2020-04-10
 
 * [FEATURE] Add jQuery 3.5.0 compatibility ([#779](https://github.com/DavyJonesLocker/client_side_validations/pull/779))

data/README.md

@@ -2,10 +2,12 @@
 
 [![Gem Version](https://badge.fury.io/rb/client_side_validations.svg)](https://badge.fury.io/rb/client_side_validations)
 [![npm version](https://badge.fury.io/js/%40client-side-validations%2Fclient-side-validations.svg)](https://badge.fury.io/js/%40client-side-validations%2Fclient-side-validations)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=client_side_validations&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=client_side_validations&package-manager=bundler&version-scheme=semver)
 [![Build Status](https://secure.travis-ci.org/DavyJonesLocker/client_side_validations.svg?branch=master)](https://travis-ci.org/DavyJonesLocker/client_side_validations)
 [![Maintainability](https://api.codeclimate.com/v1/badges/9f9e8bb6edc92615f34e/maintainability)](https://codeclimate.com/github/DavyJonesLocker/client_side_validations/maintainability)
 [![Coverage Status](https://coveralls.io/repos/github/DavyJonesLocker/client_side_validations/badge.svg?branch=master)](https://coveralls.io/github/DavyJonesLocker/client_side_validations?branch=master)
 
+
 `ClientSideValidations` made easy for your Rails 5.x / Rails 6.0 applications!
 
 ## Project Goals ##
@@ -90,9 +92,26 @@ attach its event handlers.
 
 ####  When using Sprockets ####
 
-Make sure that you are requiring jQuery.
+Since ClientSideValidations can also be used via webpacker, it does not require
+by default `jquery-rails` gem.
+
+Make sure that `jquery-rails` is part of your bundled gems and `application.js`,
+otherwise add:
+
+```ruby
+gem 'jquery-rails', '~> 4.3'
+```
+
+to your `Gemfile`, run `bundle`, and add
+
+```js
+//= require jquery
+```
+
+to your `app/assets/javascripts/application.js` file.
 
-Add the following to your `app/assets/javascripts/application.js` file.
+Then, add the following to your `app/assets/javascripts/application.js` file
+after `//= require jquery`.
 
 ```js
 //= require rails.validations
@@ -115,11 +134,10 @@ Note: If you run `copy_assets`, you will need to run it again each time you upda
 The initializer includes a commented out `ActionView::Base.field_error_proc`.
 Uncomment this to render your error messages inline with the input fields.
 
-I recommend you not use a solution similar to `error_messages_for`. Client
-Side Validations is never going to support rendering this type of error
-rendering. If you want to maintain consistency between the client side
-rendered validation error messages and the server side rendered
-validation error messages please use what is in
+I recommend you to not use a solution similar to `error_messages_for`. Client
+Side Validations does not support this type of error rendering. If you want to
+maintain consistency between the client side rendered validation error messages
+and the server side rendered validation error messages please use what is in
 `config/initializers/client_side_validations.rb`
 
 ## Plugins ##

data/lib/client_side_validations/action_view/form_builder.rb

@@ -7,21 +7,25 @@ module ClientSideValidations
         def self.prepended(base)
           (base.field_helpers - %i[label check_box radio_button fields_for hidden_field file_field]).each do |selector|
             base.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-              def #{selector}(method, options = {})
-                build_validation_options(method, options)
-                options.delete(:validate)
-
-                # Cannot call super here, override the whole method
-                @template.send(                      #   @template.send(
-                  #{selector.inspect},               #     "text_field",
-                  @object_name,                      #     @object_name,
-                  method,                            #     method,
-                  objectify_options(options))        #     objectify_options(options))
-              end
+              # Cannot call super here, rewrite all
+              def #{selector}(method, options = {})       # def text_field(method, options = {})
+                build_validation_options(method, options) #   build_validation_options(method, options)
+                options.delete(:validate)                 #   options.delete(:validate)
+                @template.send(                           #   @template.send(
+                  #{selector.inspect},                    #     "text_field",
+                  @object_name,                           #     @object_name,
+                  method,                                 #     method,
+                  objectify_options(options))             #     objectify_options(options))
+              end                                         # end
             RUBY_EVAL
           end
         end
 
+        def initialize(object_name, object, template, options)
+          super(object_name, object, template, options)
+          @options[:validators] = { object => {} }
+        end
+
         def client_side_form_settings(_options, form_helper)
           {
             type:      self.class.to_s,
@@ -38,9 +42,24 @@ module ClientSideValidations
           nil
         end
 
-        def initialize(object_name, object, template, options)
-          super(object_name, object, template, options)
-          @options[:validators] = { object => {} }
+        def check_box(method, options = {}, checked_value = '1', unchecked_value = '0')
+          build_validation_options(method, options)
+          options.delete(:validate)
+          super(method, options, checked_value, unchecked_value)
+        end
+
+        %i[collection_check_boxes collection_radio_buttons].each do |method_name|
+          define_method method_name do |method, collection, value_method, text_method, options = {}, html_options = {}, &block|
+            build_validation_options(method, html_options.merge(name: options[:name]))
+            html_options.delete(:validate)
+            super(method, collection, value_method, text_method, options, html_options, &block)
+          end
+        end
+
+        def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+          build_validation_options(method, html_options.merge(name: options[:name]))
+          html_options.delete(:validate)
+          super(method, collection, value_method, text_method, options, html_options)
         end
 
         def fields_for(record_name, record_object = nil, fields_options = {}, &block)
@@ -53,10 +72,16 @@ module ClientSideValidations
           super(record_name, record_object, fields_options, &block)
         end
 
-        def check_box(method, options = {}, checked_value = '1', unchecked_value = '0')
+        def file_field(method, options = {})
           build_validation_options(method, options)
           options.delete(:validate)
-          super(method, options, checked_value, unchecked_value)
+          super(method, options)
+        end
+
+        def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+          build_validation_options(method, html_options.merge(name: options[:name]))
+          html_options.delete(:validate)
+          super(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
         end
 
         def radio_button(method, tag_value, options = {})
@@ -71,38 +96,12 @@ module ClientSideValidations
           super(method, choices, options, html_options, &block)
         end
 
-        def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-          build_validation_options(method, html_options.merge(name: options[:name]))
-          html_options.delete(:validate)
-          super(method, collection, value_method, text_method, options, html_options)
-        end
-
-        %i[collection_check_boxes collection_radio_buttons].each do |method_name|
-          define_method method_name do |method, collection, value_method, text_method, options = {}, html_options = {}, &block|
-            build_validation_options(method, html_options.merge(name: options[:name]))
-            html_options.delete(:validate)
-            super(method, collection, value_method, text_method, options, html_options, &block)
-          end
-        end
-
-        def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-          build_validation_options(method, html_options.merge(name: options[:name]))
-          html_options.delete(:validate)
-          super(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
-        end
-
         def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
           super(method, priority_zones, options, html_options)
         end
 
-        def file_field(method, options = {})
-          build_validation_options(method, options)
-          options.delete(:validate)
-          super(method, options)
-        end
-
         private
 
         def build_validation_options(method, options = {})

data/lib/client_side_validations/action_view/form_helper.rb

@@ -99,12 +99,15 @@ module ClientSideValidations
           if validation_hash.key?(attr)
             validator_hash[name] = validation_hash[attr]
           elsif attr.to_s.ends_with?('_id')
-            add_validator_with_association validator_hash, validation_hash, name, attr
+            association_name = attr.to_s.gsub(/_id\Z/, '').to_sym
+            add_validator_with_association validator_hash, validation_hash, name, association_name
+          elsif attr.to_s.ends_with?('_ids')
+            association_name = attr.to_s.gsub(/_ids\Z/, '').pluralize.to_sym
+            add_validator_with_association validator_hash, validation_hash, name, association_name
           end
         end
 
-        def add_validator_with_association(validator_hash, validation_hash, name, attr)
-          association_name = attr.to_s.gsub(/_id\Z/, '').to_sym
+        def add_validator_with_association(validator_hash, validation_hash, name, association_name)
           return unless validation_hash.key?(association_name)
 
           validator_hash[name] = validation_hash[association_name]

data/lib/client_side_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClientSideValidations
-  VERSION = '16.2.0'
+  VERSION = '17.0.0'
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -4,7 +4,7 @@ module ClientSideValidations
   module Generators
     class CopyAssetsGenerator < Rails::Generators::Base
       def copy_javascript_asset
-        return unless self.class == CopyAssetsGenerator || !asset_pipeline_enabled?
+        return unless self.class == CopyAssetsGenerator || copy_assets?
 
         assets.each do |asset|
           source_paths << asset[:path]
@@ -13,7 +13,7 @@ module ClientSideValidations
       end
 
       def self.asset_directory
-        if asset_pipeline_enabled?
+        if sprockets?
           "app#{Rails.configuration.assets.prefix}/javascripts"
         else
           'public/javascripts'
@@ -28,9 +28,16 @@ module ClientSideValidations
         assets.map { |asset| asset[:file] }.join(', ')
       end
 
-      def self.asset_pipeline_enabled?
-        # Rails 4.1 doesn't provide :enabled in asset configuration, so we look for Sprockets
-        defined?(Sprockets).present?
+      def self.copy_assets?
+        !sprockets? && !webpacker?
+      end
+
+      def self.sprockets?
+        defined?(Sprockets)
+      end
+
+      def self.webpacker?
+        defined?(Webpacker)
       end
 
       def self.installation_message
@@ -49,8 +56,8 @@ module ClientSideValidations
         CopyAssetsGenerator.assets
       end
 
-      def asset_pipeline_enabled?
-        self.class.asset_pipeline_enabled?
+      def copy_assets?
+        self.class.copy_assets?
       end
     end
   end

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'generators/client_side_validations/copy_assets_generator'
+require_relative 'copy_assets_generator'
 
 module ClientSideValidations
   module Generators

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

@@ -1,5 +1,5 @@
 /*!
- * Client Side Validations JS - v0.1.3 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations JS - v0.1.4 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2020 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (https://opensource.org/licenses/mit-license.php)
  */
@@ -194,10 +194,11 @@
         },
         remove: function remove(element, settings) {
           var form = $(element[0].form);
-          var errorFieldClass = $(settings.input_tag).attr('class');
-          var inputErrorField = element.closest('.' + errorFieldClass.replace(/ /g, '.'));
+          var inputErrorFieldClass = $(settings.input_tag).attr('class');
+          var inputErrorField = element.closest('.' + inputErrorFieldClass.replace(/ /g, '.'));
           var label = form.find("label[for='" + element.attr('id') + "']:not(.message)");
-          var labelErrorField = label.closest('.' + errorFieldClass);
+          var labelErrorFieldClass = $(settings.label_tag).attr('class');
+          var labelErrorField = label.closest('.' + labelErrorFieldClass.replace(/ /g, '.'));
 
           if (inputErrorField[0]) {
             inputErrorField.find('#' + element.attr('id')).detach();
@@ -726,7 +727,7 @@
   };
 
   var executeAllValidators = function executeAllValidators(element, validators) {
-    if (element.data('changed') === false) {
+    if (element.data('changed') === false || element.prop('disabled')) {
       return;
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 16.2.0
+  version: 17.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,20 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: js_regex
   requirement: !ruby/object:Gem::Requirement
@@ -77,42 +63,30 @@ dependencies:
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -175,14 +149,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.83.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.83.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -215,22 +189,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="