Merge branch 'pr/57'

Author: Tim Vandecasteele

CHANGELOG.markdown

@@ -4,6 +4,7 @@
 * Adding support for generating swagger responseClass and models from Grape Entities - [@calebwoods](https://github.com/calebwoods).
 * Adding hidden endpoints - [@arturoherrero](https://github.com/arturoherrero).
 * Fix: allow urls with `-` - [@dadario](https://github.com/dadario).
+* Fix: mounting multiple documentations - [@Drakula2k](https://github.com/Drakula2k).
 * Your Contribution Here
 
 ### 0.6.0 (June 19, 2013)

lib/grape-swagger.rb

@@ -46,7 +46,7 @@ def self.setup(options)
             }
             options = defaults.merge(options)
 
-            @@target_class = options[:target_class]
+            target_class = options[:target_class]
             @@mount_path = options[:mount_path]
             @@class_name = options[:class_name] || options[:mount_path].gsub('/','')
             @@markdown = options[:markdown]
@@ -59,7 +59,7 @@ def self.setup(options)
             get @@mount_path do
               header['Access-Control-Allow-Origin'] = '*'
               header['Access-Control-Request-Method'] = '*'
-              routes = @@target_class::combined_routes
+              routes = target_class::combined_routes
 
               if @@hide_documentation_path
                 routes.reject!{ |route, value| "/#{route}/".index(parse_path(@@mount_path, nil) << '/') == 0 }
@@ -87,8 +87,8 @@ def self.setup(options)
               header['Access-Control-Allow-Origin'] = '*'
               header['Access-Control-Request-Method'] = '*'
               models = []
-              routes = @@target_class::combined_routes[params[:name]]
-              routes_array = routes.map { |route|
+              routes = target_class::combined_routes[params[:name]]
+              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

spec/non_default_api_spec.rb

@@ -337,4 +337,59 @@ def app; SimpleApiWithHiddenPaths; end
       end
     end
   end
+
+  context "multiple documentations" do
+    before :all do
+      class FirstApi < Grape::API
+        desc 'This is the first API'
+        get '/first' do
+          { first: 'hip' }
+        end
+
+        add_swagger_documentation mount_path: '/first/swagger_doc'
+      end
+
+      class SecondApi < Grape::API
+        desc 'This is the second API'
+        get '/second' do
+          { second: 'hop' }
+        end
+
+        add_swagger_documentation mount_path: '/second/swagger_doc'
+      end
+
+      class SimpleApiWithMultipleMountedDocumentations < Grape::API
+        mount FirstApi
+        mount SecondApi
+      end
+    end
+
+    def app; SimpleApiWithMultipleMountedDocumentations; end
+
+    it "retrieves the first swagger-documentation on /first/swagger_doc" do
+      get '/first/swagger_doc.json'
+      JSON.parse(last_response.body).should == {
+        "apiVersion" => "0.1",
+        "swaggerVersion" => "1.1",
+        "basePath" => "http://example.org",
+        "operations" => [],
+        "apis" => [
+          { "path" => "/first/swagger_doc/first.{format}" }
+        ]
+      }
+    end
+
+    it "retrieves the first swagger-documentation on /second/swagger_doc" do
+      get '/second/swagger_doc.json'
+      JSON.parse(last_response.body).should == {
+        "apiVersion" => "0.1",
+        "swaggerVersion" => "1.1",
+        "basePath" => "http://example.org",
+        "operations" => [],
+        "apis" => [
+          { "path" => "/second/swagger_doc/second.{format}" }
+        ]
+      }
+    end
+  end
 end