onebox 1.8.23 → 1.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 584d1054d0ca1dd735a214cebe2b08427bdf3d1a
-  data.tar.gz: 5b070e05e93e822320f5450a70cc993d8f7bc9e3
+SHA256:
+  metadata.gz: 46083e1a21f3b8566a13d1f23db6d2b63d0dab0f4e81a4f124b131cbf1f417df
+  data.tar.gz: dce9be021faa467dcb5e5675cc21529535f83c920614752232c5c5e9df21dea7
 SHA512:
-  metadata.gz: 9b7537379a2d5119196364a192d211dc308f7656f4e782bce43f39a73af582a57d96a368bd3056dc6d5ab56d4960d107c9073bfe0a35dc0125801a8a00769a97
-  data.tar.gz: af5cc488f634add8fa6af284068035f30f14c7d85f0983744cc6617e6b238f2ce9b4c8c91d424da73e6aa33cd8dcd30191857eaef9e260b1b9ab8b6a1ec1e10b
+  metadata.gz: a5bd9ed7b95189ebdd9dad2b29ba634684b12a65ceee1131f168423af934919251f4d6a16ddcbedbd27c77d4ee03b28d8701f44c61bb3868bffbf77dc385b6cb
+  data.tar.gz: 857d41458895aa81cc799edbae5b25cb67420afa5e7df0af31dfc22330a5849b206830de40d3df23a9931679a2d856471e6441bb5521a4fbb2f6e1dc7a97235a

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -211,7 +211,9 @@ module Onebox
             d[:description] = html_entities.decode(Sanitize.fragment(Onebox::Helpers.truncate(d[:description].strip, 250)))
           end
 
-          if !Onebox::Helpers.blank?(d[:domain])
+          if !Onebox::Helpers.blank?(d[:site_name])
+            d[:domain] = html_entities.decode(Onebox::Helpers.truncate(d[:site_name].strip, 80))
+          elsif !Onebox::Helpers.blank?(d[:domain])
             d[:domain] = "http://#{d[:domain]}" unless d[:domain] =~ /^https?:\/\//
             d[:domain] = URI(d[:domain]).host.to_s.sub(/^www\./, '') rescue nil
           end
@@ -220,18 +222,22 @@ module Onebox
           d[:image] = d[:image_secure_url] || d[:image_url] || d[:thumbnail_url] || d[:image]
           d[:video] = d[:video_secure_url] || d[:video_url] || d[:video]
 
-          # 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))
+          if !Onebox::Helpers.blank?(d[:published_time])
+            d[:article_published_time] = 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
           end
 

data/lib/onebox/helpers.rb

@@ -24,7 +24,7 @@ module Onebox
       og = {}
 
       doc.css('meta').each do |m|
-        if (m["property"] && m["property"][/^og:(.+)$/i]) || (m["name"] && m["name"][/^og:(.+)$/i])
+        if (m["property"] && m["property"][/^(?:og|article):(.+)$/i]) || (m["name"] && m["name"][/^(?:og|article):(.+)$/i])
           value = (m["content"] || m["value"]).to_s
           og[$1.tr('-:', '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
         end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.23"
+  VERSION = "1.8.24"
 end

data/onebox.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakeweb', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'mocha', '~> 1.1'
-  spec.add_development_dependency 'rubocop', '~> 0.30'
+  spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

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

@@ -95,6 +95,14 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
       expect(onebox.to_html).not_to be_empty
       expect(FakeWeb.last_request['Cookie']).to eq('evil=trout')
     end
+
+    it "fetches site_name and article_published_time tags" 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:03PM - 08 Aug 14")
+    end
   end
 
   describe 'canonical link' do

data/templates/whitelistedgeneric.mustache

@@ -4,6 +4,10 @@
 
 <p>{{description}}</p>
 
+{{#article_published_time}}
+  <p><span class="label1">{{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.23
+  version: 1.8.24
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -214,14 +214,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.50'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -524,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.
@@ -611,4 +611,3 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
-has_rdoc: