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

Unify ClientError and ServerError into ApiError

Browse Source 
in Ruby generator
This commit is contained in:
xhh 2015-06-15 16:38:08 +08:00
parent e9c1dd7842
commit 9d5928551b
9 changed files with 67 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
View File

@ -73,6 +73,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
supportingFiles.add(new SupportingFile("swagger.mustache", baseFolder, "swagger.rb"));
supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "request.mustache", swaggerFolder, "request.rb"));
supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "response.mustache", swaggerFolder, "response.rb"));
supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "api_error.mustache", swaggerFolder, "api_error.rb"));
supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "version.mustache", swaggerFolder, "version.rb"));
supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "configuration.mustache", swaggerFolder, "configuration.rb"));
supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb"));

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

@ -52,7 +52,7 @@ module {{moduleName}}
return if Swagger.authenticated?
if Swagger.configuration.username.blank? || Swagger.configuration.password.blank?
raise ClientError, "Username and password are required to authenticate."
raise ApiError, "Username and password are required to authenticate."
end
request = Swagger::Request.new(
@ -69,10 +69,4 @@ module {{moduleName}}
end
end
end
class ServerError < StandardError
end
class ClientError < StandardError
end
end

26
modules/swagger-codegen/src/main/resources/ruby/swagger/api_error.mustache Normal file
View File

@ -0,0 +1,26 @@
module {{moduleName}}
module Swagger
class ApiError < StandardError
attr_reader :code, :response_headers, :response_body
# Usage examples:
# ApiError.new
# ApiError.new("message")
# ApiError.new(:code => 500, :response_headers => {}, :response_body => "")
# ApiError.new(:code => 404, :message => "Not Found")
def initialize(arg = nil)
if arg.is_a? Hash
arg.each do |k, v|
if k.to_s == 'message'
super v
else
instance_variable_set "@#{k}", v
end
end
else
super arg
end
end
end
end
end

8
modules/swagger-codegen/src/main/resources/ruby/swagger/response.mustache
View File

@ -9,9 +9,11 @@ module {{moduleName}}
def initialize(raw)
self.raw = raw
case self.code
when 500..510 then raise(ServerError, self.body)
when 299..426 then raise(ClientError, self.body)
unless raw.success?
fail ApiError.new(:code => code,
:response_headers => headers,
:response_body => body),
raw.status_message
end
end

1
modules/swagger-codegen/src/main/resources/ruby/swagger_client.mustache
View File

@ -2,6 +2,7 @@
require '{{gemName}}/monkey'
require '{{gemName}}/swagger'
require '{{gemName}}/swagger/configuration'
require '{{gemName}}/swagger/api_error'
require '{{gemName}}/swagger/request'
require '{{gemName}}/swagger/response'
require '{{gemName}}/swagger/version'

1
samples/client/petstore/ruby/lib/swagger_client.rb
View File

@ -2,6 +2,7 @@
require 'swagger_client/monkey'
require 'swagger_client/swagger'
require 'swagger_client/swagger/configuration'
require 'swagger_client/swagger/api_error'
require 'swagger_client/swagger/request'
require 'swagger_client/swagger/response'
require 'swagger_client/swagger/version'

8
samples/client/petstore/ruby/lib/swagger_client/swagger.rb
View File

@ -52,7 +52,7 @@ module SwaggerClient
return if Swagger.authenticated?
if Swagger.configuration.username.blank? || Swagger.configuration.password.blank?
raise ClientError, "Username and password are required to authenticate."
raise ApiError, "Username and password are required to authenticate."
end
request = Swagger::Request.new(
@ -69,10 +69,4 @@ module SwaggerClient
end
end
end
class ServerError < StandardError
end
class ClientError < StandardError
end
end

26
samples/client/petstore/ruby/lib/swagger_client/swagger/api_error.rb Normal file
View File

@ -0,0 +1,26 @@
module SwaggerClient
module Swagger
class ApiError < StandardError
attr_reader :code, :response_headers, :response_body
# Usage examples:
# ApiError.new
# ApiError.new("message")
# ApiError.new(:code => 500, :response_headers => {}, :response_body => "")
# ApiError.new(:code => 404, :message => "Not Found")
def initialize(arg = nil)
if arg.is_a? Hash
arg.each do |k, v|
if k.to_s == 'message'
super v
else
instance_variable_set "@#{k}", v
end
end
else
super arg
end
end
end
end
end

8
samples/client/petstore/ruby/lib/swagger_client/swagger/response.rb
View File

@ -9,9 +9,11 @@ module SwaggerClient
def initialize(raw)
self.raw = raw
case self.code
when 500..510 then raise(ServerError, self.body)
when 299..426 then raise(ClientError, self.body)
unless raw.success?
fail ApiError.new(:code => code,
:response_headers => headers,
:response_body => body),
raw.status_message
end
end