onebox 1.5.17 → 1.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451ff8d5ee7ce3d3c3fdeffca55cccba29cdb91c
-  data.tar.gz: 83033812a9b67dd10048cfe72896c5b315e2d5da
+  metadata.gz: d1ad782f96ff776d0d2266234a1a35c728fda673
+  data.tar.gz: f6f790cb45621ec73844872684e855de29142484
 SHA512:
-  metadata.gz: a76b282e64d1191b6e7ddd4dc2f8a2b8f30c6f10f409a12ee71d3e794005c6cba66f26d315aec092e05ceb6bc586af6afe2c08ea29ba14000ebb4afd330992c6
-  data.tar.gz: 10faeefda12d96758903bbb6f11e1bfc2462a4f73e6be19466e1b6f3030d3eeb93ca2b0ceb9e7d74114fc0f04e25b5f272b24efc47125dce3b88027280f826a8
+  metadata.gz: f5fccca33ea465d18f16ccd6d277f96065a07c20c9d807efdd7e59e85f28c8846267cea1f8ea763f0c909f8395eb8ba01d5c2f2f22250c18587879762e520f83
+  data.tar.gz: e3b611db4ce5d131643102aa3642047a092ca0f16223329a367f02c4407c075fc9af1ab2949098fb7162c79c558a3e60d7c3455ce21675c62599602b9399d089

data/Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 require "rspec/core/rake_task"
 require "yard"
+require 'bundler'
 
 begin
   Bundler.setup :default, :development

data/lib/onebox/engine/youtube_onebox.rb

@@ -57,6 +57,14 @@ module Onebox
         html
       end
 
+      def video_title
+        yt_oembed_url = "http://www.youtube.com/oembed?format=json&url=http://www.youtube.com/watch?v=#{video_id.split('?')[0]}"
+        yt_oembed_data = Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response(yt_oembed_url).body))
+        yt_oembed_data[:title]
+      rescue
+        return nil
+      end
+
       # Regex to parse strings like "1h3m2s". Also accepts bare numbers (which are seconds).
       TIMESTR_REGEX = /(\d+h)?(\d+m)?(\d+s?)?/
 

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.17"
+  VERSION = "1.5.18"
 end

data/onebox.gemspec

@@ -4,39 +4,37 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'onebox/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "onebox"
+  spec.name          = 'onebox'
   spec.version       = Onebox::VERSION
-  spec.authors       = ["Joanna Zeta", "Vyki Englert", "Robin Ward"]
-  spec.email         = ["holla@jzeta.com", "vyki.englert@gmail.com", "robin.ward@gmail.com"]
+  spec.authors       = ['Joanna Zeta', 'Vyki Englert', 'Robin Ward']
+  spec.email         = ['holla@jzeta.com', 'vyki.englert@gmail.com', 'robin.ward@gmail.com']
   spec.description   = %q{A gem for turning URLs into previews.}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/discourse/onebox"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/discourse/onebox'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "multi_json", "~> 1.7"
-  spec.add_runtime_dependency "mustache", "~> 0.99"
-  spec.add_runtime_dependency "nokogiri", "~> 1.6.1"
-  spec.add_runtime_dependency "moneta", "~> 0.7"
+  spec.add_runtime_dependency 'multi_json', '~> 1.11'
+  spec.add_runtime_dependency 'mustache'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6.6'
+  spec.add_runtime_dependency 'moneta', '~> 0.8'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency "yard", "~> 0.8"
-  spec.add_development_dependency "fakeweb", "~> 1.3"
-  spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "mocha", "~> 0.14"
-  spec.add_development_dependency "rubocop", "~> 0.11"
-  spec.add_development_dependency "twitter", "~> 4.8"
-  spec.add_development_dependency "guard-rspec", "~> 4.2.8"
-  spec.add_development_dependency "sinatra", "~> 1.4"
-  spec.add_development_dependency "sinatra-contrib", "~> 1.4"
-  spec.add_development_dependency "haml", "~> 4.0"
-  # listen current is a bit broken
-  # http://stackoverflow.com/questions/21319753/readline-seems-to-be-broken
-  spec.add_development_dependency "listen", "= 2.6.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'yard', '~> 0.8'
+  spec.add_development_dependency 'fakeweb', '~> 1.3'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'mocha', '~> 1.1'
+  spec.add_development_dependency 'rubocop', '~> 0.30'
+  spec.add_development_dependency 'twitter', '~> 4.8'
+  spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
+  spec.add_development_dependency 'sinatra', '~> 1.4'
+  spec.add_development_dependency 'sinatra-contrib', '~> 1.4'
+  spec.add_development_dependency 'haml', '~> 4.0'
+  spec.add_development_dependency 'listen', '~> 2.10.0'
 end

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

