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

Merge pull request #175 from Christian-G/master 

Added HTTP Proxy support
This commit is contained in:
Steve Bazyl 2014-12-05 16:50:25 -08:00
parent c6eb3920ad 0fda40c21f
commit 3a295bf0e7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/google/api_client.rb
View File

@ -97,6 +97,9 @@ module Google
else else
logger.warn { "#{self.class} - Please provide :application_name and :application_version when initializing the client" } logger.warn { "#{self.class} - Please provide :application_name and :application_version when initializing the client" }
end end
proxy = options[:proxy] || Object::ENV["http_proxy"]
self.user_agent = options[:user_agent] || ( self.user_agent = options[:user_agent] || (
"#{application_string} " + "#{application_string} " +
"google-api-ruby-client/#{Google::APIClient::VERSION::STRING} #{ENV::OS_VERSION} (gzip)" "google-api-ruby-client/#{Google::APIClient::VERSION::STRING} #{ENV::OS_VERSION} (gzip)"
@ -118,6 +121,7 @@ module Google
faraday.options.params_encoder = Faraday::FlatParamsEncoder faraday.options.params_encoder = Faraday::FlatParamsEncoder
faraday.ssl.ca_file = ca_file faraday.ssl.ca_file = ca_file
faraday.ssl.verify = true faraday.ssl.verify = true
faraday.proxy proxy
faraday.adapter Faraday.default_adapter faraday.adapter Faraday.default_adapter
end end
return self return self