paramore 3.1.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb73686fb48a297c559c211476f565f8aba18a2e93a10936b75cacd4eab2bcb2
-  data.tar.gz: df12fd5715e1c4e3851a1ed2f9748f24cccec9d9ccc817c7b6ba74960370f426
+  metadata.gz: 6340acf8c31895cbe076513a9523e161e9017f2941fd69740000c274233273fc
+  data.tar.gz: 2c0cc6707f1876fb01cf75bcc2f5ce9f1e9e8480148523bcf5a45ebb3a4e64c3
 SHA512:
-  metadata.gz: 5d7f2e6f52065f18ebb5b7d51577950ceb234db5f5a21fd3a20fdb987066c451da22beda1bc86a4101ad9bfaf4ccf195a38b1281b02c92c4d8cc2d1fa6602958
-  data.tar.gz: b5dd8ae054488a628c580924cfdfb0355ef063a43eb7e46fe249ae9ecad62a4a80d5603b4eed182d1b69c1d691926c97165c605b11d05eec4b5ed66efbc3cac3
+  metadata.gz: 8d310cb628671876e4dc707f57e24aa79e11dd08da615ae1f8205aac3fd80de1c77243f7fa765ec4168464b9710bc97110c3835775de9ed5b42a09b10bcf6191
+  data.tar.gz: cbfd5ffa27d01ad661f48d4bc8bf0d23288426ae14a73cd565c99ee8c8d0b9b2f64a4b57cbdadcabda0848ab227da951927fe75126200e347aa11abed7c55e5b

data/lib/paramore/cast_parameters.rb

@@ -9,7 +9,7 @@ module Paramore
 
     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
@@ -18,16 +18,24 @@ 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.to_h { |name, field| [name, cast(field, hash[name], name)] }
+      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)

data/lib/paramore/extension.rb

@@ -8,6 +8,10 @@ module Paramore
       default
     ].freeze
 
+    def field(*args)
+      Paramore.field(*args)
+    end
+
     def param_schema(accessor_name, parameter_configuration)
       unless parameter_configuration.keys.size == 1
         raise ArgumentError,

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.1
+  version: 3.5.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.1 !
+  Thank you for installing Paramore 3.5.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