video_info 2.3.1 → 2.3.2

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

@@ -7,61 +7,138 @@ describe VideoInfo::Providers::Vimeo do
 
     context "with vimeo url" do
       let(:url) { 'http://www.vimeo.com/898029' }
-      it { should be_true }
+      it { is_expected.to be_truthy }
+    end
+
+    context "with Vimeo OnDemand url" do
+      let(:url) { 'https://vimeo.com/ondemand/less/101677664' }
+      it { is_expected.to be_truthy }
     end
 
     context "with vimeo album url" do
       let(:url) { 'http://vimeo.com/album/2755718' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
 
     context "with vimeo hubnub embed url" do
       let(:url) { 'http://player.vimeo.com/hubnut/album/2755718' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
 
     context "with other url" do
       let(:url) { 'http://www.youtube.com/898029' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
   end
 
   describe "#available?" do
     context "with valid video", :vcr do
       subject { VideoInfo.new('http://www.vimeo.com/898029') }
-      its(:available?)       { should be_true }
+
+      describe '#available?' do
+        it { is_expected.to be_available }
+      end
     end
 
     context "with 'this video does not exist' video", :vcr do
       subject { VideoInfo.new('http://vimeo.com/59312311') }
-      its(:available?)       { should be_false }
+
+      describe '#available?' do
+        it { is_expected.to_not be_available }
+      end
     end
 
     context "with 'password required' video", :vcr do
-      subject { VideoInfo.new('http://vimeo.com/54189727') }
-      its(:available?)       { should be_false }
+      subject { VideoInfo.new('http://vimeo.com/74636562') }
+
+      describe '#available?' do
+        it { is_expected.to_not be_available }
+      end
     end
   end
 
   context "with video 898029", :vcr do
     subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
-    its(:provider)         { should eq 'Vimeo' }
-    its(:video_id)         { should eq '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="//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' }
-    its(:keywords)         { should eq 'cherry bloom, secret sounds, king of the knife, rock, alternative' }
-    its(:duration)         { should eq 175 }
-    its(:width)            { should eq 640 }
-    its(:height)           { should eq 360 }
-    its(:date)             { should eq Time.parse('2008-04-14 13:10:39', Time.now.utc) }
-    its(:thumbnail_small)  { should eq 'http://b.vimeocdn.com/ts/343/731/34373130_100.jpg' }
-    its(:thumbnail_medium) { should eq 'http://b.vimeocdn.com/ts/343/731/34373130_200.jpg' }
-    its(:thumbnail_large)  { should eq 'http://b.vimeocdn.com/ts/343/731/34373130_640.jpg' }
-    its(:view_count)       { should be > 4000 }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://www.vimeo.com/898029' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//player.vimeo.com/video/898029' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//player.vimeo.com/video/898029?autoplay=0&byline=0&portrait=0&title=0" frameborder="0"></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 'cherry bloom, secret sounds, king of the knife, rock, alternative' }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to eq 175 }
+    end
+
+    describe '#width' do
+      subject { super().width }
+      it { is_expected.to eq 640 }
+    end
+
+    describe '#height' do
+      subject { super().height }
+      it { is_expected.to eq 360 }
+    end
+
+    describe '#date' do
+      subject { super().date }
+      it { is_expected.to eq Time.parse('2008-04-14 13:10:39', Time.now.utc) }
+    end
+
+    describe '#thumbnail_small' do
+      subject { super().thumbnail_small }
+      it { is_expected.to eq 'http://i.vimeocdn.com/video/34373130_100x75.jpg' }
+    end
+
+    describe '#thumbnail_medium' do
+      subject { super().thumbnail_medium }
+      it { is_expected.to eq 'http://i.vimeocdn.com/video/34373130_200x150.jpg' }
+    end
+
+    describe '#thumbnail_large' do
+      subject { super().thumbnail_large }
+      it { is_expected.to eq 'http://i.vimeocdn.com/video/34373130_640.jpg' }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be > 4000 }
+    end
   end
 
   context "with video 898029 and url_attributes", :vcr do
@@ -80,22 +157,50 @@ describe VideoInfo::Providers::Vimeo do
   context "with video 898029 in /group/ url", :vcr do
     subject { VideoInfo.new('http://vimeo.com/groups/1234/videos/898029') }
 
-    its(:provider) { should eq 'Vimeo' }
-    its(:video_id) { should eq '898029' }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
   end
 
   context "with video 898029 in /group/ url", :vcr do
     subject { VideoInfo.new('http://player.vimeo.com/video/898029') }
 
-    its(:provider) { should eq 'Vimeo' }
-    its(:video_id) { should eq '898029' }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
   end
 
   context "with video 898029 in text", :vcr do
     subject { VideoInfo.new('<a href="http://www.vimeo.com/898029">http://www.vimeo.com/898029</a>') }
 
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+  end
+
+  context "with video 101677664 in /ondemand/ url", :vcr do
+    subject { VideoInfo.new('https://vimeo.com/ondemand/less/101677664') }
+
     its(:provider) { should eq 'Vimeo' }
-    its(:video_id) { should eq '898029' }
+    its(:video_id) { should eq '101677664' }
   end
 
 end

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

@@ -8,24 +8,32 @@ describe VideoInfo::Providers::Vkontakte do
 
     context "with vkontakte url" do
       let(:url) { 'http://vk.com/video39576223_108370515' }
-      it { should be_true }
+      it { is_expected.to be_truthy }
     end
 
     context "with other url" do
       let(:url) { 'http://www.youtube.com/898029' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
   end
 
   describe "#available?" do
     context "with valid video", :vcr do
       subject { VideoInfo.new('http://vk.com/video39576223_108370515') }
-      its(:available?)       { should be_true }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_truthy }
+      end
     end
 
     context "with invalid video", :vcr do
       subject { VideoInfo.new('http://vk.com/video39576223_invalid') }
-      its(:available?)       { should be_false }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_falsey }
+      end
     end
 
   end
@@ -33,28 +41,94 @@ describe VideoInfo::Providers::Vkontakte do
   context "with video video39576223_108370515", :vcr do
     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 '//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af' }