@@ -2,26 +2,26 @@ require "spec_helper"
 
 describe Onebox::Engine::AudioOnebox do
   it "supports ogg" do
-    Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg').to_s.should match(/<audio/)
+    expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg').to_s).to match(/<audio/)
   end
 
   it "supports mp3" do
-    Onebox.preview('http://kolber.github.io/audiojs/demos/mp3/juicy.mp3').to_s.should match(/<audio/)
+    expect(Onebox.preview('http://kolber.github.io/audiojs/demos/mp3/juicy.mp3').to_s).to match(/<audio/)
   end
 
   it "supports wav" do
-    Onebox.preview('http://download.wavetlan.com/SVV/Media/HTTP/sample14.wav').to_s.should match(/<audio/)
+    expect(Onebox.preview('http://download.wavetlan.com/SVV/Media/HTTP/sample14.wav').to_s).to match(/<audio/)
   end
 
   it "supports URLs with query parameters" do
-    Onebox.preview('https://upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg?foo=bar').to_s.should match(/<audio/)
+    expect(Onebox.preview('https://upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg?foo=bar').to_s).to match(/<audio/)
   end
 
   it "supports protocol relative URLs" do
-    Onebox.preview('//upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg').to_s.should match(/<audio/)
+    expect(Onebox.preview('//upload.wikimedia.org/wikipedia/commons/c/c8/Example.ogg').to_s).to match(/<audio/)
   end
   
   it "includes a fallback direct link to the audio" do
-    Onebox.preview('http://kolber.github.io/audiojs/demos/mp3/juicy.mp3').to_s.should match(/<a.*mp3/)
+    expect(Onebox.preview('http://kolber.github.io/audiojs/demos/mp3/juicy.mp3').to_s).to match(/<a.*mp3/)
   end
 end

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

@@ -48,10 +48,12 @@ describe Onebox::Engine::GoogleMapsOnebox do
   end
 
   # Prevent sleep from wasting our time when we test with strange redirects
-  subject { described_class.send(:allocate).tap {|obj|
-    obj.stub(:sleep)
-    obj.send(:initialize, link)
-  }}
+  subject do
+    described_class.send(:allocate).tap do |obj|
+      allow(obj).to receive(:sleep)
+      obj.send(:initialize, link)
+    end
+  end
 
   let(:data) { Onebox::Helpers.symbolize_keys(subject.send(:data)) }
   let(:link) {|example| URLS[example.metadata[:urltype] || :short][:test] }

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

@@ -2,38 +2,38 @@ require "spec_helper"
 
 describe Onebox::Engine::ImageOnebox do
   it "supports png" do
-    Onebox.preview('http://www.discourse.org/images/logo.png').to_s.should match(/<img/)
+    expect(Onebox.preview('http://www.discourse.org/images/logo.png').to_s).to match(/<img/)
   end
 
   it "supports jpg" do
-    Onebox.preview('http://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg').to_s.should match(/<img/)
+    expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg').to_s).to match(/<img/)
   end
 
   it "supports jpeg" do
-    Onebox.preview('http://upload.wikimedia.org/wikipedia/en/b/bb/Poster.jpeg').to_s.should match(/<img/)
+    expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/en/b/bb/Poster.jpeg').to_s).to match(/<img/)
   end
 
   it "supports gif" do
-    Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/5/55/Tesseract.gif').to_s.should match(/<img/)
+    expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/5/55/Tesseract.gif').to_s).to match(/<img/)
   end
 
   it "supports tif" do
-    Onebox.preview('http://www.fileformat.info/format/tiff/sample/1f37bbd5603048178487ec88b1a6425b/MARBLES.tif').to_s.should match(/<img/)
+    expect(Onebox.preview('http://www.fileformat.info/format/tiff/sample/1f37bbd5603048178487ec88b1a6425b/MARBLES.tif').to_s).to match(/<img/)
   end
 
   it "supports bmp" do
-    Onebox.preview('http://www.fileformat.info/format/bmp/sample/d4202a5fc22a48c388d9e1c636792cc6/LAND.BMP').to_s.should match(/<img/)
+    expect(Onebox.preview('http://www.fileformat.info/format/bmp/sample/d4202a5fc22a48c388d9e1c636792cc6/LAND.BMP').to_s).to match(/<img/)
   end
 
   it "supports image URLs with query parameters" do
-    Onebox.preview('https://www.google.com/logos/doodles/2014/percy-julians-115th-birthday-born-1899-5688801926053888-hp.jpg?foo=bar').to_s.should match(/<img/)
+    expect(Onebox.preview('https://www.google.com/logos/doodles/2014/percy-julians-115th-birthday-born-1899-5688801926053888-hp.jpg?foo=bar').to_s).to match(/<img/)
   end
 
   it "supports protocol relative image URLs" do
-    Onebox.preview('//www.google.com/logos/doodles/2014/percy-julians-115th-birthday-born-1899-5688801926053888-hp.jpg').to_s.should match(/<img/)
+    expect(Onebox.preview('//www.google.com/logos/doodles/2014/percy-julians-115th-birthday-born-1899-5688801926053888-hp.jpg').to_s).to match(/<img/)
   end
 
   it "includes a direct link to the image" do
-    Onebox.preview('http://www.discourse.org/images/logo.png').to_s.should match(/<a.*png/)
+    expect(Onebox.preview('http://www.discourse.org/images/logo.png').to_s).to match(/<a.*png/)
   end
 end

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

@@ -14,10 +14,10 @@ describe Onebox::Engine::TwitterStatusOnebox do
       expect(html).to include("http://www.peers.org/action/peers-pledgea")
     end
 
-    it "includes timestamp" do
-      pending
-      expect(html).to include("6:59 PM - 1 Aug 13")
-    end
+    # TODO: weird spec..
+    # it "includes timestamp" do
+    #   expect(html).to include("6:59 PM - 1 Aug 13")
+    # end
 
     it "includes username" do
       expect(html).to include("vyki_e")
@@ -28,12 +28,10 @@ describe Onebox::Engine::TwitterStatusOnebox do
     end
 
     it "includes tweet favorite count" do
-      pending
       expect(html).to include("")
     end
 
     it "includes retweet count" do
-      pending
       expect(html).to include("")
     end
   end
@@ -47,7 +45,7 @@ describe Onebox::Engine::TwitterStatusOnebox do
   context "with twitter client" do
     before(:each) do
       @twitter_client = double("TwitterClient")
-      @twitter_client.stub("status") do
+      allow(@twitter_client).to receive("status") do
         {
           created_at: "Fri Aug 02 01:59:30 +0000 2013",
           id: 363_116_819_147_538_433,
@@ -93,7 +91,7 @@ describe Onebox::Engine::TwitterStatusOnebox do
           lang: "en"
         }
       end
-      @twitter_client.stub("prettify_tweet") do
+      allow(@twitter_client).to receive("prettify_tweet") do
         "I'm a sucker for pledges.  <a href='https://twitter.com/Peers' target='_blank'>@Peers</a> Pledge <a href='https://twitter.com/search?q=%23sharingeconomy' target='_blank'>#sharingeconomy</a> <a target='_blank' href='http://www.peers.org/action/peers-pledgea/'>peers.org/action/peers-p…</a>"
       end
       Onebox.options = { twitter_client: @twitter_client }

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

@@ -2,30 +2,30 @@ require "spec_helper"
 
 describe Onebox::Engine::VideoOnebox do
   it "supports ogv" do
-    Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/3/37/STS-134_launch_2.ogv').to_s.should match(/<video/)
+    expect(Onebox.preview('http://upload.wikimedia.org/wikipedia/commons/3/37/STS-134_launch_2.ogv').to_s).to match(/<video/)
   end
 
   it "supports mp4" do
-    Onebox.preview('http://download.wavetlan.com/svv/dev/test.mp4').to_s.should match(/<video/)
+    expect(Onebox.preview('http://download.wavetlan.com/svv/dev/test.mp4').to_s).to match(/<video/)
   end
 
   it "supports mov" do
-    Onebox.preview('http://download.wavetlan.com/SVV/Media/HTTP/BlackBerry.mov').to_s.should match(/<video/)
+    expect(Onebox.preview('http://download.wavetlan.com/SVV/Media/HTTP/BlackBerry.mov').to_s).to match(/<video/)
   end
 
   it "supports webm" do
-    Onebox.preview('http://video.webmfiles.org/big-buck-bunny_trailer.webm').to_s.should match(/<video/)
+    expect(Onebox.preview('http://video.webmfiles.org/big-buck-bunny_trailer.webm').to_s).to match(/<video/)
   end
 
   it "supports URLs with query parameters" do
-    Onebox.preview('http://video.webmfiles.org/big-buck-bunny_trailer.webm?foo=bar').to_s.should match(/<video/)
+    expect(Onebox.preview('http://video.webmfiles.org/big-buck-bunny_trailer.webm?foo=bar').to_s).to match(/<video/)
   end
 
   it "supports protocol relative URLs" do
-    Onebox.preview('//video.webmfiles.org/big-buck-bunny_trailer.webm').to_s.should match(/<video/)
+    expect(Onebox.preview('//video.webmfiles.org/big-buck-bunny_trailer.webm').to_s).to match(/<video/)
   end
 
   it "includes a fallback direct link to the video" do
-    Onebox.preview('http://download.wavetlan.com/svv/dev/test.mp4').to_s.should match(/<a.*mp4/)
+    expect(Onebox.preview('http://download.wavetlan.com/svv/dev/test.mp4').to_s).to match(/<a.*mp4/)
   end
 end

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

@@ -38,12 +38,12 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
 
     it "doesn't return the HTML when not in the `html_providers`" do
       Onebox::Engine::WhitelistedGenericOnebox.html_providers = []
-      HTMLOnebox.new("http://coolsite.com").to_html.should be_nil
+      expect(HTMLOnebox.new("http://coolsite.com").to_html).to be_nil
     end
 
     it "returns the HMTL when in the `html_providers`" do
       Onebox::Engine::WhitelistedGenericOnebox.html_providers = ['CoolSite']
-      HTMLOnebox.new("http://coolsite.com").to_html.should == "cool html"
+      expect(HTMLOnebox.new("http://coolsite.com").to_html).to eq "cool html"
     end
   end
 
@@ -56,12 +56,12 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
 
     it "doesn't rewrite URLs that arent in the list" do
       Onebox::Engine::WhitelistedGenericOnebox.rewrites = []
-      DummyOnebox.new("http://youtube.com").to_html.should == "<iframe src='https://youtube.com/asdf'></iframe>"
+      expect(DummyOnebox.new("http://youtube.com").to_html).to eq "<iframe src='https://youtube.com/asdf'></iframe>"
     end
 
     it "rewrites URLs when whitelisted" do
       Onebox::Engine::WhitelistedGenericOnebox.rewrites = %w(youtube.com)
-      DummyOnebox.new("http://youtube.com").to_html.should == "<iframe src='//youtube.com/asdf'></iframe>"
+      expect(DummyOnebox.new("http://youtube.com").to_html).to eq "<iframe src='//youtube.com/asdf'></iframe>"
     end
   end
 
@@ -73,8 +73,8 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
 
     it 'uses the endpoint for the url' do
       onebox = described_class.new("http://www.meetup.com/Toronto-Ember-JS-Meetup/events/219939537")
-      onebox.raw.should_not be_nil
-      onebox.raw[:title].should == "February EmberTO Meet-up"
+      expect(onebox.raw).not_to be_nil
+      expect(onebox.raw[:title]).to eq "February EmberTO Meet-up"
     end
   end
 

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

@@ -7,7 +7,7 @@ describe Onebox::Engine::YoukuOnebox do
   end
 
   it 'returns an image as the placeholder' do
-    Onebox.preview('http://v.youku.com/v_show/id_XNjM3MzAxNzc2.html')
-        .placeholder_html.should match(/<img/)
+    expect(Onebox.preview('http://v.youku.com/v_show/id_XNjM3MzAxNzc2.html')
+        .placeholder_html).to match(/<img/)
   end
 end

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

@@ -7,25 +7,25 @@ describe Onebox::Engine::YoutubeOnebox do
   end
 
   it "adds wmode=opaque" do
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .to_s.should 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:|["']\/\/)/
 
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .to_s.should_not match(regex)
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .placeholder_html.should_not match(regex)
-    Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ')
-    .to_s.should_not 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
-    Onebox.preview('https://www.youtube.com/channel/UCL8ZULXASCc1I_oaOT0NaOQ')
-    .to_s.should 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
@@ -42,48 +42,48 @@ describe Onebox::Engine::YoutubeOnebox do
 
   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
-    Onebox.preview('http://www.youtube.com/watch?feature=player_embedded&v=21Lk4YiASMo')
-    .to_s.should 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
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo')
-    .placeholder_html.should 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
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&list=UUQau-O2C0kGJpR3_CHBTGbw&index=1')
-    .to_s.should 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
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&potential[]=exploit&potential[]=fun')
-    .to_s.should_not 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
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=3782')
-    .to_s.should match(/start=3782/)
-    Onebox.preview('https://www.youtube.com/watch?start=1h3m2s&v=21Lk4YiASMo')
-    .to_s.should match(/start=3782/)
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&t=1h3m2s')
-    .to_s.should match(/start=3782/)
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=1h3m2s')
-    .to_s.should match(/start=3782/)
-    Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo#t=1h3m2s')
-    .to_s.should 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
-    preview = Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=2m&end=3m').to_s
-    preview.should match(/start=120/)
-    preview.should match(/end=180/)
+    preview = expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&start=2m&end=3m').to_s)
+    preview.to match(/start=120/)
+    preview.to match(/end=180/)
   end
 
   it "permits looping videos" do
-    preview = Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&loop').to_s
-    preview.should match(/loop=1/)
-    preview.should match(/playlist=21Lk4YiASMo/)
+    preview = expect(Onebox.preview('https://www.youtube.com/watch?v=21Lk4YiASMo&loop').to_s)
+    preview.to match(/loop=1/)
+    preview.to match(/playlist=21Lk4YiASMo/)
   end
 end
 

data/spec/lib/onebox/engine_spec.rb

@@ -18,7 +18,7 @@ describe Onebox::Engine do
   end
 
   describe "#link" do
-    before { Onebox::View.any_instance.stub(:template) { %|this shold be a template| } }
+    before { allow(Onebox::View).to receive(:template) { %|this shold be a template| } }
 
     it "escapes `link`" do
       html = OneboxEngineExample.new(%|http://foo.com" onscript="alert('foo')|).to_html

data/spec/lib/onebox/layout_spec.rb

@@ -16,9 +16,7 @@ describe Onebox::Layout do
 
     context "when template exists in directory_b" do
       before(:each) do
-        allow_any_instance_of(described_class).to receive(:template?) do |path|
-          path == "directory_b"
-        end
+        allow_any_instance_of(described_class).to receive(:template?) { |_,path| path == "directory_b" }
       end
 
       it "returns directory_b" do
@@ -28,9 +26,7 @@ describe Onebox::Layout do
 
     context "when template exists in directory_a" do
       before(:each) do
-        allow_any_instance_of(described_class).to receive(:template?) do |path|
-          path == "directory_a"
-        end
+        allow_any_instance_of(described_class).to receive(:template?) { |_,path| path == "directory_a" }
       end
 
       it "returns directory_a" do

data/spec/lib/onebox/matcher_spec.rb

@@ -16,7 +16,7 @@ describe Onebox::Matcher do
 
       it "finds an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
-        matcher.oneboxed.should_not be_nil
+        expect(matcher.oneboxed).not_to be_nil
       end
     end
 
@@ -26,7 +26,7 @@ describe Onebox::Matcher do
 
       it "doesn't find an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
-        matcher.oneboxed.should be_nil
+        expect(matcher.oneboxed).to be_nil
       end
     end
 
@@ -36,7 +36,7 @@ describe Onebox::Matcher do
 
       it "it finds an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
-        matcher.oneboxed.should_not be_nil
+        expect(matcher.oneboxed).not_to be_nil
       end
     end
 
@@ -46,7 +46,7 @@ describe Onebox::Matcher do
 
       it "it finds an engine" do
         matcher.stubs(:ordered_engines).returns([TestEngine])
-        matcher.oneboxed.should_not be_nil
+        expect(matcher.oneboxed).not_to be_nil
       end
     end
 

data/spec/lib/onebox_spec.rb

@@ -48,11 +48,11 @@ describe Onebox do
       Onebox::Engine::WhitelistedGenericOnebox.whitelist = %w(youtube.com)
     end
     it "has no matcher for a made up url" do
-      expect(Onebox.has_matcher?("http://wow.com/omg/doge")).to be_false
+      expect(Onebox.has_matcher?("http://wow.com/omg/doge")).to be false
     end
 
     it "has a matcher for a real site" do
-      expect(Onebox.has_matcher?("http://www.youtube.com/watch?v=azaIE6QSMUs")).to be_true
+      expect(Onebox.has_matcher?("http://www.youtube.com/watch?v=azaIE6QSMUs")).to be true
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.18
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,260 +10,260 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.10.0
 description: A gem for turning URLs into previews.
 email:
 - holla@jzeta.com
@@ -273,11 +273,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-gemset
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -399,17 +399,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.
@@ -463,4 +463,3 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
-has_rdoc: