active_dry_form 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1617a05c5aafd73c384b8648854bb63ec91d0ee67bde7839fc3066f99405094
-  data.tar.gz: b38b427a933750e6ba71f8e8b7f73b961f016018e9d61937db5f4c20297debd7
+  metadata.gz: e4bd09fb7a62c1ed888ddb3abc634ec2b510e9a3be286e3313aa6e6fc58ebea3
+  data.tar.gz: b7a8c47ed543b855ebf8e5baa98206a923adbc54a605d84a836aecdaee5f12c4
 SHA512:
-  metadata.gz: d87bf0612c714715464887c085b8878fbc28a83c9229301afaaafaa513d214acb7e47b3f65e908439e5ccc6908f8dbc3ec5376c0b6386e8e4d3e275f7a11b2b8
-  data.tar.gz: '098529ead554b1a0182a31053e7476c7cef292b6301da279733727d916d5e4ed9417e9eb92ca3b2d7bca1a519138bc137dd5fbad9f3856b6914f548bd3730490'
+  metadata.gz: 011c0a880ae29f2d4084817552d0cc068c769c1e6cbcb3e9691688a65b67cccaca5d48b250249f1f3e7f0618308c23c33ee78209fbcf42db94023f650b7825ad
+  data.tar.gz: 14e4ccba512e7aa7867b1537f4ba136d9b108519ae3fb95472b6237d77b075762a35ce4caf96ec1df583855125a01fba2b620e302429da0dd80c55f888285c6e

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/corp-gp/rubocop-gp.git
-  revision: 867f7e1351c3730897cacdc20ce2d727604de245
+  revision: e5bd900ce4b10077cf8f4ae88a5a6e32e7861b65
   specs:
     rubocop-gp (0.0.4)
       rubocop
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_dry_form (1.2.1)
+    active_dry_form (1.4.0)
       actionpack
       activerecord
       dry-configurable
@@ -37,70 +37,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activesupport (7.2.2.1)
+    activesupport (7.1.3.4)
       base64
-      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
+      mutex_m
+      tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.5.0)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    dry-configurable (1.3.0)
-      dry-core (~> 1.1)
+    dry-configurable (1.2.0)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-core (1.1.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
-      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.2.0)
-    dry-initializer (3.2.0)
-    dry-logic (1.6.0)
-      bigdecimal
+    dry-inflector (1.1.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.1)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-monads (1.7.0)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.1)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.8.0)
+    dry-types (1.7.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -113,100 +107,98 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
-    erubi (1.13.1)
-    i18n (1.14.6)
+    erubi (1.13.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    logger (1.6.5)
-    loofah (2.24.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mini_portile2 (2.8.8)
-    minitest (5.25.4)
-    nokogiri (1.18.1)
-      mini_portile2 (~> 2.8.2)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.6.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.1)
-    rack (3.1.8)
-    rack-session (2.1.0)
-      base64 (>= 0.1.0)
+    racc (1.8.0)
+    rack (3.1.6)
+    rack-session (2.0.0)
       rack (>= 3.0.0)
-    rack-test (2.2.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+      nokogiri (~> 1.14)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.23.1)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.28.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.3.0)
+    rubocop-rspec (3.0.2)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
     sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
-    timeout (0.4.3)
+    strscan (3.1.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.3)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    useragent (0.16.11)
-    zeitwerk (2.6.18)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

data/lib/active_dry_form/base_form.rb

@@ -48,6 +48,10 @@ module ActiveDryForm
       attrs.each do |attr, v|
         next if !ActiveDryForm.config.strict_param_keys && !respond_to?(:"#{attr}=")
 
+        # Params for nested forms comes as a hash from frontend, convert them to array
+        # { '0' => { url: 'https://omniplatform.ru' }, '1' => { url: 'https://google.com' } } => [{ ... }, { ... }]
+        v = v.values if v.is_a?(Hash) && self.class::NESTED_FORM_ARRAYS.include?(attr.to_sym)
+
         public_send(:"#{attr}=", v)
       end
     end
@@ -98,19 +102,12 @@ module ActiveDryForm
       self
     end
 
-    def to_key
-      key = id
-      [key] if key
-    end
-
-    # hidden field for nested association
-    def id
-      record&.id
-    end
+    delegate :to_key, :id, to: :record, allow_nil: true
 
     # используется при генерации URL, когда record.persisted?
     def to_param
-      id.to_s
+      # подмодель может быть Hash, например сохраняется в json атрибут
+      record.is_a?(Hash) ? '' : record.to_param
     end
 
     def validate
@@ -150,6 +147,7 @@ module ActiveDryForm
 
     def self.define_methods
       const_set :NESTED_FORM_KEYS, []
+      const_set :NESTED_FORM_ARRAYS, Set.new
 
       self::FIELDS_INFO[:properties].each do |key, value|
         define_method :"#{key}=" do |v|
@@ -175,6 +173,9 @@ module ActiveDryForm
             namespace: key,
             is_array:  value[:type] == 'array',
           }
+          if value[:type] == 'array'
+            self::NESTED_FORM_ARRAYS << key.to_sym
+          end
           nested_key = key
         end
 

data/lib/active_dry_form/builder.rb

@@ -81,13 +81,9 @@ module ActiveDryForm
       if association.is_a?(BaseForm)
         fields_for_nested_model("#{@object_name}[#{association_name}]", association, fields_options, block)
       elsif association.respond_to?(:to_ary)
-        field_name_regexp = Regexp.new(Regexp.escape("#{@object_name}[#{association_name}][") << '\d+\]') # хак для замены хеша на массив
-        output = ActiveSupport::SafeBuffer.new
-        Array.wrap(association).each do |child|
-          output << fields_for_nested_model("#{@object_name}[#{association_name}][]", child, fields_options, block)
-            .gsub(field_name_regexp, "#{@object_name}[#{association_name}][]").html_safe
+        Array.wrap(association).each_with_index.reduce(ActiveSupport::SafeBuffer.new) do |output, (child, i)|
+          output << fields_for_nested_model("#{@object_name}[#{association_name}][#{i}]", child, fields_options, block)
         end
-        output
       end
     end
 

data/lib/active_dry_form/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveDryForm
 
-  VERSION = '1.2.1'
+  VERSION = '1.4.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_dry_form
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ermolaev Andrey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Form validation for Rails with Dry-Validation