onebox 1.8.25 → 1.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 442e01fb4f1bcf4b312f8dbdcd3b71e7c4bde332d4f0ca381d01eaf3f37fff84
-  data.tar.gz: 5cd1e9cc178e664a27d8d93244bb7162b0f8d483008d6505dc2a9c29e41c6220
+SHA1:
+  metadata.gz: 46a7ed36caa2a4739734bac88039bf5112e82237
+  data.tar.gz: 5567b27220d7ab70aa94b72f4769f6803043b802
 SHA512:
-  metadata.gz: 0e71fef9fb69b35c1d7413a85dba0b233ba21e52bb12b9fa46a58b63fb7829c74a3af587bf78addb9a09e11b2e64c24a0817d2d86741f5b189f8ae960e972b84
-  data.tar.gz: c00d0124b8cf9c214f8af312d530772347a25f78dfa2c96b82bcca3c8d39d52fc623ae87fa3f62902da8750059ffdbd39803ec243ab194f1bf8bb8c9d81fe339
+  metadata.gz: 18bab86adf0e4dde4e4db0990ce59898489afc3061d4b1b3b3040ae566b0a10d7d6de1651b8cf920ea408d2fdc59b0dbedc2209086a039ab33b2f67a3450b1cb
+  data.tar.gz: 8453cb98229163cfa8cafb92a5d5d62b605cdf64db20fac6b80f2b06ee15fdf9d7d1432e90ad3733fda573b01037a1b79a6a4db63af74cb1d3f105e8d9f69e8b

data/lib/onebox/engine/html.rb

@@ -9,7 +9,7 @@ module Onebox
       end
 
       def raw
-        @raw ||= Nokogiri::HTML(open(url, { read_timeout: timeout }.merge(http_params)).read)
+        @raw ||= Onebox::Helpers.fetch_html_doc(url, http_params)
       end
 
       def html?

data/lib/onebox/engine/standard_embed.rb

@@ -55,21 +55,7 @@ module Onebox
           headers = nil
           headers = { 'Cookie' => options[:cookie] } if options[:cookie]
 
-          response = (Onebox::Helpers.fetch_response(url, nil, nil, headers) rescue nil)
-          doc = Nokogiri::HTML(response)
-
-          ignore_canonical = doc.at('meta[property="og:ignore_canonical"]')
-          unless ignore_canonical && ignore_canonical['content'].to_s == 'true'
-            # prefer canonical link
-            canonical_link = doc.at('//link[@rel="canonical"]/@href')
-            if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{URI(url).host}#{URI(url).path}"
-              response = (Onebox::Helpers.fetch_response(canonical_link, nil, nil, headers) rescue nil)
-              doc = Nokogiri::HTML(response) if response
-            end
-          end
-
-          @html_doc = doc
-          @html_doc
+          @html_doc = Onebox::Helpers.fetch_html_doc(url, headers)
         end
 
         def get_oembed

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -223,22 +223,22 @@ module Onebox
           d[:video] = d[:video_secure_url] || d[:video_url] || d[:video]
 
           if !Onebox::Helpers.blank?(d[:published_time])
-            d[:article_published_time] = Time.parse(d[:published_time]).strftime("%d %b %y")
+            d[:article_published_time] = Time.parse(d[:published_time]).strftime("%-d %b %y")
             d[:article_published_time_title] = Time.parse(d[:published_time]).strftime("%I:%M%p - %d %B %Y")
