paramore 3.9.3 → 3.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e0c787e647893bfc2aff716c26dc1451de26f947e372106e1888776926e22d
-  data.tar.gz: 79a9c035350ec1519c5a1ca546fbaca6c30c97047f101fc94bbdd4eccf1cf593
+  metadata.gz: '048043c9ea2f99c0f8233046a6afb9f6710610a5e1bb691f0f4e8e03479e0b20'
+  data.tar.gz: 605bc5998bc57401f3b39db585cae073b39254dd11c8cefa98a3ad53b029dc38
 SHA512:
-  metadata.gz: 63fa1693e3a7031ed28af6c9eb0d7f960cd1f42562325e4f5bef6e38bb4231f1708b9923872f5d1cb36de17a2cdff2a2556bba850f6d62ceacde007f418bd82c
-  data.tar.gz: ac1f5eff659d7bbcfb0a723ea4d5a216486e805744aef060780e8d799ac1c859e3111bd0e8b9a52cd71388a7594fe396598ed70c2f28f7eff9135dc4017ab03c
+  metadata.gz: 78715e9f134b17502cc9eacac1c6d597cc2e29f4550f223ff2c80eb41a0e50f8e0968830c1542301fb4867a9b0cc89a2dac2e87e16a0fd55b2b5df6e1a70b1f7
+  data.tar.gz: bd0ebc180f12c23d3e02860d8f5fbafa9215d3091a08c7fa44b3c92655a1289ee1a8235cd11940bab3a80379b3b87e45bd4f4208b596b9708a541b6120e503e9

data/lib/paramore/cast_parameters.rb

@@ -15,18 +15,18 @@ module Paramore
     end
 
     def run
-      cast(root_field, data, 'root')
+      cast(root_field, data, nil)
     end
 
     def cast(field, value, key, namespace = nil)
-      full_name = [namespace, key].compact.join('.')
+      full_name = [namespace, key].select(&:present?).join('.')
 
       if value.nil?
         return field.default if field.nullable? || field.default?
 
         raise Paramore::NilParameter, full_name
       elsif value == ''
-        return typecast_value(field.type, '', key, full_name) if field.allow_empty?
+        return typecast_value(field.type, '', full_name) if field.allow_empty?
         return field.default if field.default?
         return if field.nullable?
 
@@ -35,61 +35,68 @@ module Paramore
 
       case field.type
       when Hash
-        typecast_hash(field, value || {}, key, full_name)
+        typecast_hash(field, value || {}, full_name)
       when Array
-        typecast_array(field, value, key, full_name)
+        typecast_array(field, value, full_name)
       else
-        typecast_value(field.type, value, key, full_name)
+        typecast_value(field.type, value, full_name)
       end
     end
 
-    def typecast_hash(field, hash, key, full_name)
+    def typecast_hash(field, hash, full_name)
       raise Paramore::HashExpected.new(full_name, hash) unless hash.is_a?(Hash)
 
       result =
         if field.wildly_keyed_hash?
-          [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
+          cast_wild_hash(field, hash, full_name)
         else
-          if options[:no_extra_keys]
-            extra = hash.keys - field.type.keys
-            raise "Found extra keys in `#{full_name}`: #{extra}!" if extra.any?
-          end
-
-          field
-            .type
-            .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
+          cast_regular_hash(field, hash, full_name)
         end
 
       field.compact? ? result.compact : result
     end
 
-    def typecast_array(field, array, key, full_name)
+    def typecast_array(field, array, full_name)
       raise Paramore::ArrayExpected.new(full_name, array) unless array.is_a?(Array)
 
-      result = array
+      result =
+        array
         .reject { |unit| unit.to_s == '' && field.compact? }
         .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, key, full_name)
+    def typecast_value(type, value, full_name)
       type.send(Paramore.configuration.type_method_name, value)
     rescue StandardError => e
