chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #208 from blowmage/fix-warnings 

Fix warnings
This commit is contained in:
Tim Emiola 2015-03-25 17:16:41 -07:00
parent fb3fc4623f 3eb18d6011
commit 0b1dbb67fe
6 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/google/api_client.rb
View File

@ -490,7 +490,7 @@ module Google
else
check_cached_certs = lambda do
valid = false
for key, cert in @certificates
for _key, cert in @certificates
begin
self.authorization.decoded_id_token(cert.public_key)
valid = true

22
lib/google/api_client/auth/key_utils.rb
View File

@ -25,44 +25,44 @@ module Google
#
# @param [String] keyfile
# Path of the PKCS12 file to load. If not a path to an actual file,
# assumes the string is the content of the file itself.
# assumes the string is the content of the file itself.
# @param [String] passphrase
# Passphrase for unlocking the private key
#
# @return [OpenSSL::PKey] The private key for signing assertions.
def self.load_from_pkcs12(keyfile, passphrase)
load_key(keyfile, passphrase) do |content, passphrase|
OpenSSL::PKCS12.new(content, passphrase).key
load_key(keyfile, passphrase) do |content, pass_phrase|
OpenSSL::PKCS12.new(content, pass_phrase).key
end
end
##
# Loads a key from a PEM file.
#
# @param [String] keyfile
# Path of the PEM file to load. If not a path to an actual file,
# assumes the string is the content of the file itself.
# assumes the string is the content of the file itself.
# @param [String] passphrase
# Passphrase for unlocking the private key
#
# @return [OpenSSL::PKey] The private key for signing assertions.
#
def self.load_from_pem(keyfile, passphrase)
load_key(keyfile, passphrase) do | content, passphrase|
OpenSSL::PKey::RSA.new(content, passphrase)
load_key(keyfile, passphrase) do | content, pass_phrase|
OpenSSL::PKey::RSA.new(content, pass_phrase)
end
end
private
##
# Helper for loading keys from file or memory. Accepts a block
# to handle the specific file format.
#
# @param [String] keyfile
# Path of thefile to load. If not a path to an actual file,
# assumes the string is the content of the file itself.
# assumes the string is the content of the file itself.
# @param [String] passphrase
# Passphrase for unlocking the private key
#
@ -86,8 +86,8 @@ module Google
block.call(content, passphrase)
rescue OpenSSL::OpenSSLError
raise ArgumentError.new("Invalid keyfile or passphrase")
end
end
end
end
end
end
end

1
lib/google/api_client/auth/storage.rb
View File

@ -38,6 +38,7 @@ module Google
# @params [Object] Storage object
def initialize(store)
@store= store
@authorization = nil
end
##

43
lib/google/api_client/batch.rb
View File

@ -35,7 +35,7 @@ module Google
##
# Initialize the call response
#
#
# @param [String] call_id
# UUID of the original call
# @param [Fixnum] status
@ -48,7 +48,7 @@ module Google
@call_id, @status, @headers, @body = call_id, status, headers, body
end
end
# Wraps multiple API calls into a single over-the-wire HTTP request.
#
# @example
@ -58,7 +58,7 @@ module Google
# batch = Google::APIClient::BatchRequest.new do |result|
# puts result.data
# end
#
#
# batch.add(:api_method => urlshortener.url.insert, :body_object => { 'longUrl' => 'http://example.com/foo' })
# batch.add(:api_method => urlshortener.url.insert, :body_object => { 'longUrl' => 'http://example.com/bar' })
#
@ -80,16 +80,17 @@ module Google
# Callback for every call's response. Won't be called if a call defined
# a callback of its own.
#
# @return [Google::APIClient::BatchRequest]
# @return [Google::APIClient::BatchRequest]
# The constructed object.
#
# @yield [Google::APIClient::Result]
# block to be called when result ready
def initialize(options = {}, &block)
@calls = []
@global_callback = nil
@global_callback = block if block_given?
@last_auto_id = 0
@base_id = SecureRandom.uuid
options[:uri] ||= 'https://www.googleapis.com/batch'
@ -104,7 +105,7 @@ module Google
# automatically be generated, avoiding collisions. If duplicate call IDs
# are provided, an error will be thrown.
#
# @param [Hash, Google::APIClient::Request] call
# @param [Hash, Google::APIClient::Request] call
# the call to be added.
# @param [String] call_id
# the ID to be used for this call. Must be unique
@ -126,7 +127,7 @@ module Google
'A call with this ID already exists: %s' % call_id
end
callback = block_given? ? block : @global_callback
@calls << [call_id, call, callback]
@calls << [call_id, call, callback]
return self
end
@ -165,12 +166,12 @@ module Google
if @calls.nil? || @calls.empty?
raise BatchError, 'Cannot make an empty batch request'
end
parts = @calls.map {|(call_id, call, callback)| serialize_call(call_id, call)}
parts = @calls.map {|(call_id, call, _callback)| serialize_call(call_id, call)}
build_multipart(parts, 'multipart/mixed', BATCH_BOUNDARY)
super
end
protected
##
@ -183,7 +184,7 @@ module Google
# @param [Hash] headers
# the hash of headers and their values.
#
# @return [String]
# @return [String]
# the value of the desired header.
def find_header(name, headers)
_, header = headers.detect do |h, v|
@ -197,7 +198,7 @@ module Google
#
# @api private
#
# @return [String]
# @return [String]
# the new, unique ID.
def new_id
@last_auto_id += 1
@ -216,7 +217,7 @@ module Google
# @param [String] header
# Content-ID header value.
#
# @return [String]
# @return [String]
# The extracted ID value.
def header_to_id(header)
if !header.start_with?('<') || !header.end_with?('>') ||
@ -224,7 +225,7 @@ module Google
raise BatchError, 'Invalid value for Content-ID: "%s"' % header
end
base, call_id = header[1...-1].split('+')
_base, call_id = header[1...-1].split('+')
return Addressable::URI.unencode(call_id)
end
@ -236,7 +237,7 @@ module Google
# @param [String] response
# the response to parse.
#
# @return [Array<Hash>, String]
# @return [Array<Hash>, String]
# the headers and the body, separately.
def split_headers_and_body(response)
headers = {}
@ -263,12 +264,12 @@ module Google
# @param [String] call_response
# the request to deserialize.
#
# @return [Google::APIClient::BatchedCallResponse]
# @return [Google::APIClient::BatchedCallResponse]
# the parsed and converted response.
def deserialize_call_response(call_response)
outer_headers, outer_body = split_headers_and_body(call_response)
status_line, payload = outer_body.split("\n", 2)
protocol, status, reason = status_line.split(' ', 3)
_protocol, status, _reason = status_line.split(' ', 3)
headers, body = split_headers_and_body(payload)
content_id = find_header('Content-ID', outer_headers)
@ -284,7 +285,7 @@ module Google
# @param [Google::APIClient::Request] call
# the call to serialize.
#
# @return [Faraday::UploadIO]
# @return [Faraday::UploadIO]
# the serialized request
def serialize_call(call_id, call)
method, uri, headers, body = call.to_http_request
@ -293,7 +294,7 @@ module Google
request << "\r\n%s: %s" % [header, value]
end
if body
# TODO - CompositeIO if body is a stream
# TODO - CompositeIO if body is a stream
request << "\r\n\r\n"
if body.respond_to?(:read)
request << body.read
@ -303,7 +304,7 @@ module Google
end
Faraday::UploadIO.new(StringIO.new(request), 'application/http', 'ruby-api-request', 'Content-ID' => id_to_header(call_id))
end
##
# Convert an id to a Content-ID header value.
#
@ -319,7 +320,7 @@ module Google
def id_to_header(call_id)
return '<%s+%s>' % [@base_id, Addressable::URI.encode(call_id)]
end
end
end
end

6
lib/google/api_client/request.rb
View File

@ -27,7 +27,7 @@ module Google
# Represents an API request.
class Request
include Google::APIClient::Logging
MULTIPART_BOUNDARY = "-----------RubyApiMultipartPost".freeze
# @return [Hash] Request parameters
@ -157,7 +157,7 @@ module Google
# @return [Google::APIClient::Result]
# result of API request
def send(connection, is_retry = false)
self.body.rewind if is_retry && self.body.respond_to?(:rewind)
self.body.rewind if is_retry && self.body.respond_to?(:rewind)
env = self.to_env(connection)
logger.debug { "#{self.class} Sending API request #{env[:method]} #{env[:url].to_s} #{env[:request_headers]}" }
http_response = connection.app.call(env)
@ -244,7 +244,7 @@ module Google
)
end
request_env = http_request.to_env(connection)
http_request.to_env(connection)
end
##

2
lib/google/api_client/service/simple_file_store.rb
View File

@ -124,7 +124,7 @@ module Google
# Read the entire cache file from disk.
# Will avoid reading if there have been no changes.
def read_file
if !File.exists? @file_path
if !File.exist? @file_path
@cache = nil
else
# Check for changes after our last read or write.