ficon 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a5b1a8dba294c92d13f898bde371078e1927d67cb9e4af351608647f916d2f
-  data.tar.gz: 06f32b6dc310b8c7ea7dba49672f2ae85a8f1eaac890938414d27b031bf0808c
+  metadata.gz: 84e88d986bdad619358041cc478cf34418278ebdf74cb6ef12df7b653734d9dd
+  data.tar.gz: 1ed0fbcd8c01895246099fea8e26f35e358e9f4a46ecc5996add3ed6f8d193d6
 SHA512:
-  metadata.gz: bf4e5662d4b7322e559dd116524453025cd23d76407395c6da71ed7d15e8c8298f87ac97009c5ab52b551bfed6f1cc3bc61ba5f730e026340b09c9faef355161
-  data.tar.gz: df182b513fe144fca1d6a5eb6d5a2e58c4d92b69df063ce6df08a0567d7e7a83d9cef0c34a464778723f664e3650f95aee49b13814f1913133912ab81f83cc12
+  metadata.gz: 00d5013559e4a203ced2c780582a6f705a3883966d59c4f28c4a5bd69aac9a9a425cd3420adca17dec86993cca81825e80ba40ca1c4d633c40423c6c659bf4df
+  data.tar.gz: bb7311ea20869d3394789da06cfb759a64713dfc82eadb419e55561b98c49fac3797b741d8d4ab529fbae63cfbc6ed58ae22fa759404410d027f2a506a8538a2

data/lib/ficon/version.rb

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

data/lib/ficon.rb

@@ -1,18 +1,17 @@
-require "net/http"
-require "nokogiri"
-require "uri"
-require "addressable/uri"
-require "resolv"
-require "debug"
+require 'net/http'
+require 'nokogiri'
+require 'uri'
+require 'addressable/uri'
+require 'resolv'
 
-require_relative "ficon/version"
-require_relative "ficon/image"
-require_relative "ficon/cache"
+require_relative 'ficon/version'
+require_relative 'ficon/image'
+require_relative 'ficon/cache'
 
 class Ficon
   attr_reader :site, :final_uri, :url_status
   attr_accessor :user_agent
-  
+
   # URL health status constants
   ALIVE = 'alive'
   DEAD = 'dead'
@@ -39,10 +38,10 @@ class Ficon
     @data ||= cache.data
 
     if @data.nil? && response
-      @data = response.body.force_encoding("UTF-8")
+      @data = response.body.force_encoding('UTF-8')
       cache.data = @data
-      cache.etag = response["etag"] if response["etag"]
-      cache.not_before = response["last-modified"] if response["last-modified"]
+      cache.etag = response['etag'] if response['etag']
+      cache.not_before = response['last-modified'] if response['last-modified']
     end
 
     @doc ||= Nokogiri::HTML(@data)
@@ -55,7 +54,7 @@ class Ficon
       puts "#{e.inspect}"
       puts "#{e.backtrace.join('\n')}"
     else
-      puts "Please prepend http:// or https:// to the URL"
+      puts 'Please prepend http:// or https:// to the URL'
     end
     nil
   rescue RuntimeError => e
@@ -101,7 +100,8 @@ class Ficon
   end
 
   def other_page_data(document)
-    @site[:title] = document.at_xpath("//meta[@property='og:title']/@content")&.value || document.at_xpath("//title")&.text&.strip
+    @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
@@ -114,27 +114,36 @@ class Ficon
     tile_color = doc.at_xpath("//meta[@name='msapplication-TileColor']/@content")&.value
 
     paths = "//meta[@name='msapplication-TileImage']|//link[@type='image/ico' or @type='image/vnd.microsoft.icon']|//link[@rel='icon' or @rel='shortcut icon' or @rel='apple-touch-icon-precomposed' or @rel='apple-touch-icon']"
-    results += doc.xpath(paths).collect { |e| e.values.select { |v| v =~ /\.png$|\.jpg$|\.gif$|\.ico$|\.svg$|\.ico\?\d*$/ } }.flatten.collect { |v| (v[/^http/] || v[/^\//]) ? v : "/" + v }
+    results += doc.xpath(paths).collect do |e|
+      e.values.select do |v|
+        v =~ /\.png$|\.jpg$|\.gif$|\.ico$|\.svg$|\.ico\?\d*$/
+      end
+    end.flatten.collect { |v| v[/^http/] || v[%r{^/}] ? v : '/' + v }
 
     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
 
   def self.page_images(uri, doc)
     doc.xpath("//meta[@property='og:image']")
-      .collect { |e| e.values.reject(&:empty?) }.flatten
-      .collect { |v| (v[/^http/] || v[/^\//]) ? v : "/" + v }.collect { |result| normalise(uri, result) }.uniq.collect { |i| Image.new(i) }.sort_by(&:area).reverse
+       .collect { |e| e.values.reject(&:empty?) }.flatten
+       .collect { |v| v[/^http/] || v[%r{^/}] ? v : '/' + v }.collect do |result|
+      normalise(uri,
+                result)
+    end.uniq.collect { |i| Image.new(i) }.sort_by(&:area).reverse
   end
 
   def self.normalise(base, candidate)
     parsed_candidate = URI(candidate)
     base = URI(base) unless base.is_a? URI
 
-    parsed_candidate.host = base.host if parsed_candidate.host.nil?      # Set relative URLs to absolute
-    parsed_candidate.scheme = base.scheme if parsed_candidate.scheme.nil?  # Set the schema if missing
+    parsed_candidate.host = base.host if parsed_candidate.host.nil? # Set relative URLs to absolute
+    parsed_candidate.scheme = base.scheme if parsed_candidate.scheme.nil? # Set the schema if missing
 
     parsed_candidate.to_s
   end
@@ -171,25 +180,25 @@ class Ficon
 
   def fetch_url(uri, redirect_limit = 5)
     uri = URI(uri) unless uri.is_a?(URI)
-    
+
     if redirect_limit <= 0
       @url_status = DEAD
-      raise "Too many redirects"
+      raise 'Too many redirects'
     end
 
-    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+    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
+      request['User-Agent'] = @user_agent
       response = http.request(request)
-      
+
       # Set status based on response
       @url_status = classify_response_status(response)
-      
+
       case response
       when Net::HTTPRedirection
-        location = response["location"]
+        location = response['location']
         if location
           new_uri = URI.join(uri.to_s, location)
           @final_uri = Addressable::URI.parse(new_uri.to_s)
@@ -198,32 +207,32 @@ class Ficon
       else
         @final_uri = Addressable::URI.parse(uri.to_s)
       end
-      
+
       response
     end
-  rescue => e
+  rescue StandardError => 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+$/)
+    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.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"
+          puts 'HTTPS request succeeded, using HTTPS URL'
           return https_response
         end
-      rescue => https_error
+      rescue StandardError => https_error
         puts "HTTPS fallback also failed: #{https_error.inspect}"
       end
     end
-    
+
     puts "Failed to fetch #{uri}: #{e.inspect}"
     nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ficon
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Dan Milne
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Find website icons
 test_files: