ficon 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f5f2c6b36b5360a88f4eac14c07c96f7fefb9674fb6bed0bdf4a7be63ad2d0
-  data.tar.gz: f85066461f2384ed8e2ed3d302e5e3ffe537178dfaf40c128e056dd16c1e3027
+  metadata.gz: 95a5b1a8dba294c92d13f898bde371078e1927d67cb9e4af351608647f916d2f
+  data.tar.gz: 06f32b6dc310b8c7ea7dba49672f2ae85a8f1eaac890938414d27b031bf0808c
 SHA512:
-  metadata.gz: 7ac7f80ea66b97249dccbfcdd4c7adf82b741125c23dbd92339346fb63e772bcfcea893279cca1b05b100946d567ee4c82bdfc9ba85dcd4fd10c881bef987ae9
-  data.tar.gz: 8c4421c19189b779f19aca1699521e600c25f4a17807dc22a546913a28e0d230263642d8610ef68f81d548f66be4cff1654dc9a12a644319c281432555428b4e
+  metadata.gz: bf4e5662d4b7322e559dd116524453025cd23d76407395c6da71ed7d15e8c8298f87ac97009c5ab52b551bfed6f1cc3bc61ba5f730e026340b09c9faef355161
+  data.tar.gz: df182b513fe144fca1d6a5eb6d5a2e58c4d92b69df063ce6df08a0567d7e7a83d9cef0c34a464778723f664e3650f95aee49b13814f1913133912ab81f83cc12

data/lib/ficon/version.rb

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

data/lib/ficon.rb

@@ -203,6 +203,27 @@ class Ficon
     end
   rescue => e
     @url_status = classify_exception_status(e)
+    
+    # If HTTP request failed and we're using HTTP, try HTTPS automatically
+    if uri.scheme == "http" &&
+      !uri.to_s.include?("://localhost") &&
+      !uri.host.match?(/^\d+\.\d+\.\d+\.\d+$/)
+      puts "HTTP request failed, trying HTTPS for #{uri}"
+      https_uri = uri.dup
+      https_uri.scheme = "https"
+      https_uri.port = 443 if https_uri.port == 80
+      
+      begin
+        https_response = fetch_url(https_uri, redirect_limit)
+        if https_response
+          puts "HTTPS request succeeded, using HTTPS URL"
+          return https_response
+        end
+      rescue => https_error
+        puts "HTTPS fallback also failed: #{https_error.inspect}"
+      end
+    end
+    
     puts "Failed to fetch #{uri}: #{e.inspect}"
     nil
   end

data/test/ficon_test.rb

@@ -1,93 +1,92 @@
-#require 'rubygems'
-require 'debug'
-require 'resolv'
+# require 'rubygems'
+require "debug"
+require "resolv"
 
 require "minitest/autorun"
 
 PathHere = File.dirname(__FILE__)
 $LOAD_PATH.unshift File.join(PathHere, "..", "lib")
 