-          else
-            # Twitter labels
-            if !Onebox::Helpers.blank?(d[:label1]) && !Onebox::Helpers.blank?(d[:data1]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label1] =~ /#{l}/i }
-              d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label1].strip))
-              d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data1].strip))
-            end
-            if !Onebox::Helpers.blank?(d[:label2]) && !Onebox::Helpers.blank?(d[:data2]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label2] =~ /#{l}/i }
-              unless Onebox::Helpers.blank?(d[:label_1])
-                d[:label_2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
-                d[:data_2]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
-              else
-                d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
-                d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
-              end
+          end
+
+          # Twitter labels
+          if !Onebox::Helpers.blank?(d[:label1]) && !Onebox::Helpers.blank?(d[:data1]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label1] =~ /#{l}/i }
+            d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label1].strip))
+            d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data1].strip))
+          end
+          if !Onebox::Helpers.blank?(d[:label2]) && !Onebox::Helpers.blank?(d[:data2]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label2] =~ /#{l}/i }
+            unless Onebox::Helpers.blank?(d[:label_1])
+              d[:label_2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
+              d[:data_2]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
+            else
+              d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
+              d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
             end
           end
 

data/lib/onebox/helpers.rb

@@ -39,6 +39,23 @@ module Onebox
       og
     end
 
+    def self.fetch_html_doc(url, headers=nil)
+      response = (fetch_response(url, nil, nil, headers) rescue nil)
+      doc = Nokogiri::HTML(response)
+
+      ignore_canonical = doc.at('meta[property="og:ignore_canonical"]')
+      unless ignore_canonical && ignore_canonical['content'].to_s == 'true'
+        # prefer canonical link
+        canonical_link = doc.at('//link[@rel="canonical"]/@href')
+        if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{URI(url).host}#{URI(url).path}"
+          response = (fetch_response(canonical_link, nil, nil, headers) rescue nil)
+          doc = Nokogiri::HTML(response) if response
+        end
+      end
+
+      doc
+    end
+
     def self.fetch_response(location, limit = nil, domain = nil, headers = nil)
 
       limit ||= 5

data/lib/onebox/layout.rb

@@ -49,27 +49,13 @@ module Onebox
         record[:domain] || URI(link || '').host.to_s.sub(/^www\./, '')
       end
 
-      def metadata_1_label
-        record[:metadata_1_label]
-      end
-
-      def metadata_1_value
-        record[:metadata_1_value]
-      end
-
-      def metadata_2_label
-        record[:metadata_2_label]
-      end
-
-      def metadata_2_value
-        record[:metadata_2_value]
-      end
-
       def details
         {
           link: record[:link],
           title: record[:title],
           domain: domain,
+          article_published_time: record[:article_published_time],
+          article_published_time_title: record[:article_published_time_title],
           metadata_1_label: record[:metadata_1_label],
           metadata_1_value: record[:metadata_1_value],
           metadata_2_label: record[:metadata_2_label],

data/lib/onebox/version.rb

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

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

@@ -100,8 +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")
-      expect(onebox.to_html).to include("08 Aug 14")
+      expect(onebox.to_html).to include("Mail Online - 8 Aug 14")
     end
   end
 

data/spec/lib/onebox/preview_spec.rb

@@ -4,12 +4,6 @@ describe Onebox::Preview do
 
   before do
     fake("https://www.amazon.com/product", response("amazon"))
-    FakeWeb.register_uri(:get, "https://www.amazon.com/404-url", status: 404)
-    FakeWeb.register_uri(:get, "https://www.amazon.com/500-url", status: 500)
-    FakeWeb.register_uri(:get, "https://www.amazon.com/error-url", status: 500)
-    FakeWeb.register_uri(:get, "https://www.amazon.com/timeout-url", exception: Timeout::Error)
-    FakeWeb.register_uri(:get, "https://www.amazon.com/http-error", exception: Net::HTTPError)
-    FakeWeb.register_uri(:get, "https://www.amazon.com/error-connecting", exception: Errno::ECONNREFUSED)
   end
 
   let(:preview_url) { "http://www.amazon.com/product" }
@@ -21,26 +15,6 @@ describe Onebox::Preview do
       expect(preview.to_s).to include(title)
     end
 
-    it "returns an empty string if the resource is missing" do
-      expect(described_class.new("http://www.amazon.com/404-url").to_s).to eq("")
-    end
-
-    it "returns an empty string if the resource returns an error" do
-      expect(described_class.new("http://www.amazon.com/500-url").to_s).to eq("")
-    end
-
-    it "returns an empty string if the resource times out" do
-      expect(described_class.new("http://www.amazon.com/timeout-url").to_s).to eq("")
-    end
-
-    it "returns an empty string if there is an http error" do
-      expect(described_class.new("http://www.amazon.com/http-error").to_s).to eq("")
-    end
-
-    it "returns an empty string if there is an error connecting" do
-      expect(described_class.new("http://www.amazon.com/error-connecting").to_s).to eq("")
-    end
-
     it "returns an empty string if the url is not valid" do
       expect(described_class.new('not a url').to_s).to eq("")
     end

data/templates/_layout.mustache

@@ -1,6 +1,11 @@
 <aside class="onebox {{subname}}">
   <header class="source">
-    <a href="{{link}}" target='_blank'>{{domain}}</a>
+    {{#article_published_time}}
+      <a href="{{link}}" target='_blank' title="{{article_published_time_title}}">{{domain}} - {{article_published_time}}</a>
+    {{/article_published_time}}
+    {{^article_published_time}}
+      <a href="{{link}}" target='_blank'>{{domain}}</a>
+    {{/article_published_time}}
   </header>
   <article class="onebox-body">
     {{{view}}}

data/templates/whitelistedgeneric.mustache

@@ -4,10 +4,6 @@
 
 <p>{{description}}</p>
 
-{{#article_published_time}}
-  <p><span class="label1" title="{{article_published_time_title}}">{{article_published_time}}</span>
-{{/article_published_time}}
-
 {{#data_1}}
   <p><span class="label1">{{label_1}}: {{data_1}}</span>
   {{#data_2}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.25
+  version: 1.8.26
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -524,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.