-      raise "The field `#{full_name}` raised \"#{e}\"!"
+      raise "Tried casting #{Paramore::ErrorFieldName(full_name)}, but \"#{e}\" was raised!"
+    end
+
+    def cast_wild_hash(field, hash, full_name)
+      value_field = field.type.values.first
+      key_type = field.type.keys.first
+
+      hash.to_h do |inner_key, value|
+        [
+          typecast_value(key_type, inner_key, nil),
+          cast(value_field, value, inner_key, full_name)
+        ]
+      end
+    end
+
+    def cast_regular_hash(field, hash, full_name)
+      if options[:no_extra_keys]
+        extra = hash.keys - field.type.keys
+        raise "Found extra keys in #{Paramore::ErrorFieldName(full_name)}: #{extra}!" if extra.any?
+      end
+
+      field
+        .type
+        .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
 
     def missing_and_optional?(hash, key, field)

data/lib/paramore/errors.rb

@@ -1,24 +1,24 @@
 class Paramore::NilParameter < StandardError
   def initialize(param_name)
-    super("Received a nil `#{param_name}`, but it's type is non nullable!")
+    super("Received a nil #{Paramore::ErrorFieldName(param_name)}, but its type is non nullable!")
   end
 end
 
 class Paramore::NonField < StandardError
   def initialize(param_name, type)
-    super("`#{param_name}` defined as a `#{type.class}`, expected a call of `Paramore.field()`! Perhaps you declared a plain hash instead of Paramore.field({})?")
+    super("#{Paramore::ErrorFieldName(param_name)} defined as a `#{type.class}`, expected a call of `Paramore.field()`! Perhaps you declared a plain hash instead of Paramore.field({})?")
   end
 end
 
 class Paramore::HashExpected < StandardError
   def initialize(param_name, param)
-    super("Expected `#{param_name}` to be a hash, received #{param.class} instead!")
+    super("Expected #{Paramore::ErrorFieldName(param_name)} to be a hash, received #{param.class} instead!")
   end
 end
 
 class Paramore::ArrayExpected < StandardError
   def initialize(param_name, param)
-    super("Expected `#{param_name}` to be an array, received #{param.class} instead!")
+    super("Expected #{Paramore::ErrorFieldName(param_name)} to be an array, received #{param.class} instead!")
   end
 end
 
@@ -27,3 +27,7 @@ class Paramore::HashTooWild < StandardError
     super("A hash field with a type as key may not contain any more entries! (so, eg.: { String => field } is ok, but { String => field, user_id: field } is not)")
   end
 end
+
+def Paramore::ErrorFieldName(name)
+  name.present? ? "`#{name}`" : 'root field'
+end

data/lib/paramore/types.rb

@@ -1,7 +1,14 @@
 module Paramore
+  module TypeRegexes
+    INTEGER_REGEX = /^-{0,1}\d+$/
+    FLOAT_REGEX = /^-{0,1}\d+(\.\d*){0,1}$/
+  end
+
   module BigDecimal
     module_function
     def [](input)
+      raise ArgumentError "#{input} is not a BigDecimal!" unless input.to_s.match?(TypeRegexes::FLOAT_REGEX)
+
       BigDecimal(input)
     end
   end
@@ -18,7 +25,7 @@ module Paramore
   module Float
     module_function
     def [](input)
-      raise ArgumentError "#{input} is not a float!" unless input.to_s.match?(/-{0,1}\d*(\.\d*){0,1}/)
+      raise ArgumentError "#{input} is not a Float!" unless input.to_s.match?(TypeRegexes::FLOAT_REGEX)
 
       input.to_f
     end
@@ -27,7 +34,7 @@ module Paramore
   module Int
     module_function
     def [](input)
-      raise ArgumentError, "#{input} is not an integer!" unless input.to_s.match?(/^-{0,1}\d*$/)
+      raise ArgumentError, "#{input} is not an Integer!" unless input.to_s.match?(TypeRegexes::INTEGER_REGEX)
 
       input.to_i
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paramore
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 3.9.4
 platform: ruby
 authors:
 - Lukas Kairevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-17 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.3 !
+  Thank you for installing Paramore 3.9.4 !
   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