onebox 1.8.79 → 1.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 896effdb129adbeb1e51707f925b21e607cae0b6dd5c18da33df140e5b1bdc6d
-  data.tar.gz: 10979bdfa001024538c7a141fe1ff945c6212ee2279c4b053bb33bcfedcdd8fb
+  metadata.gz: 6f4025cb791c71ae3c8e60721222523344220036885b580ab8b95724a3919f9f
+  data.tar.gz: c86237739a577b807887bcab7888b79c69abe4e20a79ad3bd64a44254445a940
 SHA512:
-  metadata.gz: 3fad55242a2919216c2f23a9fd0ca68cb11f5f6a4d9c6cfdd78e90e702f42a91ef80c102ffe47a287b90b79584715650deb727d432273905b191b956f47cd5cb
-  data.tar.gz: 137a2739c8e81a2f05626e66e225c90c37068f3c449cc4caeedf8864c62b408a56678d932a3bf713b836b89a23f0e29eae7a637d5066fb41c8a5553e40e75ef3
+  metadata.gz: ab7468411bd2f318d70c1d1621f92f90f3c378df3f28ff57abfa744e3778cf1817c9ed486ad52ed00c428fdd782c43f4df68de20c8ff1b8cef0e343a552940ea
+  data.tar.gz: 180a8b88df76668dc6d0f73b35aa28ab21587208c42892d02f024e37dee66f403bb31cacd9cd2160b4b7c8596864652d837bdde8e793fd099204b71046e4a21f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    onebox (1.8.78)
+    onebox (1.8.79)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)

data/lib/onebox/engine/amazon_onebox.rb

@@ -1,4 +1,5 @@
 require 'json'
+require "onebox/open_graph"
 
 module Onebox
   module Engine
@@ -76,7 +77,7 @@ module Onebox
       end
 
       def data
-        og = ::Onebox::Helpers.extract_opengraph(raw)
+        og = ::Onebox::OpenGraph.new(raw)
 
         if raw.at_css('#dp.book_mobile') #printed books
           title = raw.at("h1#title")&.inner_text
@@ -100,7 +101,7 @@ module Onebox
             link: link,
             title: title,
             by_info: authors,
-            image: og[:image] || image,
+            image: og.image || image,
             description: raw.at("#productDescription")&.inner_text,
             rating: "#{rating}#{', ' if rating && (!isbn&.empty? || !price&.empty?)}",
             price: price,
@@ -131,7 +132,7 @@ module Onebox
             link: link,
             title: title,
             by_info: authors,
-            image: og[:image] || image,
+            image: og.image || image,
             description: raw.at("#productDescription")&.inner_text,
             rating: "#{rating}#{', ' if rating && (!asin&.empty? || !price&.empty?)}",
             price: price,
@@ -142,11 +143,11 @@ module Onebox
           }
 
         else
-          title = og[:title] || CGI.unescapeHTML(raw.css("title").inner_text)
+          title = og.title || CGI.unescapeHTML(raw.css("title").inner_text)
           result = {
             link: link,
             title: title,
-            image: og[:image] || image,
+            image: og.image || image,
             price: price
           }
 
@@ -154,7 +155,7 @@ module Onebox
           result[:by_info] = Onebox::Helpers.clean(result[:by_info].inner_html) if result[:by_info]
 
           summary = raw.at("#productDescription")
-          result[:description] = og[:description] || (summary && summary.inner_text)
+          result[:description] = og.description || (summary && summary.inner_text)
         end
 
         result[:price] = nil if result[:price].start_with?("$0") || result[:price] == 0

data/lib/onebox/engine/audioboom_onebox.rb

@@ -9,16 +9,14 @@ module Onebox
 
       def placeholder_html
         oembed = get_oembed
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed[:thumbnail_url])
 
         <<-HTML
-          <img src="#{escaped_src}" style="max-width: #{oembed[:width]}px; max-height: #{oembed[:height]}px;" #{Helpers.title_attr(oembed)}>
+          <img src="#{oembed.thumbnail_url}" style="max-width: #{oembed.width}px; max-height: #{oembed.height}px;" #{oembed.title_attr}>
         HTML
       end
 
       def to_html
-        oembed = get_oembed
-        oembed[:html]
+        get_oembed.html
       end
 
     end

data/lib/onebox/engine/bandcamp_onebox.rb

@@ -9,19 +9,17 @@ module Onebox
 
       def placeholder_html
         og = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:image])
-        "<img src='#{escaped_src}' height='#{og[:video_height]}' #{Helpers.title_attr(og)}>"
+        "<img src='#{og.image}' height='#{og.video_height}' #{og.title_attr}>"
       end
 
       def to_html
         og = get_opengraph
-        src = og[:video_secure_url] || og[:video]
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(src)
+        escaped_src = og.video_secure_url || og.video
 
         <<-HTML
           <iframe src="#{escaped_src}"
-                  width="#{og[:video_width]}"
-                  height="#{og[:video_height]}"
+                  width="#{og.video_width}"
+                  height="#{og.video_height}"
                   scrolling="no"
                   frameborder="0"
                   allowfullscreen>

data/lib/onebox/engine/cloudapp_onebox.rb

@@ -10,9 +10,9 @@ module Onebox
       def to_html
         og = get_opengraph
 
-        if !Onebox::Helpers::blank?(og[:image])
+        if !og.image.nil?
           return image_html(og)
-        elsif og[:title].to_s[/\.(mp4|ogv|webm)$/]
+        elsif og.title.to_s[/\.(mp4|ogv|webm)$/]
           return video_html(og)
         else
           return link_html(og)
@@ -22,33 +22,27 @@ module Onebox
       private
 
       def link_html(og)
-        escaped_url = ::Onebox::Helpers.normalize_url_for_output(og[:url])
-
         <<-HTML
-            <a href='#{escaped_url}' target='_blank'>
-              #{og[:title]}
+            <a href='#{og.url}' target='_blank'>
+              #{og.title}
             </a>
           HTML
       end
 
       def video_html(og)
-        src = og[:url]
-        title = og[:title]
-        direct_src = ::Onebox::Helpers.normalize_url_for_output("#{src}/#{title}")
+        direct_src = ::Onebox::Helpers.normalize_url_for_output("#{og.get(:url)}/#{og.title}")
 
         <<-HTML
-            <video width='480' height='360' #{Helpers.title_attr(og)} controls loop>
+            <video width='480' height='360' #{og.title_attr} controls loop>
               <source src='#{direct_src}' type='video/mp4'>
             </video>
           HTML
       end
 
       def image_html(og)
-        escaped_url = ::Onebox::Helpers.normalize_url_for_output(og[:url])
-
         <<-HTML
-            <a href='#{escaped_url}' target='_blank' class='onebox'>
-              <img src='#{og[:image]}' #{Helpers.title_attr(og)} alt='CloudApp' width='480'>
+            <a href='#{og.url}' target='_blank' class='onebox'>
+              <img src='#{og.image}' #{og.title_attr} alt='CloudApp' width='480'>
             </a>
           HTML
       end

data/lib/onebox/engine/coub_onebox.rb

@@ -9,12 +9,11 @@ module Onebox
 
       def placeholder_html
         oembed = get_oembed
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed[:thumbnail_url])
-        "<img src='#{escaped_src}' height='#{oembed[:thumbnail_height]}' width='#{oembed[:thumbnail_width]}' #{Helpers.title_attr(oembed)}>"
+        "<img src='#{oembed.thumbnail_url}' height='#{oembed.thumbnail_height}' width='#{oembed.thumbnail_width}' #{oembed.title_attr}>"
       end
 
       def to_html
-        get_oembed[:html]
+        get_oembed.html
       end
 
     end

data/lib/onebox/engine/five_hundred_px_onebox.rb

@@ -9,8 +9,7 @@ module Onebox
 
       def to_html
         og = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:image])
-        "<img src='#{escaped_src}' width='#{og[:image_width]}' height='#{og[:image_height]}' class='onebox' #{Helpers.title_attr(og)}>"
+        "<img src='#{og.image}' width='#{og.image_width}' height='#{og.image_height}' class='onebox' #{og.title_attr}>"
       end
 
     end

data/lib/onebox/engine/giphy_onebox.rb

@@ -9,11 +9,10 @@ module Onebox
 
       def to_html
         oembed = get_oembed
-        escaped_url = ::Onebox::Helpers.normalize_url_for_output(oembed[:url])
 
         <<-HTML
-          <a href="#{escaped_url}" target="_blank" class="onebox">
-            <img src="#{escaped_url}" width="#{oembed[:width]}" height="#{oembed[:height]}" #{Helpers.title_attr(oembed)}>
+          <a href="#{oembed.url}" target="_blank" class="onebox">
+            <img src="#{oembed.url}" width="#{oembed.width}" height="#{oembed.height}" #{oembed.title_attr}>
           </a>
         HTML
       end

data/lib/onebox/engine/google_photos_onebox.rb

@@ -9,39 +9,35 @@ module Onebox
 
       def to_html
         og = get_opengraph
-        return video_html(og) if !Onebox::Helpers::blank?(og[:video_secure_url])
-        return album_html(og) if !Onebox::Helpers::blank?(og[:type]) && og[:type] == "google_photos:photo_album"
-        return image_html(og) if !Onebox::Helpers::blank?(og[:image])
+        return video_html(og) if !og.video_secure_url.nil?
+        return album_html(og) if !og.type.nil? && og.type == "google_photos:photo_album"
+        return image_html(og) if !og.image.nil?
         nil
       end
 
       private
 
       def video_html(og)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:video_secure_url])
-        escaped_image_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
-
         <<-HTML
-            <video width='#{og[:video_width]}' height='#{og[:video_height]}' #{Helpers.title_attr(og)} poster="#{escaped_image_src}" controls loop>
-              <source src='#{escaped_src}' type='video/mp4'>
+            <video width='#{og.video_width}' height='#{og.video_height}' #{og.title_attr} poster="#{og.get_secure_image}" controls loop>
+              <source src='#{og.video_secure_url}' type='video/mp4'>
             </video>
           HTML
       end
 
       def album_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
-        album_title = Onebox::Helpers::blank?(og[:description]) ? og[:title].strip : "[#{og[:description].strip}] #{og[:title].strip}"
+        album_title = og.description.nil? ? og.title : "[#{og.description}] #{og.title}"
 
         <<-HTML
             <div class='onebox google-photos-album'>
               <a href='#{escaped_url}' target='_blank'>
-                <span class='outer-box' style='width:#{og[:image_width]}px'>
+                <span class='outer-box' style='width:#{og.image_width}px'>
                   <span class='inner-box'>
                     <span class='album-title'>#{Onebox::Helpers.truncate(album_title, 80)}</span>
                   </span>
                 </span>
-                <img src='#{escaped_src}' #{Helpers.title_attr(og)} height='#{og[:image_height]}' width='#{og[:image_width]}'>
+                <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
               </a>
             </div>
           HTML
@@ -49,20 +45,13 @@ module Onebox
 
       def image_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
 
         <<-HTML
             <a href='#{escaped_url}' target='_blank' class="onebox">
-              <img src='#{escaped_src}' #{Helpers.title_attr(og)} alt='Google Photos' height='#{og[:image_height]}' width='#{og[:image_width]}'>
+              <img src='#{og.get_secure_image}' #{og.title_attr} alt='Google Photos' height='#{og.image_height}' width='#{og.image_width}'>
             </a>
           HTML
       end
-
-      def get_secure_link(link)
-        secure_link = URI(link)
-        secure_link.scheme = 'https'
-        secure_link.to_s
-      end
     end
   end
 end

data/lib/onebox/engine/imgur_onebox.rb

@@ -9,39 +9,36 @@ module Onebox
 
       def to_html
         og = get_opengraph
-        return video_html(og) if !Onebox::Helpers::blank?(og[:video_secure_url])
+        return video_html(og) if !og.video_secure_url.nil?
         return album_html(og) if is_album?
-        return image_html(og) if !Onebox::Helpers::blank?(og[:image])
+        return image_html(og) if !og.image.nil?
         nil
       end
 
       private
 
       def video_html(og)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:video_secure_url])
-
         <<-HTML
-            <video width='#{og[:video_width]}' height='#{og[:video_height]}' #{Helpers.title_attr(og)} controls loop>
-              <source src='#{escaped_src}' type='video/mp4'>
-              <source src='#{escaped_src.gsub('mp4', 'webm')}' type='video/webm'>
+            <video width='#{og.video_width}' height='#{og.video_height}' #{og.title_attr} controls loop>
+              <source src='#{og.video_secure_url}' type='video/mp4'>
+              <source src='#{og.video_secure_url.gsub('mp4', 'webm')}' type='video/webm'>
             </video>
           HTML
       end
 
       def album_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
-        album_title = "[Album] #{Onebox::Helpers.truncate(og[:title], 80)}"
+        album_title = "[Album] #{og.title}"
 
         <<-HTML
             <div class='onebox imgur-album'>
               <a href='#{escaped_url}' target='_blank'>
-                <span class='outer-box' style='width:#{og[:image_width]}px'>
+                <span class='outer-box' style='width:#{og.image_width}px'>
                   <span class='inner-box'>
                     <span class='album-title'>#{album_title}</span>
                   </span>
                 </span>
-                <img src='#{escaped_src}' #{Helpers.title_attr(og)} height='#{og[:image_height]}' width='#{og[:image_width]}'>
+                <img src='#{og.get_secure_image}' #{og.title_attr} height='#{og.image_height}' width='#{og.image_width}'>
               </a>
             </div>
           HTML
@@ -56,21 +53,13 @@ module Onebox
 
       def image_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
 
         <<-HTML
             <a href='#{escaped_url}' target='_blank' class="onebox">
-              <img src='#{escaped_src}' #{Helpers.title_attr(og)} alt='Imgur' height='#{og[:image_height]}' width='#{og[:image_width]}'>
+              <img src='#{og.get_secure_image}' #{og.title_attr} alt='Imgur' height='#{og.image_height}' width='#{og.image_width}'>
             </a>
           HTML
       end
-
-      def get_secure_link(link)
-        secure_link = URI(link)
-        secure_link.scheme = 'https'
-        secure_link.to_s
-      end
-
     end
   end
 end

data/lib/onebox/engine/instagram_onebox.rb

@@ -12,24 +12,18 @@ module Onebox
 
       def data
         og = get_opengraph
-        title = og[:title].split(":")[0].strip.gsub(" on Instagram", "")
-        html_entities = HTMLEntities.new
+        title = og.title.split(":")[0].strip.gsub(" on Instagram", "")
 
         json_data = html_doc.xpath('//script[contains(text(),"window._sharedData")]').text.to_s
         title = "[Album] #{title}" if json_data =~ /"edge_sidecar_to_children"/
 
-        result = { link: og[:url],
-                   title: html_entities.decode(Onebox::Helpers.truncate(title, 80)),
-                   description: html_entities.decode(Onebox::Helpers.truncate(og[:description], 250))
+        result = { link: og.url,
+                   title: Onebox::Helpers.truncate(title, 80),
+                   description: og.description(250)
                   }
 
-        if !Onebox::Helpers.blank?(og[:image])
-          result[:image] = ::Onebox::Helpers.normalize_url_for_output(og[:image])
-        end
-
-        if !Onebox::Helpers.blank?(og[:video_secure_url])
-          result[:video_link] = og[:url]
-        end
+        result[:image] = og.image if !og.image.nil?
+        result[:video_link] = og.url if !og.video_secure_url.nil?
 
         result
       end

data/lib/onebox/engine/kaltura_onebox.rb

@@ -9,20 +9,18 @@ module Onebox
 
       def preview_html
         og = get_opengraph
-        thumbnail_url = ::Onebox::Helpers.normalize_url_for_output(og[:image_secure_url])
 
         <<~HTML
-          <img src="#{thumbnail_url}" width="#{og[:video_width]}" height="#{og[:video_height]}" >
+          <img src="#{og.image_secure_url}" width="#{og.video_width}" height="#{og.video_height}" >
         HTML
       end
 
       def to_html
         og = get_opengraph
-        embedded_video_url = ::Onebox::Helpers.normalize_url_for_output(og[:video_secure_url])
 
         <<~HTML
-          <iframe src="#{embedded_video_url}"
-                  width="#{og[:video_width]}" height="#{og[:video_height]}"
+          <iframe src="#{og.video_secure_url}"
+                  width="#{og.video_width}" height="#{og.video_height}"
                   frameborder='0'
                   allowfullscreen >
           </iframe>

data/lib/onebox/engine/mixcloud_onebox.rb

@@ -9,12 +9,11 @@ module Onebox
 
       def placeholder_html
         oembed = get_oembed
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed[:image])
-        "<img src='#{escaped_src}' height='#{oembed[:height]}' #{Helpers.title_attr(oembed)}>"
+        "<img src='#{oembed.image}' height='#{oembed.height}' #{oembed.title_attr}>"
       end
 
       def to_html
