webstract 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2acd9f72a410808ca0c13b251ea4a90c6a8f16fe
-  data.tar.gz: 9bf28dbbd5dd17df779ef11bb8172808a5ba0620
+  metadata.gz: 2021ffa427679aad2c1ad7953e64bc09c787ff36
+  data.tar.gz: 31800e37441971669644353ee402ec9526337007
 SHA512:
-  metadata.gz: f477129c1811a7ffce4d1bf3e8d2a77555102d8eaef1a82d9d6ef0a277236cef491e3c87c43e91b38bea994c8d2232d142349993bcca3b6e995002520b1893e0
-  data.tar.gz: 6ea30f55206ac01ccbb9a30d43928bdc7adfe13960510f84b27f49a27c61ae48e777e193c2c4f61cf1dba009f8d41f983034f116f594190b0299ddcb2a0d795c
+  metadata.gz: b1593c55dd96f86c4717a5d734f4659cad3b45ab9552e43f7fa113524f2e90bab792e128102b7ba00f25d7f1639bcdd1704126a55255afa4293adff2a8b75032
+  data.tar.gz: 8ccdafd69a089fed785756520933c4977432add9b08c7443d3996b062bb11e36ad76eac7e718a2566c61bc7e9064192414850b6ec6f34ea123f65fc4b9b8e1e0

data/lib/webstract/errors.rb

@@ -9,5 +9,9 @@ module Webstract
     # raised when the target page could not be reached
     # but due to server errors like 404, or 500.
     class PageError < StandardError; ;end
+
+    # favicon errors
+    class MissingFavicon < StandardError; ;end
+    class InvalidFavicon < StandardError; ;end
   end
 end

data/lib/webstract/favicon.rb

@@ -1,8 +1,11 @@
-require 'faviconduit'
+require 'open_uri_redirections'
+require 'nokogiri'
+require 'open-uri'
+require "addressable/uri"
 
 module Webstract
   class Favicon
-    attr_accessor :url, :favicon_data
+    attr_accessor :url, :data
 
     def initialize(options = {})
       raise(ArgumentError.new("requires url")) unless options.key?(:url)
@@ -10,7 +13,7 @@ module Webstract
     end
 
     def fetch
-      @favicon_data = Faviconduit.get(url).data
+      @data = self.class.get(url).data
     end
 
     def fetch_and_save(path)
@@ -21,5 +24,42 @@ module Webstract
       end
     end
 
+    def self.get(url)
+
+      uri = Addressable::URI.heuristic_parse(url)
+      uri = Addressable::URI.encode(uri) # needed for chars with accents in url
+
+      doc = Nokogiri::HTML(open(uri, allow_redirections: :all))
+
+      path = doc.xpath("//link[@rel='shortcut icon' or @rel='icon']/@href").first
+      path = path ? path.to_s : '/favicon.ico'
+
+      fav_uri = Addressable::URI.join(uri, path.to_s)
+
+      begin
+
+        stream = open(fav_uri, allow_redirections: :all)
+
+        unless stream.content_type[/^image/]
+          raise(Errors::InvalidFavicon, "wrong content_type (#{stream.content_type})")
+        end
+
+        data = stream.read
+
+        if data.size == 0
+          raise(Errors::InvalidFavicon, "zero data")
+        end
+
+        fav = Favicon.new(url: fav_uri.to_s)
+        fav.data = data
+        return fav
+
+      rescue OpenURI::HTTPError => e
+        raise Errors::MissingFavicon if e.to_s[/404/]
+        raise # nevermind, reraise the previous exception
+      end
+
+    end
+
   end
 end

data/lib/webstract/version.rb

@@ -1,3 +1,3 @@
 module Webstract
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webstract
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Faucett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,7 +45,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: faviconduit
+  name: open_uri_redirections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="