From 7db7b146beee6811d2effa4ddf0d3e84b1ef0e39 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 14 Apr 2015 12:32:25 +0800 Subject: [PATCH 1/2] Fix hard-coded values in Ruby client: scheme, host and base_path --- .../com/wordnik/swagger/codegen/DefaultGenerator.java | 9 ++++++--- .../main/resources/ruby/swagger/configuration.mustache | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java index 2abe2162ebd..17509973215 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java @@ -93,12 +93,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } StringBuilder hostBuilder = new StringBuilder(); + String scheme; if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) { - hostBuilder.append(swagger.getSchemes().get(0).toValue()); - hostBuilder.append("://"); + scheme = swagger.getSchemes().get(0).toValue(); } else { - hostBuilder.append("https://"); + scheme = "https"; } + hostBuilder.append(scheme); + hostBuilder.append("://"); if (swagger.getHost() != null) { hostBuilder.append(swagger.getHost()); } else { @@ -209,6 +211,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { bundle.put("host", swagger.getHost()); } bundle.put("basePath", basePath); + bundle.put("scheme", scheme); bundle.put("contextPath", contextPath); bundle.put("apiInfo", apis); bundle.put("models", allModels); diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache index 2a3728483f5..d27109aa445 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache @@ -8,9 +8,9 @@ module Swagger # Defaults go in here.. def initialize @format = 'json' - @scheme = 'http' - @host = 'petstore.swagger.io' - @base_path = '/v2' + @scheme = '{{scheme}}' + @host = '{{host}}' + @base_path = '{{contextPath}}' @user_agent = "ruby-swagger-#{Swagger::VERSION}" @inject_format = false @force_ending_format = false From 41371bd9015b2db3ba7ef3b13da504cd759b5081 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 14 Apr 2015 15:03:21 +0800 Subject: [PATCH 2/2] Initialize a default configuration object --- .../swagger-codegen/src/main/resources/ruby/swagger.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache index 1cc3ea456c2..fff098e96fc 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache @@ -7,6 +7,8 @@ require 'logger' module Swagger + @configuration = Configuration.new + class << self attr_accessor :logger @@ -27,7 +29,6 @@ module Swagger # end # def configure - self.configuration ||= Configuration.new yield(configuration) if block_given? # Configure logger. Default to use Rails