onebox 2.1.1 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbcb2268bcade7ace9670046cfbf13f58862561b59802ef0011bc8ae869a6a7
-  data.tar.gz: 51e35394339f1cdd6c6dc7be9971bbc7a0e8b8f9a31b483d877e96be86319e0f
+  metadata.gz: b6fd88926ec341ed84409e7c77dbfcce244dbf2a0c74e0a19736e81b2b693e84
+  data.tar.gz: 18f53e5fb7b1fa4eab35ea27f87e97600e82af0eaf4fd5eed0809744bf7e53c7
 SHA512:
-  metadata.gz: 9f540f3437675e0abb5ccb25013b9b516e6bb101a21a26e00a2ecf111940bc660ef8706122f805a279cb67e85823be82183d9f095bc86a7aa7f494c0ecd68645
-  data.tar.gz: 82295ede48990cf922e1e3e6cce645cd1caf4f9965d8e289d756d727f4b7886e116a5ffa1676f7df3873d524b28161c30c75478e2008887a80324e2ed8639fde
+  metadata.gz: 5a5c344336f529d53b51ac47b5b0efee1b6fb29b0b2541948d650fa1d81e11f97edfa3d1a2f8abb7915b8cf9c86e41c74b64cb40b26924e380f68d52e0015c33
+  data.tar.gz: 9cefe31755197bbfb71ba3e741329c7bdba10fd9bb19892b237cb78b22769e0e19824119b94cb3cdd24f7bec10f4aeb91cbad3a7d40eefd84c2cbe64866908b0

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
 

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,8 +301,7 @@ module Onebox
       end
 
       def has_text?
-        !Onebox::Helpers.blank?(data[:title]) &&
-        !Onebox::Helpers.blank?(data[:description])
+        !Onebox::Helpers.blank?(data[:title])
       end
 
       def is_image?
@@ -317,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
@@ -368,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/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

@@ -20,15 +20,25 @@ module Onebox
 
         { 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/engine/wistia_onebox.rb

@@ -7,7 +7,7 @@ module Onebox
       include StandardEmbed
 
       matches_regexp(/https?:\/\/(.+)?(wistia.com|wi.st)\/(medias|embed)\/.*/)
-      requires_iframe_origins "https://fast.wistia.com"
+      requires_iframe_origins("https://fast.wistia.com", "https://fast.wistia.net")
       always_https
 
       def to_html

data/lib/onebox/helpers.rb

@@ -156,6 +156,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.1"
+  VERSION = "2.1.6"
 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/allowlistedgeneric.mustache

@@ -2,7 +2,9 @@
 
 <h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
 
+{{#description}}
 <p>{{description}}</p>
+{{/description}}
 
 {{#data_1}}
   <p><span class="label1">{{label_1}}: {{data_1}}</span>

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.1
+  version: 2.1.6
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-11-16 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