video_info 2.5.0 → 2.6.0

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe VideoInfo::Providers::Vimeo do
   before(:all) do
-    VideoInfo.provider_api_keys = { vimeo: '6b66b015a3504793b4f541d878f46ff6' }
+    VideoInfo.provider_api_keys = { }
   end
 
   describe '.usable?' do
@@ -54,7 +54,7 @@ describe VideoInfo::Providers::Vimeo do
     end
 
     context "with 'this video does not exist' video", :vcr do
-      subject { VideoInfo.new('http://vimeo.com/59312311') }
+      subject { VideoInfo.new('http://vimeo.com/593123111') }
 
       describe '#available?' do
         it { is_expected.to_not be_available }
@@ -120,12 +120,12 @@ describe VideoInfo::Providers::Vimeo do
 
     describe '#width' do
       subject { super().width }
-      it { is_expected.to eq 640 }
+      it { is_expected.to eq 1280 }
     end
 
     describe '#height' do
       subject { super().height }
-      it { is_expected.to eq 360 }
+      it { is_expected.to eq 720 }
     end
 
     describe '#date' do

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

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'spec_helper'
+require 'webmock/rspec'
 
 describe VideoInfo::Providers::Vkontakte do
 
@@ -77,6 +78,17 @@ describe VideoInfo::Providers::Vkontakte do
 
   end
 
