onebox 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 372344282cacdb38dfceab5dfb6c156d7c9fa5ec04cca9cc21eb8502987ce077
-  data.tar.gz: 02a26147e10f54261596572328cf85a758178cda845a20c9999cc1b5f96ffe18
+  metadata.gz: 354e358f2909b92f1efa00092d3c82cc451760d9f8a0ee6628bb8b950f45ca2a
+  data.tar.gz: 86bcb44cc263203075a8b0e972b7899a6942fb4b0e4fad4917089ecbbed2fd32
 SHA512:
-  metadata.gz: 187c7a40761cea4d784175373600c00c2045d29ba911c8838614bf51b76454ecd7080ee93ca787d6745e69fc9d823b6de0e592746a2ccc30e9a9d55847e86cd4
-  data.tar.gz: f73f392c9451e85e5678dd0eff146092bfc0f3ae6a261eb4dfae02fb6a614976571837f3ec52e512334a4e815c3e3c8f49694179a7a41ec387d7195153cb7810
+  metadata.gz: 254b44103190d101795ccce8a736dacc7e3e5d3159b0512b7539f39e4968dd750800455c9867abbafd8387ef1ae870974c581965d7b53e699187af532dda1961
+  data.tar.gz: eff1b7f8c6add5760f5f7e6be3c1790a170e92a08ad6eb289b5a240702cfd40d681c2d3d437722dad20efe18a7a23ea154e67b60623f7f1e4a5aa651b00126e4

data/lib/onebox/engine.rb

@@ -30,6 +30,7 @@ module Onebox
 
     attr_reader :url, :uri
     attr_reader :timeout
+    attr :errors
 
     DEFAULT = {}
     def options
@@ -44,6 +45,7 @@ module Onebox
     end
 
     def initialize(link, timeout = nil)
+      @errors = {}
       @options = DEFAULT
       class_name = self.class.name.split("::").last.to_s
 
@@ -150,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

@@ -256,6 +256,15 @@ module Onebox
             d[:data_1] = Onebox::Helpers.truncate("#{d[:price_currency].strip} #{d[:price_amount].strip}")
           end
 
+          skip_missing_tags = [:video]
+          d.each do |k, v|
+            next if skip_missing_tags.include?(k)
+            if v == nil || v == ''
+              errors[k] ||= []
+              errors[k] << 'is blank'
+            end
+          end
+
           d
         end
       end
@@ -292,7 +301,8 @@ module Onebox
       end
 
       def has_text?
-        !Onebox::Helpers.blank?(data[:title])
+        !Onebox::Helpers.blank?(data[:title]) &&
+        !Onebox::Helpers.blank?(data[:description])
       end
 
       def is_image?

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

@@ -15,35 +15,32 @@ module Onebox
       end
 
       def data
-        og = get_opengraph
+        oembed = get_oembed
+        raise "No oEmbed data found. Ensure 'facebook_app_access_token' is valid" if oembed.data.empty?
 
-        # There are at least two different versions of the description. e.g.
-        # - "3,227 Likes, 88 Comments - An Account (@user.name) on Instagram: “Look at my picture!”"
-        # - "@user.name posted on their Instagram profile: “Look at my picture!”"
-
-        m = og.description.match(/\(@([\w\.]+)\) on Instagram/)
-        author_name = m[1] if m
-
-        author_name ||= begin
-          m = og.description.match(/^\@([\w\.]+)\ posted/)
-          m[1] if m
-        end
-
-        raise "Author username not found for post #{clean_url}" unless author_name
-
-        permalink = clean_url.gsub("/#{author_name}/", "/")
+        permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
 
         { link: permalink,
-          title: "@#{author_name}",
-          image: og.image,
-          description: Onebox::Helpers.truncate(og.title, 250)
+          title: "@#{oembed.author_name}",
+          image: oembed.thumbnail_url,
+          description: Onebox::Helpers.truncate(oembed.title, 250),
         }
+
       end
 
       protected
 
+      def access_token
+        (options[:facebook_app_access_token] || Onebox.options.facebook_app_access_token).to_s
+      end
+
       def get_oembed_url
-        oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
+        if access_token != ''
+          oembed_url = "https://graph.facebook.com/v9.0/instagram_oembed?url=#{clean_url}&access_token=#{access_token}"
+        else
+          # The following is officially deprecated by Instagram, but works in some limited circumstances.
+          oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
+        end
       end
     end
   end

data/lib/onebox/engine/standard_embed.rb

@@ -91,7 +91,7 @@ module Onebox
         html_doc.css('meta').each do |m|
           if (m["property"] && m["property"][/^twitter:(.+)$/i]) || (m["name"] && m["name"][/^twitter:(.+)$/i])
             value = (m["content"] || m["value"]).to_s
-            twitter[$1.tr('-:' , '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
+            twitter[$1.tr('-:' , '_').to_sym] ||= value unless (Onebox::Helpers::blank?(value) || value == "0 minutes")
           end
         end
 

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
@@ -156,6 +157,7 @@ module Onebox
     end
 
     def self.truncate(string, length = 50)
+      return string if string.nil?
       string.size > length ? string[0...(string.rindex(" ", length) || length)] + "..." : string
     end
 

data/lib/onebox/preview.rb

@@ -31,6 +31,16 @@ module Onebox
       ""
     end
 
+    def errors
+      return {} unless engine
+      engine.errors
+    end
+
+    def data
+      return {} unless engine
+      engine.data
+    end
+
     def options
       OpenStruct.new(@options)
     end

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "2.1.5"
+  VERSION = "2.2.0"
 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}}

data/templates/instagram.mustache

@@ -8,4 +8,6 @@
   </div>
 {{/image}}
 
-<div class="instagram-description">{{description}}</div>
+{{#description}}
+  <div class="instagram-description">{{description}}</div>
+{{/description}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-12-23 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