video_info 2.6.0 → 2.6.1

data/lib/video_info/providers/youtube_scraper.rb

@@ -8,7 +8,20 @@ class VideoInfo
       def date
         date = itemprop_node_value('datePublished')
 
-        Time.parse(date) unless !date
+        Time.parse(date) if date
+      end
+
+      def author
+        data.css('.yt-user-info')[0].css('a').text
+      end
+
+      def author_thumbnail
+        data.css('.yt-thumb-clip')[0].css('img').attr('data-thumb')[0].value
+      end
+
+      def author_url
+        path = data.css('.yt-user-info')[0].css('a')[0].attr('href').value
+        'https://www.youtube.com' + path
       end
 
       def description
@@ -28,7 +41,7 @@ class VideoInfo
       def keywords
         value = meta_node_value('keywords')
 
-        value.split(', ') unless !value
+        value.split(', ') if value
       end
 
       def title
@@ -58,7 +71,7 @@ class VideoInfo
           node = meta_nodes.detect do |m|
             itemprop_attr = m.attr('itemprop')
 
-            itemprop_attr.value == name unless !itemprop_attr
+            itemprop_attr.value == name if itemprop_attr
           end
 
           node.attr('content').value
@@ -70,25 +83,26 @@ class VideoInfo
       end
 
       def _set_data_from_api_impl(api_url)
-        uri = URI(api_url)
-
-        unless uri.scheme
-          uri.path = uri.path.prepend('//')
-          uri.scheme = 'http'
-        end
-
         # handle fullscreen video URLs
         if url.include?('.com/v/')
           video_id = url.split('/v/')[1].split('?')[0]
           new_url = 'https://www.youtube.com/watch?v=' + video_id
           Oga.parse_html(open(new_url).read)
         else
-          Oga.parse_html(open(uri.to_s, allow_redirections: :safe).read)
+          Oga.parse_html(open(api_url).read)
         end
       end
 
       def _api_url
-        @url
+        uri = URI.parse(@url)
+
+        unless uri.scheme
+          uri.path = uri.path.prepend('//')
+        end
+
+        uri.scheme = 'https'
+
+        uri.to_s
       end
     end
   end

data/lib/video_info/providers/youtubeplaylist.rb

@@ -18,7 +18,8 @@ class VideoInfo
       end
 
       def self.usable?(url)
-        url =~ /((youtube\.com)\/playlist)|((youtube\.com)\/embed\/videoseries)/
+        url =~ %r{((youtube\.com)\/playlist)|
+                  ((youtube\.com)\/embed\/videoseries)}x
       end
 
       def date
@@ -48,7 +49,9 @@ class VideoInfo
       private
 
       def _url_regex
-        /youtube.com\/playlist\?p=(\S*)|youtube.com\/playlist\?list=(\S*)|youtube.com\/embed\/videoseries\?list=([a-zA-Z0-9-]*)/
+        %r{youtube.com\/playlist\?p=(\S*)|
+          youtube.com\/playlist\?list=(\S*)|
+          youtube.com\/embed\/videoseries\?list=([a-zA-Z0-9-]*)}x
       end
     end
   end

data/lib/video_info/providers/youtubeplaylist_api.rb

@@ -1,5 +1,11 @@
 class VideoInfo
   module YoutubePlaylistAPI
+    def available?
+      !data['items'].empty?
+    rescue VideoInfo::HttpError
+      false
+    end
+
     def description
       data['items'][0]['snippet']['description']
     end
@@ -49,7 +55,8 @@ class VideoInfo
     end
 
     def _playlist_items_api_path
-      "/youtube/v3/playlistItems?part=snippet&playlistId=#{playlist_id}&fields=items&key=#{api_key}"
+      '/youtube/v3/playlistItems?part=snippet&' \
+      "playlistId=#{playlist_id}&fields=items&key=#{api_key}"
     end
 
     def _playlist_items_api_url

data/lib/video_info/providers/youtubeplaylist_scraper.rb

