Merge branch 'pr/62'

Author: Tim Vandecasteele

.rvmrc

@@ -6,7 +6,7 @@
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
 #     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@grape-swagger"
+environment_id="ruby-1.9.3@grape-swagger"
 
 # Uncomment the following lines if you want to verify rvm version per project
 # rvmrc_rvm_version="1.14.3 (stable)" # 1.10.1 seams as a safe start

CHANGELOG.markdown

@@ -3,6 +3,7 @@
 * Fix: translate parameter `type` to String, enables using Mongoid fields as parameter definitions - [@dblock](https://github.com/dblock).
 * 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).
 * 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.match('\/([\w|-]*?)[\.\/\(]').captures.first
           next if resource.empty?
           resource.downcase!
           @combined_routes[resource] ||= []

spec/simple_mounted_api_spec.rb

@@ -17,6 +17,14 @@ class SimpleMountedApi < Grape::API
         { bla: 'something' }
       end
 
+      desc 'This gets something for URL using - separator.', {
+        :notes => '_test_'
+      }
+
+      get '/simple-test' do
+        { bla: 'something' }
+      end
+
       desc 'this gets something else', {
         :headers => {
           "XAuthToken" => { description: "A required header.", required: true },
@@ -67,6 +75,7 @@ def app; SimpleApi end
       "operations" => [],
       "apis" => [
         { "path" => "/swagger_doc/simple.{format}" },
+        { "path" => "/swagger_doc/simple-test.{format}" },
         { "path" => "/swagger_doc/simple_with_headers.{format}" },
         { "path" => "/swagger_doc/items.{format}" },
         { "path" => "/swagger_doc/custom.{format}" },
@@ -94,6 +103,24 @@ def app; SimpleApi end
   end
 
   context "retrieves the documentation for mounted-api that" do
+    it "contains '-' in URL" do
+      get '/swagger_doc/simple-test.json'
+      JSON.parse(last_response.body).should == {
+        "apiVersion" => "0.1",
+        "swaggerVersion" => "1.1",
+        "basePath" => "http://example.org",
+        "resourcePath" => "",
+        "apis" => [
+          {
+            "path" => "/simple-test.{format}",
+            "operations" => [
+              { "notes" => "_test_", "summary" => "This gets something for URL using - separator.", "nickname" => "GET-simple-test---format-", "httpMethod" => "GET", "parameters" => [] }
+            ]
+          }
+        ]
+      }
+    end
+
     it "includes headers" do
       get '/swagger_doc/simple_with_headers.json'
       JSON.parse(last_response.body)["apis"].should == [{
@@ -117,7 +144,7 @@ def app; SimpleApi end
       }]
     end
 
-    it "retrieves the documentation for mounted-api that supports multiple parameters" do
+    it "supports multiple parameters" do
       get '/swagger_doc/items.json'
       JSON.parse(last_response.body)["apis"].should == [{
         "path" => "/items.{format}",