+  context "with video https://vk.com/id44052340?z=video61291456_159590018%2F2521d92730a272a9ea", :vcr do
+    subject { VideoInfo.new('https://vk.com/id44052340?z=video61291456_159590018%2F2521d92730a272a9ea') }
+
+    its(:provider)         { should eq 'Vkontakte' }
+    its(:video_owner)      { should eq '61291456' }
+    its(:video_id)         { should eq '159590018' }
+    its(:title)            { should eq 'Happy Birthday To You' }
+    its(:embed_url)        { should eq '//vk.com/video_ext.php?oid=61291456&id=159590018&hash=68174b2af560c54c' }
+    its(:embed_code)       { should eq '<iframe src="//vk.com/video_ext.php?oid=61291456&id=159590018&hash=68174b2af560c54c" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+  end
+
   context "with video videos43640822#/video43640822_168790809", :vcr do
     subject { VideoInfo.new('https://vk.com/videos43640822#/video43640822_168790809') }
 
@@ -93,8 +105,8 @@ describe VideoInfo::Providers::Vkontakte do
     its(:video_owner)      { should eq '2152699' }
     its(:video_id)         { should eq '168591741' }
     its(:url)              { should eq 'https://vk.com/kirill.lyanoi?z=video2152699_168591741%2F56fd229a9dfe2dcdbe' }
-    its(:embed_url)        { should eq '//www.youtube.com/embed/4Thws5wq5GI' }
-    its(:embed_code)       { should eq '<iframe src="//www.youtube.com/embed/4Thws5wq5GI" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+    its(:embed_url)        { should eq '//vk.com/video_ext.php?oid=2152699&id=168591741&hash=' }
+    its(:embed_code)       { should eq '<iframe src="//vk.com/video_ext.php?oid=2152699&id=168591741&hash=" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
     its(:title)            { should eq 'BEAT SOUL STEP — RDC14 Project818 Russian Dance Championship, May 1-2, Moscow 2014' }
     its(:description)      { should start_with 'BEAT SOUL STEP ★ Project818 Russian Dance Championship ★ 1-2 мая, Москва 2014' }
     its(:keywords)         { should start_with 'BEAT SOUL STEP ★ Project818 Russian Dance Championship ★ 1-2 мая, Москва 2014' }
@@ -131,4 +143,31 @@ describe VideoInfo::Providers::Vkontakte do
     its(:title)            { should eq 'SpaceGlasses are the future of computing' }
   end
 
+  context 'with valid video and connection timeout' do
+    subject { VideoInfo.new('http://vk.com/video-54799401_165822734') }
+
+    describe '#title' do
+      before do
+        stub_request(:any, /.*vk.com.*/).to_timeout
+      end
+
+      it 'raises VideoInfo::HttpError exception' do
+        expect { subject.title }.to raise_error VideoInfo::HttpError
+      end
+    end
+  end
+
+  context 'with valid video and OpenURI::HTTPError exception' do
+    subject { VideoInfo.new('http://vk.com/video-54799401_165822734') }
+
+    describe '#title' do
+      before do
+        stub_request(:any, /.*vk.com.*/).to_raise(OpenURI::HTTPError.new('error', :nop))
+      end
+
+      it 'raises VideoInfo::HttpError exception' do
+        expect { subject.title }.to raise_error VideoInfo::HttpError
+      end
+    end
+  end
 end

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

@@ -389,4 +389,88 @@ describe VideoInfo::Providers::Youtube do
     it { expect(subject.embed_code(iframe_attributes: { :'data-colorbox' => true })).to match(/data-colorbox="true"/) }
   end
 
+  context "with full screen video URLs", :vcr do
+    subject { VideoInfo.new('http://www.youtube.com/v/mZqGqE0D0n4') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'YouTube' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq 'mZqGqE0D0n4' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://www.youtube.com/v/mZqGqE0D0n4' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//www.youtube.com/embed/mZqGqE0D0n4' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'Cherry Bloom - King Of The Knife' }
+    end
+
+    describe '#description' do
+      subject { super().description }
+      it { is_expected.to eq 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
+    end
+
+    describe '#keywords' do
+      subject { super().keywords }
+      it { is_expected.to eq %w(cherry bloom king of the knife guitar drum clip rock alternative tremplin Paris-Forum) }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to eq 176 }
+    end
+
+    describe '#width' do
+      subject { super().width }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#height' do
+      subject { super().height }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#date' do
+      subject { super().date }
+      it { is_expected.to eq Time.parse('Sat Apr 12 22:25:35 UTC 2008', Time.now.utc) }
+    end
+
+    describe '#thumbnail_small' do
+      subject { super().thumbnail_small }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/default.jpg' }
+    end
+
+    describe '#thumbnail_medium' do
+      subject { super().thumbnail_medium }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg' }
+    end
+
+    describe '#thumbnail_large' do
+      subject { super().thumbnail_large }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg' }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be > 4000 }
+    end
+  end
+
 end

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

@@ -8,11 +8,16 @@ describe VideoInfo::Providers::YoutubePlaylist do
   describe ".usable?" do
     subject { VideoInfo::Providers::YoutubePlaylist.usable?(url) }
 
-    context "with youtube.com/playlist url" do
+    context "with youtube.com/playlist?p= url" do
       let(:url) { 'http://www.youtube.com/playlist?p=PLA575C81A1FBC04CF' }
       it { is_expected.to be_truthy }
     end
 
+    context "with youtube.com/playlist?list= url" do
+      let(:url) { 'http://www.youtube.com/playlist?list=PLA575C81A1FBC04CF' }
+      it { is_expected.to be_truthy }
+    end
+
     context "with youtube.com url" do
       let(:url) { 'http://www.youtube.com/watch?v=Xp6CXF' }
       it { is_expected.to be_falsey }
@@ -42,6 +47,15 @@ describe VideoInfo::Providers::YoutubePlaylist do
         it { is_expected.to be_falsey }
       end
     end
+
+    context "with &list= url", :vcr do
+      subject { VideoInfo.new('http://www.youtube.com/playlist?list=PLA575C81A1FBC04CF') }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_truthy }
+      end
+    end
   end
 
   context "with playlist PL9hW1uS6HUftLdHI6RIsaf", :vcr do

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

@@ -8,11 +8,16 @@ describe VideoInfo::Providers::YoutubePlaylist do
   describe ".usable?" do
     subject { VideoInfo::Providers::YoutubePlaylist.usable?(url) }
 
-    context "with youtube.com/playlist url" do
+    context "with youtube.com/playlist?p= url" do
       let(:url) { 'http://www.youtube.com/playlist?p=PLA575C81A1FBC04CF' }
       it { is_expected.to be_truthy }
     end
 
+    context "with youtube.com/playlist?list= url" do
+      let(:url) { 'http://www.youtube.com/playlist?list=PLA575C81A1FBC04CF' }
+      it { is_expected.to be_truthy }
+    end
+
     context "with youtube.com url" do
       let(:url) { 'http://www.youtube.com/watch?v=Xp6CXF' }
       it { is_expected.to be_falsey }
@@ -42,6 +47,15 @@ describe VideoInfo::Providers::YoutubePlaylist do
         it { is_expected.to be_falsey }
       end
     end
+
+    context "with &list= url", :vcr do
+      subject { VideoInfo.new('http://www.youtube.com/playlist?list=PLA575C81A1FBC04CF') }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_truthy }
+      end
+    end
   end
 
   context "with playlist PL9hW1uS6HUftLdHI6RIsaf", :vcr do
@@ -134,7 +148,7 @@ describe VideoInfo::Providers::YoutubePlaylist do
 
     describe '#videos' do
       subject { super().videos }
-      it { expect { subject}.to raise_error(NotImplementedError) }
+      it { expect { subject }.to raise_error(NotImplementedError) }
     end
 
     describe '#view_count' do

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'webmock/rspec'
 
 describe VideoInfo::Providers::Youtube do
   describe ".usable?" do
@@ -35,6 +36,25 @@ describe VideoInfo::Providers::Youtube do
       end
     end
 
+    context 'with valid video and invalid API key' do
+      subject { VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
+      let(:msg) { 'your API key is probably invalid. Please verify it.' }
+      before do
+        VideoInfo.provider_api_keys[:youtube] = 'invalid_key'
+      end
+
+      after do
+        VideoInfo.provider_api_keys[:youtube] = nil
+      end
+
+      describe '#available?' do
+        it 'logs warning message to alert user about invalid API key' do
+          expect(VideoInfo.logger).to receive(:warn).with(msg)
+          subject.title
+        end
+      end
+    end
+
     context "with 'video is unavailable' video", :vcr do
       subject { VideoInfo.new('http://www.youtube.com/watch?v=SUkXvWn1m7Q') }
 
@@ -393,4 +413,130 @@ describe VideoInfo::Providers::Youtube do
       it { is_expected.to eq ('Deafheaven - Sunbather') }
     end
   end
+
+  context "with full screen video URLs", :vcr do
+    subject { VideoInfo.new('http://www.youtube.com/v/mZqGqE0D0n4') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'YouTube' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq 'mZqGqE0D0n4' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://www.youtube.com/v/mZqGqE0D0n4' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//www.youtube.com/embed/mZqGqE0D0n4' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'Cherry Bloom - King Of The Knife' }
+    end
+
+    describe '#description' do
+      subject { super().description }
+      it { is_expected.to eq 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
+    end
+
+    describe '#keywords' do
+      subject { super().keywords }
+      it { is_expected.to eq %w(cherry bloom king of the knife guitar drum clip rock alternative tremplin Paris-Forum) }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to eq 176 }
+    end
+
+    describe '#width' do
+      subject { super().width }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#height' do
+      subject { super().height }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#date' do
+      subject { super().date }
+      it { is_expected.to eq Time.parse('Sat Apr 12 2008', Time.now.utc) }
+    end
+
+    describe '#thumbnail_small' do
+      subject { super().thumbnail_small }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/default.jpg' }
+    end
+
+    describe '#thumbnail_medium' do
+      subject { super().thumbnail_medium }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg' }
+    end
+
+    describe '#thumbnail_large' do
+      subject { super().thumbnail_large }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg' }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be > 4000 }
+    end
+  end
+
+
+  context "with full screen video URLs with params", :vcr do
+    subject { VideoInfo.new('https://www.youtube.com/v/ylTY9WbMGDc?someParam=foo') }
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'Deafheaven - Sunbather' }
+    end
+  end
+
+  context 'with valid video and connection timeout' do
+    subject { VideoInfo.new('https://www.youtube.com/watch?v=lExm5LELpP4') }
+
+    describe '#title' do
+      before do
+        @stubbed = stub_request(:get, 'https://www.youtube.com/watch?v=lExm5LELpP4').to_timeout
+      end
+
+      after do
+        remove_request_stub(@stubbed) if @stubbed
+      end
+
+      it 'raises VideoInfo::HttpError exception' do
+        expect { subject.title }.to raise_error VideoInfo::HttpError
+      end
+    end
+  end
+
+  context 'with valid video and OpenURI::HTTPError exception' do
+    subject { VideoInfo.new('https://www.youtube.com/watch?v=lExm5LELpP4') }
+
+    describe '#title' do
+      before do
+        stub_request(:get, 'https://www.youtube.com/watch?v=lExm5LELpP4').to_raise(OpenURI::HTTPError.new('error', :nop))
+      end
+
+      it 'raises VideoInfo::HttpError exception' do
+        expect { subject.title }.to raise_error VideoInfo::HttpError
+      end
+    end
+  end
 end

data/video_info.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'addressable'
+  s.add_dependency 'addressable', '~> 2.3'
   s.add_dependency 'multi_json', '~> 1.11'
-  s.add_dependency 'htmlentities'
-  s.add_dependency 'iso8601'
-  s.add_dependency 'oga'
-  s.add_dependency 'open_uri_redirections'
+  s.add_dependency 'htmlentities', '~> 4.3'
+  s.add_dependency 'iso8601', '~> 0.9'
+  s.add_dependency 'oga', '~> 2.2'
+  s.add_dependency 'open_uri_redirections', '~> 0.2'
+  s.add_dependency 'net_http_timeout_errors', '~> 0.3.0'
 
   s.add_development_dependency 'bundler', '>= 1.3.5'
   s.add_development_dependency 'rake'