onebox 1.5.31 → 1.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168c41ce81094aaa302822d95c75191890a96dc2
-  data.tar.gz: 3e6fcf7bc9cbc8a7f9c0f7fe7a024d563f1f758a
+  metadata.gz: aa9168446ef3d1d26838bbd529dedc3a15f583ea
+  data.tar.gz: d2e3b70b361f78002adef13326e492a73b60aeab
 SHA512:
-  metadata.gz: 68b17a619d440e150fea9f956480f2ae4c415ae56443368776f8406c423c84511833376aefc934dbfc33e85f703dff0ca3128899c7a2b5023ca4574eb5a10e55
-  data.tar.gz: a564013c615125738cc41e750c5493f81f57da1dd2dd85639fbcad784d8de0a3c09211dfcd0a092fa8141aca6c151dc39f07903e5e92823f7a601dc31bd495d8
+  metadata.gz: c047b42a97d0c327081370fcacbc5cf5164ba8af9d22538bcc2002ccdf410f8c967e60605053b995b5ca2d65d57b3042dc1d762a9da9c5d0ee1659a9278f8baf
+  data.tar.gz: fb64aeff91145d2d9f8ee23fc9f5d281fc40c7a8c1aea423fbdb114f9a4fa1be53bf13e327d641a06ae59fc8648dd7a34e65cfa9283eb4e863e9c8c51982e3c1

data/lib/onebox/engine/standard_embed.rb

@@ -55,7 +55,8 @@ module Onebox
 
         # Determine if we should use oEmbed or OpenGraph (prefers oEmbed)
         oembed_alternate = html_doc.at("//link[@type='application/json+oembed']") || html_doc.at("//link[@type='text/json+oembed']")
-        fetch_oembed_raw(oembed_alternate)
+        # Do not use oEmbed for WordPress sites (https://meta.discourse.org/t/onebox-for-wordpress-4-4-sites/36765)
+        fetch_oembed_raw(oembed_alternate) unless oembed_alternate.nil? || oembed_alternate['href'] =~ /public-api.wordpress.com\/oembed/ || oembed_alternate['href'] =~ /wp-json\/oembed/
 
         open_graph = parse_open_graph(html_doc, url)
         if @raw
@@ -71,7 +72,14 @@ module Onebox
       def fetch_oembed_raw(oembed_url)
         return unless oembed_url
         oembed_url = oembed_url['href'] unless oembed_url['href'].nil?
-        @raw = Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response(oembed_url).body))
+        oembed_data = Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response(oembed_url).body))
+        @raw =
+          if oembed_data[:html] && oembed_data[:html].bytesize > 4000
+            # fallback to OpenGraph if oEmbed data size is more than 4000 bytes
+            nil
+          else
+            oembed_data
+          end
       rescue Errno::ECONNREFUSED, Net::HTTPError, MultiJson::LoadError
         @raw = nil
       end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -19,6 +19,7 @@ module Onebox
         %w(23hq.com
           500px.com
           8tracks.com
+          abc.net.au
           about.com
           answers.com
           arstechnica.com
@@ -211,10 +212,9 @@ module Onebox
         return data[:html] if html_type?
         return layout.to_html if article_type?
         return html_for_video(data[:video]) if data[:video]
-
         return image_html if photo_type?
+        return nil if data[:title].nil? || data[:title].empty?
 
-        return nil unless data[:title]
         layout.to_html
       end
 

data/lib/onebox/engine/youku_onebox.rb

@@ -22,19 +22,7 @@ module Onebox
       end
 
       def placeholder_html
-        if video_id
-          meta_url = "http://v.youku.com/player/getPlayList/VideoIDS/#{video_id}"
-          response = Onebox::Helpers.fetch_response(meta_url)
-          meta = MultiJson::load(response.body) if response && response.body
-          image_src = if meta && meta['data'] && meta['data'][0] && meta['data'][0]['logo']
-                        meta['data'][0]['logo']
-                      else
-                        nil
-                      end
-          "<img src='#{image_src}' width='480' height='270'>"
-        else
-          to_html
-        end
+        to_html
       end
 
       private

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.31"
+  VERSION = "1.5.32"
 end

data/spec/lib/onebox/engine/youku_onebox_spec.rb

@@ -6,8 +6,8 @@ describe Onebox::Engine::YoukuOnebox do
     FakeWeb.register_uri(:get, 'http://v.youku.com/player/getPlayList/VideoIDS/XNjM3MzAxNzc2', body: response('youku-meta'), content_type: 'text/html')
   end
 
-  it 'returns an image as the placeholder' do
+  it 'returns iframe as the placeholder' do
     expect(Onebox.preview('http://v.youku.com/v_show/id_XNjM3MzAxNzc2.html')
-        .placeholder_html).to match(/<img/)
+        .placeholder_html).to match(/iframe/)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.31
+  version: 1.5.32
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -431,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.