build global tag set from route tags

- adds changelog entry
- adds note in UPGRADING

Author: LeFnord

CHANGELOG.md

@@ -2,9 +2,10 @@
 
 #### Features
 
+* [#524](https://github.com/ruby-grape/grape-swagger/pull/524): Use route tags for global tag set - [@LeFnord](https://github.com/LeFnord).
+* [#523](https://github.com/ruby-grape/grape-swagger/pull/523): Allow specifying custom tags at the route level - [@jordanfbrown](https://github.com/jordanfbrown).
 * [#520](https://github.com/ruby-grape/grape-swagger/pull/520): Response model can have required attributes - [@WojciechKo](https://github.com/WojciechKo).
 * [#510](https://github.com/ruby-grape/grape-swagger/pull/510): Use 'token_owner' instead of 'oauth_token' on Swagger UI endpoint authorization. - [@texpert](https://github.com/texpert).
-* [#523](https://github.com/ruby-grape/grape-swagger/pull/523): Allow specifying custom tags at the route level. - [@jordanfbrown](https://github.com/jordanfbrown).
 * Your contribution here.
 
 #### Fixes

README.md

@@ -394,7 +394,7 @@ add_swagger_documentation \
 * [Overriding the tags](#tags)
 * [Defining an endpoint as an array](#array)
 * [Using an options hash](#options)
-* [Overriding param type](#overriding-param-type)
+* [Overriding parameter type](#overriding-param-type)
 * [Overriding data type of the parameter](#overriding-type-of-param)
 * [Multiple types](#multiple-types)
 * [Array of data type](#array-type)

UPGRADING.md

@@ -1,6 +1,10 @@
 Upgrading Grape-swagger
 =======================
 
+### Upgrading to >= 0.25.0
+
+The global tag set now only includes tags for documented routes. This behaviour has impact in particular for calling the documtation of a specific route.
+
 ### Upgrading to >= 0.21.0
 
 With grape >= 0.21.0, `grape-entity` support moved to separate gem `grape-swagger-entity`, if you use grape entity, update your Gemfile:

lib/grape-swagger/doc_methods.rb

@@ -50,7 +50,9 @@ def setup(options)
           options
         )
 
-        paths, definitions = endpoint.path_and_definition_objects(combi_routes, options)
+        paths, definitions   = endpoint.path_and_definition_objects(combi_routes, options)
+        tags                 = GrapeSwagger::DocMethods::TagNameDescription.build(paths)
+        output[:tags]        = tags unless tags.empty? || paths.blank?
         output[:paths]       = paths unless paths.blank?
         output[:definitions] = definitions unless definitions.blank?
 

lib/grape-swagger/doc_methods/tag_name_description.rb

@@ -2,23 +2,15 @@ module GrapeSwagger
   module DocMethods
     class TagNameDescription
       class << self
-        def build(options = {})
-          target_class = options[:target_class]
-          namespaces = target_class.combined_namespaces
-          namespace_routes = target_class.combined_namespace_routes
-
-          namespace_routes.keys.map do |local_route|
-            next if namespace_routes[local_route].map { |route| route.options[:hidden] }.all? { |value| value.respond_to?(:call) ? value.call : value }
-
-            original_namespace_name = target_class.combined_namespace_identifiers.key?(local_route) ? target_class.combined_namespace_identifiers[local_route] : local_route
-            description = namespaces[original_namespace_name] && namespaces[original_namespace_name].options[:desc]
-            description ||= "Operations about #{original_namespace_name.pluralize}"
-
-            {
-              name: local_route,
-              description: description
-            }
-          end.compact
+        def build(paths)
+          paths.values.each_with_object([]) do |path, memo|
+            path.values.first[:tags].each do |tag|
+              memo << {
+                name: tag,
+                description: "Operations about #{tag.pluralize}"
+              }
+            end
+          end.uniq
         end
       end
     end

lib/grape-swagger/endpoint.rb

@@ -29,7 +29,6 @@ def swagger_object(target_class, request, options)
         securityDefinitions: options[:security_definitions],
         host:           GrapeSwagger::DocMethods::OptionalObject.build(:host, options, request),
         basePath:       GrapeSwagger::DocMethods::OptionalObject.build(:base_path, options, request),
-        tags:           GrapeSwagger::DocMethods::TagNameDescription.build(options),
         schemes:        options[:schemes].is_a?(String) ? [options[:schemes]] : options[:schemes]
       }.delete_if { |_, value| value.blank? }
     end

spec/swagger_v2/api_swagger_v2_spec.rb

@@ -118,91 +118,117 @@ def app
     end
   end
 
-  before do
-    get '/v3/swagger_doc'
-  end
+  describe 'whole documentation' do
+    subject do
+      get '/v3/swagger_doc'
+      JSON.parse(last_response.body)
+    end
 
-  let(:json) { JSON.parse(last_response.body) }
+    describe 'swagger object' do
+      describe 'required keys' do
+        it { expect(subject.keys).to include 'swagger' }
+        it { expect(subject['swagger']).to eql '2.0' }
+        it { expect(subject.keys).to include 'info' }
+        it { expect(subject['info']).to be_a Hash }
+        it { expect(subject.keys).to include 'paths' }
+        it { expect(subject['paths']).to be_a Hash }
+      end
 
-  describe 'swagger object' do
-    describe 'required keys' do
-      it { expect(json.keys).to include 'swagger' }
-      it { expect(json['swagger']).to eql '2.0' }
-      it { expect(json.keys).to include 'info' }
-      it { expect(json['info']).to be_a Hash }
-      it { expect(json.keys).to include 'paths' }
-      it { expect(json['paths']).to be_a Hash }
-    end
+      describe 'info object required keys' do
+        let(:info) { subject['info'] }
+
+        it { expect(info.keys).to include 'title' }
+        it { expect(info['title']).to be_a String }
+        it { expect(info.keys).to include 'version' }
+        it { expect(info['version']).to be_a String }
 
-    describe 'info object required keys' do
-      let(:info) { json['info'] }
+        describe 'license object' do
+          let(:license) { subject['info']['license'] }
 
-      it { expect(info.keys).to include 'title' }
-      it { expect(info['title']).to be_a String }
-      it { expect(info.keys).to include 'version' }
-      it { expect(info['version']).to be_a String }
+          it { expect(license.keys).to include 'name' }
+          it { expect(license['name']).to be_a String }
+          it { expect(license.keys).to include 'url' }
+          it { expect(license['url']).to be_a String }
+        end
 
-      describe 'license object' do
-        let(:license) { json['info']['license'] }
+        describe 'contact object' do
+          let(:contact) { subject['info']['contact'] }
 
-        it { expect(license.keys).to include 'name' }
-        it { expect(license['name']).to be_a String }
-        it { expect(license.keys).to include 'url' }
-        it { expect(license['url']).to be_a String }
-      end
+          it { expect(contact.keys).to include 'name' }
+          it { expect(contact['name']).to be_a String  }
+          it { expect(contact.keys).to include 'email' }
+          it { expect(contact['email']).to be_a String }
+          it { expect(contact.keys).to include 'url' }
+          it { expect(contact['url']).to be_a String }
+        end
 
-      describe 'contact object' do
-        let(:contact) { json['info']['contact'] }
+        describe 'global tags' do
+          let(:tags) { subject['tags'] }
 
-        it { expect(contact.keys).to include 'name' }
-        it { expect(contact['name']).to be_a String  }
-        it { expect(contact.keys).to include 'email' }
-        it { expect(contact['email']).to be_a String }
-        it { expect(contact.keys).to include 'url' }
-        it { expect(contact['url']).to be_a String }
+          it { expect(tags).to be_a Array }
+          it { expect(tags).not_to be_empty }
+        end
       end
-    end
 
-    describe 'path object' do
-      let(:paths) { json['paths'] }
+      describe 'path object' do
+        let(:paths) { subject['paths'] }
 
-      it 'hides documentation paths per default' do
-        expect(paths.keys).not_to include '/swagger_doc', '/swagger_doc/{name}'
-      end
+        it 'hides documentation paths per default' do
+          expect(paths.keys).not_to include '/swagger_doc', '/swagger_doc/{name}'
+        end
 
-      specify do
-        paths.each_pair do |path, value|
-          expect(path).to start_with('/')
-          expect(value).to be_a Hash
-          expect(value).not_to be_empty
+        specify do
+          paths.each_pair do |path, value|
+            expect(path).to start_with('/')
+            expect(value).to be_a Hash
+            expect(value).not_to be_empty
 
-          value.each do |method, declaration|
-            expect(http_verbs).to include method
-            expect(declaration).to have_key('responses')
+            value.each do |method, declaration|
+              expect(http_verbs).to include method
+              expect(declaration).to have_key('responses')
 
-            declaration['responses'].each do |status_code, response|
-              expect(status_code).to match(/\d{3}/)
-              expect(response).to have_key('description')
+              declaration['responses'].each do |status_code, response|
+                expect(status_code).to match(/\d{3}/)
+                expect(response).to have_key('description')
+              end
             end
           end
         end
       end
-    end
 
-    describe 'definitions object' do
-      let(:definitions) { json['definitions'] }
-      specify do
-        definitions.each do |model, properties|
-          expect(model).to match(/\w+/)
-          expect(properties).to have_key('properties')
+      describe 'definitions object' do
+        let(:definitions) { subject['definitions'] }
+
+        specify do
+          definitions.each do |model, properties|
+            expect(model).to match(/\w+/)
+            expect(properties).to have_key('properties')
+          end
         end
       end
     end
+
+    describe 'swagger file' do
+      it do
+        expect(subject).to eql swagger_json
+      end
+    end
   end
 
-  describe 'swagger file' do
-    it do
-      expect(json).to eql swagger_json
+  describe 'specific resource documentation' do
+    subject do
+      get '/v3/swagger_doc/other_thing'
+      JSON.parse(last_response.body)
+    end
+
+    let(:tags) { subject['tags'] }
+    specify do
+      expect(tags).to eql [
+        {
+          'name' => 'other_thing',
+          'description' => 'Operations about other_things'
+        }
+      ]
     end
   end
 end

spec/swagger_v2/guarded_endpoint_spec.rb

@@ -86,6 +86,7 @@ def app
         'swagger' => '2.0',
         'produces' => ['application/xml', 'application/json', 'application/octet-stream', 'text/plain'],
         'host' => 'example.org',
+        'tags' => [{ 'name' => 'auth', 'description' => 'Operations about auths' }],
         'paths' => {
           '/auth' => {
             'get' => {

spec/swagger_v2/namespace_tags_prefix_spec.rb

@@ -55,10 +55,7 @@ def app
     specify do
       expect(subject['tags']).to eql(
         [
-          { 'name' => 'hudson', 'description' => 'Operations about hudsons' },
-          { 'name' => 'colorado', 'description' => 'Operations about colorados' },
-          { 'name' => 'thames', 'description' => 'Operations about thames' },
-          { 'name' => 'niles', 'description' => 'Operations about niles' }
+          { 'name' => 'colorado', 'description' => 'Operations about colorados' }
         ]
       )
 
@@ -75,10 +72,7 @@ def app
       specify do
         expect(subject['tags']).to eql(
           [
-            { 'name' => 'hudson', 'description' => 'Operations about hudsons' },
-            { 'name' => 'colorado', 'description' => 'Operations about colorados' },
-            { 'name' => 'thames', 'description' => 'Operations about thames' },
-            { 'name' => 'niles', 'description' => 'Operations about niles' }
+            { 'name' => 'thames', 'description' => 'Operations about thames' }
           ]
         )
 

spec/swagger_v2/namespace_tags_spec.rb

@@ -48,10 +48,7 @@ def app
     specify do
       expect(subject['tags']).to eql(
         [
-          { 'name' => 'hudson', 'description' => 'Operations about hudsons' },
-          { 'name' => 'colorado', 'description' => 'Operations about colorados' },
-          { 'name' => 'thames', 'description' => 'Operations about thames' },
-          { 'name' => 'niles', 'description' => 'Operations about niles' }
+          { 'name' => 'colorado', 'description' => 'Operations about colorados' }
         ]
       )
 
@@ -68,10 +65,7 @@ def app
       specify do
         expect(subject['tags']).to eql(
           [
-            { 'name' => 'hudson', 'description' => 'Operations about hudsons' },
-            { 'name' => 'colorado', 'description' => 'Operations about colorados' },
-            { 'name' => 'thames', 'description' => 'Operations about thames' },
-            { 'name' => 'niles', 'description' => 'Operations about niles' }
+            { 'name' => 'thames', 'description' => 'Operations about thames' }
           ]
         )
 

spec/swagger_v2/simple_mounted_api_spec.rb

@@ -193,13 +193,7 @@ def app
         'produces' => ['application/xml', 'application/json', 'application/octet-stream', 'text/plain'],
         'host' => 'example.org',
         'tags' => [
-          { 'name' => 'simple', 'description' => 'Operations about simples' },
-          { 'name' => 'simple-test', 'description' => 'Operations about simple-tests' },
-          { 'name' => 'simple-head-test', 'description' => 'Operations about simple-head-tests' },
-          { 'name' => 'simple-options-test', 'description' => 'Operations about simple-options-tests' },
-          { 'name' => 'simple_with_headers', 'description' => 'Operations about simple_with_headers' },
-          { 'name' => 'items', 'description' => 'Operations about items' },
-          { 'name' => 'custom', 'description' => 'Operations about customs' }
+          { 'name' => 'simple', 'description' => 'Operations about simples' }
         ],
         'paths' => {
           '/simple' => {
@@ -231,13 +225,7 @@ def app
           'produces' => ['application/xml', 'application/json', 'application/octet-stream', 'text/plain'],
           'host' => 'example.org',
           'tags' => [
-            { 'name' => 'simple', 'description' => 'Operations about simples' },
-            { 'name' => 'simple-test', 'description' => 'Operations about simple-tests' },
-            { 'name' => 'simple-head-test', 'description' => 'Operations about simple-head-tests' },
-            { 'name' => 'simple-options-test', 'description' => 'Operations about simple-options-tests' },
-            { 'name' => 'simple_with_headers', 'description' => 'Operations about simple_with_headers' },
-            { 'name' => 'items', 'description' => 'Operations about items' },
-            { 'name' => 'custom', 'description' => 'Operations about customs' }
+            { 'name' => 'simple-test', 'description' => 'Operations about simple-tests' }
           ],
           'paths' => {
             '/simple-test' => {