swaggard 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e1aa159808f0d01c9e6759727b97aff8a0cb4c383f441a3ca602e6b302da8b
-  data.tar.gz: 4f3b2511fbd15049e5e8746af31174705544a477b70cc0cbbe30d24563897ee7
+  metadata.gz: 7a8b23d0506bee9f1348d9d9226395143d49fddafdfedd0b738e6fa46e037034
+  data.tar.gz: d217e3ea082ecb262f8a298d8c3418835441a0d6c3e67737cf2affb14d7a90f2
 SHA512:
-  metadata.gz: 244da8fb5d6d234aab95d0b6e1b6bf13fd1dd7f519daf93aa2ff1f21dd05e2d0a886aa1e80f07ae7181d7541fc853b83bf5f711465976577cea725175bb0be36
-  data.tar.gz: c82e666367b0555c8d7de02f785c9045aa53c77c591855afa5e1c093f294c8b69cff7cbcc5a9eb70cdda1004f855cf149148fede20be4f4296515878855aa34c
+  metadata.gz: c27ee9ce529d840cf54f0e9c3fa3849c9cac9c6a42f99d2b46ff7330865e48a3a7890473455b8925f5c907f569f0c36d4bb904ae501a586207ed670a9fbca934
+  data.tar.gz: f1fd82efe8b1106596a48470dcb7bc2a528e7e27340c1f046c986b281ab615cd92a779362f620a54ed5af429bd3b6957df8bbfd7f82d6ece3bb8de9c2d8ecfb7

data/lib/swaggard.rb

@@ -61,21 +61,25 @@ module Swaggard
       @api.ignore_put_if_patch! if Swaggard.configuration.ignore_put_if_patch_exists
     end
 
+    def tag_matches?(tag, controller_name, path)
+      matches = tag.controller_name == controller_name
+
+      return matches unless tag.route.present?
+
+      matches && Regexp.new(tag.route).match?(path)
+    end
+
     def build_operation(path, verb, route)
       controller_name = route[:controller]
       action_name = route[:action]
 
-      return unless controllers[controller_name]
-
-      controller_tag = controllers[controller_name][:tag]
+      controller_tag, controller_operations = tags.find { |tag, _operations| tag_matches?(tag, controller_name, path) }
 
       return unless controller_tag
 
-      return unless controllers[controller_name][:operations]
-
-      return unless controllers[controller_name][:operations][action_name]
+      return unless controller_operations[action_name]
 
-      operation_yard_object = controllers[controller_name][:operations][action_name]
+      operation_yard_object = controller_operations[action_name]
 
       return unless operation_yard_object
 
@@ -100,23 +104,26 @@ module Swaggard
       end
     end
 
-    def controllers
-      return @controllers if @controllers
+    def tags
+      return @tags if @tags
 
       parser = Parsers::Controller.new
 
-      @controllers = {}
+      @tags = []
       Dir[configuration.controllers_path].each do |file|
         yard_objects = get_yard_objects(file)
 
-        tag, operations = parser.run(yard_objects)
+        tags, operations = parser.run(yard_objects)
 
-        next unless tag
+        next unless tags
 
-        @controllers[tag.controller_class.controller_path] ||= { tag: tag, operations: operations }
+        tags.each do |tag|
+          @tags << [tag, operations]
+          # [tag.controller_class.controller_path] ||= { tag: tag, operations: operations }
+        end
       end
 
-      @controllers
+      @tags
     end
 
     def routes

data/lib/swaggard/parsers/controller.rb

@@ -4,23 +4,29 @@ require_relative '../swagger/tag'
 module Swaggard
   module Parsers
     class Controller
-
       def run(yard_objects)
-        tag = nil
+        tags = nil
         operations = {}
 
         yard_objects.each do |yard_object|
           if yard_object.type == :class
-            tag = Swagger::Tag.new(yard_object)
-          elsif tag && yard_object.type == :method
+            tags = get_tags(yard_object)
+          elsif tags && yard_object.type == :method
             name = yard_object.name
             operations[name.to_s] = yard_object
           end
         end
 
-        return tag, operations
+        return tags, operations
       end
 
+      private
+
+      def get_tags(yard_object)
+        tags = yard_object.tags.select { |tag| tag.tag_name == 'tag' }
+
+        tags.map { |tag| Swagger::Tag.new(yard_object, tag) }
+      end
     end
   end
 end

data/lib/swaggard/swagger/operation.rb

@@ -32,7 +32,7 @@ module Swaggard
 
           case yard_tag.tag_name
           when 'operation_id'
-            @operation_id = value
+            @operation_id = "#{@tag.name}.#{value}"
           when 'query_parameter'
             @parameters << Parameters::Query.new(value)
           when 'form_parameter'

data/lib/swaggard/swagger/tag.rb

@@ -1,20 +1,20 @@
 module Swaggard
   module Swagger
     class Tag
-
       attr_accessor :name, :description
 
-      attr_reader :controller_class
+      attr_reader :controller_class, :controller_name, :route
 
-      def initialize(yard_object)
+      def initialize(yard_object, tag)
         controller_name = "#{yard_object.namespace}::#{yard_object.name}"
 
         @yard_name = yard_object.name
         @controller_class = controller_name.constantize
-
-        tag = yard_object.tags.find { |tag| tag.tag_name == 'tag' }
+        @controller_name = controller_class.controller_path
 
         @name =  tag ? tag.text : "#{@controller_class.controller_path}"
+        @name, @route = @name.split(' ')
+
         @description = yard_object.docstring || ''
       end
 
@@ -24,7 +24,6 @@ module Swaggard
           'description' => @description
         }
       end
-
     end
   end
 end

data/lib/swaggard/version.rb

@@ -1,3 +1,3 @@
 module Swaggard
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adrian Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails