onebox 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f68792a4551ae1d514bc6bdbd07607ead5ebb5a
-  data.tar.gz: e464aae6ea273ce32edcc3321c5b589e61162468
+  metadata.gz: 0ee3ee949d6acccb2fde3909408b020bbc1795ea
+  data.tar.gz: d34818d55947c38f9b2d89ba23f27b382e3f77de
 SHA512:
-  metadata.gz: 81677af638f4db63c2fac2b5489fee88f3fd50924908b2294a3eca02e1013d85281a22712e84d16588a8ef41f45328f19fa5425b7f55c4ec9f4f4cd22bf3677a
-  data.tar.gz: 514e05a5956aa021d98cc713c2f84df2a3bc6c916c82d93f167194c9c7f8d933d0d5e3bbd336a6baef1c0d5e8653a899b0107d8af5086adc607f8df98ea91040
+  metadata.gz: 2908ef091a88899845f40c9e89457017303c065c02ad116a5f48f4989450876fd46fb8efb9f49b492133e5d7b0ba8cd781e99176a1ca116dc9cb9a54a6bd5f17
+  data.tar.gz: c02f95a6d4cf36f5692a81353c398ddf984b6cf9b5b2cdb9f3de2a18696752d1c7ffd28c0c0558e2652c2271833183e656ddd48d851924ccd145375f32133f12

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -124,6 +124,21 @@ module Onebox
           zillow.com)
       end
 
+      # Often using the `html` attribute is not what we want, like for some blogs that
+      # include the entire page HTML. However for some providers like Imgur it allows us
+      # to return gifv and galleries.
+      def self.default_html_providers
+        ['Imgur']
+      end
+
+      def self.html_providers
+        @html_providers ||= default_html_providers.dup
+      end
+
+      def self.html_providers=(new_provs)
+        @html_providers = new_provs
+      end
+
       # A re-written URL coverts https:// -> // - it is useful on HTTPS sites that embed
       # youtube for example
       def self.rewrites
@@ -178,11 +193,22 @@ module Onebox
         html
       end
 
+      def html_type?
+        return data &&
+               data[:html] &&
+               (
+                 (data[:html] =~ /iframe/) ||
+                 WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
+               )
+      end
+
       def generic_html
-        return data[:html] if data[:html] && data[:html] =~ /iframe/
+        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 unless data[:title]
         layout.to_html
       end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

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

@@ -28,6 +28,24 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
     end
   end
 
+  describe 'html_providers' do
+    class HTMLOnebox < Onebox::Engine::WhitelistedGenericOnebox
+      def data
+        {html: 'cool html',
+         provider_name: 'CoolSite'}
+      end
+    end
+
+    it "doesn't return the HTML when not in the `html_providers`" do
+      Onebox::Engine::WhitelistedGenericOnebox.html_providers = []
+      HTMLOnebox.new("http://coolsite.com").to_html.should be_nil
+    end
+
+    it "returns the HMTL when in the `html_providers`" do
+      Onebox::Engine::WhitelistedGenericOnebox.html_providers = ['CoolSite']
+      HTMLOnebox.new("http://coolsite.com").to_html.should == "cool html"
+    end
+  end
 
   describe 'rewrites' do
     class DummyOnebox < Onebox::Engine::WhitelistedGenericOnebox

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json