-    its(:embed_code)       { should eq '<iframe src="//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
-    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 }
-    its(:view_count)       { should be > 10 }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vkontakte' }
+    end
+
+    describe '#video_owner' do
+      subject { super().video_owner }
+      it { is_expected.to eq '39576223' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '108370515' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://vk.com/video39576223_108370515' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'Я уточка))))) | VK' }
+    end
+
+    describe '#description' do
+      subject { super().description }
+      it { is_expected.to eq 'это ВЗРЫВ МОЗГА!!! Просто отвал башки...' }
+    end
+
+    describe '#keywords' do
+      subject { super().keywords }
+      it { is_expected.to eq 'это ВЗРЫВ МОЗГА!!! Просто отвал башки...' }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to eq 183 }
+    end
+
+    describe '#width' do
+      subject { super().width }
+      it { is_expected.to eq 320 }
+    end
+
+    describe '#height' do
+      subject { super().height }
+      it { is_expected.to eq 240 }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be > 10 }
+    end
   end
 
   context "with video video-54799401_165822734", :vcr do
     subject { VideoInfo.new('http://vk.com/video-54799401_165822734') }
 
-    its(:provider)         { should eq 'Vkontakte' }
-    its(:video_owner)      { should eq '-54799401' }
-    its(:video_id)         { should eq '165822734' }
-    its(:title)            { should eq 'SpaceGlasses are the future of computing | VK' }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vkontakte' }
+    end
+
+    describe '#video_owner' do
+      subject { super().video_owner }
+      it { is_expected.to eq '-54799401' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '165822734' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'SpaceGlasses are the future of computing | VK' }
+    end
   end
 
 end

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

@@ -7,29 +7,37 @@ describe VideoInfo::Providers::YoutubePlaylist do
 
     context "with youtube.com/playlist url" do
       let(:url) { 'http://www.youtube.com/playlist?p=PLA575C81A1FBC04CF' }
