video_info 1.6.0 → 2.0.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Youtube/with_video_mZqGqE0D0n4/view_count/.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/1.5.0
+      - VideoInfo/2.0.0
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -25,9 +25,9 @@ http_interactions:
       Access-Control-Allow-Origin:
       - '*'
       Expires:
-      - Mon, 07 Oct 2013 19:53:17 GMT
+      - Fri, 25 Oct 2013 20:34:01 GMT
       Date:
-      - Mon, 07 Oct 2013 19:53:17 GMT
+      - Fri, 25 Oct 2013 20:34:01 GMT
       Cache-Control:
       - private, max-age=300, no-transform
       Vary:
@@ -35,9 +35,9 @@ http_interactions:
       Gdata-Version:
       - '2.1'
       Etag:
-      - W/"D0AFQH47eCp7I2A9WhBXE0g."
+      - W/"CkAMQ347eCp7I2A9Wh5SE08."
       Last-Modified:
-      - Wed, 27 Mar 2013 03:41:51 GMT
+      - Wed, 09 Oct 2013 12:13:02 GMT
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -45,18 +45,19 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       Content-Length:
-      - '4658'
+      - '4652'
       Server:
       - GSE
       Alternate-Protocol:
       - 80:quic
     body:
       encoding: UTF-8
-      string: '{"version":"1.0","encoding":"UTF-8","entry":{"xmlns":"http://www.w3.org/2005/Atom","xmlns$media":"http://search.yahoo.com/mrss/","xmlns$gd":"http://schemas.google.com/g/2005","xmlns$yt":"http://gdata.youtube.com/schemas/2007","gd$etag":"W/\"D0AFQH47eCp7I2A9WhBXE0g.\"","id":{"$t":"tag:youtube.com,2008:video:mZqGqE0D0n4"},"published":{"$t":"2008-04-12T22:25:35.000Z"},"updated":{"$t":"2013-03-27T03:41:51.000Z"},"category":[{"scheme":"http://schemas.google.com/g/2005#kind","term":"http://gdata.youtube.com/schemas/2007#video"},{"scheme":"http://gdata.youtube.com/schemas/2007/categories.cat","term":"Music","label":"Music"}],"title":{"$t":"Cherry
-        Bloom - King Of The Knife"},"content":{"type":"application/x-shockwave-flash","src":"http://www.youtube.com/v/mZqGqE0D0n4?version=3&f=videos&app=youtube_gdata"},"link":[{"rel":"alternate","type":"text/html","href":"http://www.youtube.com/watch?v=mZqGqE0D0n4&feature=youtube_gdata"},{"rel":"http://gdata.youtube.com/schemas/2007#video.responses","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/responses?v=2"},{"rel":"http://gdata.youtube.com/schemas/2007#video.related","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/related?v=2"},{"rel":"http://gdata.youtube.com/schemas/2007#uploader","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/users/zxQk-rZGowoqMBKxGD5jSA?v=2"},{"rel":"self","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4?v=2"}],"author":[{"name":{"$t":"cherrybloomband"},"uri":{"$t":"http://gdata.youtube.com/feeds/api/users/cherrybloomband"},"yt$userId":{"$t":"zxQk-rZGowoqMBKxGD5jSA"}}],"yt$accessControl":[{"action":"comment","permission":"allowed"},{"action":"commentVote","permission":"allowed"},{"action":"videoRespond","permission":"allowed"},{"action":"rate","permission":"allowed"},{"action":"embed","permission":"allowed"},{"action":"list","permission":"allowed"},{"action":"autoPlay","permission":"allowed"},{"action":"syndicate","permission":"allowed"}],"gd$comments":{"gd$feedLink":{"rel":"http://gdata.youtube.com/schemas/2007#comments","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/comments?v=2","countHint":15}},"media$group":{"media$category":[{"$t":"Music","label":"Music","scheme":"http://gdata.youtube.com/schemas/2007/categories.cat"}],"media$content":[{"url":"http://www.youtube.com/v/mZqGqE0D0n4?version=3&f=videos&app=youtube_gdata","type":"application/x-shockwave-flash","medium":"video","isDefault":"true","expression":"full","duration":175,"yt$format":5},{"url":"rtsp://r5---sn-5hn7su7k.c.youtube.com/CiILENy73wIaGQl-0gNNqIaamRMYDSANFEgGUgZ2aWRlb3MM/0/0/0/video.3gp","type":"video/3gpp","medium":"video","expression":"full","duration":175,"yt$format":1},{"url":"rtsp://r5---sn-5hn7su7k.c.youtube.com/CiILENy73wIaGQl-0gNNqIaamRMYESARFEgGUgZ2aWRlb3MM/0/0/0/video.3gp","type":"video/3gpp","medium":"video","expression":"full","duration":175,"yt$format":6}],"media$credit":[{"$t":"cherrybloomband","role":"uploader","scheme":"urn:youtube","yt$display":"cherrybloomband"}],"media$description":{"$t":"The
-        first video from the upcoming album Secret Sounds, to download in-stores April
-        14. Checkout http://www.cherrybloom.net","type":"plain"},"media$keywords":{},"media$license":{"$t":"youtube","type":"text/html","href":"http://www.youtube.com/t/terms"},"media$player":{"url":"http://www.youtube.com/watch?v=mZqGqE0D0n4&feature=youtube_gdata_player"},"media$thumbnail":[{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/default.jpg","height":90,"width":120,"time":"00:01:27.500","yt$name":"default"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg","height":180,"width":320,"yt$name":"mqdefault"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg","height":360,"width":480,"yt$name":"hqdefault"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/1.jpg","height":90,"width":120,"time":"00:00:43.750","yt$name":"start"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/2.jpg","height":90,"width":120,"time":"00:01:27.500","yt$name":"middle"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/3.jpg","height":90,"width":120,"time":"00:02:11.250","yt$name":"end"}],"media$title":{"$t":"Cherry
-        Bloom - King Of The Knife","type":"plain"},"yt$duration":{"seconds":"175"},"yt$uploaded":{"$t":"2008-04-12T22:25:35.000Z"},"yt$uploaderId":{"$t":"UCzxQk-rZGowoqMBKxGD5jSA"},"yt$videoid":{"$t":"mZqGqE0D0n4"}},"gd$rating":{"average":4.822222,"max":5,"min":1,"numRaters":45,"rel":"http://schemas.google.com/g/2005#overall"},"yt$statistics":{"favoriteCount":"0","viewCount":"6243"},"yt$rating":{"numDislikes":"2","numLikes":"43"}}}'
+      string: '{"version":"1.0","encoding":"UTF-8","entry":{"xmlns":"http://www.w3.org/2005/Atom","xmlns$media":"http://search.yahoo.com/mrss/","xmlns$gd":"http://schemas.google.com/g/2005","xmlns$yt":"http://gdata.youtube.com/schemas/2007","gd$etag":"W/\"CkAMQ347eCp7I2A9Wh5SE08.\"","id":{"$t":"tag:youtube.com,2008:video:mZqGqE0D0n4"},"published":{"$t":"2008-04-12T22:25:35.000Z"},"updated":{"$t":"2013-10-09T12:13:02.000Z"},"category":[{"scheme":"http://schemas.google.com/g/2005#kind","term":"http://gdata.youtube.com/schemas/2007#video"},{"scheme":"http://gdata.youtube.com/schemas/2007/categories.cat","term":"Music","label":"Music"}],"title":{"$t":"Cherry
+        Bloom - King Of The Knife"},"content":{"type":"application/x-shockwave-flash","src":"http://www.youtube.com/v/mZqGqE0D0n4?version=3&f=videos&app=youtube_gdata"},"link":[{"rel":"alternate","type":"text/html","href":"http://www.youtube.com/watch?v=mZqGqE0D0n4&feature=youtube_gdata"},{"rel":"http://gdata.youtube.com/schemas/2007#video.responses","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/responses?v=2"},{"rel":"http://gdata.youtube.com/schemas/2007#video.related","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/related?v=2"},{"rel":"http://gdata.youtube.com/schemas/2007#uploader","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/users/zxQk-rZGowoqMBKxGD5jSA?v=2"},{"rel":"self","type":"application/atom+xml","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4?v=2"}],"author":[{"name":{"$t":"Cherry
+        Bloom"},"uri":{"$t":"http://gdata.youtube.com/feeds/api/users/cherrybloomband"},"yt$userId":{"$t":"zxQk-rZGowoqMBKxGD5jSA"}}],"yt$accessControl":[{"action":"comment","permission":"allowed"},{"action":"commentVote","permission":"allowed"},{"action":"videoRespond","permission":"allowed"},{"action":"rate","permission":"allowed"},{"action":"embed","permission":"allowed"},{"action":"list","permission":"allowed"},{"action":"autoPlay","permission":"allowed"},{"action":"syndicate","permission":"allowed"}],"gd$comments":{"gd$feedLink":{"rel":"http://gdata.youtube.com/schemas/2007#comments","href":"http://gdata.youtube.com/feeds/api/videos/mZqGqE0D0n4/comments?v=2","countHint":15}},"media$group":{"media$category":[{"$t":"Music","label":"Music","scheme":"http://gdata.youtube.com/schemas/2007/categories.cat"}],"media$content":[{"url":"http://www.youtube.com/v/mZqGqE0D0n4?version=3&f=videos&app=youtube_gdata","type":"application/x-shockwave-flash","medium":"video","isDefault":"true","expression":"full","duration":175,"yt$format":5},{"url":"rtsp://r5---sn-4g57kuez.c.youtube.com/CiILENy73wIaGQl-0gNNqIaamRMYDSANFEgGUgZ2aWRlb3MM/0/0/0/video.3gp","type":"video/3gpp","medium":"video","expression":"full","duration":175,"yt$format":1},{"url":"rtsp://r5---sn-4g57kuez.c.youtube.com/CiILENy73wIaGQl-0gNNqIaamRMYESARFEgGUgZ2aWRlb3MM/0/0/0/video.3gp","type":"video/3gpp","medium":"video","expression":"full","duration":175,"yt$format":6}],"media$credit":[{"$t":"cherrybloomband","role":"uploader","scheme":"urn:youtube","yt$display":"Cherry
+        Bloom"}],"media$description":{"$t":"The first video from the upcoming album
+        Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net","type":"plain"},"media$keywords":{},"media$license":{"$t":"youtube","type":"text/html","href":"http://www.youtube.com/t/terms"},"media$player":{"url":"http://www.youtube.com/watch?v=mZqGqE0D0n4&feature=youtube_gdata_player"},"media$thumbnail":[{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/default.jpg","height":90,"width":120,"time":"00:01:27.500","yt$name":"default"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg","height":180,"width":320,"yt$name":"mqdefault"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg","height":360,"width":480,"yt$name":"hqdefault"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/1.jpg","height":90,"width":120,"time":"00:00:43.750","yt$name":"start"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/2.jpg","height":90,"width":120,"time":"00:01:27.500","yt$name":"middle"},{"url":"http://i1.ytimg.com/vi/mZqGqE0D0n4/3.jpg","height":90,"width":120,"time":"00:02:11.250","yt$name":"end"}],"media$title":{"$t":"Cherry
+        Bloom - King Of The Knife","type":"plain"},"yt$duration":{"seconds":"175"},"yt$uploaded":{"$t":"2008-04-12T22:25:35.000Z"},"yt$uploaderId":{"$t":"UCzxQk-rZGowoqMBKxGD5jSA"},"yt$videoid":{"$t":"mZqGqE0D0n4"}},"gd$rating":{"average":4.822222,"max":5,"min":1,"numRaters":45,"rel":"http://schemas.google.com/g/2005#overall"},"yt$statistics":{"favoriteCount":"0","viewCount":"6264"},"yt$rating":{"numDislikes":"2","numLikes":"43"}}}'
     http_version: 
-  recorded_at: Mon, 07 Oct 2013 19:57:36 GMT
-recorded_with: VCR 2.5.0
+  recorded_at: Fri, 25 Oct 2013 20:34:02 GMT
+recorded_with: VCR 2.6.0

data/spec/lib/video_info/provider_spec.rb

@@ -1,42 +1,62 @@
 require 'spec_helper'
 
 describe VideoInfo::Provider do
-
   class ProviderFu < VideoInfo::Provider
     def _url_regex
       /foo\/(\d)/
     end
+
+    def embed_url
+      "foo.com"
+    end
+
+    def _default_url_attributes; {} end
+    def _default_iframe_attributes; {} end
   end
+  let(:url) { 'url' }
+  let(:options) { { } }
+  let(:provider) { ProviderFu.new('foo/1', options) }
 
   describe "initialize" do
-    let(:url) { 'url' }
-    let(:options) { { } }
-    let(:provider) { ProviderFu.new(url, options) }
 
     it { expect { VideoInfo::Provider.new(url) }.to raise_error(NotImplementedError, 'Provider class must implement #_url_regex private method') }
-    it { expect { ProviderFu.new('foo/1') }.to raise_error(NotImplementedError, 'Provider class must implement #_api_url private method') }
+    it { expect { provider.data }.to raise_error(NotImplementedError, 'Provider class must implement #_api_url private method') }
 
     it "sets default user_agent options" do
