Hide endpoints with the same namespace

Author: arturoherrero

lib/grape-swagger.rb

@@ -66,8 +66,8 @@ def self.setup(options)
               end
 
               routes_array = routes.keys.map { |local_route|
-                  next if routes[local_route].any? { |route| route.route_hidden }
-                  { :path => "#{parse_path(route.route_path.gsub('(.:format)', ''),route.route_version)}/#{local_route}#{@@hide_format ? '' : '.{format}'}" }
+                next if routes[local_route].all? { |route| route.route_hidden }
+                { :path => "#{parse_path(route.route_path.gsub('(.:format)', ''),route.route_version)}/#{local_route}#{@@hide_format ? '' : '.{format}'}" }
               }.compact
 
               {
@@ -88,7 +88,8 @@ def self.setup(options)
               header['Access-Control-Request-Method'] = '*'
               models = []
               routes = @@target_class::combined_routes[params[:name]]
-              routes_array = routes.map do |route|
+              routes_array = routes.map { |route|
+                next if route.route_hidden
                 notes = route.route_notes && @@markdown ? Kramdown::Document.new(strip_heredoc(route.route_notes)).to_html : route.route_notes
                 http_codes = parse_http_codes route.route_http_codes
                 models << route.route_entity if route.route_entity
@@ -106,7 +107,7 @@ def self.setup(options)
                   :path => parse_path(route.route_path, api_version),
                   :operations => [operations]
                 }
-              end
+              }.compact
 
               api_description = {
                 apiVersion: api_version,

spec/hide_api_spec.rb

@@ -24,7 +24,7 @@ class HideApi < Grape::API
 
   def app; HideApi end
 
-  it "retrieves swagger-documentation that doesn't include hidden endpoint" do
+  it "retrieves swagger-documentation that doesn't include hidden endpoints" do
     get '/swagger_doc.json'
     JSON.parse(last_response.body).should == {
       "apiVersion" => "0.1",
@@ -38,3 +38,67 @@ def app; HideApi end
     }
   end
 end
+
+
+describe "a hide mounted api with same namespace" do
+  before :all do
+    class HideNamespaceMountedApi < Grape::API
+      desc 'Show this endpoint'
+      get '/simple/show' do
+        { :foo => 'bar' }
+      end
+
+      desc 'Hide this endpoint', {
+        :hidden => true
+      }
+      get '/simple/hide' do
+        { :foo => 'bar' }
+      end
+    end
+
+    class HideNamespaceApi < Grape::API
+      mount HideNamespaceMountedApi
+      add_swagger_documentation
+    end
+  end
+
+  def app; HideNamespaceApi end
+
+  it "retrieves the documentation for mounted-api" do
+    get '/swagger_doc.json'
+    JSON.parse(last_response.body).should == {
+      "apiVersion" => "0.1",
+      "swaggerVersion" => "1.1",
+      "basePath" => "http://example.org",
+      "operations" => [],
+      "apis" => [
+        { "path" => "/swagger_doc/simple.{format}" },
+        { "path" => "/swagger_doc/swagger_doc.{format}" }
+      ]
+    }
+  end
+
+  it "retrieves the documentation for mounted-api that doesn't include hidden paths" do
+    get '/swagger_doc/simple.json'
+    JSON.parse(last_response.body).should == {
+      "apiVersion" => "0.1",
+      "swaggerVersion" => "1.1",
+      "basePath" => "http://example.org",
+      "resourcePath" => "",
+      "apis" => [
+        {
+          "path" => "/simple/show.{format}",
+          "operations" => [
+            {
+              "notes" => nil,
+              "summary" => "Show this endpoint",
+              "nickname" => "GET-simple-show---format-",
+              "httpMethod" => "GET",
+              "parameters" => []
+            }
+          ]
+        }
+      ]
+    }
+  end
+end