client_side_validations 19.1.0 → 20.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5904433f3b766e4544605c251a50c28349fbad906456b4823e19ea2700aef1
-  data.tar.gz: 0d3fe57c177d373237ce63c2f905fd2c907579c268e550134f3d954a2b72df61
+  metadata.gz: 947a8c3e977a52425b7d60ca031c38ba6aa0e22534704859cf10330f42fc7c64
+  data.tar.gz: 120c000d994694b6cf98ceb28ed40507a43e28132563a1d03f43dde3bcf9a272
 SHA512:
-  metadata.gz: 51f6b2a441831cb479f267a04627badde3d6478f733b7a66792ca9df0e3f4eb403fed52210a7c2001c855b697d9cfeb14f51eb222aadc21b392bebf71d4ad903
-  data.tar.gz: bf6196647cba2846209dd206e2e3bc1eec79f4e07f66720996c1761670288cd8496fcef2a5e620faea34cf8225dfc2856f9eb480773755c9b28dc6acb4ab03e4
+  metadata.gz: 82dadc40eac82e9b38fca023d4732a8f6a3d835bc29f5b41ffa68345b8366a797c3a224ac0af0c8f50bc0067361c527741cf43bbf0d07779309134914c80231e
+  data.tar.gz: 125ae43cbb60726874f2ddba6aec7f355ebfb4e5a0e6cf7218cb42b9abb55d100e03f464a835b0b7490bc9232d55f73361cb759a0a3533b758ee0464b87b8717

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 20.0.2 / 2021-12-22
+
+* [BUGFIX] Fix Rails 7.0 compatibility ([#869](https://github.com/DavyJonesLocker/client_side_validations/issues/869))
+
+## 20.0.1 / 2021-12-22
+
+* [BUGFIX] Fix missing HTTP method ([#867](https://github.com/DavyJonesLocker/client_side_validations/issue/867))
+* [ENHANCEMENT] Update development dependencies
+
+## 20.0.0 / 2021-12-16
+
+* [FEATURE] Add Rails 7 compatibility - POSSIBLE BREAKING CHANGE ([#862](https://github.com/DavyJonesLocker/client_side_validations/pull/862))
+* [ENHANCEMENT] Update development dependencies
+
+## 19.1.1 / 2021-11-15
+
+* [ENHANCEMENT] Require MFA to publish gems
+* [ENHANCEMENT] Update development dependencies
+
 ## 19.1.0 / 2021-10-05
 
 * [FEATURE] Add Turbo compatibility ([#849](https://github.com/DavyJonesLocker/client_side_validations/pull/849))

data/README.md

@@ -2,13 +2,13 @@
 
 [![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://github.com/DavyJonesLocker/client_side_validations/actions/workflows/ruby.yml/badge.svg)](https://github.com/DavyJonesLocker/client_side_validations/actions)
+[![Ruby Build Status](https://github.com/DavyJonesLocker/client_side_validations/actions/workflows/ruby.yml/badge.svg)](https://github.com/DavyJonesLocker/client_side_validations/actions)
+[![JavaScript Build Status](https://github.com/DavyJonesLocker/client_side_validations/actions/workflows/javascript.yml/badge.svg)](https://github.com/DavyJonesLocker/client_side_validations/actions)
 [![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=main)](https://coveralls.io/github/DavyJonesLocker/client_side_validations?branch=main)
 
 
-`ClientSideValidations` made easy for your Rails 5.2 / Rails 6.x applications!
+`ClientSideValidations` made easy for your Rails 5.2 / 6.x / 7.0 applications!
 
 ## Project Goals ##
 
@@ -78,17 +78,17 @@ import '@client-side-validations/client-side-validations/src'
 require('@client-side-validations/client-side-validations')
 ```
 
-##### Heads-up for Turbolinks users #####
+##### Heads-up for Turbo and Turbolinks users #####
+
+If you are using [Turbo](https://github.com/hotwired/turbo-rails), use the
+`import` syntax and make sure that `@client-side-validations/client-side-validations/src`
+is imported **after** `@hotwired/turbo-rails`, so ClientSideValidations can properly detect
+`window.Turbo` and attach its event handlers.
 
 If you are using [Turbolinks](https://github.com/turbolinks/turbolinks) 5.2,
-use the require syntax and make sure that `@client-side-validations/client-side-validations`
-is required after`Turbolinks.start()`, so ClientSideValidations can properly
-attach its event handlers.
-
-[Turbo](https://github.com/hotwired/turbo-rails) automatically calls `start()`,
-so you can use the `import` syntax. Just make sure that `@client-side-validations/client-side-validations/src`
-is imported **after** `turbo`, so ClientSideValidations can properly
-attach its event handlers.
+use the `require` syntax and make sure that `@client-side-validations/client-side-validations`
+is required **after** `Turbolinks.start()`, so ClientSideValidations can properly
+detect `window.Turbolinks` and attach its event handlers.
 
 ####  When using Sprockets ####
 

data/lib/client_side_validations/action_view/form_builder.rb

@@ -22,15 +22,15 @@ module ClientSideValidations
         end
 
         def initialize(object_name, object, template, options)
-          super(object_name, object, template, options)
+          super
           @options[:validators] = { object => {} }
         end
 
         def client_side_form_settings(_options, form_helper)
           {
             type:      self.class.to_s,
-            input_tag: form_helper.class.field_error_proc.call(%(<span id="input_tag"></span>), Struct.new(:error_message, :tag_id).new([], '')),
-            label_tag: form_helper.class.field_error_proc.call(%(<label id="label_tag"></label>), Struct.new(:error_message, :tag_id).new([], ''))
+            input_tag: error_field(form_helper, :span, 'input_tag'),
+            label_tag: error_field(form_helper, :label, 'label_tag')
           }
         end
 
@@ -45,7 +45,7 @@ module ClientSideValidations
         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)
+          super
         end
 
         %i[collection_check_boxes collection_radio_buttons].each do |method_name|
@@ -59,7 +59,7 @@ module ClientSideValidations
         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)
+          super
         end
 
         def fields_for(record_name, record_object = nil, fields_options = {}, &block)
@@ -69,46 +69,52 @@ module ClientSideValidations
           end
 
           fields_options[:validate] ||= @options[:validate] if @options[:validate] && !fields_options.key?(:validate)
-          super(record_name, record_object, fields_options, &block)
+          super
         end
 
         def fields(scope = nil, model: nil, **options, &block)
           options[:validate] ||= @options[:validate] if @options[:validate] && !options.key?(:validate)
-          super(scope, model: model, **options, &block)
+          super
         end
 
         def file_field(method, options = {})
           build_validation_options(method, options)
           options.delete(:validate)
-          super(method, options)
+          super
         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)
+          super
         end
 
         def radio_button(method, tag_value, options = {})
           build_validation_options(method, options)
           options.delete(:validate)
-          super(method, tag_value, options)
+          super
         end
 
         def select(method, choices = nil, options = {}, html_options = {}, &block)
           build_validation_options(method, html_options.merge(name: options[:name]))
           html_options.delete(:validate)
-          super(method, choices, options, html_options, &block)
+          super
         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)
+          super
         end
 
         private
 
+        def error_field(form_helper, tag, id)
+          form_helper.instance_exec form_helper.content_tag(tag, nil, id: id),
+                                    Struct.new(:error_message, :tag_id).new([], ''),
+                                    &form_helper.class.field_error_proc
+        end
+
         def build_validation_options(method, options = {})
           return unless @options[:validate]
 

data/lib/client_side_validations/action_view/form_helper.rb

@@ -15,35 +15,42 @@ module ClientSideValidations
           # So we basically reimplement the whole form_for method
           raise ArgumentError, 'Missing block' unless block
 
-          html_options = options[:html] ||= {}
+          options[:html] ||= {}
 
           # Moving the switch statement to another method to
           # lower complexity
-          object, object_name = check_record(record, options)
+          model, object_name = check_record(record, options)
 
-          @validators = {}
+          remote = options.delete(:remote)
 
-          apply_html_options! options, html_options
-
-          builder = instantiate_builder(object_name, object, options)
-          output  = capture(builder, &block)
-          html_options[:multipart] ||= builder.multipart?
+          if remote && !embed_authenticity_token_in_remote_forms && options[:authenticity_token].blank?
+            options[:authenticity_token] = false
+          end
 
-          build_bound_validators! options
+          options[:model] = model
+          options[:scope] = object_name
+          options[:local] = !remote
+          options[:skip_default_ids] = false
+          options[:allow_method_names_outside_object] = options.fetch(:allow_method_names_outside_object, false)
 
-          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)
+          form_with(**options, &block)
         end
 
-        def apply_form_for_options!(record, object, options)
-          super
+        def apply_csv_form_for_options!(record, object, options)
           options[:html][:validate] = true if options[:validate]
+          options[:html][:method] ||= options[:method]
+
+          if method(:apply_form_for_options!).arity == 2
+            apply_form_for_options! object, options
+          else
+            apply_form_for_options! record, object, options
+          end
         end
 
         def fields_for(record_name, record_object = nil, options = {}, &block)
           # Order matters here. Rails mutates the `options` object
-          output = super
+          builder = instantiate_builder(record_name, record_object, options)
+          output = capture(builder, &block)
 
           build_bound_validators! options
 
@@ -61,10 +68,10 @@ module ClientSideValidations
             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)
+            apply_csv_form_for_options!(record, object, options)
           end
 
-          [object, object_name]
+          [record, object_name]
         end
 
         def build_bound_validators!(options)
@@ -121,19 +128,8 @@ module ClientSideValidations
           end
         end
 
-        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 apply_csv_html_options!(html_options, options, builder)
-          html_options.delete :validate
+          html_options.delete 'validate'
 
           csv_options = {
             html_settings: builder.client_side_form_settings(options, self),

data/lib/client_side_validations/version.rb

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

data/lib/generators/templates/client_side_validations/initializer.rb

@@ -9,6 +9,9 @@
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
 #
+# Alternatively, for a cleaner approach, it is possible to set
+# `config.action_view.field_error_proc` in the application configuration
+#
 # Note: client_side_validation requires the error to be encapsulated within
 # <label for="#{instance.send(:tag_id)}" class="message"></label>
 #

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

@@ -17,17 +17,11 @@
   function _typeof(obj) {
     "@babel/helpers - typeof";
 
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+      return typeof obj;
+    } : function (obj) {
+      return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    }, _typeof(obj);
   }
 
   var ClientSideValidations = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 19.1.0
+  version: 20.0.2
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: js_regex
   requirement: !ruby/object:Gem::Requirement
@@ -133,22 +133,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +259,7 @@ homepage: https://github.com/DavyJonesLocker/client_side_validations
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/DavyJonesLocker/client_side_validations/issues
   changelog_uri: https://github.com/DavyJonesLocker/client_side_validations/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/DavyJonesLocker/client_side_validations