-      provider.options.should eq({ 'User-Agent' => "VideoInfo/#{VideoInfo::VERSION}" })
+      expect(provider.options).to eq({ 'User-Agent' => "VideoInfo/#{VideoInfo::VERSION}" })
     end
 
     context "with custom User-Agent options" do
       let(:options) { { 'User-Agent' => 'Test User Agent / 1.0' } }
 
       it "sets the option" do
-        provider.options.should eq({ 'User-Agent' => 'Test User Agent / 1.0' })
+        expect(provider.options).to eq({ 'User-Agent' => 'Test User Agent / 1.0' })
       end
     end
 
     context "with Referer options" do
-      let(:options) { { :referer => 'http://google.com' } }
+      let(:options) { { referer: 'http://google.com' } }
 
       it "sets the option" do
-        provider.options.should include({ 'Referer' => 'http://google.com' })
+        expect(provider.options).to include({ 'Referer' => 'http://google.com' })
       end
     end
   end
 
+  describe "embed_code" do
+    it "supports url_scheme option" do
+      expect(provider.embed_code(url_scheme: 'https')).to eq '<iframe src="https://foo.com" frameborder="0"></iframe>'
+    end
+
+    it "supports url_attributes option" do
+      expect(provider.embed_code(url_attributes: { foo: 'bar' })).to eq '<iframe src="http://foo.com?foo=bar" frameborder="0"></iframe>'
+    end
+
+    it "supports url_attributes option" do
+      expect(provider.embed_code(iframe_attributes: { foo: 'bar' })).to eq '<iframe src="http://foo.com" frameborder="0" foo="bar"></iframe>'
+    end
+  end
+
   describe ".usable?" do
     it { expect { VideoInfo::Provider.usable?('url') }.to raise_error(NotImplementedError, 'Provider class must implement .usable? public method') }
   end

