video_info 2.6.1 → 3.0.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_YoutubePlaylist/with_playlist_that_does_not_exist_in_embed_path/_videos/1_4_2_1.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: https://www.googleapis.com/youtube/v3/playlistItems?fields=items&key=AIzaSyA6PYwSr1EnLFUFy1cZDk3Ifb0rxeJaeZ0&part=snippet&playlistId=PL0E8117603D70E10A
+    uri: https://www.googleapis.com/youtube/v3/playlistItems?fields=items&key=youtube_api_key_123&maxResults=50&part=snippet&playlistId=PL0E8117603D70E10A
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/2.6.0
+      - VideoInfo/2.8.0
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -18,39 +18,97 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Expires:
-      - Thu, 05 May 2016 01:01:55 GMT
+      Content-Type:
+      - application/json; charset=UTF-8
+      Vary:
+      - Origin
+      - Referer
+      - X-Origin
       Date:
-      - Thu, 05 May 2016 01:01:55 GMT
+      - Tue, 27 Oct 2020 18:42:21 GMT
+      Server:
+      - scaffolding on HTTPServer2
       Cache-Control:
-      - private, max-age=0, must-revalidate, no-transform
-      Etag:
-      - '"kiOs9cZLH2FUp6r6KJ8eyq_LIOk/ewwRz0VbTYpp2EGbOkvZ5M_1mbo"'
+      - private
+      X-Xss-Protection:
+      - '0'
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+      Alt-Svc:
+      - h3-Q050=":443"; ma=2592000,h3-29=":443"; ma=2592000,h3-T051=":443"; ma=2592000,h3-T050=":443";
+        ma=2592000,h3-Q046=":443"; ma=2592000,h3-Q043=":443"; ma=2592000,quic=":443";
+        ma=2592000; v="46,43"
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "items": []
+        }
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 18:42:21 GMT
+- request:
+    method: get
+    uri: https://www.googleapis.com/youtube/v3/playlistItems?fields=items&key=%3Cyoutube_api_key_123%3E&maxResults=50&part=snippet&playlistId=PL0E8117603D70E10A
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.8.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
       Vary:
       - Origin
+      - Referer
       - X-Origin
       Content-Type:
       - application/json; charset=UTF-8
-      X-Content-Type-Options:
-      - nosniff
+      Date:
+      - Tue, 27 Oct 2020 18:44:54 GMT
+      Server:
+      - scaffolding on HTTPServer2
+      Cache-Control:
+      - private
+      X-Xss-Protection:
+      - '0'
       X-Frame-Options:
       - SAMEORIGIN
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '17'
-      Server:
-      - GSE
-      Alternate-Protocol:
-      - 443:quic
+      X-Content-Type-Options:
+      - nosniff
       Alt-Svc:
-      - quic=":443"; ma=2592000; v="33,32,31,30,29,28,27,26,25"
+      - h3-Q050=":443"; ma=2592000,h3-29=":443"; ma=2592000,h3-T051=":443"; ma=2592000,h3-T050=":443";
+        ma=2592000,h3-Q046=":443"; ma=2592000,h3-Q043=":443"; ma=2592000,quic=":443";
+        ma=2592000; v="46,43"
+      Transfer-Encoding:
+      - chunked
     body:
-      encoding: UTF-8
+      encoding: ASCII-8BIT
       string: |
         {
-         "items": []
+          "error": {
+            "code": 400,
+            "message": "API key not valid. Please pass a valid API key.",
+            "errors": [
+              {
+                "message": "API key not valid. Please pass a valid API key.",
+                "domain": "global",
+                "reason": "badRequest"
+              }
+            ],
+            "status": "INVALID_ARGUMENT"
+          }
         }
-    http_version: 
-  recorded_at: Thu, 05 May 2016 01:01:55 GMT
-recorded_with: VCR 3.0.1
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 18:44:55 GMT
+recorded_with: VCR 3.0.3

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

@@ -23,7 +23,7 @@ describe VideoInfo::Providers::Dailymotion do
 
   describe '#available?' do
     context 'with valid video', :vcr do
