client_side_validations 19.1.1 → 20.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976902dc549fbeaa2a7d127fe814715f51588643335720ff8b5dc36336c22e55
-  data.tar.gz: 2cb0ad62989f559f67a2671f4261365fb794383cb06b09abde9f27af1f57d9b3
+  metadata.gz: 8d053793972cfeadf6eb418493b6290913f624536d45fd289e8186f6ed337906
+  data.tar.gz: 783525ab3929c02a6c3ac3af8a3fc5d0c5d549e7513fe46c56a4be8d320244e0
 SHA512:
-  metadata.gz: 56615d4a1fa647510bee9bf85861baa49117fb9e1775e29928b0d44971e6ee7180e6e3918c0f1cd9324b26a7d168eecbb4846f5eafcdf8cc549240537c09bb2d
-  data.tar.gz: bdd57bb1c3cd65be7d04bf07a50d1fde2b5646d30dc85d8bef30b19a8d1ad9b99742291e5dae0837b1637c12da3fabe960681137e25dc3cecebb2e1c41d77e86
+  metadata.gz: 1e9f42f6a856f7ee3487ae38b552a881e7fca16fada4e11cb4027067fa0956c7c4623eb571bc0b6da6e69a0eb001b88f847ff1e0e268010cba9f7169d47ce3eb
+  data.tar.gz: c08fca1ba13d7bcc86e924d195950f1f05c52ba06defcb51ed287bffdd0b58a93db27734dbb61f8308c3393d2dc773146a2130388043736cebac725bbacbd312

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 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

data/README.md

@@ -2,14 +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)
 [![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 ##
 

data/lib/client_side_validations/action_view/form_builder.rb

@@ -22,7 +22,7 @@ module ClientSideValidations
         end
 
         def initialize(object_name, object, template, options)
-          super(object_name, object, template, options)
+          super
           @options[:validators] = { object => {} }
         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,42 +69,42 @@ 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

data/lib/client_side_validations/action_view/form_helper.rb

@@ -15,35 +15,41 @@ 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]
+
+          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 +67,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 +127,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.1'
+  VERSION = '20.0.0'
 end

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.1
+  version: 20.0.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-16 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