rails-param-validation 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430b5d7c83e83717e20bd96b20961fb51e617e74bb634ee356fdfaf67af9b66f
-  data.tar.gz: e615c6d36cc776b3c2fe8056dd4aa49cc2916a5c591ce06d5b7cccc0c0a56a7d
+  metadata.gz: ee538fffc925cb6a1c60304d98c741b7bc5e2397e6144e3dc67a05249c94cf06
+  data.tar.gz: 76d69f62b3cc38cdbd84018c110e7c80e5ac94889338bd18aaf9b078c10912b8
 SHA512:
-  metadata.gz: 87f12c586949c487bb699b6bfe7e0acd52d5a486c15fe6f2dd0e20d17d16ac725249be3fb0ace47553d5df8460bbba763a870193f2f960ed857dba2ceab1d75f
-  data.tar.gz: 01122bc9d7041b99168647219d5b7d8896677b1c3d6cbe394e2e67d3c641f4766a32bea25fcb4f175112ebc89128ba14345f715bba58a7f5181bddf2480722b7
+  metadata.gz: 6279e2439b9d4065be253fba5c2d5a7604631808b844c1f1c0f5339709442ba4eb088ad18492271d353dd4a03055e2860faaf1ebd17ce2922334beb479ef6f95
+  data.tar.gz: 672919b2153bb4e3409f9dadbe3a6696f3c9d6f48c3fd9f982064d50f07ed614b3b5c4b0ef5aa7eb5a2a5b76297877d22d89431d1b263cc083a87132b5928ef7

data/lib/rails-param-validation/rails/config.rb

@@ -31,6 +31,7 @@ module RailsParamValidation
     attr_accessor :default_body_content_type
     attr_accessor :default_action_flags
     attr_accessor :post_action_definition_hook
+    attr_accessor :auto_include_in_classes
     attr_reader   :openapi
 
     def initialize
@@ -41,6 +42,7 @@ module RailsParamValidation
       @default_body_content_type = 'application/json'
       @default_action_flags = {}
       @post_action_definition_hook = ->(_action_definition) {}
+      @auto_include_in_classes = %w[ActionController::Base ActionController::API]
     end
   end
 

data/lib/rails-param-validation/rails/extensions/validation_extension.rb

@@ -6,6 +6,8 @@ module RailsParamValidation
 
     # The before_action function called which does the actual work
     def auto_validate_params!
+      @validated_parameters = nil
+
       # @type [ActionDefinition] definition
       definition = RailsParamValidation::AnnotationManager.instance.method_annotation self.class.name, action_name.to_sym, :param_definition
 
@@ -38,7 +40,7 @@ module RailsParamValidation
 
       if result.matches?
         # Copy the parameters if the validation succeeded
-        @validated_parameters = result.value.merge('action' => action, 'controller' => controller)
+        @validated_parameters = result.value.merge(action: action, controller: controller)
       else
         # Render an appropriate error message
         _render_invalid_param_response result

data/lib/rails-param-validation/rails/rails.rb

@@ -17,15 +17,14 @@ module RailsParamValidation
 
     initializer 'rails_param_validation.action_controller_extension' do
       ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.send :include, ActionControllerExtension
-        ActionController::Base.send :include, AnnotationExtension
-        ActionController::Base.send :include, CustomTypesExtension
-        ActionController::Base.send :extend, RailsParamValidation::Types
-
-        ActionController::API.send :include, ActionControllerExtension
-        ActionController::API.send :include, AnnotationExtension
-        ActionController::API.send :include, CustomTypesExtension
-        ActionController::API.send :extend, RailsParamValidation::Types
+        RailsParamValidation.config.auto_include_in_classes.each do |klass_name|
+          klass = klass_name.constantize
+
+          klass.send :include, ActionControllerExtension
+          klass.send :include, AnnotationExtension
+          klass.send :include, CustomTypesExtension
+          klass.send :extend, RailsParamValidation::Types
+        end
       end
     end
 

data/lib/rails-param-validation/types/types.rb

@@ -2,7 +2,7 @@ module RailsParamValidation
 
 def self.register(type, schema)
   AnnotationTypes::CustomT.register(
-      Namespace.with_namespace(Namespace.fetch(Namespace.caller_file), type),
+      Types::Namespace.with_namespace(Types::Namespace.fetch(Types::Namespace.caller_file), type),
       schema
   )
 end

data/lib/rails-param-validation/validators/custom_type.rb

@@ -6,11 +6,6 @@ module RailsParamValidation
     end
 
     def matches?(path, data)
-      if schema.schema.is_a? NilClass
-        puts path
-        puts schema.inspect
-      end
-
       ValidatorFactory.create(schema.schema).matches? path, data
     end
 
@@ -29,4 +24,4 @@ module RailsParamValidation
     end
   end
 
-end
+end

data/lib/rails-param-validation/version.rb

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.4.1"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Declarative parameter definition and validation for Rails
 email:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Declarative parameter definition and validation for Rails