valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-08 03:18:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1401 from xhh/ruby-base-url-slashes

Browse Source 
Ruby client: remove trailing slashes from base_url
This commit is contained in:
wing328 2015-10-16 19:32:13 +08:00
commit 90eab19305
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/ruby/configuration.mustache
View File

@ -138,7 +138,7 @@ module {{moduleName}}
end
def base_url
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}"
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
URI.encode(url)
end

2
samples/client/petstore/ruby/lib/petstore/configuration.rb
View File

@ -138,7 +138,7 @@ module Petstore
end
def base_url
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}"
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
URI.encode(url)
end

25
samples/client/petstore/ruby/spec/configuration_spec.rb Normal file
View File

@ -0,0 +1,25 @@
require 'spec_helper'
describe Petstore::Configuration do
let(:config) { Petstore::Configuration.instance }
before(:each) do
Petstore.configure do |c|
c.host = 'petstore.swagger.io'
c.base_path = 'v2'
end
end
describe '#base_url' do
it 'should have the default value' do
config.base_url.should == 'http://petstore.swagger.io/v2'
end
it 'should remove trailing slashes' do
[nil, '', '/', '//'].each do |base_path|
config.base_path = base_path
config.base_url.should == 'http://petstore.swagger.io'
end
end
end
end