onebox 1.5.37 → 1.5.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1576d08884bfa434b9bd3448ad8e961f67927d0
-  data.tar.gz: 665f05efa8854392a32f73604d01e363dd40d7c2
+  metadata.gz: e1352380dded0936ef25582e1d72ea8f265ea275
+  data.tar.gz: 335b4a502bd143fd6b926d7607087699c096c989
 SHA512:
-  metadata.gz: c02bcbd0202b81ab2e04f0764d5145fb1ed43db4c519fa208200569be4832bb74418c7b4e9425ad54a7757cafccd9860bad4d2b5dafdd2aa9c890d00f0742e05
-  data.tar.gz: ff0de27100b65d232d6274e3a862c8e6d5ecdbda2907cffae3e82f87a033d977ac744b9dec3aec10e871cae7703eeddc28d14566766b8d48c7e502e68c4e63cf
+  metadata.gz: 61bc29488640968ffa24af64d7efc44869f29a2464f7cd6f5f82624e19bfa07cf9e0a13eb542fa230721cad22e39fe0156123fd52dde4591f401e6758553cab2
+  data.tar.gz: ae7c475fdec87a70d8788cf60a7bfa286df26c114ece3edc7993771202c19a9fcc8e239adca087f15feeca533fdf3b83e354207686b8ce01c186990c4321ce3f

data/lib/onebox/engine/imgur_onebox.rb

@@ -9,16 +9,16 @@ module Onebox
 
       def to_html
         imgur_data = get_imgur_data
-        return "<video width='#{imgur_data[:"player:width"]}' height='#{imgur_data[:"player:height"]}' controls autoplay loop><source src='#{imgur_data[:"player:stream"]}' type='video/mp4'><source src='#{imgur_data[:"player:stream"].gsub('mp4', 'webm')}' type='video/webm'></video>" if imgur_data[:"player:stream"]
-        return "<div class='onebox imgur-album'><a href='#{url}' target='_blank'><span class='outer-box'><span class='inner-box'><span class='album-title'>[Album] #{imgur_data[:title]}</span></span></span><img src='#{imgur_data[:image]}' alt='Imgur'></a></div>" if is_album?
-        return "<a href='#{url}' target='_blank'><img src='#{imgur_data[:image]}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'></a>" if imgur_data[:image]
+        return "<video width='#{imgur_data[:"video:width"]}' height='#{imgur_data[:"video:height"]}' controls autoplay loop><source src='#{imgur_data[:"video:secure_url"]}' type='video/mp4'><source src='#{imgur_data[:"video:secure_url"].gsub('mp4', 'webm')}' type='video/webm'></video>" if imgur_data[:"video:secure_url"]
+        return "<div class='onebox imgur-album'><a href='#{url}' target='_blank'><span class='outer-box' style='width:#{imgur_data[:"image:width"]}px'><span class='inner-box'><span class='album-title'>[Album] #{imgur_data[:title]}</span></span></span><img src='#{get_secure_link(imgur_data[:image])}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'></a></div>" if is_album?
+        return "<a href='#{url}' target='_blank'><img src='#{get_secure_link(imgur_data[:image])}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'></a>" if imgur_data[:image]
         return nil
       end
 
       def placeholder_html
         imgur_data = get_imgur_data
-        return "<video width='#{imgur_data[:"player:width"]}' height='#{imgur_data[:"player:height"]}' controls autoplay loop><source src='#{imgur_data[:"player:stream"]}' type='video/mp4'><source src='#{imgur_data[:"player:stream"].gsub('mp4', 'webm')}' type='video/webm'></video>" if imgur_data[:"player:stream"]
-        return "<img src='#{imgur_data[:image]}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'>"
+        return "<video width='#{imgur_data[:"video:width"]}' height='#{imgur_data[:"video:height"]}' controls autoplay loop><source src='#{imgur_data[:"video:secure_url"]}' type='video/mp4'><source src='#{imgur_data[:"video:secure_url"].gsub('mp4', 'webm')}' type='video/webm'></video>" if imgur_data[:"video:secure_url"]
+        return "<img src='#{get_secure_link(imgur_data[:image])}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'>"
         return nil
       end
 
@@ -28,10 +28,10 @@ module Onebox
         html = Nokogiri::HTML(response.body)
         imgur_data = {}
         html.css('meta').each do |m|
-          if m.attribute('name') && m.attribute('name').to_s.match(/^twitter:/i)
+          if m.attribute('property') && m.attribute('property').to_s.match(/^og:/i)
             m_content = m.attribute('content').to_s.strip
-            m_name = m.attribute('name').to_s.gsub('twitter:', '')
-            imgur_data[m_name.to_sym] = m_content
+            m_property = m.attribute('property').to_s.gsub('og:', '')
+            imgur_data[m_property.to_sym] = m_content
           end
         end
         return imgur_data
@@ -42,6 +42,12 @@ module Onebox
         imgur_data_id = Nokogiri::HTML(oembed_data[:html]).xpath("//blockquote").attr("data-id")
         return !!(imgur_data_id.to_s =~ /a\//)
       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/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.37"
+  VERSION = "1.5.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.37
+  version: 1.5.38
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json