grape-swagger 0.6.0 → 0.7.0

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.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

data/.travis.yml

@@ -1,2 +1,4 @@
 rvm:
   - 1.9.3
+  - 2.0.0
+

data/CHANGELOG.markdown

@@ -1,5 +1,14 @@
 ### Next Release
 
+* 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).
+* Fix: mounting multiple documentations - [@Drakula2k](https://github.com/Drakula2k).
+* Fix: resource groupings for prefixed APIs - [@aew](https://github.com/aew).
+* Fix: hide_documentation_path on prefixed APIs - [@spier](https://github.com/spier).
+* Your Contribution Here
+
 ### 0.6.0 (June 19, 2013)
 
 * Added Rails 4 support - [@jrhe](https://github.com/jrhe).

data/Gemfile

@@ -4,7 +4,8 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'grape', '>= 0.2.0'
-gem 'kramdown'
+gem 'grape-entity', '>= 0.3.0'
+gem 'github-markdown'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -4,13 +4,15 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    backports (2.6.7)
-    builder (3.2.0)
+    backports (3.3.2)
+    builder (3.2.2)
     coderay (1.0.7)
     descendants_tracker (0.0.1)
     diff-lcs (1.1.3)
+    ffi (1.9.3-java)
     git (1.2.5)
-    grape (0.4.0)
+    github-markdown (0.6.4)
+    grape (0.5.0)
       activesupport
       builder
       hashie (>= 1.2.0)
@@ -20,7 +22,10 @@ GEM
       rack-accept
       rack-mount
       virtus
-    hashie (2.0.3)
+    grape-entity (0.3.0)
+      activesupport
+      multi_json (>= 1.3.2)
+    hashie (2.0.5)
     i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -28,14 +33,19 @@ GEM
       rake
       rdoc
     json (1.7.3)
-    kramdown (0.13.7)
+    json (1.7.3-java)
     method_source (0.8)
-    multi_json (1.7.2)
-    multi_xml (0.5.3)
+    multi_json (1.7.7)
+    multi_xml (0.5.4)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     rack (1.5.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -61,18 +71,22 @@ GEM
     shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
     slop (3.3.2)
-    virtus (0.5.4)
-      backports (~> 2.6.1)
+    spoon (0.0.4)
+      ffi
+    virtus (0.5.5)
+      backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bundler (> 1.0.0)
+  github-markdown
   grape (>= 0.2.0)
+  grape-entity (>= 0.3.0)
   jeweler (~> 1.8.4)
-  kramdown
   pry
   rack-test
   rdoc (~> 3.12)

data/README.markdown

@@ -33,7 +33,7 @@ module API
 end
 ```
 
-To explore your API, either download [Swagger UI](https://github.com/wordnik/swagger-ui) and set it up yourself or go to the [online swagger demo](http://petstore.swagger.wordnik.com/) and enter your localhost url documentation root in the url field (probably something in the line of http://localhost:3000/swagger_doc.json). 
+To explore your API, either download [Swagger UI](https://github.com/wordnik/swagger-ui) and set it up yourself or go to the [online swagger demo](http://petstore.swagger.wordnik.com/) and enter your localhost url documentation root in the url field (probably something in the line of http://localhost:3000/swagger_doc.json).
 If you use the online demo, make sure your API supports foreign requests by enabling CORS in grape, otherwise you'll see the API description, but requests on the API won't return. You can do this by putting below code in your Grape API definition:
 
 ```` ruby
@@ -47,30 +47,72 @@ end
 You can pass a hash with some configuration possibilities to ```add_swagger_documentation```, all of these are optional:
 * ```:mount_path``` The path were the API documentation is loaded, default '/swagger_doc'
 * ```:api_version``` Version of the API that's being exposed
-* ```:base_path``` Basepath of the API that's being exposed
+* ```:base_path``` Basepath of the API that's being exposed, this configuration parameter accepts a Proc to evaluate base_path, useful when you need to use request attributes to determine the base_path.
 * ```:markdown``` Allow markdown in `notes`, default `false`
 * ```:hide_documentation_path``` Don't show the '/swagger_doc' path in the generated swagger documentation
 
+
 ## Swagger Header Parameters
 
-Swagger also supports the documentation of parameters passed in the header. Since grape's ```params[]``` doesn't return header parameters we can 
-to specify header parameters seperately in a block after the description.
+Swagger also supports the documentation of parameters passed in the header. Since grape's ```params[]``` doesn't return header parameters we can specify header parameters seperately in a block after the description.
 
 ``` ruby
 desc "Return super-secret information", {
   headers: {
     "XAuthToken" => {
       description: "Valdates your identity",
-      required: true 
+      required: true
     },
     "XOptionalHeader" => {
       description: "Not reallly needed",
-      required: false 
+      required: false
     }
   }
 }
 ```
 
+## Hiding an endpoint
+
+You can hide an endpoint by adding ```:hidden => true``` in the description of the endpoint:
+
+``` ruby
+desc 'Hide this endpoint', {
+  :hidden => true
+}
+```
+
+## Grape Entities
+
+Add the [grape-entity](https://github.com/agileanimal/grape-entity) gem to our Gemfile.
+Please refer to the [grape-entity documentation](https://github.com/gileanimal/grape-entity/blob/master/README.markdown)
+for more details.
+
+The following example exposes statuses. And exposes statuses documentation adding :type and :desc.
+
+```ruby
+module API
+
+  module Entities
+    class Status < Grape::Entity
+      expose :text, :documentation => { :type => "string", :desc => "Status update text." }
+    end
+  end
+
+  class Statuses < Grape::API
+    version 'v1'
+
+    desc 'Statuses index', {
+      :entity => API::Entities::Status
+    }
+    get '/statuses' do
+      statuses = Status.all
+      type = current_user.admin? ? :full : :default
+      present statuses, with: API::Entities::Status, :type => type
+    end
+  end
+end
+```
+
 ## Swagger additions
 grape-swagger allows you to add an explanation in markdown in the notes field. Which would result in proper formatted markdown in Swagger UI. The default Swagger UI doesn't allow HTML in the notes field, so you need to use an adapted version of Swagger UI (you can find one at https://github.com/tim-vandecasteele/swagger-ui/tree/vasco).
 
@@ -99,6 +141,16 @@ desc "Reserve a virgin in heaven", {
 }
 ```
 
+You can also document the HTTP status codes that your API returns with this syntax:
+
+``` ruby
+get '/', :http_codes => [
+  [400, "Invalid parameter entry"],
+] do
+  ...
+end
+```
+
 ## Contributing to grape-swagger
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/grape-swagger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "grape-swagger"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Vandecasteele"]
-  s.date = "2013-06-19"
+  s.date = "2014-02-04"
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     ".rvmrc",
     ".travis.yml",
     "CHANGELOG.markdown",
@@ -29,9 +30,12 @@ Gem::Specification.new do |s|
     "VERSION",
     "grape-swagger.gemspec",
     "lib/grape-swagger.rb",
+    "spec/api_models_spec.rb",
     "spec/default_api_spec.rb",
-    "spec/grape-swagger-helper_spec.rb",
+    "spec/form_params_spec.rb",
+    "spec/grape-swagger_helper_spec.rb",
     "spec/grape-swagger_spec.rb",
+    "spec/hide_api_spec.rb",
     "spec/non_default_api_spec.rb",
     "spec/simple_mounted_api_spec.rb",
     "spec/spec_helper.rb"
@@ -39,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tim-vandecasteele/grape-swagger"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Add swagger compliant documentation to your grape API"
 
   if s.respond_to? :specification_version then
@@ -47,7 +51,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<grape>, [">= 0.2.0"])
-      s.add_runtime_dependency(%q<kramdown>, [">= 0"])
+      s.add_runtime_dependency(%q<grape-entity>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<github-markdown>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
@@ -57,7 +62,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<grape>, [">= 0.2.0"])
-      s.add_dependency(%q<kramdown>, [">= 0"])
+      s.add_dependency(%q<grape-entity>, [">= 0.3.0"])
+      s.add_dependency(%q<github-markdown>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
@@ -68,7 +74,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<grape>, [">= 0.2.0"])
-    s.add_dependency(%q<kramdown>, [">= 0"])
+    s.add_dependency(%q<grape-entity>, [">= 0.3.0"])
+    s.add_dependency(%q<github-markdown>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])

data/lib/grape-swagger.rb

@@ -1,4 +1,4 @@
-require 'kramdown'
+require 'github/markdown'
 
 module Grape
   class API
@@ -12,12 +12,19 @@ module Grape
         mount(documentation_class)
 
         @combined_routes = {}
+
         routes.each do |route|
-          resource = route.route_path.match('\/(\w*?)[\.\/\(]').captures.first
+          route_match = route.route_path.split(route.route_prefix).last.match('\/([\w|-]*?)[\.\/\(]')
+          next if route_match.nil?
+          resource = route_match.captures.first
           next if resource.empty?
           resource.downcase!
+
           @combined_routes[resource] ||= []
-          @combined_routes[resource] << route
+
+          unless @@hide_documentation_path and route.route_path.include?(@@mount_path)
+            @combined_routes[resource] << route
+          end
         end
 
       end
@@ -35,132 +42,225 @@ module Grape
 
           def self.setup(options)
             defaults = {
-              :target_class => nil,
-              :mount_path => '/swagger_doc',
-              :base_path => nil,
-              :api_version => '0.1',
-              :markdown => false,
-              :hide_documentation_path => false,
-              :hide_format => false
+              :target_class             => nil,
+              :mount_path               => '/swagger_doc',
+              :base_path                => nil,
+              :api_version              => '0.1',
+              :markdown                 => false,
+              :hide_documentation_path  => false,
+              :hide_format              => false,
+              :models                   => [],
+              :info                     => {},
+              :authorizations           => nil,
+              :root_base_path           => true,
+              :include_base_url         => true
             }
+
             options = defaults.merge(options)
 
-            @@target_class = options[:target_class]
-            @@mount_path = options[:mount_path]
-            @@class_name = options[:class_name] || options[:mount_path].gsub('/','')
-            @@markdown = options[:markdown]
+            target_class     = options[:target_class]
+            @@mount_path     = options[:mount_path]
+            @@class_name     = options[:class_name] || options[:mount_path].gsub('/', '')
+            @@markdown       = options[:markdown]
+            @@hide_format    = options[:hide_format]
+            api_version      = options[:api_version]
+            base_path        = options[:base_path]
+            authorizations   = options[:authorizations]
+            include_base_url = options[:include_base_url]
+            root_base_path   = options[:root_base_path]
+            extra_info       = options[:info]
+
             @@hide_documentation_path = options[:hide_documentation_path]
-            @@hide_format = options[:hide_format]
-            api_version = options[:api_version]
-            base_path = options[:base_path]
 
             desc 'Swagger compatible API description'
             get @@mount_path do
-              header['Access-Control-Allow-Origin'] = '*'
+              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 }
               end
 
               routes_array = routes.keys.map do |local_route|
-                  { :path => "#{parse_path(route.route_path.gsub('(.:format)', ''),route.route_version)}/#{local_route}#{@@hide_format ? '' : '.{format}'}" }
-              end
-              {
-                apiVersion: api_version,
-                swaggerVersion: "1.1",
-                basePath: parse_base_path(base_path, request),
-                operations:[],
-                apis: routes_array
+                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
+                {
+                  :path => parsed_path,
+                  #:description => "..."
+                }
+              end.compact
+
+              output = {
+                apiVersion:     api_version,
+                swaggerVersion: "1.2",
+                produces:       content_types_for(target_class),
+                operations:     [],
+                apis:           routes_array,
+                info:           parse_info(extra_info)
               }
+
+              basePath                = parse_base_path(base_path, request)
+              output[:basePath]       = basePath        if basePath && basePath.size > 0 && root_base_path != false
+              output[:authorizations] = authorizations  if authorizations
+
+              output
             end
 
-            desc 'Swagger compatible API description for specific API', :params =>
-              {
-                "name" => { :desc => "Resource name of mounted API", :type => "string", :required => true },
+            desc 'Swagger compatible API description for specific API', :params => {
+              "name" => {
+                :desc     => "Resource name of mounted API",
+                :type     => "string",
+                :required => true
               }
+            }
             get "#{@@mount_path}/:name" do
-              header['Access-Control-Allow-Origin'] = '*'
+              header['Access-Control-Allow-Origin']   = '*'
               header['Access-Control-Request-Method'] = '*'
-              routes = @@target_class::combined_routes[params[:name]]
-              routes_array = routes.map do |route|
-                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
-                operations = {
-                    :notes => notes,
-                    :summary => route.route_description || '',
-                    :nickname   => route.route_method + route.route_path.gsub(/[\/:\(\)\.]/,'-'),
+
+              models = []
+              routes = target_class::combined_routes[params[:name]]
+
+              ops = routes.reject(&:route_hidden).group_by do |route|
+                parse_path(route.route_path, api_version)
+              end
+
+              apis = []
+
+              ops.each do |path, routes|
+                operations = routes.map do |route|
+                  notes       = as_markdown(route.route_notes)
+                  http_codes  = parse_http_codes(route.route_http_codes)
+
+                  models << route.route_entity if route.route_entity
+
+                  operation = {
+                    :produces   => content_types_for(target_class),
+                    :notes      => notes.to_s,
+                    :summary    => route.route_description || '',
+                    :nickname   => route.route_nickname || (route.route_method + route.route_path.gsub(/[\/:\(\)\.]/,'-')),
                     :httpMethod => route.route_method,
                     :parameters => parse_header_params(route.route_headers) +
                       parse_params(route.route_params, route.route_path, route.route_method)
-                }
-                operations.merge!({:errorResponses => http_codes}) unless http_codes.empty?
-                {
-                  :path => parse_path(route.route_path, api_version),
-                  :operations => [operations]
+                  }
+                  operation.merge!(:type => parse_entity_name(route.route_entity)) if route.route_entity
+                  operation.merge!(:responseMessages => http_codes) unless http_codes.empty?
+                  operation
+                end.compact
+                apis << {
+                  path: path,
+                  operations: operations
                 }
               end
 
-              {
-                apiVersion: api_version,
-                swaggerVersion: "1.1",
-                basePath: parse_base_path(base_path, request),
-                resourcePath: "",
-                apis: routes_array
+              api_description = {
+                apiVersion:     api_version,
+                swaggerVersion: "1.2",
+                resourcePath:   "",
+                apis:           apis
               }
+
+              basePath                   = parse_base_path(base_path, request)
+              api_description[:basePath] = basePath if basePath && basePath.size > 0
+              api_description[:models]   = parse_entity_models(models) unless models.empty?
+
+              api_description
             end
           end
 
-
           helpers do
+
+            def as_markdown(description)
+              description && @@markdown ? GitHub::Markdown.render_gfm(strip_heredoc(description)) : description
+            end
+
             def parse_params(params, path, method)
-              if params
-                params.map do |param, value|
-                  value[:type] = 'file' if value.is_a?(Hash) && value[:type] == 'Rack::Multipart::UploadedFile'
-
-                  dataType = value.is_a?(Hash) ? value[:type]||'String' : 'String'
-                  description = value.is_a?(Hash) ? value[:desc] || value[:description] : ''
-                  required = value.is_a?(Hash) ? !!value[:required] : false
-                  paramType = path.include?(":#{param}") ? 'path' : (method == 'POST') ? 'form' : 'query'
-                  name = (value.is_a?(Hash) && value[:full_name]) || param
-                  {
-                    paramType: paramType,
-                    name: name,
-                    description: description,
-                    dataType: dataType,
-                    required: required
-                  }
+              params ||= []
+
+              params.map do |param, value|
+                value[:type] = 'file' if value.is_a?(Hash) && value[:type] == 'Rack::Multipart::UploadedFile'
+
+                dataType    = value.is_a?(Hash) ? (value[:type] || 'String').to_s : 'String'
+                description = value.is_a?(Hash) ? value[:desc] || value[:description] : ''
+                required    = value.is_a?(Hash) ? !!value[:required] : false
+                defaultValue = value.is_a?(Hash) ? value[:defaultValue] : nil
+                paramType = if path.include?(":#{param}")
+                   'path'
+                else
+                  %w[ POST PUT PATCH ].include?(method) ? 'form' : 'query'
                 end
-              else
-                []
+                name        = (value.is_a?(Hash) && value[:full_name]) || param
+
+                parsed_params = {
+                  paramType:    paramType,
+                  name:         name,
+                  description:  as_markdown(description),
+                  type:         dataType,
+                  dataType:     dataType,
+                  required:     required
+                }
+
+                parsed_params.merge!({defaultValue: defaultValue}) if defaultValue
+
+                parsed_params
               end
             end
 
+            def content_types_for(target_class)
+              content_types = (target_class.settings[:content_types] || {}).values
+
+              if content_types.empty?
+                formats       = [target_class.settings[:format], target_class.settings[:default_format]].compact.uniq
+                formats       = Grape::Formatter::Base.formatters({}).keys if formats.empty?
+                content_types = Grape::ContentTypes::CONTENT_TYPES.select{|content_type, mime_type| formats.include? content_type}.values
+              end
+
+              content_types.uniq
+            end
+
+            def parse_info(info)
+              {
+                contact:            info[:contact],
+                description:        info[:description],
+                license:            info[:license],
+                licenseUrl:         info[:license_url],
+                termsOfServiceUrl:  info[:terms_of_service_url],
+                title:              info[:title]
+              }.delete_if{|_, value| value.blank?}
+            end
 
             def parse_header_params(params)
-              if params
-                params.map do |param, value|
-                  dataType = 'String'
-                  description = value.is_a?(Hash) ? value[:description] : ''
-                  required = value.is_a?(Hash) ? !!value[:required] : false
-                  paramType = "header"
-                  {
-                    paramType: paramType,
-                    name: param,
-                    description: description,
-                    dataType: dataType,
-                    required: required
-                  }
-                end
-              else
-                []
+              params ||= []
+
+              params.map do |param, value|
+                dataType    = 'String'
+                description = value.is_a?(Hash) ? value[:description] : ''
+                required    = value.is_a?(Hash) ? !!value[:required] : false
+                defaultValue = value.is_a?(Hash) ? value[:defaultValue] : nil
+                paramType   = "header"
+
+                parsed_params = {
+                  paramType:    paramType,
+                  name:         param,
+                  description:  as_markdown(description),
+                  type:         dataType,
+                  dataType:     dataType,
+                  required:     required
+                }
+
+                parsed_params.merge!({defaultValue: defaultValue}) if defaultValue
+
+                parsed_params
               end
             end
 
             def parse_path(path, version)
               # adapt format to swagger format
-              parsed_path = path.gsub '(.:format)', ( @@hide_format ? '' : '.{format}')
+              parsed_path = path.gsub('(.:format)', @@hide_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.
@@ -171,18 +271,54 @@ module Grape
               version ? parsed_path.gsub('{version}', version) : parsed_path
             end
 
+            def parse_entity_name(name)
+              entity_parts = name.to_s.split('::')
+              entity_parts.reject! {|p| p == "Entity" || p == "Entities"}
+              entity_parts.join("::")
+            end
+
+            def parse_entity_models(models)
+              result = {}
+
+              models.each do |model|
+                name        = parse_entity_name(model)
+                properties  = {}
+
+                model.documentation.each do |property_name, property_info|
+                  properties[property_name] = property_info
+
+                  # rename Grape Entity's "desc" to "description"
+                  if property_description = property_info.delete(:desc)
+                    property_info[:description] = property_description
+                  end
+                end
+
+                result[name] = {
+                  id:         model.instance_variable_get(:@root) || name,
+                  name:       model.instance_variable_get(:@root) || name,
+                  properties: properties
+                }
+              end
+
+              result
+            end
+
             def parse_http_codes codes
               codes ||= {}
-              codes.collect do |k, v|
-                {:code => k, :reason => v}
+              codes.map do |k, v|
+                {
+                  code: k,
+                  message: v,
+                  #responseModel: ...
+                }
               end
             end
 
-            def try(*a, &b)
-              if a.empty? && block_given?
+            def try(*args, &block)
+              if args.empty? && block_given?
                 yield self
-              else
-                public_send(*a, &b) if respond_to?(a.first)
+              elsif respond_to?(args.first)
+                public_send(*args, &block)
               end
             end
 
@@ -192,7 +328,13 @@ module Grape
             end
 
             def parse_base_path(base_path, request)
-              (base_path.is_a?(Proc) ? base_path.call(request) : base_path) || request.base_url
+              if base_path.is_a?(Proc)
+                base_path.call(request)
+              elsif base_path.is_a?(String)
+                URI(base_path).relative? ? URI.join(request.base_url, base_path).to_s : base_path
+              else
+                request.base_url
+              end
             end
           end
         end