@@ -1,6 +1,4 @@
 require 'oga'
-require 'open-uri'
-require 'open_uri_redirections'
 
 class VideoInfo
   module Providers
@@ -17,8 +15,23 @@ class VideoInfo
         nil
       end
 
+      def author
+        data.css('.channel-header-profile-image').attr('title')[0].value
+      end
+
+      def author_thumbnail
+        data.css('.channel-header-profile-image').attr('src')[0].value
+      end
+
+      def author_url
+        element = data.css('.channel-header-profile-image-container')
+        'https://www.youtube.com' + element.attr('href')[0].value
+      end
+
       def videos
-        raise(NotImplementedError, 'To access videos, you must provide an API key to VideoInfo.provider_api_keys')
+        raise(NotImplementedError,
+              'To access videos, you must provide an API key ' \
+              'to VideoInfo.provider_api_keys')
       end
 
       def view_count

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'.freeze
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_invalid_video_url/_available_/1_2_2_1_1.yml

@@ -0,0 +1,89 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/inValIdiD
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Api-Object:
+      - video
+      X-Dm-Backnode:
+      - 10.194.151.108:80
+      X-Dm-Api-Method:
+      - info
+      Cache-Control:
+      - no-cache, must-revalidate, stale-if-error=900
+      Content-Type:
+      - application/json; charset=UTF-8
+      Access-Control-Expose-Headers:
+      - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
+        X-DM-BackNode-Response-Time
+      X-Dm-Lb-Ip:
+      - 195.8.215.129
+      Expires:
+      - Fri, 01 Jan 2010 05:00:00 GMT
+      X-Dm-Lb-Name:
+      - lb-09
+      X-Dm-Random-Number:
+      - '2083301'
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Dm-Backnode-Response-Time:
+      - '22'
+      X-Robots-Tag:
+      - noindex
+      Access-Control-Allow-Headers:
+      - Content-Type, Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
+      X-Dm-Page:
+      - us.rest.rest_api
+      Via:
+      - 1.1 varnish
+      - 1.1 varnish
+      Fastly-Debug-Digest:
+      - 1f140405cf79803f1e28a389edd8ca212ce1e285b54a58fb8a17474780cac6a2
+      Content-Length:
+      - '206'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 May 2016 01:01:43 GMT
+      Age:
+      - '0'
+      Connection:
+      - keep-alive
+      X-Served-By:
+      - cache-fra1232-FRA, cache-sjc3135-SJC
+      X-Cache:
+      - MISS, MISS
+      X-Cache-Hits:
+      - 0, 0
+      Vary:
+      - X-DM-EC-Geo-Country
+      X-Dm-Cache-Status:
+      - MISS
+      X-Dm-Edge:
+      - Fastly
+    body:
+      encoding: UTF-8
+      string: '{"error":{"more_info":"https:\/\/developer.dailymotion.com\/api#error-codes","code":404,"message":"Can''t
+        find object video for `id'' parameter","type":"not_found","error_data":{"reason":"object_not_found"}}}'
+    http_version: 
+  recorded_at: Thu, 05 May 2016 01:01:43 GMT
+recorded_with: VCR 3.0.1

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_valid_video/_available_/1_2_1_1_1.yml

@@ -0,0 +1,92 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/x7lni3
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Api-Object:
+      - video
+      X-Dm-Backnode:
+      - 10.190.2.132:80
+      X-Dm-Api-Method:
+      - info
+      Cache-Control:
+      - public, max-age=900, stale-if-error=900
+      Content-Type:
+      - application/json; charset=UTF-8
+      Access-Control-Expose-Headers:
+      - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
+        X-DM-BackNode-Response-Time
+      X-Dm-Lb-Ip:
+      - 195.8.215.129
+      X-Dm-Tg:
+      - v-x7lni3
+      X-Dm-Lb-Name:
+      - lb-10
+      X-Dm-Random-Number:
+      - '5983493'
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Dm-Backnode-Response-Time:
+      - '34'
+      Etag:
+      - W/"rQeFNlJ5iMPO8gmsSDhiVw-gzip"
+      X-Robots-Tag:
+      - noindex
+      Last-Modified:
+      - Tue, 19 May 2015 07:03:39 GMT
+      Access-Control-Allow-Headers:
+      - Content-Type, Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
+      X-Dm-Page:
+      - us.rest.rest_api
+      Via:
+      - 1.1 varnish
+      - 1.1 varnish
+      Fastly-Debug-Digest:
+      - 5156934e90466ffd0e4642c50195b7206345d38887e9d445fa00692b2f902722
+      Content-Length:
+      - '103'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 May 2016 01:01:43 GMT
+      Age:
+      - '0'
+      Connection:
+      - keep-alive
+      X-Served-By:
+      - cache-fra1249-FRA, cache-sjc3125-SJC
+      X-Cache:
+      - MISS, MISS
+      X-Cache-Hits:
+      - 0, 0
+      Vary:
+      - X-DM-EC-Geo-Country, Accept-Encoding
+      X-Dm-Cache-Status:
+      - MISS
+      X-Dm-Edge:
+      - Fastly
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","channel":"fun","owner":"x4r137"}'
+    http_version: 
+  recorded_at: Thu, 05 May 2016 01:01:43 GMT
+recorded_with: VCR 3.0.1

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/with_video_x7lni3/_date/should_show_correct_date.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/x7lni3?fields=id,title,description,duration,created_time,url,views_total,tags,thumbnail_url,thumbnail_720_url,thumbnail_240_url,thumbnail_60_url
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.6.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Api-Object:
+      - video
+      X-Dm-Backnode:
+      - 10.190.2.38:80
+      X-Dm-Api-Method:
+      - info
+      Cache-Control:
+      - public, max-age=900, stale-if-error=900
+      Content-Type:
+      - application/json; charset=UTF-8
+      Access-Control-Expose-Headers:
+      - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
+        X-DM-BackNode-Response-Time
+      X-Dm-Lb-Ip:
+      - 195.8.215.129
+      X-Dm-Tg:
+      - v-x7lni3
+      X-Dm-Lb-Name:
+      - lb-10
+      X-Dm-Random-Number:
+      - '7329818'
+      Access-Control-Allow-Origin:
+      - "*"
+      Etag:
+      - W/"rQeFNlJ5iMPO8gmsSDhiVw-gzip"
+      X-Robots-Tag:
+      - noindex
+      Last-Modified:
+      - Tue, 19 May 2015 07:03:39 GMT
+      Access-Control-Allow-Headers:
+      - Content-Type, Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
+      X-Dm-Page:
+      - us.rest.rest_api
+      Via:
+      - 1.1 varnish
+      - 1.1 varnish
+      Fastly-Debug-Digest:
+      - 3553012804c358303689e11ec92c5f0012bb9c79e3360e85b4454ccedf666ef9
+      Content-Length:
+      - '441'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 May 2016 01:01:44 GMT
+      Age:
+      - '0'
+      Connection:
+      - keep-alive
+      X-Served-By:
+      - cache-fra1238-FRA, cache-sjc3131-SJC
+      X-Cache:
+      - MISS, HIT
+      X-Cache-Hits:
+      - 0, 1
+      Vary:
+      - X-DM-EC-Geo-Country, Accept-Encoding
+      X-Dm-Backnode-Response-Time:
+      - '0'
+      X-Dm-Cache-Status:
+      - HIT
+      X-Dm-Edge:
+      - Fastly
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","description":"Super
+        R\u00e9mi Kart est un jeu vid\u00e9o de course d\u00e9velopp\u00e9 et \u00e9dit\u00e9
+        par N''Importe Quoi TV. Sa principale originalit\u00e9 vient de sa r\u00e9alit\u00e9...<br
+        \/>L''aventure continue sur www.nimportequi.com","duration":136,"created_time":1228321771,"url":"http:\/\/www.dailymotion.com\/video\/x7lni3_mario-kart-remi-gaillard_fun","views_total":10300359,"tags":["r\u00e9mi","remi","gaillard","imposteur","imposture","mario","bros","kart","nintendo","jeux"],"thumbnail_url":"http:\/\/s2.dmcdn.net\/BgWxI.jpg","thumbnail_720_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x720-YcV.jpg","thumbnail_240_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x240-b83.jpg","thumbnail_60_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x60-kbf.jpg"}'
+    http_version: 
+  recorded_at: Thu, 05 May 2016 01:01:44 GMT
+recorded_with: VCR 3.0.1

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/with_video_x7lni3/_description/1_3_7_1.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/x7lni3?fields=id,title,description,duration,created_time,url,views_total,tags,thumbnail_url,thumbnail_720_url,thumbnail_240_url,thumbnail_60_url
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.6.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Api-Object:
+      - video
+      X-Dm-Backnode:
+      - 10.190.2.38:80
+      X-Dm-Api-Method:
+      - info
+      Cache-Control:
+      - public, max-age=900, stale-if-error=900
+      Content-Type:
+      - application/json; charset=UTF-8
+      Access-Control-Expose-Headers:
+      - Date, X-DM-BackNode-Response-Time, X-DM-Edge, X-DM-Cache-Status, X-Served-By,
+        X-DM-BackNode-Response-Time
+      X-Dm-Lb-Ip:
+      - 195.8.215.129
+      X-Dm-Tg:
+      - v-x7lni3
+      X-Dm-Lb-Name:
+      - lb-10
+      X-Dm-Random-Number:
+      - '7329818'
+      Access-Control-Allow-Origin:
+      - "*"
+      Etag:
+      - W/"rQeFNlJ5iMPO8gmsSDhiVw-gzip"
+      X-Robots-Tag:
+      - noindex
+      Last-Modified:
+      - Tue, 19 May 2015 07:03:39 GMT
+      Access-Control-Allow-Headers:
+      - Content-Type, Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
+      X-Dm-Page:
+      - us.rest.rest_api
+      Via:
+      - 1.1 varnish
+      - 1.1 varnish
+      Fastly-Debug-Digest:
+      - 3553012804c358303689e11ec92c5f0012bb9c79e3360e85b4454ccedf666ef9
+      Content-Length:
+      - '441'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Thu, 05 May 2016 01:01:44 GMT
+      Age:
+      - '0'
+      Connection:
+      - keep-alive
+      X-Served-By:
+      - cache-fra1238-FRA, cache-sjc3128-SJC
+      X-Cache:
+      - MISS, HIT
+      X-Cache-Hits:
+      - 0, 1
+      Vary:
+      - X-DM-EC-Geo-Country, Accept-Encoding
+      X-Dm-Backnode-Response-Time:
+      - '0'
+      X-Dm-Cache-Status:
+      - HIT
+      X-Dm-Edge:
+      - Fastly
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","description":"Super
+        R\u00e9mi Kart est un jeu vid\u00e9o de course d\u00e9velopp\u00e9 et \u00e9dit\u00e9
+        par N''Importe Quoi TV. Sa principale originalit\u00e9 vient de sa r\u00e9alit\u00e9...<br
+        \/>L''aventure continue sur www.nimportequi.com","duration":136,"created_time":1228321771,"url":"http:\/\/www.dailymotion.com\/video\/x7lni3_mario-kart-remi-gaillard_fun","views_total":10300359,"tags":["r\u00e9mi","remi","gaillard","imposteur","imposture","mario","bros","kart","nintendo","jeux"],"thumbnail_url":"http:\/\/s2.dmcdn.net\/BgWxI.jpg","thumbnail_720_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x720-YcV.jpg","thumbnail_240_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x240-b83.jpg","thumbnail_60_url":"http:\/\/s2.dmcdn.net\/BgWxI\/x60-kbf.jpg"}'
+    http_version: 
+  recorded_at: Thu, 05 May 2016 01:01:43 GMT
+recorded_with: VCR 3.0.1