rails-param-validation 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91d17285ccb7056d82f4765816c11097127528e459cc76ed720fe81e14ed9b6
-  data.tar.gz: 680f1b12419968f6528a48552a9d0c9327cdae7c7a0072d2ed43189b91784854
+  metadata.gz: 9f36c1fb9e60cc1162e7a1baae9953e77441018a1a12825d72b97731a645d760
+  data.tar.gz: d4100447e253b96a02cb407dcde58c941ac44f6fb3046f1a54dd17172bcdad6e
 SHA512:
-  metadata.gz: cda64c3b3a95f3ecbc96381f9e5b2e4681b0c6d2b3dde14e6d3e2037e8c65d1b9dd70663aae52739271914086327e0ce913e685e346af883135b37d33762e9dd
-  data.tar.gz: b39531488e543569efa588e35c8f3fc887e14e2891f0243817f2fb4476470315d609854b90d032f895205c626a6546cbaab686876dea7a517a947f5e1ed40171
+  metadata.gz: 88ff549087489e388b4341a3646930ce38a07f6275fe1649f59181e2940f2ce4086a644300f7574760c654eac71c2d202ffb7ccd7d3b0ac1392ff88fa3e76ee0
+  data.tar.gz: ab7013451be92067596264d5e7f2689be20269276b0850936bc589ac43fe27276e0279344fa74786016f90fdcb77c8cf257f157793a4f8516a16f31dbd0e1dd7

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 = "#{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
+        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/helper.rb

@@ -7,7 +7,7 @@ module RailsParamValidation
 
     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('::').map { |p| p.capitalize }.join.to_sym
+      (klass.is_a?(String) ? klass : klass.name).gsub(/Controller$/, '').split('::').last.capitalize.to_sym
     end
   end
 

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

@@ -70,7 +70,10 @@ module RailsParamValidation
           action_definition.merge!(summary: operation.description) if operation.description.present?
 
           if body.any?
-            body_type_name = "#{RailsHelper.clean_controller_name operation.controller}#{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] = {

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

@@ -37,4 +37,4 @@ module RailsParamValidation
     end
   end
 
-end
+end

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

@@ -1,3 +1,3 @@
 module RailsParamValidation
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-param-validation
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Oskar Kirmis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-31 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