-        get_oembed[:html]
+        get_oembed.html
       end
     end
   end

data/lib/onebox/engine/opengraph_image.rb

@@ -4,8 +4,7 @@ module Onebox
 
       def to_html
         og = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:image])
-        "<img src='#{escaped_src}' width='#{og[:image_width]}' height='#{og[:image_height]}' class='onebox' #{Helpers.title_attr(og)}>"
+        "<img src='#{og.image}' width='#{og.image_width}' height='#{og.image_height}' class='onebox' #{og.title_attr}>"
       end
 
     end

data/lib/onebox/engine/replit_onebox.rb

@@ -9,16 +9,14 @@ module Onebox
 
       def placeholder_html
         oembed = get_oembed
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed[:thumbnail_url])
 
         <<-HTML
-          <img src="#{escaped_src}" style="max-width: #{oembed[:width]}px; max-height: #{oembed[:height]}px;" #{Helpers.title_attr(oembed)}>
+          <img src="#{oembed.thumbnail_url}" style="max-width: #{oembed.width}px; max-height: #{oembed.height}px;" #{oembed.title_attr}>
         HTML
       end
 
       def to_html
-        oembed = get_oembed
-        oembed[:html]
+        get_oembed.html
       end
 
     end

data/lib/onebox/engine/sketchfab_onebox.rb

@@ -8,15 +8,13 @@ module Onebox
       always_https
 
       def to_html
-        opengraph = get_opengraph
-
-        src = opengraph[:video_url].gsub("autostart=1", "")
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(src)
+        og = get_opengraph
+        src = og.video_url.gsub("autostart=1", "")
 
         <<-HTML
-          <iframe src="#{escaped_src}"
-                  width="#{opengraph[:video_width]}"
-                  height="#{opengraph[:video_height]}"
+          <iframe src="#{src}"
+                  width="#{og.video_width}"
+                  height="#{og.video_height}"
                   scrolling="no"
                   frameborder="0"
                   allowfullscreen>
@@ -25,9 +23,7 @@ module Onebox
       end
 
       def placeholder_html
-        opengraph = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(opengraph[:image])
-        "<img src='#{escaped_src}'>"
+        "<img src='#{get_opengraph.image}'>"
       end
 
     end

data/lib/onebox/engine/soundcloud_onebox.rb

@@ -8,26 +8,22 @@ module Onebox
       always_https
 
       def to_html
-        oembed_data[:html].gsub('visual=true', 'visual=false')
+        oembed = get_oembed
+        oembed.html.gsub('visual=true', 'visual=false')
       end
 
       def placeholder_html
-        return if Onebox::Helpers.blank?(oembed_data[:thumbnail_url])
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed_data[:thumbnail_url])
-        "<img src='#{escaped_src}' #{Helpers.title_attr(oembed_data)}>"
+        oembed = get_oembed
+        return if Onebox::Helpers.blank?(oembed.thumbnail_url)
+        "<img src='#{oembed.thumbnail_url}' #{oembed.title_attr}>"
       end
 
-      private
+      protected
 
-      def oembed_data
-        @oembed_data ||= begin
-          oembed_url = "https://soundcloud.com/oembed.json?url=#{url}"
-          oembed_url << "&maxheight=166" unless url["/sets/"]
-          response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
-          Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
-        rescue
-          {}
-        end
+      def get_oembed_url
+        oembed_url = "https://soundcloud.com/oembed.json?url=#{url}"
+        oembed_url << "&maxheight=166" unless url["/sets/"]
+        oembed_url
       end
 
     end

data/lib/onebox/engine/standard_embed.rb

@@ -1,4 +1,5 @@
 require "cgi"
+require "onebox/open_graph"
 
 module Onebox
   module Engine
@@ -41,9 +42,18 @@ module Onebox
 
         @raw = {}
 
-        og.each { |k, v| @raw[k] ||= v unless Onebox::Helpers::blank?(v) }
+        og.data.each do |k, v|
+          next if k == "title_attr"
+          v = og.send(k)
+          @raw[k] ||= v unless v.nil?
+        end
+
         twitter.each { |k, v| @raw[k] ||= v unless Onebox::Helpers::blank?(v) }