data/spec/lib/video_info/providers/vimeo_spec.rb

@@ -17,12 +17,12 @@ describe VideoInfo::Providers::Vimeo do
   end
 
   context "with video 898029", :vcr do
-    subject { VideoInfo.get('http://www.vimeo.com/898029') }
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
     its(:provider)         { should eq 'Vimeo' }
     its(:video_id)         { should eq '898029' }
-    its(:url)              { should eq 'http://vimeo.com/898029' }
-    its(:embed_url)        { should eq 'http://player.vimeo.com/video/898029' }
+    its(:url)              { should eq 'http://www.vimeo.com/898029' }
+    its(:embed_url)        { should eq 'player.vimeo.com/video/898029' }
     its(:embed_code)       { should eq '<iframe src="http://player.vimeo.com/video/898029?autoplay=0&byline=0&portrait=0&title=0" frameborder="0"></iframe>' }
     its(:title)            { should eq 'Cherry Bloom - King Of The Knife' }
     its(:description)      { should eq 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
@@ -38,34 +38,34 @@ describe VideoInfo::Providers::Vimeo do
   end
 
   context "with video 898029 and url_attributes", :vcr do
-    subject { VideoInfo.get('http://www.vimeo.com/898029') }
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
-    it { subject.embed_code(:url_attributes => { :autoplay => 1 }).should match(/autoplay=1/) }
+    it { expect(subject.embed_code(url_attributes: { autoplay: 1 })).to match(/autoplay=1/) }
   end
 
   context "with video 898029 and iframe_attributes", :vcr do
-    subject { VideoInfo.get('http://www.vimeo.com/898029') }
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
-    it { subject.embed_code(:iframe_attributes => { :width => 800, :height => 600 }).should match(/width="800"/) }
-    it { subject.embed_code(:iframe_attributes => { :width => 800, :height => 600 }).should match(/height="600"/) }
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/width="800"/) }
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/height="600"/) }
   end
 
   context "with video 898029 in /group/ url", :vcr do
