lib/http_utilities/http/mechanize/client.rb in http_utilities-1.2.6 vs lib/http_utilities/http/mechanize/client.rb in http_utilities-1.2.6.1
- old
+ new
@@ -20,22 +20,23 @@
logger = options.fetch(:logger, STDOUT)
self.agent = ::Mechanize.new
self.agent.log = ::Logger.new(logger) if (verbose)
+ self.proxy = {}
self.set_proxy_options(options)
- if (self.proxy[:host] && self.proxy[:port])
+ if self.proxy[:host] && self.proxy[:port]
log(:info, "[HttpUtilities::Http::Mechanize::Client] - Will use proxy #{self.proxy[:host]}:#{self.proxy[:port]} for Mechanize.")
self.agent.set_proxy(self.proxy[:host], self.proxy[:port], self.proxy[:username], self.proxy[:password])
end
self.set_user_agent
(self.user_agent) ? self.agent.user_agent = self.user_agent : self.agent.user_agent_alias = 'Mac Safari'
timeout = options.fetch(:timeout, 300)
- self.agent.open_timeout = self.agent.read_timeout = timeout if (timeout)
+ self.agent.open_timeout = self.agent.read_timeout = timeout if timeout
end
def reset_agent(options = {})
self.agent, self.proxy, self.user_agent = nil
init_agent(options)
@@ -48,20 +49,20 @@
page = self.agent.get(url)
rescue Net::HTTPNotFound, ::Mechanize::ResponseCodeError => error
log(:error, "[HttpUtilities::Http::Mechanize::Client] - Response Code Error occurred for url #{url}. Error class: #{error.class.name}. Error message: #{error.message}")
- if (retries > 0)
+ if retries > 0
reset_agent(options)
retries -= 1
retry
end
rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::ECONNRESET, Timeout::Error, Net::HTTPUnauthorized, Net::HTTPForbidden, StandardError => connection_error
log(:error, "[HttpUtilities::Http::Mechanize::Client] - Error occurred. Error class: #{connection_error.class.name}. Message: #{connection_error.message}")
- if (retries > 0)
+ if retries > 0
reset_agent(options)
retries -= 1
retry
end
end
@@ -86,12 +87,12 @@
def get_form(url_or_page, form_identifier = {}, options = {})
form = nil
index = form_identifier.delete(:index) { |el| 0 }
page = (url_or_page.is_a?(String)) ? get_page(url_or_page, options) : url_or_page
- if (page)
- if (form_identifier.empty?)
+ if page
+ if form_identifier.empty?
form = page.forms[index]
else
forms = page.forms_with(form_identifier)
form = (forms && forms.any?) ? forms[index] : nil
end
@@ -189,6 +190,6 @@
end
end
end
-end
\ No newline at end of file
+end