-        oembed.each { |k, v| @raw[k] ||= v unless Onebox::Helpers::blank?(v) }
+
+        oembed.data.each do |k, v|
+          v = oembed.send(k)
+          @raw[k] ||= v unless v.nil?
+        end
 
         favicon = get_favicon
         @raw["favicon".to_sym] = favicon unless Onebox::Helpers::blank?(favicon)
@@ -63,42 +73,11 @@ module Onebox
       end
 
       def get_oembed
-        oembed_url = nil
-
-        StandardEmbed.oembed_providers.each do |regexp, endpoint|
-          if url =~ regexp
-            oembed_url = "#{endpoint}?url=#{url}"
-            break
-          end
-        end
-
-        if html_doc
-          if Onebox::Helpers.blank?(oembed_url)
-            application_json = html_doc.at("//link[@type='application/json+oembed']/@href")
-            oembed_url = application_json.value if application_json
-          end
-
-          if Onebox::Helpers.blank?(oembed_url)
-            text_json = html_doc.at("//link[@type='text/json+oembed']/@href")
-            oembed_url ||= text_json.value if text_json
-          end
-        end
-
-        return {} if Onebox::Helpers.blank?(oembed_url)
-
-        json_response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
-        oe = Onebox::Helpers.symbolize_keys(::MultiJson.load(json_response))
-
-        # never use oembed from WordPress 4.4 (it's broken)
-        oe.delete(:html) if oe[:html] && oe[:html]["wp-embedded-content"]
-
-        oe
-      rescue Errno::ECONNREFUSED, Net::HTTPError, Net::HTTPFatalError, MultiJson::LoadError
-        {}
+        @oembed ||= Onebox::Oembed.new(get_json_response)
       end
 
       def get_opengraph
-        ::Onebox::Helpers.extract_opengraph(html_doc)
+        @opengraph ||= ::Onebox::OpenGraph.new(html_doc)
       end
 
       def get_twitter
@@ -124,6 +103,43 @@ module Onebox
 
         Onebox::Helpers::get_absolute_image_url(favicon, url)
       end
+
+      def get_json_response
+        oembed_url = get_oembed_url
+
+        return "{}" if Onebox::Helpers.blank?(oembed_url)
+
+        Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
+      rescue Errno::ECONNREFUSED, Net::HTTPError, Net::HTTPFatalError, MultiJson::LoadError
+        "{}"
+      end
+
+      protected
+
+      def get_oembed_url
+        oembed_url = nil
+
+        StandardEmbed.oembed_providers.each do |regexp, endpoint|
+          if url =~ regexp
+            oembed_url = "#{endpoint}?url=#{url}"
+            break
+          end
+        end
+
+        if html_doc
+          if Onebox::Helpers.blank?(oembed_url)
+            application_json = html_doc.at("//link[@type='application/json+oembed']/@href")
+            oembed_url = application_json.value if application_json
+          end
+
+          if Onebox::Helpers.blank?(oembed_url)
+            text_json = html_doc.at("//link[@type='text/json+oembed']/@href")
+            oembed_url ||= text_json.value if text_json
+          end
+        end
+
+        oembed_url
+      end
     end
   end
 end

data/lib/onebox/engine/steam_store_onebox.rb

@@ -9,13 +9,12 @@ module Onebox
 
       def placeholder_html
         og = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:image])
         <<-HTML
           <div style='width:100%; height:190px; background-color:#262626; color:#9e9e9e; margin:15px 0;'>
             <div style='padding:10px'>
-              <h3 style='color:#fff; margin:10px 0 10px 5px;'>#{og[:title]}</h3>
-              <img src='#{escaped_src}' style='float:left; max-width:184px; margin:5px 15px 0 5px'/>
-              <p>#{og[:description]}</p>
+              <h3 style='color:#fff; margin:10px 0 10px 5px;'>#{og.title}</h3>
+              <img src='#{og.image}' style='float:left; max-width:184px; margin:5px 15px 0 5px'/>
+              <p>#{og.description}</p>
             </div>
           </div>
         HTML

data/lib/onebox/engine/vimeo_onebox.rb

