Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added options hash. #8

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/url_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
require_relative 'url_resolver/resolver.rb'

module UrlResolver
def self.resolve(url)
def self.resolve(url, options={})
@@resolver ||= UrlResolver::Resolver.new
@@resolver.resolve(url)
@@resolver.resolve(url, options)
end
end
19 changes: 14 additions & 5 deletions lib/url_resolver/resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,21 @@ def user_agent
UrlResolver.configuration.user_agent
end

def resolve(url)
def resolve(url, options={})
url_to_check = URI.escape(url)
cached_url = cache.get_url(url_to_check)
return cached_url if cached_url

response = RestClient.head(url_to_check, user_agent: user_agent)

options.merge!({
rest_client: {
url: url_to_check,
method: :head,
user_agent: user_agent
}
})

response = RestClient::Request.execute(options[:rest_client])

response.args[:url].tap do |final_url|
cache.set_url(url_to_check, final_url)
end
Expand All @@ -35,12 +44,12 @@ def resolve(url)
RestClient::Forbidden,
RestClient::NotAcceptable,
URI::InvalidURIError => e

if e.message == 'getaddrinfo: nodename nor servname provided, or not known'
response = RestClient.head(url_to_check) { |response, request, result, &block| response }
url = response.headers[:location] if response.code == 302 && response.headers[:location]
end

cache.set_url(url_to_check, url) if UrlResolver.configuration.cache_failures
url
rescue Exception => e
Expand Down