onebox 2.1.3 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28e30904785f029ad0c680c09b73ba17f347dd4fd554092b80fd91ead1be13fa
-  data.tar.gz: af26160711971a9fe39d0e3154dfc7ae0bd0bd6ef203bf675e2ed652f2e0e9f7
+  metadata.gz: b9885ad2362b97a26732cf64fef583674c58250648f403627aef33e87687f2bb
+  data.tar.gz: 7678e338a3eb5276e53e3f673d230dc67f2b1cdf395adb339f09162f96e4c058
 SHA512:
-  metadata.gz: 157ff74bdfd086e3b52ad216a7009b2b9c706dc5fdf4cf7c9591a62b8af3e3dceea77f46bf2e31493fd0e2f496b2d6263fba756a992190ed82d868a85772713a
-  data.tar.gz: d75b64388c883d406655c32b8990852bf3c10e8e1e8cb06335eb6b9ea482f6da2491fa41e2700528200b5fdf062f2f9a70e6ab650e4605c3e1ec2b97fcd99d9c
+  metadata.gz: 8fe261d1536790c511b437afcf5e6aff632d21f3c4ef47c96c4a3adbf31c6b8f2b07e186323ddb4858a1c37c23d651bd96deeb49feb493c4064c11f2ba5d0d92
+  data.tar.gz: e46b1a057f9f6b351dd96eed98dbcee7209fe5ca9c4c247dbeb715988851a3ac99875e174022f60f08a5848e226f277562be131085dcbfa667544de41da17cd0

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
@@ -316,7 +325,7 @@ module Onebox
         return true if AllowlistedGenericOnebox.html_providers.include?(data[:provider_name])
         return false unless data[:html]["iframe"]
 
-        fragment = Nokogiri::HTML::fragment(data[:html])
+        fragment = Nokogiri::HTML5::fragment(data[:html])
         src = fragment.at_css('iframe')&.[]("src")
         options[:allowed_iframe_regexes]&.any? { |r| src =~ r }
       end
@@ -367,7 +376,7 @@ module Onebox
       end
 
       def embedded_html
-        fragment = Nokogiri::HTML::fragment(data[:html])
+        fragment = Nokogiri::HTML5::fragment(data[:html])
         fragment.css("img").each { |img| img["class"] = "thumbnail" }
         if iframe = fragment.at_css("iframe")
           iframe.remove_attribute("style")

data/lib/onebox/engine/github_folder_onebox.rb

@@ -0,0 +1,79 @@
+# 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: og.url,
+          path_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/imgur_onebox.rb

@@ -58,7 +58,7 @@ module Onebox
 
         <<-HTML
             <a href='#{escaped_url}' target='_blank' rel='noopener' class="onebox">
-              <img src='#{og.get_secure_image}' #{og.title_attr} alt='Imgur' height='#{og.image_height}' width='#{og.image_width}'>
+              <img src='#{og.get_secure_image.chomp("?fb")}' #{og.title_attr} alt='Imgur'>
             </a>
           HTML
       end

data/lib/onebox/engine/instagram_onebox.rb

@@ -16,19 +16,31 @@ module Onebox
 
       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,
           title: "@#{oembed.author_name}",
-          image: "#{permalink}/media/?size=l",
-          description: Onebox::Helpers.truncate(oembed.title, 250)
+          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
@@ -45,7 +55,7 @@ module Onebox
       return "" unless html
 
       if @options[:max_width]
-        doc = Nokogiri::HTML::fragment(html)
+        doc = Nokogiri::HTML5::fragment(html)
         if doc
           doc.css('[width]').each do |e|
             width = e['width'].to_i

data/lib/onebox/version.rb

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

data/onebox.gemspec

@@ -33,7 +33,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-discourse', '~> 2.1.2'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.4.0'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

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='{{path_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.3
+  version: 2.1.8
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -186,14 +186,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -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