-      subject { VideoInfo.new('http://www.dailymotion.com/video/x7lni3') }
+      subject { VideoInfo.new('http://www.dailymotion.com/video/x7lni3'.freeze) }
 
       describe '#available?' do
         subject { super().available? }
@@ -76,6 +76,21 @@ describe VideoInfo::Providers::Dailymotion do
       it { is_expected.to eq 'Mario Kart (Rémi Gaillard)' }
     end
 
+    describe '#author' do
+      subject { super().author }
+      it { is_expected.to eq 'Rémi Gaillard' }
+    end
+
+    describe '#author_url' do
+      subject { super().author_url }
+      it { is_expected.to eq 'https://www.dailymotion.com/nqtv' }
+    end
+
+    describe '#author_thumbnail' do
+      subject { super().author_thumbnail }
+      it { is_expected.to match /https:\/\/s[12].dmcdn.net\/u\/US931VO3V-24wNr1\/60x60/ }
+    end
+
     describe '#description' do
       subject { super().description }
       description_text = 'Super Rémi Kart est un jeu vidéo de course ' \
@@ -116,17 +131,32 @@ describe VideoInfo::Providers::Dailymotion do
 
     describe '#thumbnail_small' do
       subject { super().thumbnail_small }
-      it { is_expected.to eq 'http://s2.dmcdn.net/BgWxI/x60-kbf.jpg' }
+      it { is_expected.to match /https:\/\/s[12].dmcdn.net\/v\/mj4x1VaO59OF6TK6\/x60/ }
     end
 
     describe '#thumbnail_medium' do
       subject { super().thumbnail_medium }
-      it { is_expected.to eq 'http://s2.dmcdn.net/BgWxI/x240-b83.jpg' }
+      it { is_expected.to match /https:\/\/s[12].dmcdn.net\/v\/mj4x1VaO59Vm42lt\/x240/ }
     end
 
     describe '#thumbnail_large' do
       subject { super().thumbnail_large }
-      it { is_expected.to eq 'http://s2.dmcdn.net/BgWxI/x720-YcV.jpg' }
+      it { is_expected.to match /https:\/\/s[12].dmcdn.net\/v\/mj4x1VaO59VyFzJt\/x720/ }
+    end
+
+    describe '#thumbnail_large_2x' do
+      subject { super().thumbnail_large_2x }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#thumbnail_maxres' do
+      subject { super().thumbnail_maxres }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#thumbnail' do
+      subject { super().thumbnail }
+      it { is_expected.to match /https:\/\/s[12].dmcdn.net\/v\/mj4x1VaO59VyFzJt\/x720/ }
     end
 
     describe '#view_count' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-[nil, '6b66b015a3504793b4f541d878f46ff6'].each do |api_key|
-  describe VideoInfo::Providers::Vimeo do
+[nil, ENV["VIMEO_ACCESS_TOKEN"] || 'vimeo_access_token'].each do |api_key|
+  describe VideoInfo::Providers::Vimeo, :vcr do
     before(:all) do
       VideoInfo.provider_api_keys = { vimeo: api_key }
     end
@@ -47,15 +47,15 @@ require 'spec_helper'
     end
 
     describe '#available?' do
-      context 'with valid video', :vcr do
-        subject { VideoInfo.new('http://vimeo.com/98605382') }
+      context 'with valid video' do
+        subject { VideoInfo.new('http://vimeo.com/98605382'.freeze) }
 
         describe '#available?' do
           it { is_expected.to be_available }
         end
       end
 
-      context "with 'this video does not exist' video", :vcr do
+      context "with 'this video does not exist' video" do
         subject { VideoInfo.new('http://vimeo.com/59312311') }
 
         describe '#available?' do
@@ -63,7 +63,7 @@ require 'spec_helper'
         end
       end
 
-      context "with 'password required' video", :vcr do
+      context "with 'password required' video" do
         subject { VideoInfo.new('http://vimeo.com/74636562') }
 
         describe '#available?' do
