onebox 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988dda6f5b64b8781329e91c3f0b8dc826d0e8bc
-  data.tar.gz: df7b513451cfb05039fd6d45ff236d042bd8359c
+  metadata.gz: 98fc21836d5ddcb857c0bb72f823c23d5e269496
+  data.tar.gz: 0686f0001610272d1faafc07c36128d24aa7a4b3
 SHA512:
-  metadata.gz: 50f11c399aaf148cc15111f3bc420f1f7dfd1e39c301b1757008ba13bc71f7ea73745f4c22e25c372696cb50587215b38510e47f835567545934028a12a2c2d7
-  data.tar.gz: 727cbe61c73b320fb63a9232a88afe41e75e231dfcb3d169d6571875c4bc5693688381f964454f77ce8e5c47a08813f0ccf1966d64517f0bb157aec77b6e0db0
+  metadata.gz: 31092ef0ffdfd513fc8b1f1f8e6ce4422eb451e48c749635b824bacb0305364e49ade2c27adba386d740b4a5e140891f509ad16c7760dcce8edfe04db49097f5
+  data.tar.gz: a73d3abdb2f91231f273e4f7e7fea101f5592b2f8e32984c425d4da209fabd33c310540b0acb1026a574f4b72581241428dda64a0ffc1437f81179b627b8643c

data/lib/onebox/engine.rb

@@ -149,6 +149,7 @@ require_relative "engine/video_onebox"
 require_relative "engine/audio_onebox"
 require_relative "engine/stack_exchange_onebox"
 require_relative "engine/twitter_status_onebox"
+require_relative "engine/wikimedia_onebox"
 require_relative "engine/wikipedia_onebox"
 require_relative "engine/youtube_onebox"
 require_relative "engine/youku_onebox"
@@ -162,6 +163,7 @@ require_relative "engine/slides_onebox"
 require_relative "engine/xkcd_onebox"
 require_relative "engine/giphy_onebox"
 require_relative "engine/gfycat_onebox"
+require_relative "engine/typeform_onebox"
 require_relative "engine/vimeo_onebox"
 require_relative "engine/steam_store_onebox"
 require_relative "engine/sketchfab_onebox"

data/lib/onebox/engine/gfycat_onebox.rb

@@ -2,36 +2,60 @@ module Onebox
   module Engine
     class GfycatOnebox
       include Engine
-      include StandardEmbed
+      include JSON
 
       matches_regexp(/^https?:\/\/gfycat\.com\//)
       always_https
 
-      def to_html
-        oembed = get_oembed
-        src = Nokogiri::HTML::fragment(oembed[:html]).at_css("iframe")["src"]
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(src)
+      def self.priority
+        # This engine should have priority over WhitelistedGenericOnebox.
+        1
+      end
 
+      def url
+        "https://gfycat.com/cajax/get/#{match[:name]}"
+      end
+
+      def to_html
         <<-HTML
-          <iframe src="#{escaped_src}"
-                  width="#{oembed[:width]}"
-                  height="#{oembed[:height]}"
-                  scrolling="no"
-                  frameborder="0"
-                  allowfullscreen>
-          </iframe>
+          <div>
+            <video controls loop autoplay muted poster="#{data[:posterUrl]}" width="#{data[:width]}" height="#{data[:height]}">
+              <source id="webmSource" src="#{data[:webmUrl]}" type="video/webm">
+              <source id="mp4Source" src="#{data[:mp4Url]}" type="video/mp4">
+              <img title="Sorry, your browser doesn't support HTML5 video." src="#{data[:posterUrl]}">
+            </video><br/>
+            <a href="#{data[:url]}">#{data[:name]}</a>
+          </div>
         HTML
       end
 
       def placeholder_html
-        og = get_opengraph
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(og[:image])
-
         <<-HTML
-          <img src="#{escaped_src}" width="#{og[:image_width]}" height="#{og[:image_height]}">
+          <a href="#{data[:url]}">
+            <img src="#{data[:posterUrl]}" width="#{data[:width]}" height="#{data[:height]}"><br/>
+            #{data[:gfyName]}
+          </a>
         HTML
       end
 
+      private
+
+        def match
+          @match ||= @url.match(/^https?:\/\/gfycat\.com\/(?<name>.+)/)
+        end
+
+        def data
+          {
+            name: raw['gfyItem']['gfyName'],
+            url: @url,
+            posterUrl: raw['gfyItem']['posterUrl'],
+            webmUrl: raw['gfyItem']['webmUrl'],
+            mp4Url: raw['gfyItem']['mp4Url'],
+            width: raw['gfyItem']['width'],
+            height: raw['gfyItem']['height']
+          }
+        end
+
     end
   end
 end

data/lib/onebox/engine/google_maps_onebox.rb

@@ -48,7 +48,7 @@ module Onebox
       end
 
       def to_html
-        "<div class='maps-onebox'>#{Helpers.click_to_scroll_div + "<iframe src=\"#{link}\" width=\"690\" height=\"400\" frameborder=\"0\" style=\"border:0\">#{placeholder_html}</iframe>"}</div>"
+        "<div class='maps-onebox'><iframe src=\"#{link}\" width=\"690\" height=\"400\" frameborder=\"0\" style=\"border:0\">#{placeholder_html}</iframe></div>"
       end
 
       def placeholder_html

