onebox 1.8.26 → 1.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a7ed36caa2a4739734bac88039bf5112e82237
-  data.tar.gz: 5567b27220d7ab70aa94b72f4769f6803043b802
+  metadata.gz: '08ae08abe8fd51a365cbd459c4e4f278ea150263'
+  data.tar.gz: 9bf91c3aaf8a4752b834758df951fdb15803490e
 SHA512:
-  metadata.gz: 18bab86adf0e4dde4e4db0990ce59898489afc3061d4b1b3b3040ae566b0a10d7d6de1651b8cf920ea408d2fdc59b0dbedc2209086a039ab33b2f67a3450b1cb
-  data.tar.gz: 8453cb98229163cfa8cafb92a5d5d62b605cdf64db20fac6b80f2b06ee15fdf9d7d1432e90ad3733fda573b01037a1b79a6a4db63af74cb1d3f105e8d9f69e8b
+  metadata.gz: 28ef6d769b53b73850a805c714ac50d7da17c0057141a4b427700f8eec7e00de2c42eafc78259bdf20ab2168c6878cdf4d48ec82c82862aed911de5d52086d92
+  data.tar.gz: 9afca78a39e27f4cb0551c68dad859ac3063ee0ba7d7796798187fc9efd979b97dd7c0efb14f22001f475faf8efc11701f3137c279931139950b81bddb90c3f3

data/lib/onebox/engine/standard_embed.rb

@@ -44,6 +44,9 @@ module Onebox
         twitter.each { |k, v| @raw[k] ||= v unless Onebox::Helpers::blank?(v) }
         oembed.each { |k, v| @raw[k] ||= v unless Onebox::Helpers::blank?(v) }
 
+        favicon = get_favicon
+        @raw["favicon".to_sym] = favicon unless Onebox::Helpers::blank?(favicon)
+
         @raw
       end
 
@@ -111,6 +114,20 @@ module Onebox
 
           twitter
         end
+
+        def get_favicon
+          return nil unless html_doc
+
+          favicon = html_doc.css('link[rel="shortcut icon"], link[rel="icon shortcut"], link[rel="shortcut"], link[rel="icon"]').first
+          favicon = favicon.nil? ? nil : favicon['href']&.strip
+
+          if favicon && favicon.match(/^https?:\/\//i).nil?
+            uri = URI(url)
+            favicon = uri.scheme + "://" + uri.host.sub(/\/$/,"") + "/" + favicon.sub(/^\//,"")
+          end
+
+          favicon
+        end
     end
   end
 end

data/lib/onebox/layout.rb

@@ -53,6 +53,7 @@ module Onebox
         {
           link: record[:link],
           title: record[:title],
+          favicon: record[:favicon],
           domain: domain,
           article_published_time: record[:article_published_time],
           article_published_time_title: record[:article_published_time_title],

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.26"
+  VERSION = "1.8.27"
 end

data/spec/lib/onebox/engine/whitelisted_generic_onebox_spec.rb

@@ -100,7 +100,7 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
       onebox = described_class.new(url)
       expect(onebox.to_html).not_to be_empty
 
-      expect(onebox.to_html).to include("Mail Online - 8 Aug 14")
+      expect(onebox.to_html).to include("Mail Online – 8 Aug 14")
     end
   end
 
@@ -116,6 +116,8 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
       it 'fetches opengraph data and twitter labels from canonical link' do
         onebox = described_class.new(mobile_url)
         expect(onebox.to_html).not_to be_nil
+        expect(onebox.to_html).to include("images/favicon.ico")
+        expect(onebox.to_html).to include("Etsy")
         expect(onebox.to_html).to include("Personalized Word Pillow Case")
         expect(onebox.to_html).to include("Allow your personality to shine through your decor; this contemporary and modern accent will help you do just that.")
         expect(onebox.to_html).to include("https://img1.etsystatic.com/028/1/6088772/il_570xN.613262127_e0zl.jpg")

data/templates/_layout.mustache

@@ -1,7 +1,10 @@
 <aside class="onebox {{subname}}">
   <header class="source">
+    {{#favicon}}
+      <img src="{{favicon}}" class="site-icon"/>
+    {{/favicon}}
     {{#article_published_time}}
-      <a href="{{link}}" target='_blank' title="{{article_published_time_title}}">{{domain}} - {{article_published_time}}</a>
+      <a href="{{link}}" target='_blank' title="{{article_published_time_title}}">{{domain}} &ndash; {{article_published_time}}</a>
     {{/article_published_time}}
     {{^article_published_time}}
       <a href="{{link}}" target='_blank'>{{domain}}</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.26
+  version: 1.8.27
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json