@@ -72,7 +72,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 136971428', :vcr do
+    context 'with video 136971428' do
       subject { VideoInfo.new('https://vimeo.com/136971428') }
 
       describe '#provider' do
@@ -164,9 +164,36 @@ require 'spec_helper'
         it { is_expected.to eq thumbnail_url }
       end
 
+      describe '#thumbnail_large_2x' do
+        subject { super().thumbnail_large_2x }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#thumbnail_maxres' do
+        subject { super().thumbnail_maxres }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#thumbnail' do
+        subject { super().thumbnail }
+        thumbnail_url = 'https://i.vimeocdn.com/video/531688239_640.jpg'
+        it { is_expected.to eq thumbnail_url }
+      end
+
       describe '#author_thumbnail' do
         subject { super().author_thumbnail }
-        thumbnail_url = 'https://i.vimeocdn.com/portrait/327118_75x75.jpg'
+
+        #
+        # For some reason, the scraper returns an image URL without
+        # a file extension. This will likely change in the future.
+        #
+
+        thumbnail_url = 'https://i.vimeocdn.com/portrait/14790276_75x75'
+
+        if api_key
+          thumbnail_url += '.jpg'
+        end
+
         it { is_expected.to eq thumbnail_url }
       end
 
@@ -186,7 +213,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 898029 and url_attributes', :vcr do
+    context 'with video 898029 and url_attributes' do
       subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
       it 'should add URL attribute' do
@@ -196,7 +223,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 898029 and iframe_attributes', :vcr do
+    context 'with video 898029 and iframe_attributes' do
       subject { VideoInfo.new('http://www.vimeo.com/898029') }
 
       it 'should have proper dimensions' do
@@ -207,7 +234,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 898029 in /group/ url', :vcr do
+    context 'with video 898029 in /group/ url' do
       subject { VideoInfo.new('http://vimeo.com/groups/1234/videos/898029') }
 
       describe '#provider' do
@@ -221,7 +248,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 898029 in /group/ url', :vcr do
+    context 'with video 898029 in /group/ url' do
       subject { VideoInfo.new('http://player.vimeo.com/video/898029') }
 
       describe '#provider' do
@@ -235,7 +262,7 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 898029 in text', :vcr do
+    context 'with video 898029 in text' do
       video_url_in_text = '<a href="http://www.vimeo.com/898029">' \
                           'http://www.vimeo.com/898029</a>'
       subject { VideoInfo.new(video_url_in_text) }
@@ -251,14 +278,14 @@ require 'spec_helper'
       end
     end
 
-    context 'with video 101677664 in /ondemand/ url', :vcr do
+    context 'with video 101677664 in /ondemand/ url' do
       subject { VideoInfo.new('https://vimeo.com/ondemand/less/101677664') }
 
       its(:provider) { should eq 'Vimeo' }
       its(:video_id) { should eq '101677664' }
     end
 
-    context 'with video 111431415 in /channels/*/ url', :vcr do
+    context 'with video 111431415 in /channels/*/ url' do
       video_url = 'https://vimeo.com/channels/some_channel1/111431415'
       subject { VideoInfo.new(video_url) }
 
@@ -266,12 +293,46 @@ require 'spec_helper'
       its(:video_id) { should eq '111431415' }
     end
 
-    context 'with video 126641548 in /user*/review/126641548/* url', :vcr do
+    context 'with video 126641548 in /user*/review/126641548/* url' do
       video_url = 'http://www.vimeo.com/user39798190/review/126641548/8a56234e32'
       subject { VideoInfo.new(video_url) }
 
       its(:provider) { should eq 'Vimeo' }
       its(:video_id) { should eq '126641548' }
     end
