onebox 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb554e8d0c9c9bd449b812203d44e7b8ebaf586
-  data.tar.gz: 93b23186d771f8f45c7934d3977613753ea8c6ef
+  metadata.gz: 2104fcbe20267fd2a272b43bccaf3ff7c0f4d0c3
+  data.tar.gz: 7292bbe6cf11d62f924272f26089c5e3071c9563
 SHA512:
-  metadata.gz: 37463bc2dcd32dabba738c511cb1d4ee00a1f0a44e5dbf2aab04fe5c723cea3400d495d4c3fcc46d3a873c4100adddfb6be8e9a6e14bc1ed00812bfe3bd005ec
-  data.tar.gz: 283d61dd73d49e7e714806700ebc6297dfe96b9282062b6dbc7365b7aac64375370c8d6232f0df9389caab0f9d7068e9ec1d88c26278a78eb75dd3a4965c9e3d
+  metadata.gz: 5050d6a43ddb0a98daa8623c5f7d636a63a4642a0a69184c85908f778a89efd49c0655890d1c67f1342b604fd9c7249e774022a896481e9dc2761de012d9c06c
+  data.tar.gz: 09f0001109957fb97fe5a9d69e1ed768c919c6b05bbb0e7e7b7c16a31878463bd20b9b5470f6d68d8ad0ecc6dbe93ef42f2e59aff8b9fa66c5336a88ace99eeb

data/lib/onebox/engine/standard_embed.rb

@@ -61,14 +61,16 @@ module Onebox
             end
           end
 
-          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 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
+            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)

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -264,6 +264,7 @@ module Onebox
 
         def is_embedded?
           data[:html] &&
+          data[:height] &&
           (
             data[:html]["iframe"] ||
             WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
@@ -278,8 +279,8 @@ module Onebox
           return if Onebox::Helpers.blank?(data[:image])
 
           alt    = data[:description]  || data[:title]
-          width  = data[:image_width]  || data[:thumbnail_width]
-          height = data[:image_height] || data[:thumbnail_height]
+          width  = data[:image_width]  || data[:thumbnail_width]  || data[:width]
+          height = data[:image_height] || data[:thumbnail_height] || data[:height]
           "<img src='#{data[:image]}' alt='#{alt}' width='#{width}' height='#{height}'>"
         end
 
@@ -309,6 +310,13 @@ module Onebox
         def embedded_html
           fragment = Nokogiri::HTML::fragment(data[:html])
           fragment.css("img").each { |img| img["class"] = "thumbnail" }
+          if iframe = fragment.at_css("iframe")
+            iframe.remove_attribute("style")
+            iframe["width"] = data[:width] || "100%"
+            iframe["height"] = data[:height]
+            iframe["scrolling"] = "no"
+            iframe["frameborder"] = "0"
+          end
           fragment.to_html
         end
     end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

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

@@ -31,8 +31,11 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
   describe 'html_providers' do
     class HTMLOnebox < Onebox::Engine::WhitelistedGenericOnebox
       def data
-        {html: 'cool html',
-         provider_name: 'CoolSite'}
+        {
+          html: 'cool html',
+          height: 123,
+          provider_name: 'CoolSite',
+        }
       end
     end
 

data/templates/whitelistedgeneric.mustache

@@ -1,4 +1,4 @@
-{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+{{#image}}<img src="{{image}}" width="{{image_width}}" height="{{image_height}}" class="thumbnail"/>{{/image}}
 
 <h3><a href='{{{link}}}' target="_blank">{{title}}</a></h3>
 

data/web/views/index.haml

@@ -22,8 +22,8 @@
   .message-group
     %label(for='placeholder-html')
       placeholder_html
-    %span#placeholder-html
+    %pre#placeholder-html
   .message-group
     %label(for='preview-html')
       to_s
-    %span#preview-html
+    %pre#preview-html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Joanna Zeta
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.