onebox 2.1.6 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6fd88926ec341ed84409e7c77dbfcce244dbf2a0c74e0a19736e81b2b693e84
-  data.tar.gz: 18f53e5fb7b1fa4eab35ea27f87e97600e82af0eaf4fd5eed0809744bf7e53c7
+  metadata.gz: 90c9d1f633caf0798657ff3655a0d41cca71364ed0199bc3beea5f686df4c148
+  data.tar.gz: 8360d4b10bf5af91a8905e09777bd305545a8db0448b9b80301b39b7bd37b1ca
 SHA512:
-  metadata.gz: 5a5c344336f529d53b51ac47b5b0efee1b6fb29b0b2541948d650fa1d81e11f97edfa3d1a2f8abb7915b8cf9c86e41c74b64cb40b26924e380f68d52e0015c33
-  data.tar.gz: 9cefe31755197bbfb71ba3e741329c7bdba10fd9bb19892b237cb78b22769e0e19824119b94cb3cdd24f7bec10f4aeb91cbad3a7d40eefd84c2cbe64866908b0
+  metadata.gz: 232104ac79cb41e53b404e90e930d1ed229f07df11dab37d72d5267366082f8d26a9d7185dd1b51a3dfe2d1eac9d71f30fddde58203fadffb8c209bcfdfa5cd2
+  data.tar.gz: f25d39bc21a67607a78924abee0d31ce18137d06fc672fe820cd9d0758a155e3e5370795c924bc1f404b2be41cfd93669c7709d9616043828ee1cca588afe2b4

data/lib/onebox/engine.rb

@@ -152,6 +152,7 @@ require_relative "engine/amazon_onebox"
 require_relative "engine/github_issue_onebox"
 require_relative "engine/github_blob_onebox"
 require_relative "engine/github_commit_onebox"
+require_relative "engine/github_folder_onebox"
 require_relative "engine/github_gist_onebox"
 require_relative "engine/github_pullrequest_onebox"
 require_relative "engine/google_calendar_onebox"

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Engine
+    class GithubFolderOnebox
+      include Engine
+      include StandardEmbed
+      include LayoutSupport
+
+      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
+        og = get_opengraph
+
+        max_length = 250
+
+        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: url,
+          image: og.image,
+          title: Onebox::Helpers.truncate(title, 250),
+          path: display_path,
+          description: display_description,
+          favicon: get_favicon
+        }
+      end
+
+      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
+
+      def clean_description(description, title, max_length)
+        return unless description
+
+        desc_end = " - #{title}"
+        if description[-desc_end.length..-1] == desc_end
+          description = description[0...-desc_end.length]
+        end
+
+        Onebox::Helpers.truncate(description, max_length)
+      end
+    end
+  end
+end

data/lib/onebox/engine/instagram_onebox.rb

@@ -7,15 +7,17 @@ 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
         oembed = get_oembed
+        raise "No oEmbed data found. Ensure 'facebook_app_access_token' is valid" if oembed.data.empty?
+
         permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
 
         { link: permalink,

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.6"
+  VERSION = "2.2.1"
 end

data/templates/githubfolder.mustache

@@ -0,0 +1,11 @@
+{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+
+<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+
+{{#path}}
+<p><a href='{{link}}' target="_blank" rel="noopener">{{path}}</a></p>
+{{/path}}
+
+{{#description}}
+  <p><span class="label1">{{description}}</span></p>
+{{/description}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.1
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -316,6 +316,7 @@ files:
 - lib/onebox/engine/giphy_onebox.rb
 - lib/onebox/engine/github_blob_onebox.rb
 - lib/onebox/engine/github_commit_onebox.rb
+- lib/onebox/engine/github_folder_onebox.rb
 - lib/onebox/engine/github_gist_onebox.rb
 - lib/onebox/engine/github_issue_onebox.rb
 - lib/onebox/engine/github_pullrequest_onebox.rb
@@ -383,6 +384,7 @@ files:
 - templates/amazon.mustache
 - templates/githubblob.mustache
 - templates/githubcommit.mustache
+- templates/githubfolder.mustache
 - templates/githubgist.mustache
 - templates/githubissue.mustache
 - templates/githubpullrequest.mustache