+
+    context 'with video 141349194' do
+      video_url = 'https://vimeo.com/141349194'
+      subject { VideoInfo.new(video_url) }
+
+      its(:thumbnail) { should eq 'https://i.vimeocdn.com/video/538320894_640.jpg' }
+      its(:thumbnail_large) { should eq 'https://i.vimeocdn.com/video/538320894_640.jpg' }
+      its(:thumbnail_medium) { should eq 'https://i.vimeocdn.com/video/538320894_200x150.jpg' }
+      its(:thumbnail_small) { should eq 'https://i.vimeocdn.com/video/538320894_100x75.jpg' }
+
+    end
+
+    context 'with unavailable video' do
+      if api_key.nil?
+        video_url = 'https://vimeo.com/0812455'
+        subject { VideoInfo.new(video_url) }
+
+        its(:available?) { should be false }
+        its(:author) { should be nil }
+        its(:author_thumbnail) { should be nil }
+        its(:author_url) { should be nil }
+        its(:title) { should be nil }
+        its(:description) { should be nil }
+        its(:date) { should be nil }
+        its(:duration) { should be nil }
+        its(:keywords) { should be nil }
+        its(:height) { should be nil }
+        its(:width) { should be nil }
+        its(:thumbnail_small) { should be nil }
+        its(:thumbnail_medium) { should be nil }
+        its(:thumbnail_large) { should be nil }
+        its(:view_count) { should be nil }
+      end
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe VideoInfo::Providers::Wistia do
+describe VideoInfo::Providers::Wistia, :vcr do
   describe '.usable?' do
     subject { VideoInfo::Providers::Wistia.usable?(url) }
 
@@ -17,9 +17,9 @@ describe VideoInfo::Providers::Wistia do
   end
 
   describe '#available?' do
-    context 'with valid video', :vcr do
+    context 'with valid video' do
       video_url = 'http://fast.wistia.net/embed/iframe/rs1me54mpw'
-      subject { VideoInfo.new(video_url) }
+      subject { VideoInfo.new(video_url.freeze) }
 
       describe '#available?' do
         subject { super().available? }
@@ -27,7 +27,7 @@ describe VideoInfo::Providers::Wistia do
       end
     end
 
-    context 'with invalid video', :vcr do
+    context 'with invalid video' do
       subject { VideoInfo.new('http://fast.wistia.net/embed/iframe/no_video') }
 
       describe '#available?' do
@@ -37,7 +37,7 @@ describe VideoInfo::Providers::Wistia do
     end
   end
 
-  context 'with video rs1me54mpw', :vcr do
+  context 'with video rs1me54mpw' do
     subject { VideoInfo.new('http://fast.wistia.net/embed/iframe/rs1me54mpw') }
 
     describe '#provider' do
@@ -110,9 +110,27 @@ describe VideoInfo::Providers::Wistia do
                       '?image_crop_resized=960x540'
       it { is_expected.to eq thumbnail_url }
     end
+
+    describe '#thumbnail_large_2x' do
+      subject { super().thumbnail_large_2x }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#thumbnail_maxres' do
+      subject { super().thumbnail_maxres }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#thumbnail' do
+      subject { super().thumbnail }
+      thumbnail_url = 'https://embed-ssl.wistia.com/deliveries/' \
+                      'dc005e6a7583a25c4b7c284c08afc42fb67fdb95.jpg' \
+                      '?image_crop_resized=960x540'
+      it { is_expected.to eq thumbnail_url }
+    end
   end
 
-  context 'with video pxonqr42is', :vcr do
+  context 'with video pxonqr42is' do
     subject { VideoInfo.new('http://fast.wistia.com/embed/medias/pxonqr42is') }
 
     describe '#provider' do
@@ -149,7 +167,7 @@ describe VideoInfo::Providers::Wistia do
 
     describe '#duration' do
       subject { super().duration }
-      it { is_expected.to eq 250.0 }
+      it { is_expected.to eq 250.428 }
     end
 
     describe '#width' do
@@ -159,7 +177,7 @@ describe VideoInfo::Providers::Wistia do
 
     describe '#height' do
       subject { super().height }
-      it { is_expected.to eq 568 }
+      it { is_expected.to eq 540 }
     end
 
     describe '#thumbnail_small' do