paramore 3.8.3 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e4a6c0bf84e8aaaaacb7865918b2261a348a38bf84e6696f0aff3228744296d
-  data.tar.gz: 69968d3fae522e9f4375e3845edce3fdd5d33446f92ca7aebd2c16d2bf69211d
+  metadata.gz: 3ecad97758f06ed4c9666cc21dff1f109c96f99af568dc748909bc860d98e342
+  data.tar.gz: 8391f84447ff31b61a715fda75ea51da38055d36d33ea8326627d0414a738e4b
 SHA512:
-  metadata.gz: 84ed81904455ed520d2a1125f2f9af170729acdb971a86df4d38175e62f607dce54833bbb30cafbca9a58cb96cdab92bbe9c1db065a7393a10e2b3b56e355a80
-  data.tar.gz: eaa0fa83f88fa411cc19ce0dcefa9f57ca76ecc54c8e7616fe6786d96f569f9d571a2d1c90c7abf4c9d21cf4c3d773c240b787e7421a365bf40da24284e052a9
+  metadata.gz: d67a468476d57a80b2f0961ec02343b518cc01f3c5f2a68ebd46aafc41279ec7ed07d75c466e4a3a4e5e5e633637bee92cecea215d412defd91852346b7c426a
+  data.tar.gz: b4ad88a4893c0365e2e805cbfac035ae26566c96fcddf86a4361931906c57bb4d9f98cbd6f8b412faa601da091222b9cfd1dfd3004b2326886413059ced5cd78

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)
@@ -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}!" if extra.size > 0
+          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/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.3
+  version: 3.9.2
 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.3 !
+  Thank you for installing Paramore 3.9.2 !
   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