-    subject { VideoInfo.get('http://vimeo.com/groups/1234/videos/898029') }
+    subject { VideoInfo.new('http://vimeo.com/groups/1234/videos/898029') }
 
     its(:provider) { should eq 'Vimeo' }
     its(:video_id) { should eq '898029' }
   end
 
   context "with video 898029 in /group/ url", :vcr do
-    subject { VideoInfo.get('http://player.vimeo.com/video/898029') }
+    subject { VideoInfo.new('http://player.vimeo.com/video/898029') }
 
     its(:provider) { should eq 'Vimeo' }
     its(:video_id) { should eq '898029' }
   end
 
   context "with video 898029 in text", :vcr do
-    subject { VideoInfo.get('<a href="http://www.vimeo.com/898029">http://www.vimeo.com/898029</a>') }
+    subject { VideoInfo.new('<a href="http://www.vimeo.com/898029">http://www.vimeo.com/898029</a>') }
 
     its(:provider) { should eq 'Vimeo' }
     its(:video_id) { should eq '898029' }

data/spec/lib/video_info/providers/vkontakte_spec.rb

@@ -19,16 +19,17 @@ describe VideoInfo::Providers::Vkontakte do
   end
 
   context "with video 39576223_108370515", :vcr do
-    subject { VideoInfo.get('http://vk.com/video39576223_108370515') }
+    subject { VideoInfo.new('http://vk.com/video39576223_108370515') }
 
     its(:provider)         { should eq 'Vkontakte' }
     its(:video_owner)      { should eq '39576223' }
     its(:video_id)         { should eq '108370515' }
     its(:url)              { should eq 'http://vk.com/video39576223_108370515' }
-    its(:embed_url)        { should eq 'http://vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af' }
+    its(:embed_url)        { should eq 'vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af' }
     its(:embed_code)       { should eq '<iframe src="http://vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
-    its(:title)            { should eq 'Я уточка)))))' }
+    its(:title)            { should eq 'Я уточка))))) | VK' }
     its(:description)      { should eq 'это ВЗРЫВ МОЗГА!!! Просто отвал башки...' }
+    its(:keywords)         { should eq 'это ВЗРЫВ МОЗГА!!! Просто отвал башки...' }
     its(:duration)         { should eq 183 }
     its(:width)            { should eq 320 }
     its(:height)           { should eq 240 }

data/spec/lib/video_info/providers/youtube_spec.rb

@@ -22,12 +22,12 @@ describe VideoInfo::Providers::Youtube do
   end
 
   context "with video mZqGqE0D0n4", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
 
     its(:provider)         { should eq 'YouTube' }
     its(:video_id)         { should eq 'mZqGqE0D0n4' }
     its(:url)              { should eq 'http://www.youtube.com/watch?v=mZqGqE0D0n4' }
-    its(:embed_url)        { should eq 'http://www.youtube.com/embed/mZqGqE0D0n4' }
+    its(:embed_url)        { should eq 'www.youtube.com/embed/mZqGqE0D0n4' }
     its(:embed_code)       { should eq '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
     its(:title)            { should eq 'Cherry Bloom - King Of The Knife' }
     its(:description)      { should eq 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
@@ -43,27 +43,27 @@ describe VideoInfo::Providers::Youtube do
   end
 
   context "with video oQ49W_xKzKA", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=oQ49W_xKzKA') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=oQ49W_xKzKA') }
 
-    it { subject.embed_code(:url_attributes => { :autoplay => 1 }).should match(/autoplay=1/) }
+    it { expect(subject.embed_code(url_attributes: { autoplay: 1 })).to match(/autoplay=1/) }
   end
 
   context "with video oQ49W_xKzKA", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=oQ49W_xKzKA') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=oQ49W_xKzKA') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'oQ49W_xKzKA' }
   end
 
   context "with video Xp6CXF-Cesg", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=Xp6CXF-Cesg') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=Xp6CXF-Cesg') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'Xp6CXF-Cesg' }
   end
 
   context "with video VeasFckfMHY in user url", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/user/EducatorVids3?v=VeasFckfMHY') }
+    subject { VideoInfo.new('http://www.youtube.com/user/EducatorVids3?v=VeasFckfMHY') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'VeasFckfMHY' }
@@ -71,7 +71,7 @@ describe VideoInfo::Providers::Youtube do
   end
 
   context "with video VeasFckfMHY after params", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?feature=player_profilepage&v=VeasFckfMHY') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?feature=player_profilepage&v=VeasFckfMHY') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'VeasFckfMHY' }
@@ -79,60 +79,60 @@ describe VideoInfo::Providers::Youtube do
   end
 
   context "with video VeasFckfMHY in path", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/v/VeasFckfMHY') }
+    subject { VideoInfo.new('http://www.youtube.com/v/VeasFckfMHY') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'VeasFckfMHY' }
   end
 
   context "with video VeasFckfMHY in e path", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/e/VeasFckfMHY') }
+    subject { VideoInfo.new('http://www.youtube.com/e/VeasFckfMHY') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'VeasFckfMHY' }
   end
 
   context "with video VeasFckfMHY in embed path", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/embed/VeasFckfMHY') }
+    subject { VideoInfo.new('http://www.youtube.com/embed/VeasFckfMHY') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'VeasFckfMHY' }
   end
 
   context "with video JM9NgvjjVng in youtu.be url", :vcr do
-    subject { VideoInfo.get('http://youtu.be/JM9NgvjjVng') }
+    subject { VideoInfo.new('http://youtu.be/JM9NgvjjVng') }
 
     its(:provider) { should eq 'YouTube' }
     its(:video_id) { should eq 'JM9NgvjjVng' }
   end
 
   context 'without http or www', :vcr do
-    subject { VideoInfo.get('youtu.be/JM9NgvjjVng') }
+    subject { VideoInfo.new('youtu.be/JM9NgvjjVng') }
 
     its(:provider) { should == 'YouTube' }
     its(:video_id) { should eq 'JM9NgvjjVng' }
   end
 
   context "with video url in text", :vcr do
-    subject { VideoInfo.get('<a href="http://www.youtube.com/watch?v=mZqGqE0D0n4">http://www.youtube.com/watch?v=mZqGqE0D0n4</a>') }
+    subject { VideoInfo.new('<a href="http://www.youtube.com/watch?v=mZqGqE0D0n4">http://www.youtube.com/watch?v=mZqGqE0D0n4</a>') }
 
     its(:provider) { should == 'YouTube' }
     its(:video_id) { should == 'mZqGqE0D0n4' }
   end
 
   context "with iframe attributes", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
 
     its(:provider) { should == 'YouTube' }
-    it { subject.embed_code(:iframe_attributes => { :width => 800, :height => 600 }).should match(/width="800"/) }
-    it { subject.embed_code(:iframe_attributes => { :width => 800, :height => 600 }).should match(/height="600"/) }
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/width="800"/) }
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/height="600"/) }
   end
 
   context "with arbitrary iframe_attributes", :vcr do
-    subject { VideoInfo.get('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
+    subject { VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
 
     its(:provider)   { should == 'YouTube' }
-    it { subject.embed_code(:iframe_attributes => { :'data-colorbox' => true }).should match(/data-colorbox="true"/) }
+    it { expect(subject.embed_code(iframe_attributes: { :'data-colorbox' => true })).to match(/data-colorbox="true"/) }
   end
 
 end

data/spec/lib/video_info_spec.rb

@@ -2,48 +2,48 @@ require 'spec_helper'
 
 describe VideoInfo do
 
-  describe ".get" do
+  describe "#initialize" do
     let(:url) { 'url' }
-    let(:options) { { :foo => :bar } }
-    let(:provider) { double('provider') }
+    let(:options) { { foo: :bar } }
+    let(:provider) { double('provider', provider: 'Provider') }
 
     it "uses the first usable provider" do
-      VideoInfo::Providers::Vimeo.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Vkontakte.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Youtube.should_receive(:usable?).with(url) { true }
-      VideoInfo::Providers::Youtube.should_receive(:new).with(url, options) { provider }
+      VideoInfo::Providers::Vimeo.stub(:usable?) { false }
+      VideoInfo::Providers::Vkontakte.stub(:usable?) { false }
+      VideoInfo::Providers::Youtube.stub(:usable?) { true }
+      VideoInfo::Providers::Youtube.stub(:new) { provider }
 
-      VideoInfo.get(url, options).should eq provider
+      expect(VideoInfo.new(url, options).provider).to eq 'Provider'
     end
 
-    it "returns nil when no providers are usable" do
-      VideoInfo::Providers::Vimeo.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Vkontakte.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Youtube.should_receive(:usable?).with(url) { false }
+    it "raise when no providers are usable" do
+      VideoInfo::Providers::Vimeo.stub(:usable?) { false }
+      VideoInfo::Providers::Vkontakte.stub(:usable?) { false }
+      VideoInfo::Providers::Youtube.stub(:usable?) { false }
 
-      VideoInfo.get(url, options).should be_nil
+      expect { VideoInfo.new(url, options) }.to raise_error(VideoInfo::UrlError)
     end
   end
 
   describe ".usable?" do
     let(:url) { 'url' }
-    let(:options) { { :foo => :bar } }
-    let(:provider) { double('provider') }
+    let(:provider) { double('provider', new: true) }
 
     it "returns true when a provider is usable" do
-      VideoInfo::Providers::Vimeo.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Vkontakte.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Youtube.should_receive(:usable?).with(url) { true }
+      VideoInfo::Providers::Vimeo.stub(:usable?) { false }
+      VideoInfo::Providers::Vkontakte.stub(:usable?) { false }
+      VideoInfo::Providers::Youtube.stub(:usable?) { true }
+      VideoInfo::Providers::Youtube.stub(:new) { true }
 
-      VideoInfo.usable?(url).should be_true
+      expect(VideoInfo.usable?(url)).to be_true
     end
 
     it "returns false when no providers are usable" do
-      VideoInfo::Providers::Vimeo.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Vkontakte.should_receive(:usable?).with(url) { false }
-      VideoInfo::Providers::Youtube.should_receive(:usable?).with(url) { false }
+      VideoInfo::Providers::Vimeo.stub(:usable?) { false }
+      VideoInfo::Providers::Vkontakte.stub(:usable?) { false }
+      VideoInfo::Providers::Youtube.stub(:usable?) { false }
 
-      VideoInfo.usable?(url).should be_false
+      expect(VideoInfo.usable?(url)).to be_false
     end
   end
 

data/spec/spec_helper.rb

@@ -9,14 +9,20 @@ end
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  config.default_cassette_options = { :record => :new_episodes }
+  config.default_cassette_options = {
+    record: :new_episodes,
+    re_record_interval: 7 * 24 * 60 * 60
+  }
   config.hook_into :webmock
   config.configure_rspec_metadata!
 end
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

data/video_info.gemspec

@@ -11,16 +11,19 @@ Gem::Specification.new do |s|
   s.author       = 'Thibaud Guillaume-Gentil'
   s.email        = 'thibaud@thibaud.me'
   s.homepage     = 'https://rubygems.org/gems/video_info'
-  s.summary      = 'Vimeo & YouTube parser'
-  s.description  = 'Get video info from YouTube and Vimeo url.'
+  s.summary      = 'YouTube, Vimeo & VK parser'
+  s.description  = 'Get video info from YouTube, Vimeo and VK url.'
 
   s.files        = `git ls-files`.split($/)
   s.test_files   = s.files.grep(%r{^spec/})
   s.require_path = 'lib'
 
+  s.required_ruby_version = '>= 1.9.2'
+
   s.add_dependency 'addressable'
   s.add_dependency 'multi_json'
   s.add_dependency 'htmlentities'
+
   s.add_development_dependency 'bundler', '>= 1.3.5'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'