data/lib/onebox/engine/typeform_onebox.rb

@@ -0,0 +1,35 @@
+module Onebox
+  module Engine
+    class TypeformOnebox
+      include Engine
+
+      matches_regexp(/^https?:\/\/[a-z0-9]+\.typeform\.com\/to\/[a-zA-Z0-9]+/)
+      always_https
+
+      def placeholder_html
+        escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
+
+        <<-HTML
+          <iframe src="#{escaped_url}"
+                  width="100%"
+                  height="600px"
+                  scrolling="no"
+                  frameborder="0">
+          </iframe>
+        HTML
+      end
+
+      def to_html
+        escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
+        <<-HTML
+          <iframe src="#{escaped_url}"
+                  width="100%"
+                  height="600px"
+                  scrolling="no"
+                  frameborder="0">
+          </iframe>
+        HTML
+      end
+    end
+  end
+end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -61,7 +61,6 @@ module Onebox
           forbes.com
           foxnews.com
           funnyordie.com
-          gfycat.com
           groupon.com
           howtogeek.com
           huffingtonpost.ca
@@ -258,8 +257,7 @@ module Onebox
         end
 
         def is_video?
-          data[:type] =~ /video/ &&
-          !Onebox::Helpers.blank?(data[:video])
+          data[:type] =~ /^video\// && !Onebox::Helpers.blank?(data[:video])
         end
 
         def is_embedded?
@@ -290,26 +288,15 @@ module Onebox
         def video_html
           escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:video])
 
-          if data[:video_type] == "video/mp4"
-            <<-HTML
-              <video title='#{data[:title]}'
-                     width='#{data[:video_width]}'
-                     height='#{data[:video_height]}'
-                     style='max-width:100%'
-                     controls=''>
-                <source src='#{escaped_src}'>
-              </video>
-            HTML
-          else
-            <<-HTML
-              <iframe src='#{escaped_src}'
-                      title='#{data[:title]}'
-                      width='#{data[:video_width]}'
-                      height='#{data[:video_height]}'
-                      frameborder='0'>
-              </iframe>
-            HTML
-          end
+          <<-HTML
+            <video title='#{data[:title]}'
+                   width='#{data[:video_width]}'
+                   height='#{data[:video_height]}'
+                   style='max-width:100%'
+                   controls=''>
+              <source src='#{escaped_src}'>
+            </video>
+          HTML
         end
 
         def embedded_html

data/lib/onebox/engine/wikimedia_onebox.rb

@@ -0,0 +1,42 @@
+module Onebox
+  module Engine
+    class WikimediaOnebox
+      include Engine
+      include LayoutSupport
+      include JSON
+
+      matches_regexp /^https?:\/\/commons\.wikimedia\.org\/wiki\/(File:.+)/
+      always_https
+
+      def self.priority
+        # Wikimedia links end in an image extension.
+        # E.g. https://commons.wikimedia.org/wiki/File:Stones_members_montage2.jpg
+        # This engine should have priority over the generic ImageOnebox.
+
+        1
+      end
+
+      def url
+        "https://en.wikipedia.org/w/api.php?action=query&titles=#{match[:name]}&prop=imageinfo&iilimit=50&iiprop=timestamp|user|url&iiurlwidth=500&format=json"
+      end
+
+      private
+
+        def match
+          @match ||= @url.match(/^https?:\/\/commons\.wikimedia\.org\/wiki\/(?<name>File:.+)/)
+        end
+
+        def data
+          first_page = raw['query']['pages'].first[1]
+
+          {
+            link: first_page['imageinfo'].first['descriptionurl'],
+            title: first_page['title'],
+            image: first_page['imageinfo'].first['url'],
+            thumbnail: first_page['imageinfo'].first['thumburl']
+          }
+        end
+
+    end
+  end
+end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.3"
+  VERSION = "1.8.4"
 end

data/spec/fixtures/gfycat.response

