ficon 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c762adf3cdb126d047b66c426c3f388a3a8c61e2c6c009cff2f0dca3c7f219
-  data.tar.gz: 53a177388f199f7133991f1067ad1a71d747c5d84c99b88d379d7878a3196eb5
+  metadata.gz: 6b300144548c846bb2d309ca04ca78198f9e37682e50f08ac2f60e95f54e84f5
+  data.tar.gz: 90e5b7804b8e6c44e8c361c585e03a2553724322cebf84846c66c73c1652a234
 SHA512:
-  metadata.gz: 2af1238cf43c03e84081ddfeeb69a545613e0348b33dab4aa3670d8e152e9ce4089f9b8c892764ecb143cf2aaa90b6afa4fd7b844bb611e98a8b18b27ce161b6
-  data.tar.gz: 6eac859ed1529c3f22fcdaf5634a8e66ae1c625da7fbc0a1bce80afe53fc2a2a15145ac827cf65de414e68b7ea86be6cf25b808102606ab44f77def6a20124c4
+  metadata.gz: 6781246417b9d5cc5e1791acae5232dcd13ea9a934f0f977929fd57a5fa348dff96143b2acf327bd3ea7626e0eea65c92b585f4bd544c3fcd7764de76eee121b
+  data.tar.gz: 0a2b83a50bdbc340e8877028f77f99de6ca23e9bdfa15b237f0d47390394ba3f9165ebfdf2a625bffdbebca40789cac8ce2cc3b6d9c6cf11c79ae2f23f8aca19

data/lib/ficon/version.rb

@@ -1,3 +1,3 @@
 class Ficon
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/lib/ficon.rb

@@ -9,25 +9,28 @@ require_relative "ficon/image"
 require_relative "ficon/cache"
 
 class Ficon
-  attr_reader :site
+  attr_reader :site, :final_uri
   attr_accessor :user_agent
 
   def initialize(uri, user_agent: nil)
     @uri = Addressable::URI.heuristic_parse(uri)
+    @final_uri = @uri
     @site = {}
     @user_agent = user_agent || "Ficon/#{VERSION} (Ruby icon finder; https://github.com/dkam/ficon)"
     process
   end
 
   def doc
-    cache = Cache.new(@uri)
+    # First try to fetch to determine final URL
+    response = fetch_url(@uri) unless @data
+    return nil if response.nil? && @data.nil?
 
-    @data ||= cache.data
+    # Use final URL for caching
+    cache = Cache.new(@final_uri)
 
-    if @data.nil?
-      response = fetch_url(@uri)
-      return nil unless response
+    @data ||= cache.data
 
+    if @data.nil? && response
       @data = response.body.force_encoding("UTF-8")
       cache.data = @data
       cache.etag = response["etag"] if response["etag"]
@@ -60,30 +63,27 @@ class Ficon
   end
 
   def report
-    <<~REPORT
-      Site icon: #{@site[:images].first}
-      Page icon: #{@site[:page_images].first}
-      Page title: #{@site[:title]}
-      Page description: #{@site[:description]}
-      Canonical URL: #{@site[:canonical]}
-    REPORT
+    report_lines = []
+    report_lines << "Site icon: #{@site[:images].first}"
+    report_lines << "Page icon: #{@site[:page_images].first}"
+    report_lines << "Page title: #{@site[:title]}"
+    report_lines << "Page description: #{@site[:description]}"
+    report_lines << "Final URL: #{@final_uri}" if @final_uri.to_s != @uri.to_s
+    report_lines << "Canonical URL: #{@site[:canonical]}" if @site[:canonical]
+    report_lines.join("\n") + "\n"
   end
 
-  def site_icons
-    @site[:images]
-  end
+  def site_icons = @site[:images]
 
-  def page_images
-    @site[:page_images]
-  end
+  def site_icon = site_icons&.first
 
-  def title
-    @site[:title]
-  end
+  def page_images = @site[:page_images]
 
-  def description
-    @site[:description]
-  end
+  def page_image = page_images&.first
+
+  def title = @site[:title]
+
+  def description = @site[:description]
 
   def other_page_data
     @site[:title] = doc.at_xpath("//meta[@property='og:title']/@content")&.value || @doc.at_xpath("//title")&.text&.strip
@@ -126,15 +126,31 @@ class Ficon
 
   private
 
-  def fetch_url(uri)
+  def fetch_url(uri, redirect_limit = 5)
     uri = URI(uri) unless uri.is_a?(URI)
 
+    raise "Too many redirects" if redirect_limit <= 0
+
     Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
       http.read_timeout = 10
       http.open_timeout = 5
       request = Net::HTTP::Get.new(uri)
       request["User-Agent"] = @user_agent
-      http.request(request)
+      response = http.request(request)
+
+      case response
+      when Net::HTTPRedirection
+        location = response["location"]
+        if location
+          new_uri = URI.join(uri.to_s, location)
+          @final_uri = Addressable::URI.parse(new_uri.to_s)
+          return fetch_url(new_uri, redirect_limit - 1)
+        end
+      else
+        @final_uri = Addressable::URI.parse(uri.to_s)
+      end
+
+      response
     end
   rescue Net::HTTPError, SocketError, Timeout::Error => e
     puts "Failed to fetch #{uri}: #{e.inspect}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ficon
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Dan Milne