Merge branch 'pr/58'

Author: Tim Vandecasteele

CHANGELOG.markdown

@@ -5,6 +5,7 @@
 * 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).
+* Fix: resource groupings for prefixed APIs - [@aew](https://github.com/aew).
 * Your Contribution Here
 
 ### 0.6.0 (June 19, 2013)

lib/grape-swagger.rb

@@ -13,7 +13,7 @@ def add_swagger_documentation(options={})
 
         @combined_routes = {}
         routes.each do |route|
-          resource = route.route_path.match('\/([\w|-]*?)[\.\/\(]').captures.first
+          resource = route.route_path.split(route.route_prefix).last.match('\/([\w|-]*?)[\.\/\(]').captures.first
           next if resource.empty?
           resource.downcase!
           @combined_routes[resource] ||= []

spec/non_default_api_spec.rb

@@ -257,7 +257,7 @@ def app; SimpleApiWithMarkdown end
     end
   end
 
-  context "versioned API" do
+  context "prefixed and versioned API" do
     before :all do
       class VersionedMountedApi < Grape::API
         prefix 'api'
@@ -278,7 +278,8 @@ class SimpleApiWithVersion < Grape::API
     def app; SimpleApiWithVersion end
 
     it "parses version and places it in the path" do
-      get '/swagger_doc/api.json'
+      get '/swagger_doc/something.json'
+
       JSON.parse(last_response.body)["apis"].each do |api|
         api["path"].should start_with "/api/v1/"
       end