onebox 1.5.62 → 1.5.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4969ae9933bb333861d909df2089075648c2963
-  data.tar.gz: 7eb13f7b5c2e8a37c43af1a56b138737c05ec16f
+  metadata.gz: 98f6286920826da98121c8d36aa07ba8188e0b30
+  data.tar.gz: 5bc9ca2a886a63491a493d3d793f56850b8477c9
 SHA512:
-  metadata.gz: 7e2f1e665e5e62efb3cf32cc24ec61f06da47e89cdbc2db5ae3be7e436b9446b7d3eb9d0676b3af7537ff1c11c676c7653d733378c85b1a3739a328aa9cb3caa
-  data.tar.gz: 4e43bc28d5ef4f0d60a7c11f25b57c9809774fb8ab7c594d435fcb8e2eceb472365a9ae20681f35d374272f99feec154e52481e63cf262dc3eca96a5d906f8ba
+  metadata.gz: 9391bbf88620ce75eb1d9872b1a23b8852fd96c9bdc2a61e37216b02f8494c10afe34809ce00a8925363124ab7f5a71cb6861c9b760bf0fdb210dea27457109a
+  data.tar.gz: 26babfa1d71b8c5b3b83a53424a2d44cda284035f8b4eca95efae2de3b891a7e149407eb1b10de16bbb96740cde38e7319b2464666790fe2c0916f56e1301bf6

data/lib/onebox/engine.rb

@@ -165,3 +165,4 @@ require_relative "engine/steam_store_widget_onebox"
 require_relative "engine/pastebin_onebox"
 require_relative "engine/slides_onebox"
 require_relative "engine/xkcd_onebox"
+require_relative "engine/giphy_onebox"

data/lib/onebox/engine/giphy_onebox.rb

@@ -0,0 +1,20 @@
+module Onebox
+  module Engine
+    class GiphyOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/giphy\.com\/gifs\//)
+
+      def to_html
+        oembed = get_oembed
+
+        <<-HTML
+          <a href="#{oembed[:url]}" target="_blank">
+            <img src="#{oembed[:image]}" width="#{oembed[:width]}" height="#{oembed[:height]}">
+          </a>
+        HTML
+      end
+    end
+  end
+end

data/lib/onebox/engine/standard_embed.rb

@@ -41,7 +41,7 @@ module Onebox
         @raw
       end
 
-      private
+      protected
 
         def html_doc
           return @html_doc if @html_doc
@@ -83,8 +83,9 @@ module Onebox
           end
 
           # Attempt to retrieve the title from the meta tag
-          if title = html_doc.at_css('title').try(:text)
-            og[:title] ||= title unless Onebox::Helpers.blank?(title)
+          title_element = html_doc.at_css('title')
+          if title_element && title_element.text
+            og[:title] ||= title_element.text unless Onebox::Helpers.blank?(title_element.text)
           end
 
           og

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -220,10 +220,10 @@ module Onebox
 
         def generic_html
           return article_html  if is_article?
-          return embedded_html if is_embedded?
           return video_html    if is_video?
           return image_html    if is_image?
           return article_html  if has_text?
+          return embedded_html if is_embedded?
         end
 
         def is_article?

data/lib/onebox/engine/youtube_onebox.rb

@@ -65,7 +65,7 @@ module Onebox
           @video_id ||= begin
             # http://youtu.be/afyK1HSFfgw
             if uri.host["youtu.be"]
-              id = uri.path[/\/([\w\-]+)\//, 1]
+              id = uri.path[/\/([\w\-]+)/, 1]
               return id if id
             end
 

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.62"
+  VERSION = "1.5.63"
 end

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

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Onebox::Engine::YoutubeOnebox do
   before do
     fake("https://www.youtube.com/watch?feature=player_embedded&v=21Lk4YiASMo", response("youtube"))
+    fake("https://youtu.be/21Lk4YiASMo", response("youtube"))
+    fake("http://www.youtube.com/oembed?format=json&url=http://www.youtube.com/watch?v=21Lk4YiASMo", response("youtube"))
     fake("https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ", response("youtube-channel"))
     fake("https://www.youtube.com/playlist?list=PL5308B2E5749D1696", response("youtube-playlist"))
   end
@@ -41,6 +43,7 @@ describe Onebox::Engine::YoutubeOnebox do
 
   it "returns an image as the placeholder" do
     expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo').placeholder_html).to match(/<img/)
+    expect(Onebox.preview('https://youtu.be/21Lk4YiASMo').placeholder_html).to match(/<img/)
   end
 
   it "passes the playlist ID through" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.62
+  version: 1.5.63
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -302,6 +302,7 @@ files:
 - lib/onebox/engine/amazon_onebox.rb
 - lib/onebox/engine/audio_onebox.rb
 - lib/onebox/engine/douban_onebox.rb
+- lib/onebox/engine/giphy_onebox.rb
 - lib/onebox/engine/github_blob_onebox.rb
 - lib/onebox/engine/github_commit_onebox.rb
 - lib/onebox/engine/github_gist_onebox.rb