ficon 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e8577eb04ba2dceefb974b436520ff73b8c37f6beb04c85ac62f02e774bbc94
-  data.tar.gz: 4196a3eb41905e40f0285eb132b3ae4d9e9c2c00f002584f6dc0b667893842db
+  metadata.gz: a9f5f2c6b36b5360a88f4eac14c07c96f7fefb9674fb6bed0bdf4a7be63ad2d0
+  data.tar.gz: f85066461f2384ed8e2ed3d302e5e3ffe537178dfaf40c128e056dd16c1e3027
 SHA512:
-  metadata.gz: afbea646a672f8654bd8ba76a628c373ca1c40dbf051af8937656f755f65872031a6fc88e6a223914469a5baf10e303fc47e770ddb3abbf70305c1e08ebe1714
-  data.tar.gz: b08f3e0d30b5f93f503d03b5222938ab37e7c5fb423b5cbcf2df3fe217ed791aec4dc8cb8a32e540e41cd9bf06d7ea62b3bc062b159aa64452caa992c069de29
+  metadata.gz: 7ac7f80ea66b97249dccbfcdd4c7adf82b741125c23dbd92339346fb63e772bcfcea893279cca1b05b100946d567ee4c82bdfc9ba85dcd4fd10c881bef987ae9
+  data.tar.gz: 8c4421c19189b779f19aca1699521e600c25f4a17807dc22a546913a28e0d230263642d8610ef68f81d548f66be4cff1654dc9a12a644319c281432555428b4e

data/lib/ficon/version.rb

@@ -1,3 +1,3 @@
 class Ficon
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/lib/ficon.rb

@@ -64,9 +64,15 @@ class Ficon
   end
 
   def process
-    @site[:images] = self.class.site_images(@uri, doc) || []
-    @site[:page_images] = self.class.page_images(@uri, doc) || []
-    other_page_data
+    document = doc
+    if document
+      @site[:images] = self.class.site_images(@uri, document) || []
+      @site[:page_images] = self.class.page_images(@uri, document) || []
+      other_page_data(document)
+    else
+      @site[:images] = []
+      @site[:page_images] = []
+    end
     nil
   end
 
@@ -82,13 +88,9 @@ class Ficon
     report_lines.join("\n") + "\n"
   end
 
-  def site_icons = @site[:images]
-
-  def site_icon = site_icons&.first
-
-  def page_images = @site[:page_images]
+  def site_icons = @site[:images] || []
 
-  def page_image = page_images&.first
+  def page_images = @site[:page_images] || []
 
   def title = @site[:title]
 
@@ -98,11 +100,11 @@ class Ficon
     Cache.clear_cache
   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
+  def other_page_data(document)
+    @site[:title] = document.at_xpath("//meta[@property='og:title']/@content")&.value || document.at_xpath("//title")&.text&.strip
+    @site[:description] = document.at_xpath("//meta[@property='og:description']/@content")&.value
+    canonical = document.at_xpath("//link[@rel='canonical']/@href")&.value
+    @site[:canonical] = canonical unless canonical == @uri.to_s
   end
 
   def self.site_images(uri, doc)
@@ -137,6 +139,34 @@ class Ficon
     parsed_candidate.to_s
   end
 
+  def classify_response_status(response)
+    case response.code.to_i
+    when 200..299
+      ALIVE
+    when 404, 410
+      DEAD
+    when 401, 403, 429
+      BLOCKED
+    when 500..599
+      SICK
+    else
+      SICK
+    end
+  end
+
+  def classify_exception_status(exception)
+    case exception
+    when SocketError, Resolv::ResolvError
+      DEAD  # DNS resolution failures
+    when Net::HTTPError, Timeout::Error, Errno::ECONNREFUSED
+      SICK  # Network issues worth retrying
+    when OpenSSL::SSL::SSLError
+      SICK  # SSL certificate errors
+    else
+      SICK  # Default to retryable for unknown errors
+    end
+  end
+
   private
 
   def fetch_url(uri, redirect_limit = 5)
@@ -176,32 +206,4 @@ class Ficon
     puts "Failed to fetch #{uri}: #{e.inspect}"
     nil
   end
-
-  def classify_response_status(response)
-    case response.code.to_i
-    when 200..299
-      ALIVE
-    when 404, 410
-      DEAD
-    when 401, 403, 429
-      BLOCKED
-    when 500..599
-      SICK
-    else
-      SICK
-    end
-  end
-
-  def classify_exception_status(exception)
-    case exception
-    when SocketError, Resolv::ResolutionError
-      DEAD  # DNS resolution failures
-    when Net::HTTPError, Timeout::Error, Errno::ECONNREFUSED
-      SICK  # Network issues worth retrying
-    when OpenSSL::SSL::SSLError
-      SICK  # SSL certificate errors
-    else
-      SICK  # Default to retryable for unknown errors
-    end
-  end
 end

data/test/ficon_test.rb

@@ -1,5 +1,6 @@
 #require 'rubygems'
 require 'debug'
+require 'resolv'
 
 require "minitest/autorun"
 
@@ -69,4 +70,53 @@ class FiconTest < Minitest::Test
     ficon_custom.user_agent = 'Changed/2.0'
     assert_equal 'Changed/2.0', ficon_custom.user_agent
   end
+
+  def test_response_status_classification
+    ficon = Ficon.new('https://example.com')
+    
+    # Test ALIVE status (2xx)
+    assert_equal Ficon::ALIVE, ficon.classify_response_status(mock_response(200))
+    assert_equal Ficon::ALIVE, ficon.classify_response_status(mock_response(201))
+    assert_equal Ficon::ALIVE, ficon.classify_response_status(mock_response(299))
+    
+    # Test DEAD status (404, 410)
+    assert_equal Ficon::DEAD, ficon.classify_response_status(mock_response(404))
+    assert_equal Ficon::DEAD, ficon.classify_response_status(mock_response(410))
+    
+    # Test BLOCKED status (401, 403, 429)
+    assert_equal Ficon::BLOCKED, ficon.classify_response_status(mock_response(401))
+    assert_equal Ficon::BLOCKED, ficon.classify_response_status(mock_response(403))
+    assert_equal Ficon::BLOCKED, ficon.classify_response_status(mock_response(429))
+    
+    # Test SICK status (5xx and others)
+    assert_equal Ficon::SICK, ficon.classify_response_status(mock_response(500))
+    assert_equal Ficon::SICK, ficon.classify_response_status(mock_response(502))
+    assert_equal Ficon::SICK, ficon.classify_response_status(mock_response(503))
+    assert_equal Ficon::SICK, ficon.classify_response_status(mock_response(300)) # Other codes default to SICK
+  end
+
+  def test_exception_status_classification
+    ficon = Ficon.new('https://example.com')
+    
+    # Test DEAD status (DNS and resolution errors)
+    assert_equal Ficon::DEAD, ficon.classify_exception_status(SocketError.new)
+    assert_equal Ficon::DEAD, ficon.classify_exception_status(Resolv::ResolvError.new)
+    
+    # Test SICK status (network and timeout errors)
+    assert_equal Ficon::SICK, ficon.classify_exception_status(Timeout::Error.new)
+    assert_equal Ficon::SICK, ficon.classify_exception_status(Errno::ECONNREFUSED.new)
+    assert_equal Ficon::SICK, ficon.classify_exception_status(OpenSSL::SSL::SSLError.new)
+    assert_equal Ficon::SICK, ficon.classify_exception_status(Net::HTTPError.new('error', nil))
+    
+    # Test default to SICK for unknown exceptions
+    assert_equal Ficon::SICK, ficon.classify_exception_status(StandardError.new)
+  end
+
+  private
+
+  def mock_response(code)
+    response = Object.new
+    response.define_singleton_method(:code) { code }
+    response
+  end
 end

metadata

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