paramore 3.1.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a617acfe047478a8c2082a94ad5151d3701bcc3ba964f1ccb0269242583e7c0
-  data.tar.gz: ec1c58dd29e93bd0c931d6b9d422c3333888c112a4d6726f7e4833d7f7b90f8f
+  metadata.gz: 8e8663a895e1498608035c7717e8a881617d1ba889e67e6115472117717963fc
+  data.tar.gz: 3e6b5675baeae13d31abee6f1ed4b77261ed233be87e42a5277ce803f5801c0e
 SHA512:
-  metadata.gz: f451b20d3078e38ffd716c8d186206a72e63287eb98a8c2a5832f9e8ced549371b90faf57450e97eb38d31b002f96ea6948af0b61612273624317028ac7fe720
-  data.tar.gz: 47b62333f92a8f925e2f8d6319a0c23baefa6e97840fc57634323824a05023d651798025981f4ab81764b646a86eaefc21b006ea627b3faba0ea6bd6eee2a451
+  metadata.gz: b51afaf562c8671afadd367cdb9388d50b77939d5aaf939cc54f3b00e0046ee8ff218a54c04e29db3979edfb46635a2fb387643dc726c61c513a658c821c9a2a
+  data.tar.gz: 24528d33bbb924bfb1c75f7ee24a9c0853ae0c6af357695df0a3e29771a2e6084df26a4259e494d548bac1e26c781b862a5d0b4e1df9a480cdeb515d3e1ceaeb

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
@@ -28,24 +18,32 @@ module Paramore
 
       case field.type
       when Hash
-        typecast_hash(field.type, value || {})
+        typecast_hash(field, value || {})
       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
+      result = field
+        .type
+        .reject { |name, inner_field| !hash.key?(name) && !inner_field.required? }
+        .to_h { |name, inner_field| [name, cast(inner_field, hash[name], name)] }
+      field.compact? ? result.compact : result
     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,33 @@ module Paramore
       null: false,
       compact: false,
       default: nil,
+      empty: true,
+      required: true,
     }.freeze
 
-    def initialize(given_type, null:, compact:, default:)
+    def initialize(given_type, null:, compact:, default:, empty:, required:)
       @given_type = given_type
       @nullable = null
       @compact = compact
+      @allow_empty = empty
       @default = default
+      @required = required
+    end
+
+    def required?
+      @required
+    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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paramore
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Lukas Kairevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 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.1.0 !
+  Thank you for installing Paramore 3.4.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
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A declarative approach to Rails' strong parameter typing and sanitizing