onebox 2.1.7 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a1e5a4239bdcf5a170e23cb70ae17f581cd25de8c6b72eb911d953119fb8cb
-  data.tar.gz: 80057c1f0667b807e1e5be53ff283dabeabe64aa3c3f53d1c63658346e7d12ab
+  metadata.gz: 817b81480e38b1a133342d89f83991cd0e94217581ddb74c6275c6631c7285bf
+  data.tar.gz: 545e95966e368c2b36a9792dd99934ec609635e19d95bb02ef1dd1fbcd51c5f6
 SHA512:
-  metadata.gz: 94a0e7ecc496f75f5f59f40701247fba1bff1068a21c91773e43285c3bf83eadd945ecdd910a8becb454870f5c790baed7626e5cd7d2fe7a6951e7da5fb3e701
-  data.tar.gz: 1ad163ff7cfad65008902d27244bd74a9d84e2e49d8600c9ed6f48e74f0fff4d8e77250b36cb4c03e68fdf6f29ab67a8e3e1238b7645156f3f93269f94548329
+  metadata.gz: fc0ea7daff3babaa77cebf9e5e00161877a86106d15b1a2d4e1b1e56f1e4ba9ebfd6e3666a991d420e4ea71180dc8fcaf2bafc0ac659934399706462c1e45d69
+  data.tar.gz: f509adf0a3ad1d557700a690bfb9b922ec9c181b68cf6ab61134394ee70c8ee4487d64faa863262a28cd795ed14e39bc774521572551c719faa39a1acc208a3e

data/lib/onebox/engine/allowlisted_generic_onebox.rb

@@ -286,7 +286,7 @@ module Onebox
         return image_html    if is_image?
         return embedded_html if is_embedded?
         return card_html     if is_card?
-        return article_html  if has_text?
+        return article_html  if (has_text? || is_image_article?)
       end
 
       def is_card?
@@ -301,9 +301,17 @@ module Onebox
       end
 
       def has_text?
+        has_title? && !Onebox::Helpers.blank?(data[:description])
+      end
+
+      def has_title?
         !Onebox::Helpers.blank?(data[:title])
       end
 
+      def is_image_article?
+        has_title? && has_image?
+      end
+
       def is_image?
         data[:type] =~ /photo|image/ &&
         data[:type] !~ /photostream/ &&

data/lib/onebox/engine/github_folder_onebox.rb

@@ -7,9 +7,14 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp Regexp.new(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com[\:\d]*(\/\w*){2}\/tree/)
+      matches_regexp Regexp.new(/^https?:\/\/(?:www\.)?(?:(?:\w)+\.)?(github)\.com[\:\d]*(\/[^\/]+){2}/)
       always_https
 
+      def self.priority
+        # This engine should have lower priority than the other Github engines
+        150
+      end
+
       private
 
       def data
@@ -20,11 +25,29 @@ module Onebox
         display_path = extract_path(og.url, max_length)
         display_description = clean_description(og.description, og.title, max_length)
 
+        title = og.title
+
+        fragment = Addressable::URI.parse(url).fragment
+        if fragment
+          fragment = Addressable::URI.unencode(fragment)
+
+          if html_doc.css('.Box.md')
+            # For links to markdown docs
+            node = html_doc.css('a.anchor').find { |n| n['href'] == "##{fragment}" }
+            subtitle = node&.parent&.text
+          elsif html_doc.css('.Box.rdoc')
+            # For links to rdoc docs
+            node = html_doc.css('h3').find { |n| n['id'] == "user-content-#{fragment.downcase}" }
+            subtitle = node&.css('text()')&.first&.text
+          end
+
+          title = "#{title} - #{subtitle}" if subtitle
+        end
+
         {
-          link: og.url,
-          path_link: url,
+          link: url,
           image: og.image,
-          title: og.title,
+          title: Onebox::Helpers.truncate(title, 250),
           path: display_path,
           description: display_description,
           favicon: get_favicon
@@ -34,6 +57,9 @@ module Onebox
       def extract_path(root, max_length)
         path = url.split('#')[0].split('?')[0]
         path = path["#{root}/tree/".length..-1]
+
+        return unless path
+
         path.length > max_length ? path[-max_length..-1] : path
       end
 

data/lib/onebox/engine/instagram_onebox.rb

@@ -7,11 +7,11 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/)
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/(?:p|tv)\/[a-zA-Z\d_-]+/)
       always_https
 
       def clean_url
-        url.scan(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/).flatten.first
+        url.scan(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/(?:p|tv)\/[a-zA-Z\d_-]+/).flatten.first
       end
 
       def data

data/lib/onebox/engine/simplecast_onebox.rb

@@ -8,6 +8,7 @@ module Onebox
 
       matches_regexp(/https?:\/\/(.+)?simplecast.com\/(episodes|s)\/.*/)
       always_https
+      requires_iframe_origins("https://embed.simplecast.com")
 
       def to_html
         get_oembed.html

data/lib/onebox/helpers.rb

@@ -27,7 +27,7 @@ module Onebox
     def self.fetch_html_doc(url, headers = nil)
       response = (fetch_response(url, nil, nil, headers) rescue nil)
       doc = Nokogiri::HTML(response)
-      uri = URI(url)
+      uri = Addressable::URI.parse(url)
 
       ignore_canonical_tag = doc.at('meta[property="og:ignore_canonical"]')
       should_ignore_canonical = IGNORE_CANONICAL_DOMAINS.map { |hostname| uri.hostname.match?(hostname) }.any?
@@ -35,8 +35,9 @@ module Onebox
       unless (ignore_canonical_tag && ignore_canonical_tag['content'].to_s == 'true') || should_ignore_canonical
         # prefer canonical link
         canonical_link = doc.at('//link[@rel="canonical"]/@href')
-        if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{uri.host}#{uri.path}"
-          response = (fetch_response(canonical_link, nil, nil, headers) rescue nil)
+        canonical_uri = Addressable::URI.parse(canonical_link)
+        if canonical_link && "#{canonical_uri.host}#{canonical_uri.path}" != "#{uri.host}#{uri.path}"
+          response = (fetch_response(canonical_uri.to_s, nil, nil, headers) rescue nil)
           doc = Nokogiri::HTML(response) if response
         end
       end

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "2.1.7"
+  VERSION = "2.2.2"
 end

data/templates/githubfolder.mustache

@@ -3,7 +3,7 @@
 <h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
 
 {{#path}}
-<p><a href='{{path_link}}' target="_blank" rel="noopener">{{path}}</a></p>
+<p><a href='{{link}}' target="_blank" rel="noopener">{{path}}</a></p>
 {{/path}}
 
 {{#description}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.2.2
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable