paramore 3.8.1 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb9cb65dc81c466a739cc7a64b97c0a4cefcc34e3307b045344146b03311538e
-  data.tar.gz: 8705b38d4a047d8fd8bde08f3109419452f752a404a076a90fc4a53fcef3eee8
+  metadata.gz: 851431003d956d84bd81e2906e91bf7214dec4e545837ecb993da871b7b3d2db
+  data.tar.gz: f58885155ee86529b7e6fe70e3e02b930a4a20c2e47f3c33a46ca82a3809a781
 SHA512:
-  metadata.gz: d881d9275da96cbb82100c3e2b3e3928631e2255068950c1d6f7fcddaf5bf01c96eee0d75781a27c2253200551a9c75d9497c420ab653ce1ae28738f3aa83a29
-  data.tar.gz: 62ce73d067d64d61e244295b03cd93385e4235d85066cb57652946b70e6df28ed2f310f0f5d5c4a5ba53c980cc706677d49ed6516bad93f183e36f6b1ffef162
+  metadata.gz: ff41680f998907900897575c33276aa6c11e1027124b7844851996f6969edcac24904b0bc641a55379d47a66ccbab36b0319461b5cd408d570dafe31ae445007
+  data.tar.gz: 1184372ed73019ab06d2ad0c27937e42bfcc9c474d7c54abb784a2cd1f7630fc957eb052810d557f7c62699f03cbd49a12be3a21a7ff2ebe25e35df35c49172b

data/lib/paramore/cast_parameters.rb

@@ -1,10 +1,21 @@
 require_relative 'errors'
 
 module Paramore
-  module CastParameters
-    module_function
-    def run(field, data)
-      cast(field, data, 'data')
+  class CastParameters
+    attr_accessor :root_field, :data, :options
+
+    def initialize(field, data, options)
+      @root_field = field
+      @data = data
+      @options = options
+    end
+
+    def self.run(field, data, options = {})
+      new(field, data, options).run
+    end
+
+    def run
+      cast(root_field, data, 'data')
     end
 
     def cast(field, value, name = nil)
@@ -14,6 +25,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,17 +43,7 @@ module Paramore
       when Array
         typecast_array(field, value, name)
       else
-        if value == '' && !field.allow_empty?
-          if field.default?
-            field.default
-          elsif field.nullable?
-            nil
-          else
-            raise Paramore::NilParameter, name
-          end
-        else
-          typecast_value(field.type, value, name)
-        end
+        typecast_value(field.type, value, name)
       end
     end
 
@@ -47,13 +58,17 @@ module Paramore
             [typecast_value(key_type, name, nil), cast(value_field, value, name)]
           end
         else
+          if options[:no_extra_keys]
+            extra = hash.keys - field.type.keys
+            raise "Found extra keys in `name`: #{extra}!"
+          end
+
           field
             .type
             .reject { |name, value_field| missing_and_optional?(hash, name, value_field) }
             .to_h { |name, value_field| [name, cast(value_field, hash[name], name)] }
         end
 
-
       field.compact? ? result.compact : result
     end
 
@@ -69,6 +84,8 @@ module Paramore
 
     def typecast_value(type, value, name)
       type.send(Paramore.configuration.type_method_name, value)
+    rescue StandardError => e
+      raise "The field `#{name}` raised \"#{e}\"!"
     end
 
     def missing_and_optional?(hash, name, field)

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

data/lib/paramore/field.rb

@@ -6,7 +6,7 @@ module Paramore
       null: false,
       compact: false,
       default: nil,
-      empty: true,
+      empty: false,
       required: true,
     }.freeze
 

data/lib/paramore/types.rb

@@ -18,6 +18,8 @@ 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}/)
+
       input.to_f
     end
   end
@@ -25,6 +27,8 @@ module Paramore
   module Int
     module_function
     def [](input)
+      raise ArgumentError "#{input} is not an integer!" unless input.to_s.match?(/^-{0,1}\d*$/)
+
       input.to_i
     end
   end

metadata

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