rails-param-validation 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e81185301762be6703608dfc575c27813c49fde9969057c0b821c7cc78f7680
-  data.tar.gz: 5c3c75f3d2a8e6275d1c794540d972e62b13ada2592a5602ca71bb80794d6f05
+  metadata.gz: ea025e319c6a3d02b8781c6c80ffc068cb72b8d694e3dc1fc843656f2dd4b862
+  data.tar.gz: 9f1f786ec22824cb5ae9eaa8a33ef39d5a147ac9ed19d570e6414513cf418adf
 SHA512:
-  metadata.gz: 1af2e48e2ef3d6af489e009177839378b5e19b8817a456a9cb1e399e525b2a974d52ed1986a321c44035248c527d8ef1b7711de0e175252791a12567a8bd98da
-  data.tar.gz: b4528b9e92d0c7079cced511255760766771ba6b6f9e5f013d8f1049bdf1fce6f10f86750760bae7ebb12d53ce66b027d18d4228c7dd953d5f1e6fa70af60979
+  metadata.gz: a2ec3191599ac5b8fa5a4dbcf7684759de23a129be732e90275298b358e9d84d53cb653225413cadc229ad03b1e9baecac9dbce2e2269b1d8b9e8344a21b3fff
+  data.tar.gz: 980cf1cde5a0d0500da47c4eb69ec514a28c0da4eb769b13d23d443f63d5587faf915c23705b6178c02817d6665bda3249cc1862bcc1c10093e04b6d1c7514d9

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

@@ -1,10 +1,10 @@
 module RailsParamValidation
 
   class ActionDefinition
-    attr_reader :params, :request_body_type, :paths, :responses, :controller, :action, :security
+    attr_reader :params, :request_body_type, :paths, :responses, :controller, :action, :security, :source_file
     attr_accessor :description
 
-    def initialize
+    def initialize(source_file)
       @params = {}
       @paths = []
       @param_validation_enabled = true
@@ -12,6 +12,7 @@ module RailsParamValidation
       @request_body_type = RailsParamValidation.config.default_body_content_type if defined?(Rails)
       @responses = {}
       @flags = {}
+      @source_file = source_file
       @security = []
     end
 
@@ -65,7 +66,10 @@ module RailsParamValidation
 
     def finalize!(class_name, method_name)
       @responses.each do |code, response|
-        name = "#{class_name.to_s.capitalize}#{method_name.to_s.camelcase}#{Rack::Utils::SYMBOL_TO_STATUS_CODE.key(code).to_s.camelize}Response".to_sym
+        name = Types::Namespace.with_namespace(
+            Types::Namespace.fetch(@source_file),
+            "#{RailsHelper.clean_controller_name(class_name)}.#{method_name.to_s.camelcase}.#{Rack::Utils::SYMBOL_TO_STATUS_CODE.key(code).to_s.camelize}Response".to_sym
+        )
         AnnotationTypes::CustomT.register(name, response[:schema])
 
         response.merge!(schema: AnnotationTypes::CustomT.new(name))

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

@@ -94,7 +94,7 @@ module RailsParamValidation
       end
 
       def action(description = nil, flags = RailsParamValidation.config.default_action_flags)
-        @param_definition = ActionDefinition.new
+        @param_definition = ActionDefinition.new(Types::Namespace.caller_file)
         @param_definition.description = description
         flags.each { |name, value| @param_definition.add_flag name, value }
 

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

@@ -6,7 +6,8 @@ module RailsParamValidation
 
     module ClassMethods
       def declare(type, schema)
-        RailsParamValidation::AnnotationTypes::CustomT.register type, schema
+        namespace = Types::Namespace.fetch(Types::Namespace.caller_file)
+        RailsParamValidation::AnnotationTypes::CustomT.register Types::Namespace.with_namespace(namespace, type), schema
       end
     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
 

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

@@ -4,6 +4,11 @@ module RailsParamValidation
     def self.controller_to_tag(klass)
       (klass.is_a?(String) ? klass : klass.name).gsub(/Controller$/, '').to_sym
     end
+
+    def self.clean_controller_name(klass)
+      klass = klass.to_s if klass.is_a? Symbol
+      (klass.is_a?(String) ? klass : klass.name).gsub(/Controller$/, '').split('::').last.capitalize.to_sym
+    end
   end
 
 end

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

@@ -25,7 +25,7 @@ module RailsParamValidation
         openapi: OPENAPI_VERSION,
         info: { version: @info[:version], title: @info[:title], description: @info[:description] },
         servers: @info[:url].map { |url| { url: url } },