@@ -9,12 +9,11 @@ module Onebox
 
       def placeholder_html
         oembed = get_oembed
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed[:thumbnail_url])
-        "<img src='#{escaped_src}' width='#{oembed[:thumbnail_width]}' height='#{oembed[:thumbnail_height]}' #{Helpers.title_attr(oembed)}>"
+        "<img src='#{oembed.thumbnail_url}' width='#{oembed.thumbnail_width}' height='#{oembed.thumbnail_height}' #{oembed.title_attr}>"
       end
 
       def to_html
-        get_oembed[:html]
+        get_oembed.html
       end
     end
   end

data/lib/onebox/engine/wistia_onebox.rb

@@ -8,24 +8,19 @@ module Onebox
       always_https
 
       def to_html
-        oembed_data[:html]
+        get_oembed.html
       end
 
       def placeholder_html
-        return if Onebox::Helpers.blank?(oembed_data[:thumbnail_url])
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(oembed_data[:thumbnail_url])
-        "<img src='#{escaped_src}' #{Helpers.title_attr(oembed_data)}>"
+        oembed = get_oembed
+        return if Onebox::Helpers.blank?(oembed.thumbnail_url)
+        "<img src='#{oembed.thumbnail_url}' #{oembed.title_attr}>"
       end
 
       private
-      def oembed_data
-        @oembed_data ||= begin
-          oembed_url = "https://fast.wistia.com/oembed?embedType=iframe&url=#{url}"
-          response = Onebox::Helpers.fetch_response(oembed_url) rescue "{}"
-          Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
-        rescue
-          {}
-        end
+
+      def get_oembed_url
+        "https://fast.wistia.com/oembed?embedType=iframe&url=#{url}"
       end
     end
   end

data/lib/onebox/engine/youtube_onebox.rb

@@ -1,3 +1,5 @@
+require 'onebox/oembed'
+
 module Onebox
   module Engine
     class YoutubeOnebox
@@ -12,9 +14,9 @@ module Onebox
 
       def placeholder_html
         if video_id
-          "<img src='https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg' width='#{WIDTH}' height='#{HEIGHT}' #{Helpers.title_attr(video_oembed_data)}>"
+          "<img src='https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg' width='#{WIDTH}' height='#{HEIGHT}' #{video_oembed_data.title_attr}>"
         elsif list_id
-          "<img src='#{list_thumbnail_url}' width='#{WIDTH}' height='#{HEIGHT}' #{Helpers.title_attr(list_oembed_data)}>"
+          "<img src='#{list_thumbnail_url}' width='#{WIDTH}' height='#{HEIGHT}' #{list_oembed_data.title_attr}>"
         else
           to_html
         end
@@ -49,11 +51,7 @@ module Onebox
       end
 
       def video_title
-        @video_title ||= begin
-          Onebox::Helpers.truncate(video_oembed_data[:title], 80)
-        rescue
-          nil
-        end
+        @video_title ||= video_oembed_data.title
       end
 
       private
@@ -85,8 +83,8 @@ module Onebox
         @list_thumbnail_url ||= begin
           url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/playlist?list=#{list_id}"
           response = Onebox::Helpers.fetch_response(url) rescue "{}"
-          data = Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
-          data[:thumbnail_url]
+          data = Onebox::Oembed.new(response)
+          data.thumbnail_url
         rescue
           nil
         end
@@ -95,13 +93,13 @@ module Onebox
       def video_oembed_data
         url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/watch?v=#{video_id}"
         response = Onebox::Helpers.fetch_response(url) rescue "{}"
-        Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+        Onebox::Oembed.new(response)
       end
 
       def list_oembed_data
         url = "https://www.youtube.com/oembed?format=json&url=https://www.youtube.com/playlist?list=#{list_id}"
         response = Onebox::Helpers.fetch_response(url) rescue "{}"
-        Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+        Onebox::Oembed.new(response)
       end
 
       def embed_params

data/lib/onebox/helpers.rb

@@ -18,27 +18,6 @@ module Onebox
       html.gsub(/<[^>]+>/, ' ').gsub(/\n/, '')
     end
 
