paramore 3.8.0 → 3.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bb9a50f6bb63dc53c88d85e39689b00ef649e0a025cef6819499b38eceed03
-  data.tar.gz: f2b156953e944825ebf6f4a9952b777ad35bbda553354d9ffcb9dcc0cfc6d6b6
+  metadata.gz: 0cc67c79a09ee03ca89162f574ff3b6fda2b24bedc6e3a20ec5c0e780e9999c1
+  data.tar.gz: 24895561218cf93fb309b31c40b370ddd0cd0899986342d0b1d847f11459525f
 SHA512:
-  metadata.gz: 7c587bfe07b88eaa6fa15cfba9b901feaa39c19b95a37f0c930b4074e38c0f8b8321b08a25e25dcf57df7e73b53a3b9d76eaf4a61861d7d9c6f2afa710a6832f
-  data.tar.gz: 6cded21a8fd8dad5ef7a0b26fc9faed8b9ac046a3a46ee85ac5f950ccb406a500a5c66fce564956978a12f11a02c7ad1148fdeb3a9a09097fe931dcdf8d85221
+  metadata.gz: 28cf57ff69601f5a351a817b104111595bf1fb7a05cefa14066701710c389b7dfef68c07098f88865e2aa0db358ce4987c9a71aa9b76553f9fcd9817f851c1d2
+  data.tar.gz: 0ce7299a531ee49b3695c542873932326561bb8ae6b7af812071b41f1ac45ef11e89e3004c5a628005afdc9e3884c47d5b632656b889b4e6a6bcbc20dc761a5c

data/lib/paramore/cast_parameters.rb

@@ -14,6 +14,16 @@ module Paramore
         else
           raise Paramore::NilParameter, name
         end
+      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
       end
 
       case field.type
@@ -22,11 +32,7 @@ module Paramore
       when Array
         typecast_array(field, value, name)
       else
-        if value == '' && !field.allow_empty? && field.nullable?
-          field.default? ? field.default : nil
-        else
-          typecast_value(field.type, value, name)
-        end
+        typecast_value(field.type, value, name)
       end
     end
 

data/lib/paramore/extension.rb

@@ -30,20 +30,33 @@ module Paramore
       define_method(accessor_name) do |rails_parameters = params|
         return instance_variable_get("@#{accessor_name}") if instance_variable_defined?("@#{accessor_name}")
 
-        if rails_parameters[required_parameter_name].nil? && types_definition.default
+        if rails_parameters[required_parameter_name].nil? && types_definition.default?
           instance_variable_set("@#{accessor_name}", types_definition.default)
           return instance_variable_get("@#{accessor_name}")
         end
 
-        permitted_params = rails_parameters
-          .require(required_parameter_name)
-          .permit(permitted_parameter_argument)
+        required_params = rails_parameters.require(required_parameter_name)
+        should_permit = permitted_parameter_argument.any? && required_params.is_a?(ActionController::Parameters)
+
+        permitted_params =
+          if should_permit
+            required_params.permit(permitted_parameter_argument)
+          else
+            required_params
+          end
 
         parameter_values =
           if types_definition.is_a?(Paramore::Field)
-            permitted_params.merge(
-              Paramore::CastParameters.run(types_definition, permitted_params.to_hash.with_indifferent_access)
-            ).permit!
+            if should_permit
+              permitted_params.merge(
+                Paramore::CastParameters.run(
+                  types_definition,
+                  permitted_params.to_hash.with_indifferent_access
+                )
+              ).permit!
+            else
+              Paramore::CastParameters.run(types_definition, permitted_params)
+            end
           else
             permitted_params.permit!
           end

metadata

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