grape-swagger 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/grape-swagger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "grape-swagger"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Vandecasteele"]
-  s.date = "2014-02-04"
+  s.date = "2014-02-06"
   s.description = "A simple way to add proper auto generated documentation - that can be displayed with swagger - to your inline described grape API"
   s.email = "tim.vandecasteele@gmail.com"
   s.extra_rdoc_files = [
@@ -38,7 +38,9 @@ Gem::Specification.new do |s|
     "spec/hide_api_spec.rb",
     "spec/non_default_api_spec.rb",
     "spec/simple_mounted_api_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "test/config.ru",
+    "test/nested_api.rb"
   ]
   s.homepage = "http://github.com/tim-vandecasteele/grape-swagger"
   s.licenses = ["MIT"]

data/lib/grape-swagger.rb

@@ -93,11 +93,10 @@ module Grape
               routes_array = routes.keys.map do |local_route|
                 next if routes[local_route].all?(&:route_hidden)
 
-                parsed_path = route.route_version ? "/#{route.route_version}" : ""
-                parsed_path += "/#{local_route}"
-                parsed_path += '.{format}' unless @@hide_format
+                url_base    = parse_path(route.route_path.gsub('(.:format)', ''), route.route_version) if include_base_url
+                url_format  = '.{format}' unless @@hide_format
                 {
-                  :path => parsed_path,
+                  :path => "#{url_base}/#{local_route}#{url_format}",
                   #:description => "..."
                 }
               end.compact

data/spec/api_models_spec.rb

@@ -50,9 +50,9 @@ describe "API Models" do
       "produces" => ["application/json"],
       "operations" => [],
       "apis" => [
-        { "path" => "/something.{format}" },
-        { "path" => "/thing.{format}" },
-        { "path" => "/swagger_doc.{format}" }
+        { "path" => "/swagger_doc/something.{format}" },
+        { "path" => "/swagger_doc/thing.{format}" },
+        { "path" => "/swagger_doc/swagger_doc.{format}" }
       ]
     }
   end

data/spec/default_api_spec.rb

@@ -26,8 +26,8 @@ describe "Default API" do
         "produces" => ["application/json"],
         "operations" => [],
         "apis" => [
-          { "path" => "/something.{format}" },
-          { "path" => "/swagger_doc.{format}" }
+          { "path" => "/swagger_doc/something.{format}" },
+          { "path" => "/swagger_doc/swagger_doc.{format}" }
         ]
       }
     end

data/spec/hide_api_spec.rb

@@ -34,8 +34,8 @@ describe "a hide mounted api" do
       "produces" => ["application/xml", "application/json", "text/plain"],
       "operations" => [],
       "apis" => [
-        { "path" => "/simple.{format}" },
-        { "path" => "/swagger_doc.{format}" }
+        { "path" => "/swagger_doc/simple.{format}" },
+        { "path" => "/swagger_doc/swagger_doc.{format}" }
       ]
     }
   end
@@ -76,8 +76,8 @@ describe "a hide mounted api with same namespace" do
       "produces" => ["application/xml", "application/json", "text/plain"],
       "operations" => [],
       "apis" => [
-        { "path" => "/simple.{format}" },
-        { "path" => "/swagger_doc.{format}" }
+        { "path" => "/swagger_doc/simple.{format}" },
+        { "path" => "/swagger_doc/swagger_doc.{format}" }
       ]
     }
   end

data/spec/non_default_api_spec.rb

@@ -153,8 +153,8 @@ describe "options: " do
         "produces" => ["application/xml", "application/json", "text/plain"],
         "operations" => [],
         "apis" => [
-          { "path" => "/v1/something.{format}" },
-          { "path" => "/v1/swagger_doc.{format}" }
+          { "path" => "/v1/swagger_doc/something.{format}" },
+          { "path" => "/v1/swagger_doc/swagger_doc.{format}" }
         ]
       }
     end
@@ -211,7 +211,7 @@ describe "options: " do
         "produces" => ["application/xml", "application/json", "text/plain"],
         "operations" => [],
         "apis" => [
-          { "path" => "/something.{format}" }
+          { "path" => "/swagger_doc/something.{format}" }
         ]
       }
     end
@@ -326,6 +326,13 @@ describe "options: " do
     def app; SimpleApiWithDifferentMount end
 
 
+    it "retrieves the given base-path on /api_doc" do
+      get '/api_doc.json'
+        JSON.parse(last_response.body)["apis"].each do |api|
+        api["path"].should start_with SimpleApiWithDifferentMount::MOUNT_PATH
+      end
+    end
+
     it "retrieves the same given base-path for mounted-api" do
       get '/api_doc/something.json'
       JSON.parse(last_response.body)["apis"].each do |api|
@@ -500,12 +507,12 @@ describe "options: " do
         "produces" => ["application/xml", "application/json", "text/plain"],
         "operations" => [],
         "apis" => [
-          { "path" => "/first.{format}" }
+          { "path" => "/first/swagger_doc/first.{format}" }
         ]
       }
     end
 
-    it "retrieves the first swagger-documentation on /second/swagger_doc" do
+    it "retrieves the second swagger-documentation on /second/swagger_doc" do
       get '/second/swagger_doc.json'
       JSON.parse(last_response.body).should == {
         "apiVersion" => "0.1",
@@ -515,7 +522,7 @@ describe "options: " do
         "produces" => ["application/xml", "application/json", "text/plain"],
         "operations" => [],
         "apis" => [
-          { "path" => "/second.{format}" }
+          { "path" => "/second/swagger_doc/second.{format}" }
         ]
       }
     end

data/spec/simple_mounted_api_spec.rb

@@ -76,12 +76,12 @@ describe "a simple mounted api" do
       "produces" => ["application/xml", "application/json", "text/plain"],
       "operations" => [],
       "apis" => [
-        { "path" => "/simple.{format}" },
-        { "path" => "/simple-test.{format}" },
-        { "path" => "/simple_with_headers.{format}" },
-        { "path" => "/items.{format}" },
-        { "path" => "/custom.{format}" },
-        { "path" => "/swagger_doc.{format}" }
+        { "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}" },
+        { "path" => "/swagger_doc/swagger_doc.{format}" }
       ]
     }
   end

data/test/config.ru

@@ -0,0 +1,2 @@
+require './nested_api'
+run SimpleApi.new

data/test/nested_api.rb

@@ -0,0 +1,30 @@
+require 'grape'
+require '../lib/grape-swagger'
+
+class SimpleNestedApi < Grape::API
+  desc "Nested root"
+  get 'index' do
+  end
+end
+
+class SimpleMountedApi < Grape::API
+  mount SimpleNestedApi => '/nested'
+  desc "Document root"
+  get 'index' do
+  end
+
+  add_swagger_documentation mount_path: '/simple/swagger_doc'
+end
+
+class OtherSimpleMountedApi < Grape::API
+  desc "other simple mounted api root"
+  get 'index' do
+  end
+
+  add_swagger_documentation mount_path: '/other_simple/swagger_doc'
+end
+
+class SimpleApi < Grape::API
+  mount SimpleMountedApi => '/api'
+  mount OtherSimpleMountedApi => '/other_api'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -202,6 +202,8 @@ files:
 - spec/non_default_api_spec.rb
 - spec/simple_mounted_api_spec.rb
 - spec/spec_helper.rb
+- test/config.ru
+- test/nested_api.rb
 homepage: http://github.com/tim-vandecasteele/grape-swagger
 licenses:
 - MIT
@@ -217,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4023410877516363028
+      hash: -17008049882572761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: