Fix bug where mounting in a versioned api by path was not possible.

Author: Tim Vandecasteele

lib/grape-swagger.rb

@@ -64,8 +64,8 @@ def self.setup(options)
                 routes.reject!{ |route, value| "/#{route}/".index(parse_path(@@mount_path, nil) << '/') == 0 }
               end
 
-              routes_array = routes.keys.map do |route|
-                  { :path => "#{@@mount_path}/#{route}.{format}" }
+              routes_array = routes.keys.map do |local_route|
+                  { :path => "#{parse_path(route.route_path.gsub('(.:format)', ''),route.route_version)}/#{local_route}.{format}" }
               end
               {
                 apiVersion: api_version,
@@ -158,10 +158,10 @@ def parse_header_params(params)
             def parse_path(path, version)
               # adapt format to swagger format
               parsed_path = path.gsub('(.:format)', '.{format}')
-              # This is attempting to emulate the behavior of 
-              # Rack::Mount::Strexp. We cannot use Strexp directly because 
-              # all it does is generate regular expressions for parsing URLs. 
-              # TODO: Implement a Racc tokenizer to properly generate the 
+              # This is attempting to emulate the behavior of
+              # Rack::Mount::Strexp. We cannot use Strexp directly because
+              # all it does is generate regular expressions for parsing URLs.
+              # TODO: Implement a Racc tokenizer to properly generate the
               # parsed path.
               parsed_path = parsed_path.gsub(/:([a-zA-Z_]\w*)/, '{\1}')
               # add the version

spec/non_default_api_spec.rb

@@ -61,6 +61,38 @@ def app; SimpleApiWithApiVersion end
     end
   end
 
+  context "mounting in a versioned api" do
+    before(:all) do
+      class SimpleApiToMountInVersionedApi < Grape::API
+        desc 'this gets something'
+        get '/something' do
+          {:bla => 'something'}
+        end
+      end
+
+      class SimpleApiWithVersionInPath < Grape::API
+        version 'v1', :using => :path
+
+        mount SimpleApiToMountInVersionedApi
+        add_swagger_documentation
+      end
+    end
+
+    def app; SimpleApiWithVersionInPath end
+
+    it "should get the documentation on a versioned path /v1/swagger_doc" do
+      get '/v1/swagger_doc'
+      last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"http://example.org\", :operations=>[], :apis=>[{:path=>\"/v1/swagger_doc/something.{format}\"}, {:path=>\"/v1/swagger_doc/swagger_doc.{format}\"}]}"
+    end
+
+    it "should get the resource specific documentation on a versioned path /v1/swagger_doc/something" do
+      get '/v1/swagger_doc/something'
+      last_response.status.should == 200
+    end
+
+  end
+
+
   context "overruling hiding the documentation paths" do
     before(:all) do
       class HideDocumentationPathMountedApi < Grape::API
@@ -80,7 +112,7 @@ def app; SimpleApiWithHiddenDocumentation end
 
     it "it doesn't show the documentation path on /swagger_doc" do
       get '/swagger_doc'
-      last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"http://example.org\", :operations=>[], :apis=>[{:path=>\"/swagger_doc/something.{format}\"}]}" 
+      last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"http://example.org\", :operations=>[], :apis=>[{:path=>\"/swagger_doc/something.{format}\"}]}"
     end
   end
 
@@ -143,27 +175,27 @@ def app; SimpleApiWithMarkdown end
       last_response.body.should == "{:apiVersion=>\"0.1\", :swaggerVersion=>\"1.1\", :basePath=>\"http://example.org\", :resourcePath=>\"\", :apis=>[{:path=>\"/something.{format}\", :operations=>[{:notes=>\"<p><em>test</em></p>\\n\", :summary=>\"this gets something\", :nickname=>\"GET-something---format-\", :httpMethod=>\"GET\", :parameters=>[]}]}]}"
     end
   end
-  
+
   context "versioned API" do
     before(:all) do
       class VersionedMountedApi < Grape::API
         prefix 'api'
         version 'v1'
-  
+
         desc 'this gets something'
         get '/something' do
           {:bla => 'something'}
         end
       end
-  
+
       class SimpleApiWithVersion < Grape::API
         mount VersionedMountedApi
         add_swagger_documentation :api_version => "v1"
       end
     end
-  
+
     def app; SimpleApiWithVersion end
-  
+
     it "parses version and places it in the path" do
       get '/swagger_doc/api'
       last_response.body.should == "{:apiVersion=>\"v1\", :swaggerVersion=>\"1.1\", :basePath=>\"http://example.org\", :resourcePath=>\"\", :apis=>[{:path=>\"/api/v1/something.{format}\", :operations=>[{:notes=>nil, :summary=>\"this gets something\", :nickname=>\"GET-api--version-something---format-\", :httpMethod=>\"GET\", :parameters=>[]}]}]}"