From 0b7db0ce2d66a66d64740478ad7e24ce0b169276 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Wed, 26 Sep 2012 14:01:57 -0700 Subject: [PATCH] clean up of formatting --- samples/client/petstore/ruby/lib/Pet_api.rb | 40 +++++------ samples/client/petstore/ruby/lib/Store_api.rb | 24 +++---- samples/client/petstore/ruby/lib/User_api.rb | 66 +++++++------------ 3 files changed, 48 insertions(+), 82 deletions(-) diff --git a/samples/client/petstore/ruby/lib/Pet_api.rb b/samples/client/petstore/ruby/lib/Pet_api.rb index 0e8bf2d20c9..2cb00a1f7f6 100644 --- a/samples/client/petstore/ruby/lib/Pet_api.rb +++ b/samples/client/petstore/ruby/lib/Pet_api.rb @@ -9,14 +9,12 @@ class Pet_api end def self.get_pet_by_id (pet_id,opts={}) - query_param_keys = [ - ] + query_param_keys = [] # verify existence of params raise "pet_id is required" if pet_id.nil? # set default values and merge with input - options = { - :pet_id => pet_id}.merge(opts) + options = { :pet_id => pet_id}.merge(opts) #resource path path = "/pet.{format}/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', escapeString(pet_id)) @@ -33,15 +31,13 @@ class Pet_api Pet.new(response) end - def self.add_pet (body,opts={}) - query_param_keys = [ - ] +def self.add_pet (body,opts={}) + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/pet.{format}".sub('{format}','json') @@ -77,15 +73,13 @@ class Pet_api end - def self.update_pet (body,opts={}) - query_param_keys = [ - ] +def self.update_pet (body,opts={}) + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/pet.{format}".sub('{format}','json') @@ -121,15 +115,13 @@ class Pet_api end - def self.find_pets_by_status (status= "available",opts={}) - query_param_keys = [ - :status] +def self.find_pets_by_status (status= "available",opts={}) + query_param_keys = [:status] # verify existence of params raise "status is required" if status.nil? # set default values and merge with input - options = { - :status => status}.merge(opts) + options = { :status => status}.merge(opts) #resource path path = "/pet.{format}/findByStatus".sub('{format}','json') @@ -145,15 +137,13 @@ class Pet_api response.map {|response|Pet.new(response)} end - def self.find_pets_by_tags (tags,opts={}) - query_param_keys = [ - :tags] +def self.find_pets_by_tags (tags,opts={}) + query_param_keys = [:tags] # verify existence of params raise "tags is required" if tags.nil? # set default values and merge with input - options = { - :tags => tags}.merge(opts) + options = { :tags => tags}.merge(opts) #resource path path = "/pet.{format}/findByTags".sub('{format}','json') @@ -169,5 +159,5 @@ class Pet_api response.map {|response|Pet.new(response)} end - end +end diff --git a/samples/client/petstore/ruby/lib/Store_api.rb b/samples/client/petstore/ruby/lib/Store_api.rb index bd0fe15253e..2469dd12c95 100644 --- a/samples/client/petstore/ruby/lib/Store_api.rb +++ b/samples/client/petstore/ruby/lib/Store_api.rb @@ -9,14 +9,12 @@ class Store_api end def self.get_order_by_id (order_id,opts={}) - query_param_keys = [ - ] + query_param_keys = [] # verify existence of params raise "order_id is required" if order_id.nil? # set default values and merge with input - options = { - :order_id => order_id}.merge(opts) + options = { :order_id => order_id}.merge(opts) #resource path path = "/store.{format}/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', escapeString(order_id)) @@ -33,15 +31,13 @@ class Store_api Order.new(response) end - def self.delete_order (order_id,opts={}) - query_param_keys = [ - ] +def self.delete_order (order_id,opts={}) + query_param_keys = [] # verify existence of params raise "order_id is required" if order_id.nil? # set default values and merge with input - options = { - :order_id => order_id}.merge(opts) + options = { :order_id => order_id}.merge(opts) #resource path path = "/store.{format}/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', escapeString(order_id)) @@ -58,15 +54,13 @@ class Store_api end - def self.place_order (body,opts={}) - query_param_keys = [ - ] +def self.place_order (body,opts={}) + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/store.{format}/order".sub('{format}','json') @@ -102,5 +96,5 @@ class Store_api end - end +end diff --git a/samples/client/petstore/ruby/lib/User_api.rb b/samples/client/petstore/ruby/lib/User_api.rb index edc76dd2e61..de73d035eeb 100644 --- a/samples/client/petstore/ruby/lib/User_api.rb +++ b/samples/client/petstore/ruby/lib/User_api.rb @@ -9,14 +9,12 @@ class User_api end def self.create_users_with_array_input (body,opts={}) - query_param_keys = [ - ] + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/user.{format}/createWithArray".sub('{format}','json') @@ -52,15 +50,13 @@ class User_api end - def self.create_user (body,opts={}) - query_param_keys = [ - ] +def self.create_user (body,opts={}) + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/user.{format}".sub('{format}','json') @@ -96,15 +92,13 @@ class User_api end - def self.create_users_with_list_input (body,opts={}) - query_param_keys = [ - ] +def self.create_users_with_list_input (body,opts={}) + query_param_keys = [] # verify existence of params raise "body is required" if body.nil? # set default values and merge with input - options = { - :body => body}.merge(opts) + options = { :body => body}.merge(opts) #resource path path = "/user.{format}/createWithList".sub('{format}','json') @@ -140,17 +134,14 @@ class User_api end - def self.update_user (username,body,opts={}) - query_param_keys = [ - ] +def self.update_user (username,body,opts={}) + query_param_keys = [] # verify existence of params raise "username is required" if username.nil? raise "body is required" if body.nil? # set default values and merge with input - options = { - :username => username, - :body => body}.merge(opts) + options = { :username => username, :body => body}.merge(opts) #resource path path = "/user.{format}/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username)) @@ -187,15 +178,13 @@ class User_api end - def self.delete_user (username,opts={}) - query_param_keys = [ - ] +def self.delete_user (username,opts={}) + query_param_keys = [] # verify existence of params raise "username is required" if username.nil? # set default values and merge with input - options = { - :username => username}.merge(opts) + options = { :username => username}.merge(opts) #resource path path = "/user.{format}/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username)) @@ -212,15 +201,13 @@ class User_api end - def self.get_user_by_name (username,opts={}) - query_param_keys = [ - ] +def self.get_user_by_name (username,opts={}) + query_param_keys = [] # verify existence of params raise "username is required" if username.nil? # set default values and merge with input - options = { - :username => username}.merge(opts) + options = { :username => username}.merge(opts) #resource path path = "/user.{format}/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username)) @@ -237,17 +224,14 @@ class User_api User.new(response) end - def self.login_user (username,password,opts={}) - query_param_keys = [ - :username, :password] +def self.login_user (username,password,opts={}) + query_param_keys = [:username,:password] # verify existence of params raise "username is required" if username.nil? raise "password is required" if password.nil? # set default values and merge with input - options = { - :username => username, - :password => password}.merge(opts) + options = { :username => username, :password => password}.merge(opts) #resource path path = "/user.{format}/login".sub('{format}','json') @@ -263,13 +247,11 @@ class User_api string.new(response) end - def self.logout_user (opts={}) - query_param_keys = [ - ] +def self.logout_user (opts={}) + query_param_keys = [] # set default values and merge with input - options = { - }.merge(opts) + options = { }.merge(opts) #resource path path = "/user.{format}/logout".sub('{format}','json') @@ -285,5 +267,5 @@ class User_api end - end +end