onebox 1.5.50 → 1.5.60

data/spec/fixtures/xkcd.response

@@ -0,0 +1 @@
+{"month": "10", "num": 327, "link": "", "year": "2007", "news": "", "safe_title": "Exploits of a Mom", "transcript": "[[A woman is talking on the phone, holding a cup]]\nPhone: Hi, this is your son's school. We're having some computer trouble.\nMom: Oh dear\u00c3\u00a2\u00c2\u0080\u00c2\u0094did he break something?\nPhone: In a way\u00c3\u00a2\u00c2\u0080\u00c2\u0094\nPhone: Did you really name your son \"Robert'); DROP TABLE Students;--\" ?\nMom: Oh, yes. Little Bobby Tables, we call him.\nPhone: Well, we've lost this year's student records. I hope you're happy.\nMom: And I hope you've learned to sanitize your database inputs.\n{{title-text: Her daughter is named Help I'm trapped in a driver's license factory.}}", "alt": "Her daughter is named Help I'm trapped in a driver's license factory.", "img": "http:\/\/imgs.xkcd.com\/comics\/exploits_of_a_mom.png", "title": "Exploits of a Mom", "day": "10"}

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

@@ -11,15 +11,14 @@ describe Onebox::Engine::SlidesOnebox do
 
   describe "#placeholder_html" do
     it "returns an image as the placeholder" do
-      expect(Onebox.preview(link)
-      .placeholder_html).to include("//s3.amazonaws.com/media-p.slid.es/thumbnails/secure/cff7c3/decks.jpg")
+      expect(Onebox.preview(link).placeholder_html).to include("//s3.amazonaws.com/media-p.slid.es/thumbnails/secure/cff7c3/decks.jpg")
     end
   end
 
   describe "#to_html" do
     it "returns iframe embed" do
       expect(html).to include(URI(link).path)
-        expect(html).to include("iframe")
+      expect(html).to include("iframe")
     end
   end
 end

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

@@ -66,9 +66,11 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
   end
 
   describe 'oembed_providers' do
+    let(:url) { "http://www.meetup.com/Toronto-Ember-JS-Meetup/events/219939537" }
+
     before do
-      fake("http://api.meetup.com/oembed?url=http://www.meetup.com/Toronto-Ember-JS-Meetup/events/219939537",
-           response('meetup'))
+      fake(url, response('meetup'))
+      fake("http://api.meetup.com/oembed?url=#{url}", response('meetup_oembed'))
     end
 
     it 'uses the endpoint for the url' do

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

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Onebox::Engine::XkcdOnebox do
+  let(:link) { "https://xkcd.com/327/" }
+  let(:api_link) { "https://xkcd.com/327/info.0.json" }
+  let(:html) { described_class.new(link).to_html }
+
+  before do
+    fake(api_link, response("xkcd"))
+  end
+
+  it "has the comic's description" do
+    expect(html).to include("Her daughter is named Help")
+  end
+
+  it "has the comic's title" do
+    expect(html).to include("Exploits of a Mom")
+  end
+
+  it "has the permalink to the comic" do
+    expect(html).to include(link)
+  end
+
+  it "has the comic image" do
+    expect(html).to include("http://imgs.xkcd.com/comics/exploits_of_a_mom.png")
+  end
+end

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