-      it { should be_true }
+      it { is_expected.to be_truthy }
     end
 
     context "with youtube.com url" do
       let(:url) { 'http://www.youtube.com/watch?v=Xp6CXF' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
 
     context "with other url" do
       let(:url) { 'http://example.com/video1' }
-      it { should be_false }
+      it { is_expected.to be_falsey }
     end
   end
 
   describe "#available?" do
     context "with valid playlist", :vcr do
       subject { VideoInfo.new('http://www.youtube.com/playlist?p=PLA575C81A1FBC04CF') }
-      its(:available?)       { should be_true }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_truthy }
+      end
     end
 
     context "with invalid playlist", :vcr do
       subject { VideoInfo.new('http://www.youtube.com/playlist?p=PLA575C81A1FBC04CF_invalid') }
-      its(:available?)       { should be_false }
+
+      describe '#available?' do
+        subject { super().available? }
+        it { is_expected.to be_falsey }
+      end
     end
   end
 
@@ -45,36 +53,113 @@ describe VideoInfo::Providers::YoutubePlaylist do
     }
     subject { VideoInfo.new('http://www.youtube.com/playlist?p=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr') }
 
-    its(:provider)         { should eq 'YouTube' }
-    its(:playlist_id)      { should eq 'PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
-    its(:url)              { should eq 'http://www.youtube.com/playlist?p=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
-    its(:embed_url)        { should eq '//www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
-    its(:embed_code)       { should eq '<iframe src="//www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
-    its(:title)            { should eq 'YouTube Policy and Copyright' }
-    its(:description)      { should eq 'Learn more about copyright basics, flagging, and the YouTube community.' }
-    its(:keywords)         { should be_nil }
-    its(:duration)         { should be_nil }
-    its(:width)            { should be_nil }
-    its(:height)           { should be_nil }
-    its(:date)             { should be_nil }
-    its(:thumbnail_small)  { should eq 'http://i.ytimg.com/vi/8b0aEoxqqC0/default.jpg' }
-    its(:thumbnail_medium) { should eq 'http://i.ytimg.com/vi/8b0aEoxqqC0/mqdefault.jpg' }
-    its(:thumbnail_large)  { should eq 'http://i.ytimg.com/vi/8b0aEoxqqC0/hqdefault.jpg' }
-    its(:videos)           { should match_array(videos) }
-    its(:view_count)       { should be_nil }
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'YouTube' }
+    end
+
+    describe '#playlist_id' do
+      subject { super().playlist_id }
+      it { is_expected.to eq 'PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://www.youtube.com/playlist?p=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr" frameborder="0" allowfullscreen="allowfullscreen"></iframe>' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'YouTube Policy and Copyright' }
+    end
+
+    describe '#description' do
+      subject { super().description }
+      it { is_expected.to eq 'Learn more about copyright basics, flagging, and the YouTube community.' }
+    end
+
+    describe '#keywords' do
+      subject { super().keywords }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to be_nil }
+    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 be_nil }
+    end
+
+    describe '#thumbnail_small' do
+      subject { super().thumbnail_small }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/8b0aEoxqqC0/default.jpg' }
+    end
+
+    describe '#thumbnail_medium' do
+      subject { super().thumbnail_medium }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/8b0aEoxqqC0/mqdefault.jpg' }
+    end
+
+    describe '#thumbnail_large' do
+      subject { super().thumbnail_large }
+      it { is_expected.to eq 'https://i.ytimg.com/vi/8b0aEoxqqC0/hqdefault.jpg' }
+    end
+
+    describe '#videos' do
+      subject { super().videos }
+      it { is_expected.to match_array(videos) }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be_nil }
+    end
   end
 
   context "with playlist PL0E8117603D70E10A in embed path", :vcr do
     subject { VideoInfo.new('http://www.youtube.com/embed/videoseries?list=PL0E8117603D70E10A') }
 
-    its(:playlist_id) { should eq 'PL0E8117603D70E10A' }
-    its(:videos) { should eq [] }
+    describe '#playlist_id' do
+      subject { super().playlist_id }
+      it { is_expected.to eq 'PL0E8117603D70E10A' }
+    end
+
+    describe '#videos' do
+      subject { super().videos }
+      it { is_expected.to eq [] }
+    end
   end
 
   context "with playlist PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr in embed path", :vcr do
     subject { VideoInfo.new('http://www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr') }
 
-    its(:playlist_id) { should eq 'PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
+    describe '#playlist_id' do
+      subject { super().playlist_id }
+      it { is_expected.to eq 'PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr' }
+    end
   end