-        tags: @tags.map { |tag, description| { name: tag, description: description } },
+        tags: @tags.map { |tag, description| { name: RailsHelper.clean_controller_name(tag), description: description } },
         paths: {},
         components: { schemas: {} }
       }
@@ -49,7 +49,7 @@ module RailsParamValidation
         RoutingHelper.routes_for(operation.controller.to_s.underscore, operation.action.to_s).each do |route|
           action_definition = {
               operationId: "#{route[:method].downcase}#{route[:path].split(/[^a-zA-Z0-9]+/).map(&:downcase).map(&:capitalize).join}",
-              tags: [operation.controller],
+              tags: [RailsHelper.clean_controller_name(operation.controller)],
               parameters: parameters,
               security: operation.security,
               responses: operation.responses.map do |status, values|
@@ -70,7 +70,10 @@ module RailsParamValidation
           action_definition.merge!(summary: operation.description) if operation.description.present?
 
           if body.any?
-            body_type_name = "#{operation.controller.capitalize}#{operation.action.capitalize}Body".to_sym
+            body_type_name = Types::Namespace.with_namespace(
+                Types::Namespace.fetch(operation.source_file),
+                "#{RailsHelper.clean_controller_name operation.controller}.#{operation.action.to_s.camelcase}.Body".to_sym
+            )
             AnnotationTypes::CustomT.register(body_type_name, body)
 
             action_definition[:requestBody] = {
@@ -104,7 +107,7 @@ module RailsParamValidation
         description = AnnotationManager.instance.class_annotation klass, :description
 
         if description
-          @tags[RailsHelper.controller_to_tag klass] = description
+          @tags[RailsHelper.controller_to_tag klass.constantize] = description
         end
 
         AnnotationManager.instance.methods(klass).each do |method|

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

@@ -1,7 +1,10 @@
 module RailsParamValidation
 
 def self.register(type, schema)
-  AnnotationTypes::CustomT.register type, schema
+  AnnotationTypes::CustomT.register(
+      Namespace.with_namespace(Namespace.fetch(Namespace.caller_file), type),
+      schema
+  )
 end
 
 module AnnotationTypes
@@ -72,6 +75,58 @@ end
 end
 
 module Types
+  class Namespace
+    def self.store(scope, namespace)
+      map[scope] = namespace
+    end
+
+    def self.fetch(scope)
+      path = scope.split('/')
+
+      (path.size - 1).times do
+        key = path.join '/'
+        return map[key] if map.key? key
+
+        path.pop
+      end
+    end
+
+    def self.caller_file
+      caller_locations(2, 1)[0].path
+    end
+
+    def self.with_namespace(namespace, type)
+      if namespace
+        path = namespace.to_s.split('.')
+
+        while type.start_with?("_")
+          type = type[1..-1]
+          path.pop
+        end
+
+        "#{path.join(".")}.#{type}".to_sym
+      else
+        type
+      end
+    end
+
+    class << self
+      protected
+
+      def map
+        @map ||= { '' => nil }
+      end
+    end
+  end
+
+  def FileNamespace(namespace)
+    Namespace.store Namespace.caller_file, namespace
+  end
+
+  def DirectoryNamespace(namespace)
+    Namespace.store File.dirname(caller_locations(1, 1)[0].path), namespace
+  end
+
   def ArrayType(inner_type)
     AnnotationTypes::ArrayT.new(inner_type)
   end
@@ -85,7 +140,7 @@ module Types
   end
 
   def Type(type)
-    AnnotationTypes::CustomT.new(type)
+    AnnotationTypes::CustomT.new(Namespace.with_namespace(Namespace.fetch(Namespace.caller_file), type))
   end
 end
 

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

@@ -1,6 +1,8 @@
 module RailsParamValidation
 
   class ConstantValidator < Validator
+    CLASS_MAP = { TrueClass => Boolean, FalseClass => Boolean }
+
     def initialize(schema)
       super schema
 
@@ -21,7 +23,7 @@ module RailsParamValidation
     end
 
     def to_openapi
-      ValidatorFactory.create(schema.class).to_openapi.merge(enum: [schema])
+      ValidatorFactory.create(CLASS_MAP.fetch(schema.class, schema.class)).to_openapi.merge(enum: [schema])
     end
   end
 

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

@@ -6,6 +6,11 @@ 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
 
@@ -24,4 +29,4 @@ module RailsParamValidation
     end
   end
 
-end
+end

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

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.3.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-04 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.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Declarative parameter definition and validation for Rails