easy_params 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a19f19d20a42ef6a6ba3e606298c3dbf696a22c9dcdc9e42a8ffe48e1e67db
-  data.tar.gz: fce70967d59989d5e650289483d5437f4ebb80793d49b3a446d252796017117c
+  metadata.gz: 38358431f3a00f55f6a46aaa72941c1cbe0fe5f81d6a2fd898a019e09c2cf069
+  data.tar.gz: 218c09133f6cc7220545fe2fbdf34deefc8a6ab4941d6ef9e729d264f6ecca93
 SHA512:
-  metadata.gz: 3f690f1a17df11da94e8f707c99f97854aec48ca890320c0345159286c4e10ac19448a5b3a6557936c6076b4bf4e886cd51841ef394b3a205c91626a680b598f
-  data.tar.gz: c43521492ce73961d7ff7fb562ba7b8ba944f03c928a8c68298f8f6f168c21ab698d4acdf3fe2dd073296bec99418cf14adffd8446cc751541b32136b452e972
+  metadata.gz: 8674d76046f76b6ce08e0e1a7c2a1d8c12f55bf549b4ea580fcfcf1b6a5b50cda6caa6621b684fd94a41a8bad3a25044de5ea2b8b2f68e7496e6dec00e86d3ea
+  data.tar.gz: 268b513fff84704447102ee24f1cfef76e271c73a7ab7379eef1fc1093307c69d462d0679eb387d85bc90031e588d399b53ba2c233c94829e335efe4abf7eee6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_params (0.3.0)
+    easy_params (0.3.1)
       activemodel (>= 3.2, < 8)
       dry-struct (~> 1.4)
       dry-types (~> 1.5)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/README.md

@@ -51,10 +51,10 @@ end
 Validation messages for nested attributes will look like this.
 ```ruby
 {
-  :"sections/0/id"=>an_instance_of(Array),
-  :"sections/0/post/id"=>an_instance_of(Array),
-  :"post/id"=>an_instance_of(Array),
-  :"post/sections/0/id"=>an_instance_of(Array)
+  :"sections[0].id"=>an_instance_of(Array),
+  :"sections[0].post.id"=>an_instance_of(Array),
+  :"post.id"=>an_instance_of(Array),
+  :"post.sections[0].id"=>an_instance_of(Array)
  }
 ```
 Optionally you can use more compact form

data/lib/easy_params/base.rb

@@ -22,44 +22,45 @@ module EasyParams
     private
 
     def validate_nested
-      attributes.each(&run_nested_validations)
+      attributes.each do |_, value|
+        case value
+        when *EasyParams::Types::ARRAY_OF_STRUCTS_TYPES_LIST
+          value.each(&:valid?)
+        when *EasyParams::Types::STRUCT_TYPES_LIST
+          value.valid?
+        end
+      end
+      attributes.each(&aggregate_nested_errors)
     end
 
-    def run_nested_validations
+    def aggregate_nested_errors
       proc do |attr_name, value, array_index, error_key_prefix|
         case value
-        when Array
+        when *EasyParams::Types::ARRAY_OF_STRUCTS_TYPES_LIST
           value.each.with_index do |element, i|
-            run_nested_validations[attr_name, element, i, error_key_prefix]
+            aggregate_nested_errors[attr_name, element, "[#{i}]", error_key_prefix]
           end
-        when self.class.struct
-          handle_struct_validation(value, error_key_prefix, attr_name, array_index)
+        when *EasyParams::Types::STRUCT_TYPES_LIST
+          handle_nested_errors(value, error_key_prefix, attr_name, array_index)
         end
       end
     end
 
-    def handle_struct_validation(value, error_key_prefix, attr_name, array_index)
-      if value.invalid?
-        error_key_components = [error_key_prefix, attr_name, array_index]
-        attr_error_key_prefix = error_key_components.compact.join('/')
-        add_errors_on_top_level(value, attr_error_key_prefix)
-      end
-      value.attributes.each do |nested_attr_name, nested_value|
-        run_nested_validations[nested_attr_name, nested_value, nil, attr_error_key_prefix]
-      end
+    def handle_nested_errors(value, error_key_prefix, attr_name, array_index)
+      return if value.errors.blank?
+
+      error_key_components = [error_key_prefix, attr_name, array_index]
+      attr_error_key_prefix = error_key_components.compact.join('.').gsub(/\.\[(\d+)\]/, '[\1]')
+      add_errors_on_top_level(value, attr_error_key_prefix)
     end
 
     if defined? ActiveModel::Error
       def add_errors_on_top_level(value, attr_error_key_prefix)
-        value.errors.each do |error|
-          next unless error.options[:message]
-
-          errors.add("#{attr_error_key_prefix}/#{error.attribute}", error.options[:message])
-        end
+        value.errors.each { |error| errors.add("#{attr_error_key_prefix}.#{error.attribute}", error.message) }
       end
     else
       def add_errors_on_top_level(value, attr_error_key_prefix)
-        value.errors.each { |key, message| errors.add("#{attr_error_key_prefix}/#{key}", message) }
+        value.errors.each { |key, message| errors.add("#{attr_error_key_prefix}.#{key}", message) }
       end
     end
   end

data/lib/easy_params/types.rb

@@ -9,9 +9,12 @@ module EasyParams
     Float     = Dry::Types['params.float'].optional.meta(omittable: true).default(nil)
     Bool      = Dry::Types['strict.bool'].optional.meta(omittable: true).default(nil)
     String    = Dry::Types['string'].optional.meta(omittable: true).default(nil)
-    Array     = Dry::Types['array'].of(Struct).meta(omittable: true).default([])
+    Array     = Dry::Types['array'].meta(omittable: true).default([])
     Date      = Dry::Types['params.date'].optional.meta(omittable: true).default(nil)
     DateTime  = Dry::Types['params.date_time'].optional.meta(omittable: true).default(nil)
     Time      = Dry::Types['params.time'].optional.meta(omittable: true).default(nil)
+
+    STRUCT_TYPES_LIST = [Struct, StructDSL].freeze
+    ARRAY_OF_STRUCTS_TYPES_LIST = [Array.of(Struct), Array.of(StructDSL)].freeze
   end
 end

data/lib/easy_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasyParams
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_params
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrii Baran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel