paramore 3.0.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6231e51cfe1acb4969ec05739c8386d6c772d5df241dee728fa2428e6bfc2a
-  data.tar.gz: 7bc786c9b1a163b1bcc6774c8a709d68e80b36cca3c69c6d501f98084d6538e9
+  metadata.gz: 58abb01856e9f20f59b4bf4608e8c5444973970ac6845b96b7c12c117a0596bc
+  data.tar.gz: 5ed6febf9385fe094736e3e2f8b29dd8a0db845a1e3837474daf64f2a06c7bc7
 SHA512:
-  metadata.gz: 1665184eba554c3216a5d8185535695dcfbb9e5ce5a38559acac184130ee4f7787065ac72445c258873a7479ac1c2ecaab34f6a68b65f607da6b96542a317a0c
-  data.tar.gz: 834d1432f9958709891ccd285280d4dd7f21caab56c1aa7d88d5178a4ef7745d0c5340553d346fbd32d4f17a6d525fd3e872c399640820940ef8830fca34ec99
+  metadata.gz: f21c1603f15ac94639370a7fdeaa8bbaac55c0b56e5693409ebf404272bf03df1bcbae1799888728d72b15aaf25e7c1384ab34190c38fe9c9de8de7fb2e36c85
+  data.tar.gz: d064f814eeccc3692a8cf7ed5502096c47657ce30b4d12300f9d57b3cf31a58724b6e576098e30a9d40a13e44793c7544006e1ead13eaef0dcf83d6b1ed053d8

data/lib/paramore/cast_parameters.rb

@@ -4,22 +4,12 @@ module Paramore
   module CastParameters
     module_function
     def run(field, data)
-      recursive_merge(cast(field, data, 'data'))
-    end
-
-    def recursive_merge(nested_hash_array)
-      nested_hash_array.reduce(:merge).map do |name, value|
-        if value.is_a?(Array) && value.all? { |_value| _value.is_a?(Hash) }
-          { name => recursive_merge(value) }
-        else
-          { name => value }
-        end
-      end.reduce(:merge)
+      cast(field, data, 'data')
     end
 
     def cast(field, value, name = nil)
       if value.nil?
-        if field.nullable? || field.default
+        if field.nullable? || field.default?
           return field.default
         else
           raise Paramore::NilParameter, name
@@ -32,20 +22,24 @@ module Paramore
       when Array
         typecast_array(field, value)
       else
-        typecast_value(field.type, value)
+        if value == '' && !field.allow_empty? && field.nullable?
+          nil
+        else
+          typecast_value(field.type, value)
+        end
       end
     end
 
     def typecast_hash(field, hash)
-      field.map do |name, field|
-        { name => cast(field, hash[name], name) }
-      end
+      field.to_h { |name, field| [name, cast(field, hash[name], name)] }
     end
 
     def typecast_array(field, array)
       array
         .reject { |unit| unit.to_s == '' && field.compact? }
-        .map { |unit| typecast_value(field.type.first, unit) }
+        .map do |unit|
+          cast(Paramore.field(field.type.first, null: true), unit)
+        end
     end
 
     def typecast_value(type, value)

data/lib/paramore/field.rb

@@ -4,17 +4,27 @@ module Paramore
       null: false,
       compact: false,
       default: nil,
+      empty: true,
     }.freeze
 
-    def initialize(given_type, null:, compact:, default:)
+    def initialize(given_type, null:, compact:, default:, empty:)
       @given_type = given_type
       @nullable = null
       @compact = compact
+      @allow_empty = empty
       @default = default
     end
 
+    def allow_empty?
+      @allow_empty
+    end
+
+    def default?
+      !@default.nil?
+    end
+
     def default
-      @default
+      @default.is_a?(Proc) ? @default.call : @default
     end
 
     def compact?

data/lib/paramore/validate.rb

@@ -10,6 +10,8 @@ module Paramore
             "`#{Paramore.configuration.type_method_name}`!"
         end
       end
+
+      root_field
     end
 
     def types(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paramore
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Lukas Kairevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -101,7 +101,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |
-  Thank you for installing Paramore 3.0.0 !
+  Thank you for installing Paramore 3.3.0 !
   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