@@ -0,0 +1 @@
+{"gfyItem":{"gfyId":"amusingposhcleanerwrasse","gfyName":"AmusingPoshCleanerwrasse","gfyNumber":"679816419","userName":"anonymous","width":"1920","height":"1080","frameRate":"60","numFrames":"407","mp4Url":"https:\/\/giant.gfycat.com\/AmusingPoshCleanerwrasse.mp4","webmUrl":"https:\/\/fat.gfycat.com\/AmusingPoshCleanerwrasse.webm","webpUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse.webp","mobileUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-mobile.mp4","mobilePosterUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-mobile.jpg","posterUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-poster.jpg","thumb360Url":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-360.mp4","thumb360PosterUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-thumb360.jpg","thumb100PosterUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-thumb100.jpg","max5mbGif":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-size_restricted.gif","max2mbGif":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse-small.gif","mjpgUrl":"https:\/\/thumbs.gfycat.com\/AmusingPoshCleanerwrasse.mjpg","gifUrl":"https:\/\/giant.gfycat.com\/AmusingPoshCleanerwrasse.gif","gifSize":"12850292","mp4Size":"12420204","webmSize":"2146835","createDate":"1488568617","views":150,"viewsNewEpoch":"149","title":null,"extraLemmas":null,"md5":"3c9261db26eda7e8f251f0abab64f8ca","tags":null,"userTags":null,"nsfw":"0","sar":null,"url":null,"source":"1","dynamo":null,"subreddit":null,"redditId":null,"redditIdText":null,"likes":null,"dislikes":null,"published":null,"description":null,"copyrightClaimaint":null,"languageText":null,"fullDomainWhitelist":[],"fullGeoWhitelist":[],"iframeProfileImageVisible":true}}

data/spec/fixtures/wikimedia.response

@@ -0,0 +1 @@
+{"batchcomplete":"","query":{"normalized":[{"from":"File:Stones_members_montage2.jpg","to":"File:Stones members montage2.jpg"}],"pages":{"-1":{"ns":6,"title":"File:Stones members montage2.jpg","missing":"","known":"","imagerepository":"shared","imageinfo":[{"timestamp":"2010-12-07T23:13:30Z","user":"84user","thumburl":"https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/Stones_members_montage2.jpg/500px-Stones_members_montage2.jpg","thumbwidth":500,"thumbheight":459,"url":"https://upload.wikimedia.org/wikipedia/commons/a/af/Stones_members_montage2.jpg","descriptionurl":"https://commons.wikimedia.org/wiki/File:Stones_members_montage2.jpg","descriptionshorturl":"https://commons.wikimedia.org/w/index.php?curid=12245228"}]}}}}

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

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe Onebox::Engine::GfycatOnebox do
+  let(:link) { "https://gfycat.com/AmusingPoshCleanerwrasse" }
+  let(:api_link) { "https://gfycat.com/cajax/get/AmusingPoshCleanerwrasse" }
+  let(:html) { described_class.new(link).to_html }
+  let(:placeholder_html) { described_class.new(link).placeholder_html }
+
+  before do
+    fake(api_link, response("gfycat"))
+  end
+
+  it "has the title" do
+    expect(html).to include("AmusingPoshCleanerwrasse")
+    expect(placeholder_html).to include("AmusingPoshCleanerwrasse")
+  end
+
+  it "has the link" do
+    expect(html).to include(link)
+    expect(placeholder_html).to include(link)
+  end
+
+  it "has the poster" do
+    expect(html).to include("https://thumbs.gfycat.com/AmusingPoshCleanerwrasse-poster.jpg")
+  end
+
+  it "has the webm video" do
+    expect(html).to include("https://fat.gfycat.com/AmusingPoshCleanerwrasse.webm")
+  end
+
+  it "has the mp4 video" do
+    expect(html).to include("https://giant.gfycat.com/AmusingPoshCleanerwrasse.mp4")
+  end
+end

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

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe Onebox::Engine::WikimediaOnebox do
+  let(:link) { "https://commons.wikimedia.org/wiki/File:Stones_members_montage2.jpg" }
+  let(:api_link) { "https://en.wikipedia.org/w/api.php?action=query&titles=File:Stones_members_montage2.jpg&prop=imageinfo&iilimit=50&iiprop=timestamp|user|url&iiurlwidth=500&format=json" }
+  let(:html) { described_class.new(link).to_html }
+
+  before do
+    fake(api_link, response("wikimedia"))
+  end
+
+  it "has the title" do
+    expect(html).to include("File:Stones members montage2.jpg")
+  end
+
+  it "has the link" do
+    expect(html).to include(link)
+  end
+
+  it "has the image" do
+    expect(html).to include("https://upload.wikimedia.org/wikipedia/commons/a/af/Stones_members_montage2.jpg")
+  end
+end

data/templates/wikimedia.mustache

@@ -0,0 +1,3 @@
+{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+
+<h3><a href='{{link}}' target='_blank'>{{title}}</a></h3>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -364,9 +364,11 @@ files:
 - lib/onebox/engine/standard_embed.rb
 - lib/onebox/engine/steam_store_onebox.rb
 - lib/onebox/engine/twitter_status_onebox.rb
+- lib/onebox/engine/typeform_onebox.rb
 - lib/onebox/engine/video_onebox.rb
 - lib/onebox/engine/vimeo_onebox.rb
 - lib/onebox/engine/whitelisted_generic_onebox.rb
+- lib/onebox/engine/wikimedia_onebox.rb
 - lib/onebox/engine/wikipedia_onebox.rb
 - lib/onebox/engine/xkcd_onebox.rb
 - lib/onebox/engine/youku_onebox.rb
@@ -388,6 +390,7 @@ files:
 - spec/fixtures/amazon.response
 - spec/fixtures/dailymail.response
 - spec/fixtures/douban.response
+- spec/fixtures/gfycat.response
 - spec/fixtures/githubblob.response
 - spec/fixtures/githubcommit.response
 - spec/fixtures/githubgist.response
@@ -405,6 +408,7 @@ files:
 - spec/fixtures/stackexchange-question.response
 - spec/fixtures/twitterstatus.response
 - spec/fixtures/video.response
+- spec/fixtures/wikimedia.response
 - spec/fixtures/wikipedia.response
 - spec/fixtures/wikipediaredirected.response
 - spec/fixtures/xkcd.response
@@ -417,6 +421,7 @@ files:
 - spec/lib/onebox/engine/amazon_onebox_spec.rb
 - spec/lib/onebox/engine/audio_onebox_spec.rb
 - spec/lib/onebox/engine/douban_onebox_spec.rb
+- spec/lib/onebox/engine/gfycat_onebox_spec.rb
 - spec/lib/onebox/engine/github_blob_onebox_spec.rb
 - spec/lib/onebox/engine/github_commit_onebox_spec.rb
 - spec/lib/onebox/engine/github_gist_onebox_spec.rb
@@ -434,6 +439,7 @@ files:
 - spec/lib/onebox/engine/twitter_status_onebox_spec.rb
 - spec/lib/onebox/engine/video_onebox_spec.rb
 - spec/lib/onebox/engine/whitelisted_generic_onebox_spec.rb
+- spec/lib/onebox/engine/wikimedia_onebox_spec.rb
 - spec/lib/onebox/engine/wikipedia_onebox_spec.rb
 - spec/lib/onebox/engine/xkcd_spec.rb
 - spec/lib/onebox/engine/youku_onebox_spec.rb
@@ -463,6 +469,7 @@ files:
 - templates/stackexchange.mustache
 - templates/twitterstatus.mustache
 - templates/whitelistedgeneric.mustache
+- templates/wikimedia.mustache
 - templates/wikipedia.mustache
 - templates/xkcd.mustache
 - web/assets/javascripts/jquery.js
@@ -499,6 +506,7 @@ test_files:
 - spec/fixtures/amazon.response
 - spec/fixtures/dailymail.response
 - spec/fixtures/douban.response
+- spec/fixtures/gfycat.response
 - spec/fixtures/githubblob.response
 - spec/fixtures/githubcommit.response
 - spec/fixtures/githubgist.response
@@ -516,6 +524,7 @@ test_files:
 - spec/fixtures/stackexchange-question.response
 - spec/fixtures/twitterstatus.response
 - spec/fixtures/video.response
+- spec/fixtures/wikimedia.response
 - spec/fixtures/wikipedia.response
 - spec/fixtures/wikipediaredirected.response
 - spec/fixtures/xkcd.response
@@ -528,6 +537,7 @@ test_files:
 - spec/lib/onebox/engine/amazon_onebox_spec.rb
 - spec/lib/onebox/engine/audio_onebox_spec.rb
 - spec/lib/onebox/engine/douban_onebox_spec.rb
+- spec/lib/onebox/engine/gfycat_onebox_spec.rb
 - spec/lib/onebox/engine/github_blob_onebox_spec.rb
 - spec/lib/onebox/engine/github_commit_onebox_spec.rb
 - spec/lib/onebox/engine/github_gist_onebox_spec.rb
@@ -545,6 +555,7 @@ test_files:
 - spec/lib/onebox/engine/twitter_status_onebox_spec.rb
 - spec/lib/onebox/engine/video_onebox_spec.rb
 - spec/lib/onebox/engine/whitelisted_generic_onebox_spec.rb
+- spec/lib/onebox/engine/wikimedia_onebox_spec.rb
 - spec/lib/onebox/engine/wikipedia_onebox_spec.rb
 - spec/lib/onebox/engine/xkcd_spec.rb
 - spec/lib/onebox/engine/youku_onebox_spec.rb