-    def self.extract_opengraph(doc)
-      return {} unless doc
-
-      og = {}
-
-      doc.css('meta').each do |m|
-        if (m["property"] && m["property"][/^(?:og|article|product):(.+)$/i]) || (m["name"] && m["name"][/^(?:og|article|product):(.+)$/i])
-          value = (m["content"] || m["value"]).to_s
-          og[$1.tr('-:', '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
-        end
-      end
-
-      # Attempt to retrieve the title from the meta tag
-      title_element = doc.at_css('title')
-      if title_element && title_element.text
-        og[:title] ||= title_element.text unless Onebox::Helpers.blank?(title_element.text)
-      end
-
-      og
-    end
-
     def self.fetch_html_doc(url, headers = nil)
       response = (fetch_response(url, nil, nil, headers) rescue nil)
       doc = Nokogiri::HTML(response)
@@ -169,15 +148,9 @@ module Onebox
     end
 
     def self.truncate(string, length = 50)
-      string = sanitize(string)
       string.size > length ? string[0...(string.rindex(" ", length) || length)] + "..." : string
     end
 
-    def self.title_attr(meta)
-      title = get(meta, :title)
-      !title.nil? ? "title='#{title}'" : ""
-    end
-
     def self.get(meta, attr)
       (meta && !blank?(meta[attr])) ? sanitize(meta[attr]) : nil
     end

data/lib/onebox/oembed.rb

@@ -0,0 +1,12 @@
+module Onebox
+  class Oembed < OpenGraph
+
+    def initialize(response)
+      @data = Onebox::Helpers.symbolize_keys(::MultiJson.load(response))
+
+      # never use oembed from WordPress 4.4 (it's broken)
+      data.delete(:html) if data[:html] && data[:html]["wp-embedded-content"]
+    end
+
+  end
+end

data/lib/onebox/open_graph.rb

@@ -0,0 +1,88 @@
+module Onebox
+  class OpenGraph
+
+    attr_reader :data
+
+    def initialize(doc)
+      @data = extract(doc)
+    end
+
+    def title
+      get(:title, 80)
+    end
+
+    def title_attr
+      !title.nil? ? "title='#{title}'" : ""
+    end
+
+    def get_secure_image
+      secure_link = URI(get(:image))
+      secure_link.scheme = 'https'
+      secure_link.to_s
+    end
+
+    def method_missing(attr, *args, &block)
+      value = get(attr, *args)
+
+      return nil if Onebox::Helpers::blank?(value)
+
+      method_name = attr.to_s
+      if method_name.end_with?(*integer_suffixes)
+        value.to_i
+      elsif method_name.end_with?(*url_suffixes)
+        ::Onebox::Helpers.normalize_url_for_output(value)
+      else
+        value
+      end
+    end
+
+    def get(attr, length = nil)
+      return nil if Onebox::Helpers::blank?(data)
+
+      value = data[attr]
+
+      return nil if Onebox::Helpers::blank?(value)
+
+      value = Sanitize.fragment(html_entities.decode(value)).strip
+      value = Onebox::Helpers.truncate(value, length) unless length.nil?
+
+      value
+    end
+
+    private
+
+    def integer_suffixes
+      ['width', 'height']
+    end
+
+    def url_suffixes
+      ['url', 'image', 'video']
+    end
+
+    def html_entities
+      @html_entities ||= HTMLEntities.new
+    end
+
+    def extract(doc)
+      return {} if Onebox::Helpers::blank?(doc)
+
+      data = {}
+
+      doc.css('meta').each do |m|
+        if (m["property"] && m["property"][/^(?:og|article|product):(.+)$/i]) || (m["name"] && m["name"][/^(?:og|article|product):(.+)$/i])
+          value = (m["content"] || m["value"]).to_s
+          data[$1.tr('-:', '_').to_sym] ||= value unless Onebox::Helpers::blank?(value)
+        end
+      end
+
+      # Attempt to retrieve the title from the meta tag
+      title_element = doc.at_css('title')
+      if title_element && title_element.text
+        data[:title] ||= title_element.text unless Onebox::Helpers.blank?(title_element.text)
+      end
+
+      data
+    end
+
+  end
+end

data/lib/onebox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.79
+  version: 1.8.80
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -366,6 +366,8 @@ files:
 - lib/onebox/matcher.rb
 - lib/onebox/mixins/git_blob_onebox.rb
 - lib/onebox/mixins/twitch_onebox.rb
+- lib/onebox/oembed.rb
+- lib/onebox/open_graph.rb
 - lib/onebox/preview.rb
 - lib/onebox/sanitize_config.rb
 - lib/onebox/status_check.rb
@@ -416,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A gem for generating embeddable HTML previews from URLs.