paramore 3.9.2 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ecad97758f06ed4c9666cc21dff1f109c96f99af568dc748909bc860d98e342
-  data.tar.gz: 8391f84447ff31b61a715fda75ea51da38055d36d33ea8326627d0414a738e4b
+  metadata.gz: b1e0c787e647893bfc2aff716c26dc1451de26f947e372106e1888776926e22d
+  data.tar.gz: 79a9c035350ec1519c5a1ca546fbaca6c30c97047f101fc94bbdd4eccf1cf593
 SHA512:
-  metadata.gz: d67a468476d57a80b2f0961ec02343b518cc01f3c5f2a68ebd46aafc41279ec7ed07d75c466e4a3a4e5e5e633637bee92cecea215d412defd91852346b7c426a
-  data.tar.gz: b4ad88a4893c0365e2e805cbfac035ae26566c96fcddf86a4361931906c57bb4d9f98cbd6f8b412faa601da091222b9cfd1dfd3004b2326886413059ced5cd78
+  metadata.gz: 63fa1693e3a7031ed28af6c9eb0d7f960cd1f42562325e4f5bef6e38bb4231f1708b9923872f5d1cb36de17a2cdff2a2556bba850f6d62ceacde007f418bd82c
+  data.tar.gz: ac1f5eff659d7bbcfb0a723ea4d5a216486e805744aef060780e8d799ac1c859e3111bd0e8b9a52cd71388a7594fe396598ed70c2f28f7eff9135dc4017ab03c

data/lib/paramore/cast_parameters.rb

@@ -15,81 +15,85 @@ module Paramore
     end
 
     def run
-      cast(root_field, data, 'data')
+      cast(root_field, data, 'root')
     end
 
-    def cast(field, value, name = nil)
+    def cast(field, value, key, namespace = nil)
+      full_name = [namespace, key].compact.join('.')
+
       if value.nil?
-        if field.nullable? || field.default?
-          return field.default
-        else
-          raise Paramore::NilParameter, name
-        end
+        return field.default if field.nullable? || field.default?
+
+        raise Paramore::NilParameter, full_name
       elsif value == ''
-        if field.allow_empty?
-          return typecast_value(field.type, '', name)
-        elsif field.default?
-          return field.default
-        elsif field.nullable?
-          return
-        else
-          raise Paramore::NilParameter, name
-        end
+        return typecast_value(field.type, '', key, full_name) if field.allow_empty?
+        return field.default if field.default?
+        return if field.nullable?
+
+        raise Paramore::NilParameter, full_name
       end
 
       case field.type
       when Hash
-        typecast_hash(field, value || {}, name)
+        typecast_hash(field, value || {}, key, full_name)
       when Array
-        typecast_array(field, value, name)
+        typecast_array(field, value, key, full_name)
       else
-        typecast_value(field.type, value, name)
+        typecast_value(field.type, value, key, full_name)
       end
     end
 
-    def typecast_hash(field, hash, name)
-      raise Paramore::HashExpected.new(name, hash) unless hash.is_a?(Hash)
+    def typecast_hash(field, hash, key, full_name)
+      raise Paramore::HashExpected.new(full_name, hash) unless hash.is_a?(Hash)
 
       result =
         if field.wildly_keyed_hash?
-          value_field = field.type.values.first
-          key_type = field.type.keys.first
-          hash.to_h do |name, value|
-            [typecast_value(key_type, name, nil), cast(value_field, value, name)]
+          [field.type.values.first, field.type.keys.first].then do |value_field, key_type|
+            hash.to_h do |inner_key, value|
+              [
+                typecast_value(key_type, inner_key, nil, nil),
+                cast(value_field, value, inner_key, full_name)
+              ]
+            end
           end
         else
           if options[:no_extra_keys]
             extra = hash.keys - field.type.keys
-            raise "Found extra keys in `#{name}`: #{extra}!" if extra.size > 0
+            raise "Found extra keys in `#{full_name}`: #{extra}!" if extra.any?
           end
 
           field
             .type
-            .reject { |name, value_field| missing_and_optional?(hash, name, value_field) }
-            .to_h { |name, value_field| [name, cast(value_field, hash[name], name)] }
+            .reject { |inner_key, value_field| missing_and_optional?(hash, inner_key, value_field) }
+            .to_h do |inner_key, value_field|
+              [
+                inner_key,
+                cast(value_field, hash[inner_key], inner_key, full_name)
+              ]
+            end
         end
 
       field.compact? ? result.compact : result
     end
 
-    def typecast_array(field, array, name)
-      raise Paramore::ArrayExpected.new(name, array) unless array.is_a?(Array)
+    def typecast_array(field, array, key, full_name)
+      raise Paramore::ArrayExpected.new(full_name, array) unless array.is_a?(Array)
 
       result = array
         .reject { |unit| unit.to_s == '' && field.compact? }
-        .map { |unit| cast(Paramore.field(field.type.first, null: true), unit) }
+        .map { |unit| cast(Paramore.field(field.type.first, null: true), unit, nil, full_name) }
 
       field.compact? ? result.compact : result
     end
 
-    def typecast_value(type, value, name)
+    def typecast_value(type, value, key, full_name)
       type.send(Paramore.configuration.type_method_name, value)
     rescue StandardError => e
-      raise "The field `#{name}` raised \"#{e}\"!"
+      raise "The field `#{full_name}` raised \"#{e}\"!"
     end
 
-    def missing_and_optional?(hash, name, field)
-      !hash.key?(name) && !field.required?
+    def missing_and_optional?(hash, key, field)
+      !hash.key?(key) && !field.required?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paramore
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.9.3
 platform: ruby
 authors:
 - Lukas Kairevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -115,7 +115,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |
-  Thank you for installing Paramore 3.9.2 !
+  Thank you for installing Paramore 3.9.3 !
   From the command line you can run `paramore` to generate a configuration file
 
   More details here         : https://github.com/lumzdas/paramore/blob/master/README.md