-require 'ficon'
-
-  SiteTests = []
-  SiteTests << { html: %Q{<meta name="msapplication-TileImage" content="https://s.yimg.com/pw/images/favicon-msapplication-tileimage.png"/> }, value: 'https://s.yimg.com/pw/images/favicon-msapplication-tileimage.png' }
-  SiteTests << { html: %Q{<link rel="shortcut icon" type="image/ico" href="https://s.yimg.com/pw/favicon.ico"> },                              value: 'https://s.yimg.com/pw/favicon.ico' }
-  SiteTests << { html: %Q{<link href="/apple-touch-icon.png" rel="apple-touch-icon-precomposed">},                                             value: 'https://site.com/apple-touch-icon.png' }
-  SiteTests << { html: %Q{<link rel="shortcut icon" href="/wp-content/themes/torrentfreakredux/assets/img/icons/favicon.png">},                value: 'https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/favicon.png' }
-  SiteTests << { html: %Q{<link rel="apple-touch-icon-precomposed" href="/wp-content/themes/torrentfreakredux/assets/img/icons/57.png">},      value: 'https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/57.png' }
-  SiteTests << { html: %Q{<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/wp-content/themes/torrentfreakredux/assets/img/icons/114.png">}, value: 'https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/114.png' }
-  SiteTests << { html: %Q{<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/wp-content/themes/torrentfreakredux/assets/img/icons/72.png">},    value: 'https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/72.png' }
-  SiteTests << { html: %Q{<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/wp-content/themes/torrentfreakredux/assets/img/icons/144.png">}, value: 'https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/144.png' }
-  SiteTests << { html: %Q{<link rel="shortcut icon" href="/favicon.png">},                                                    value: 'https://site.com/favicon.png'                 }
-  SiteTests << { html: %Q{<link rel="shortcut icon" href="favicon.ico" />},                                                   value: 'https://site.com/favicon.ico'                 }
-  SiteTests << { html: %Q{<link rel="apple-touch-icon" href="/apple-touch-icon.png">},                                        value: 'https://site.com/apple-touch-icon.png'        }
-  SiteTests << { html: %Q{<link rel="shortcut icon" href="http://example.com/myicon.ico" />},                                 value: 'http://example.com/myicon.ico'}
-  SiteTests << { html: %Q{<link rel="icon" href="http://example.com/image.ico" />},                                           value: 'http://example.com/image.ico' }
-  SiteTests << { html: %Q{<link rel="icon" type="image/vnd.microsoft.icon" href="http://example.com/image.ico" />},           value: 'http://example.com/image.ico' }
-  SiteTests << { html: %Q{<link rel="icon" type="image/png" href="http://example.com/image.png" />},                          value: 'http://example.com/image.png' }
-  SiteTests << { html: %Q{<link rel="icon" type="image/gif"  href="http://example.com/image.gif" />},                         value: 'http://example.com/image.gif' }
-  SiteTests << { html: %Q{<link rel="icon" type="image/x-icon" href="http://example.com/image.ico"/>},                        value: 'http://example.com/image.ico' }
-  SiteTests << { html: %Q{<link rel="shortcut icon" href="https://fbstatic-a.akamaihd.net/rsrc.php/yl/r/H3nktOa7ZMg.ico" />}, value: 'https://fbstatic-a.akamaihd.net/rsrc.php/yl/r/H3nktOa7ZMg.ico' }
-  SiteTests << { html: %Q{<link rel="icon" type="image/vnd.microsoft.icon" href="/viconline/img/favicon.ico?1393375504" />},  value: 'https://site.com/viconline/img/favicon.ico?1393375504' }
-  SiteTests << { html: %Q{<link rel="shortcut icon" type="image/x-icon" href="/viconline/img/favicon.ico?1393375504" />},     value: 'https://site.com/viconline/img/favicon.ico?1393375504'    }
-  SiteTests << { html: %Q{<meta name="msapplication-TileImage" content="/win8-tile-144.png"/><meta name="msapplication-TileColor" content="#00aced"/>}, value: 'https://site.com/win8-tile-144.png' }
-
-  PageTests = []
-  PageTests << { html: %Q{<meta property="og:image" content="https://www.facebook.com/images/fb_icon_325x325.png" />},        value: 'https://www.facebook.com/images/fb_icon_325x325.png'           }
+require "ficon"
 
+SiteTests = []
+SiteTests << {html: %(<meta name="msapplication-TileImage" content="https://s.yimg.com/pw/images/favicon-msapplication-tileimage.png"/> ), value: "https://s.yimg.com/pw/images/favicon-msapplication-tileimage.png"}
+SiteTests << {html: %(<link rel="shortcut icon" type="image/ico" href="https://s.yimg.com/pw/favicon.ico"> ), value: "https://s.yimg.com/pw/favicon.ico"}
+SiteTests << {html: %(<link href="/apple-touch-icon.png" rel="apple-touch-icon-precomposed">), value: "https://site.com/apple-touch-icon.png"}
+SiteTests << {html: %(<link rel="shortcut icon" href="/wp-content/themes/torrentfreakredux/assets/img/icons/favicon.png">), value: "https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/favicon.png"}
+SiteTests << {html: %(<link rel="apple-touch-icon-precomposed" href="/wp-content/themes/torrentfreakredux/assets/img/icons/57.png">), value: "https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/57.png"}
+SiteTests << {html: %(<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/wp-content/themes/torrentfreakredux/assets/img/icons/114.png">), value: "https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/114.png"}
+SiteTests << {html: %(<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/wp-content/themes/torrentfreakredux/assets/img/icons/72.png">), value: "https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/72.png"}
+SiteTests << {html: %(<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/wp-content/themes/torrentfreakredux/assets/img/icons/144.png">), value: "https://site.com/wp-content/themes/torrentfreakredux/assets/img/icons/144.png"}
+SiteTests << {html: %(<link rel="shortcut icon" href="/favicon.png">), value: "https://site.com/favicon.png"}
+SiteTests << {html: %(<link rel="shortcut icon" href="favicon.ico" />), value: "https://site.com/favicon.ico"}
+SiteTests << {html: %(<link rel="apple-touch-icon" href="/apple-touch-icon.png">), value: "https://site.com/apple-touch-icon.png"}
+SiteTests << {html: %(<link rel="shortcut icon" href="http://example.com/myicon.ico" />), value: "http://example.com/myicon.ico"}
+SiteTests << {html: %(<link rel="icon" href="http://example.com/image.ico" />), value: "http://example.com/image.ico"}
+SiteTests << {html: %(<link rel="icon" type="image/vnd.microsoft.icon" href="http://example.com/image.ico" />), value: "http://example.com/image.ico"}
+SiteTests << {html: %(<link rel="icon" type="image/png" href="http://example.com/image.png" />), value: "http://example.com/image.png"}
+SiteTests << {html: %(<link rel="icon" type="image/gif"  href="http://example.com/image.gif" />), value: "http://example.com/image.gif"}
+SiteTests << {html: %(<link rel="icon" type="image/x-icon" href="http://example.com/image.ico"/>), value: "http://example.com/image.ico"}
+SiteTests << {html: %(<link rel="shortcut icon" href="https://fbstatic-a.akamaihd.net/rsrc.php/yl/r/H3nktOa7ZMg.ico" />), value: "https://fbstatic-a.akamaihd.net/rsrc.php/yl/r/H3nktOa7ZMg.ico"}
+SiteTests << {html: %(<link rel="icon" type="image/vnd.microsoft.icon" href="/viconline/img/favicon.ico?1393375504" />), value: "https://site.com/viconline/img/favicon.ico?1393375504"}
+SiteTests << {html: %(<link rel="shortcut icon" type="image/x-icon" href="/viconline/img/favicon.ico?1393375504" />), value: "https://site.com/viconline/img/favicon.ico?1393375504"}
+SiteTests << {html: %(<meta name="msapplication-TileImage" content="/win8-tile-144.png"/><meta name="msapplication-TileColor" content="#00aced"/>), value: "https://site.com/win8-tile-144.png"}
+
+PageTests = []
+PageTests << {html: %(<meta property="og:image" content="https://www.facebook.com/images/fb_icon_325x325.png" />), value: "https://www.facebook.com/images/fb_icon_325x325.png"}
 
 class FiconTest < Minitest::Test
-  ENV['FICON_DB']=File.join( File.dirname(__FILE__), 'test.db')
+  ENV["FICON_DB"] = File.join(File.dirname(__FILE__), "test.db")
   def test_html_chunks
     SiteTests.each do |t|
-      result = Ficon.site_images('https://site.com', Nokogiri::HTML(t[:html]) )[0]
-      assert result&.url == t[:value], "Seaching |#{t[:html]}| expected #{t[:value]}, got #{result}" 
+      result = Ficon.site_images("https://site.com", Nokogiri::HTML(t[:html]))[0]
+      assert result&.url == t[:value], "Seaching |#{t[:html]}| expected #{t[:value]}, got #{result}"
     end
     PageTests.each do |t|
-      result = Ficon.page_images('https://site.com', Nokogiri::HTML(t[:html]) )[0]
-      assert result&.url == t[:value], "Seaching |#{t[:html]}| expected #{t[:value]}, got #{result}" 
+      result = Ficon.page_images("https://site.com", Nokogiri::HTML(t[:html]))[0]
+      assert result&.url == t[:value], "Seaching |#{t[:html]}| expected #{t[:value]}, got #{result}"
     end
   end
 
   def test_tile_color_extraction
-    html = %Q{<meta name="msapplication-TileImage" content="/win8-tile-144.png"/><meta name="msapplication-TileColor" content="#00aced"/>}
-    result = Ficon.site_images('https://site.com', Nokogiri::HTML(html))[0]
-    assert_equal 'https://site.com/win8-tile-144.png', result.url
-    assert_equal '#00aced', result.tile_color
+    html = %(<meta name="msapplication-TileImage" content="/win8-tile-144.png"/><meta name="msapplication-TileColor" content="#00aced"/>)
+    result = Ficon.site_images("https://site.com", Nokogiri::HTML(html))[0]
+    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')
+    ficon_default = Ficon.new("https://example.com")
     assert_match(/^FiconBot\/0\.\d+/, 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)
+    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
+    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')
-    
+    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))
@@ -96,22 +95,79 @@ class FiconTest < Minitest::Test
   end
 
   def test_exception_status_classification
-    ficon = Ficon.new('https://example.com')
-    
+    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))
-    
+    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
 
+  def test_http_to_https_fallback_conditions
+    # Test that localhost URLs are not converted to HTTPS
+    ficon_localhost = Ficon.allocate
+    uri_localhost = URI("http://localhost:3000/test")
+
+    # Mock the fetch_url method to simulate HTTP failure
+    def ficon_localhost.fetch_url(uri, redirect_limit = 5)
+      if uri.scheme == "http" && !uri.to_s.include?("://localhost") && !uri.host.match?(/^\d+\.\d+\.\d+\.\d+$/)
+        # This should not be reached for localhost
+        raise "Should not attempt HTTPS fallback for localhost"
+      end
+      nil
+    end
+
+    # This should not raise an exception
+    result = ficon_localhost.send(:fetch_url, uri_localhost)
+    assert_nil result
+
+    # Test that IP addresses are not converted to HTTPS
+    ficon_ip = Ficon.allocate
+    uri_ip = URI("http://192.168.1.1/test")
+
+    def ficon_ip.fetch_url(uri, redirect_limit = 5)
+      if uri.scheme == "http" && !uri.to_s.include?("://localhost") && !uri.host.match?(/^\d+\.\d+\.\d+\.\d+$/)
+        # This should not be reached for IP addresses
+        raise "Should not attempt HTTPS fallback for IP addresses"
+      end
+      nil
+    end
+
+    # This should not raise an exception
+    result = ficon_ip.send(:fetch_url, uri_ip)
+    assert_nil result
+  end
+
+  def test_https_port_conversion
+    # Test that port 80 is converted to 443 when switching to HTTPS
+    http_uri = URI("http://example.com:80/test")
+    assert_equal 80, http_uri.port
+
+    https_uri = http_uri.dup
+    https_uri.scheme = "https"
+    https_uri.port = 443 if https_uri.port == 80
+
+    assert_equal "https", https_uri.scheme
+    assert_equal 443, https_uri.port
+
+    # Test that custom ports are preserved
+    http_custom_uri = URI("http://example.com:8080/test")
+    https_custom_uri = http_custom_uri.dup
+    https_custom_uri.scheme = "https"
+    https_custom_uri.port = 443 if https_custom_uri.port == 80
+
+    assert_equal "https", https_custom_uri.scheme
+    assert_equal 8080, https_custom_uri.port  # Should remain unchanged
+  end
+
   private
 
   def mock_response(code)

metadata

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