@@ -8,32 +8,25 @@ describe Onebox::Engine::YoutubeOnebox do
   end
 
   it "adds wmode=opaque" do
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .to_s).to match(/wmode=opaque/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo').to_s).to match(/wmode=opaque/)
   end
 
   it "rewrites URLs for videos to be HTTPS" do
     # match: plain HTTP and protocol agnostic
     regex = /(http:|["']\/\/)/
 
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .to_s).not_to match(regex)
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .placeholder_html).not_to match(regex)
-    expect(Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ')
-    .to_s).not_to match(regex)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo').to_s).not_to match(regex)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo').placeholder_html).not_to match(regex)
+    expect(Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ').to_s).not_to match(regex)
   end
 
   it "can onebox a channel page" do
-    expect(Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ')
-    .to_s).to match(/Google Chrome/)
+    expect(Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ').to_s).to match(/Google Chrome/)
   end
 
   it "can onebox a playlist" do
-    pending('no opengraph on playlists, needs special handling')
-
-    expect(Onebox.preview('https://www.youtube.com/playlist?list=PL5308B2E5749D1696')
-    .to_s).to match(/Dear Sophie/)
+    expect(Onebox.preview('https://www.youtube.com/playlist?list=PL5308B2E5749D1696').to_s).to match(/iframe/)
+    expect(Onebox.preview('https://www.youtube.com/playlist?list=PL5308B2E5749D1696').placeholder_html).to match(/<img/)
   end
 
   it "does not make HTTP requests unless necessary" do
@@ -43,37 +36,27 @@ describe Onebox::Engine::YoutubeOnebox do
   end
 
   it "does not fail if we cannot get the video ID from the URL" do
-    # TODO this test no longer makes sense - the video ID is successfully retrieved and no fakeweb request is made
-    expect(Onebox.preview('http://www.youtube.com/watch?feature=player_embedded&v=21Lk4YiASMo')
-    .to_s).to match(/embed/)
+    expect(Onebox.preview('http://www.youtube.com/watch?feature=player_embedded&v=21Lk4YiASMo').to_s).to match(/embed/)
   end
 
   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://www.youtube.com/watch?v=21Lk4YiASMo').placeholder_html).to match(/<img/)
   end
 
   it "passes the playlist ID through" do
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&list=UUQau-O2C0kGJpR3_CHBTGbw&index=1')
-    .to_s).to match(/UUQau-O2C0kGJpR3_CHBTGbw/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&list=UUQau-O2C0kGJpR3_CHBTGbw&index=1').to_s).to match(/UUQau-O2C0kGJpR3_CHBTGbw/)
   end
 
   it "filters out nonsense parameters" do
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&potential[]=exploit&potential[]=fun')
-    .to_s).not_to match(/potential|exploit|fun/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&potential[]=exploit&potential[]=fun').to_s).not_to match(/potential|exploit|fun/)
   end
 
   it "converts time strings into a &start= parameter" do
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=3782')
-    .to_s).to match(/start=3782/)
-    expect(Onebox.preview('https://www.youtube.com/watch?start=1h3m2s&v=21Lk4YiASMo')
-    .to_s).to match(/start=3782/)
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&t=1h3m2s')
-    .to_s).to match(/start=3782/)
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=1h3m2s')
-    .to_s).to match(/start=3782/)
-    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo#t=1h3m2s')
-    .to_s).to match(/start=3782/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=3782').to_s).to match(/start=3782/)
+    expect(Onebox.preview('https://www.youtube.com/watch?start=1h3m2s&v=21Lk4YiASMo').to_s).to match(/start=3782/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&t=1h3m2s').to_s).to match(/start=3782/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=1h3m2s').to_s).to match(/start=3782/)
+    expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo#t=1h3m2s').to_s).to match(/start=3782/)
   end
 
   it "allows both start and end" do
@@ -88,4 +71,3 @@ describe Onebox::Engine::YoutubeOnebox do
     preview.to match(/playlist=21Lk4YiASMo/)
   end
 end
-

data/templates/_layout.mustache

@@ -1,16 +1,13 @@
 <aside class="onebox {{subname}}">
   <header class="source">
-    <a href="{{{link}}}" target='_blank' >
-      {{#repository_path}}{{repository_path}}{{/repository_path}}
-      {{^repository_path}}{{domain}}{{/repository_path}}
-    </a>
+    <a href="{{{link}}}" target='_blank'>{{domain}}</a>
   </header>
   <article class="onebox-body">
     {{{view}}}
   </article>
   <div class="onebox-metadata">
-    {{#twitter_label1}}<span style="float: left;">{{twitter_label1}}: {{twitter_data1}}</span>{{/twitter_label1}}
-    {{#twitter_label2}}<span style="float: right;">{{twitter_label2}}: {{twitter_data2}}</span>{{/twitter_label2}}
+    {{#metadata_1_label}}<span style="float: left;">{{metadata_1_label}}: {{metadata_1_value}}</span>{{/metadata_1_label}}
+    {{#metadata_2_label}}<span style="float: right;">{{metadata_2_label}}: {{metadata_2_value}}</span>{{/metadata_2_label}}
   </div>
   <div style="clear: both"></div>
 </aside>

data/templates/xkcd.mustache

@@ -0,0 +1,8 @@
+<div class="onebox">
+  <a href="{{url}}">
+    <h1>{{name}}</h1>
+    <h2 class="host">xkcd.com</h2>
+    <img src="{{image}}" />
+    <p>{{description}}</p>
+  </a>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.50
+  version: 1.5.60
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -326,6 +326,7 @@ files:
 - lib/onebox/engine/video_onebox.rb
 - lib/onebox/engine/whitelisted_generic_onebox.rb
 - lib/onebox/engine/wikipedia_onebox.rb
+- lib/onebox/engine/xkcd_onebox.rb
 - lib/onebox/engine/youku_onebox.rb
 - lib/onebox/engine/youtube_onebox.rb
 - lib/onebox/file_type_finder.rb
@@ -350,7 +351,8 @@ files:
 - spec/fixtures/githubpullrequest.response
 - spec/fixtures/googleplayapp.response
 - spec/fixtures/image.response
-- spec/fixtures/meetup.response
+- spec/fixtures/meetup.response.html
+- spec/fixtures/meetup_oembed.response
 - spec/fixtures/pubmed-xml.response
 - spec/fixtures/pubmed.response
 - spec/fixtures/slides.response
@@ -361,6 +363,7 @@ files:
 - spec/fixtures/video.response
 - spec/fixtures/wikipedia.response
 - spec/fixtures/wikipediaredirected.response
+- spec/fixtures/xkcd.response
 - spec/fixtures/youku-meta.response
 - spec/fixtures/youku.response
 - spec/fixtures/youtube-channel.response
@@ -386,6 +389,7 @@ files:
 - spec/lib/onebox/engine/video_onebox_spec.rb
 - spec/lib/onebox/engine/whitelisted_generic_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
 - spec/lib/onebox/engine/youtube_onebox_spec.rb
 - spec/lib/onebox/engine_spec.rb
@@ -412,6 +416,7 @@ files:
 - templates/twitterstatus.mustache
 - templates/whitelistedgeneric.mustache
 - templates/wikipedia.mustache
+- templates/xkcd.mustache
 - web/assets/javascripts/jquery.js
 - web/assets/javascripts/main.js
 - web/assets/stylesheets/normalize.css
@@ -452,7 +457,8 @@ test_files:
 - spec/fixtures/githubpullrequest.response
 - spec/fixtures/googleplayapp.response
 - spec/fixtures/image.response
-- spec/fixtures/meetup.response
+- spec/fixtures/meetup.response.html
+- spec/fixtures/meetup_oembed.response
 - spec/fixtures/pubmed-xml.response
 - spec/fixtures/pubmed.response
 - spec/fixtures/slides.response
@@ -463,6 +469,7 @@ test_files:
 - spec/fixtures/video.response
 - spec/fixtures/wikipedia.response
 - spec/fixtures/wikipediaredirected.response
+- spec/fixtures/xkcd.response
 - spec/fixtures/youku-meta.response
 - spec/fixtures/youku.response
 - spec/fixtures/youtube-channel.response
@@ -488,6 +495,7 @@ test_files:
 - spec/lib/onebox/engine/video_onebox_spec.rb
 - spec/lib/onebox/engine/whitelisted_generic_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
 - spec/lib/onebox/engine/youtube_onebox_spec.rb
 - spec/lib/onebox/engine_spec.rb