ficon 0.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38f205039b510b47be5f9a226ebc8680dbd2c97a38cae867c597e02ce6805b4
-  data.tar.gz: edefb06cd24a6091df0e92fe7ac68974cc649e0b4e3b22e73243bbcfe352a838
+  metadata.gz: 6b300144548c846bb2d309ca04ca78198f9e37682e50f08ac2f60e95f54e84f5
+  data.tar.gz: 90e5b7804b8e6c44e8c361c585e03a2553724322cebf84846c66c73c1652a234
 SHA512:
-  metadata.gz: 7d04d8330715b5194af238accadb7ab5513f3a27423ab9feb5634c03b6e5d847841eb29d4ceb85cc71faf6526b16aeaf80c561293f97b76e483789329fe5236f
-  data.tar.gz: 818b27e4318f1c587ed29a9925b66f846644d2cd82378cf1400b1b2e9a9298fc7f091b1981abdbbe51dd598f7b0475b3cef1e1e941ce80b7c14da65a9738bc83
+  metadata.gz: 6781246417b9d5cc5e1791acae5232dcd13ea9a934f0f977929fd57a5fa348dff96143b2acf327bd3ea7626e0eea65c92b585f4bd544c3fcd7764de76eee121b
+  data.tar.gz: 0a2b83a50bdbc340e8877028f77f99de6ca23e9bdfa15b237f0d47390394ba3f9165ebfdf2a625bffdbebca40789cac8ce2cc3b6d9c6cf11c79ae2f23f8aca19

data/lib/ficon/version.rb

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

data/lib/ficon.rb

@@ -9,22 +9,28 @@ require_relative "ficon/image"
 require_relative "ficon/cache"
 
 class Ficon
-  attr_reader :site
-  def initialize(uri)
+  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?
+
+    # Use final URL for caching
+    cache = Cache.new(@final_uri)
 
     @data ||= cache.data
 
-    if @data.nil?
-      response = fetch_url(@uri)
-      return nil unless response
-      
+    if @data.nil? && response
       @data = response.body.force_encoding("UTF-8")
       cache.data = @data
       cache.etag = response["etag"] if response["etag"]
@@ -57,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
@@ -91,7 +94,7 @@ class Ficon
 
   def self.site_images(uri, doc)
     results = []
-    
+
     # Get tile color for Windows tiles
     tile_color = doc.at_xpath("//meta[@name='msapplication-TileColor']/@content")&.value
 
@@ -100,7 +103,7 @@ class Ficon
 
     results.collect { |result| normalise(uri, result) }.uniq.collect do |url|
       # Check if this is a tile image to pass the color
-      is_tile = doc.at_xpath("//meta[@name='msapplication-TileImage' and @content='#{url}' or @content='#{url.sub(uri.to_s, '')}']")
+      is_tile = doc.at_xpath("//meta[@name='msapplication-TileImage' and @content='#{url}' or @content='#{url.sub(uri.to_s, "")}']")
       Image.new(url, is_tile ? tile_color : nil)
     end.sort_by(&:area).reverse
   end
@@ -123,25 +126,34 @@ class Ficon
 
   private
 
-  def fetch_url(uri)
+  def fetch_url(uri, redirect_limit = 5)
     uri = URI(uri) unless uri.is_a?(URI)
-    
-    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+
+    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'] = "Ficon/#{VERSION} (Ruby icon finder; https://github.com/dkam/ficon)"
-      http.request(request)
+      request["User-Agent"] = @user_agent
+      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}"
     nil
   end
-
-  def other_page_data
-    @site[:title] = doc.at_xpath("//meta[@property='og:title']/@content")&.value || @doc.at_xpath("//title")&.text&.strip
-    @site[:description] = doc.at_xpath("//meta[@property='og:description']/@content")&.value
-    canonical = doc.at_xpath("//link[@rel='canonical']/@href")&.value
-    @site[:canonical] = canonical unless canonical == @url
-  end
 end

data/test/ficon_test.rb

@@ -54,4 +54,19 @@ class FiconTest < Minitest::Test
     assert_equal 'https://site.com/win8-tile-144.png', result.url
     assert_equal '#00aced', result.tile_color
   end
+
+  def test_custom_user_agent
+    # Test default user agent
+    ficon_default = Ficon.new('https://example.com')
+    assert_match(/^Ficon\/0\.2/, ficon_default.user_agent)
+    
+    # Test custom user agent
+    custom_agent = 'MyApp/1.0 (Custom Bot)'
+    ficon_custom = Ficon.new('https://example.com', user_agent: custom_agent)
+    assert_equal custom_agent, ficon_custom.user_agent
+    
+    # Test user agent can be changed after initialization
+    ficon_custom.user_agent = 'Changed/2.0'
+    assert_equal 'Changed/2.0', ficon_custom.user_agent
+  end
 end

metadata

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