lib/flavicon/finder.rb in flavicon-0.1.0 vs lib/flavicon/finder.rb in flavicon-0.1.1

@@ -7,15 +7,16 @@
     TooManyRedirects = Class.new(StandardError)
 
     def find
       response, resolved = request(url)
       favicon_url = extract_from_html(response.body, resolved) || default_path(resolved)
-      valid_favicon_url?(favicon_url) ? favicon_url : nil
+      verify_favicon_url(favicon_url)
     end
 
-    def valid_favicon_url?(url)
-      response, _ = request(url)
-      response.is_a?(Net::HTTPSuccess) && response.body.to_s != '' && response.content_type =~ /image/i
+    def verify_favicon_url(url)
+      response, resolved = request(url)
+      return unless response.is_a?(Net::HTTPSuccess) && response.body.to_s != '' && response.content_type =~ /image/i
+      resolved
     end
 
     def extract_from_html(html, url)
       link = Nokogiri::HTML(html).css('head link').find do |link|
         link[:rel] =~ /\A(shortcut )?icon\z/i