paramore 3.8.2 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d3f47fc5868d8a8f33bb5b08bcc96381e27f738b33b40b407d90809b273278
-  data.tar.gz: 5b64bf7ff4967b02a9f6adbb64cf51754dec5cc3a3e84561a8c5afbb573d60c4
+  metadata.gz: 443c4fd7a430d181af1f221f8e2f8d162cde504112ccafa80e7d672445add93d
+  data.tar.gz: 8557e290f05dcc0654a5bcbb55b2832d41ea0d98ac171bd3e29939a1d9312e4f
 SHA512:
-  metadata.gz: 275df9302d728d5314f991c440f0ff9ae38a418b2a01efa2ffc4e352156cddd4e100000aa71e8cb9be9655d0f1c798e8a11f1b6d475062423909736d0ead3a60
-  data.tar.gz: e824dc4dbe31c26a8debf123f21a44b9dba2c04c7dd28a7d78c71f413f410de73b4e5b4c044f77b52f5eaf5f59f45cf6f2bcfd8a093dfef5de7c2b27686c702b
+  metadata.gz: d86cf6d7f77328271d2bc82beebf700ccb70c7303b77654342a20e7087a4d22da5779bdfcae8e64624b1f04316f0f15472385234a4668bcfdbf7f5ba88760379
+  data.tar.gz: b8f97f9e0dde2c4f646876fb4ac8fea06301fcbe882e4244a088439091464161d873791923dd2415f67a1169c2c1c2851dd5be21323d97f8aab3700bd6e460c8

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}!"
+          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.2
+  version: 3.9.1
 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.2 !
+  Thank you for installing Paramore 3.9.1 !
   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