video_info 2.8.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9564ba39bd175a28b2d3a012c7ae7f7b775ee9cfb48f9898b617ed90249cb5c
-  data.tar.gz: b9352efff0df637e5b7003a16b10bcb7d74a04a7c30f679deff23b8668c536d7
+  metadata.gz: d284395b3e33312982e53c42752ddd128eddb4209e1302efd4d80d680e9340be
+  data.tar.gz: 2cbe0d15902de1afd0ae88ee88f8a98a319040870c772c0e187fb6a94c99d9e8
 SHA512:
-  metadata.gz: 1e811d6b7a7f1331353ded5f0b043b4a6062186e7f39e2e9e91508b1ae9bb2cbe2b8a972f9187c53269334edf1618759b7dedc48a058fc010f21018ae1a0d804
-  data.tar.gz: f98bbc307aa03a09a9b1e7c57ec9fc716cc847785481eb8d9491eb87de0fda3d277103dbbe88cb17d072598082ee30303484b38f5549a0ddf1349f764b32811e
+  metadata.gz: c08b7769cea3b02f17133c9f7c12ab880de56361296777d3220c7ece3b9c8285edf1eab67c36f193acc6d66d08b7e64352f70ce1ebbb0ed78e727f9ba967b1c3
+  data.tar.gz: ef0efee0d8a41dba4bbd4ccd980e728242603cce3d31d72362a8869ba219d327abd52422481a26974946789358c8b0e683667fecd06f0822fab23762561cf05f

data/.github/workflows/unit_test.yml

@@ -0,0 +1,39 @@
+name: Ruby Unit Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Cache gems
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-gems
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: Set bundle config path
+        run: |
+          bundle config path vendor/bundle
+      - name: Install dependencies
+        run: |
+          bundle install
+      - name: Ruby Unit tests
+        run: |
+          bundle exec rspec

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at http://github.com/guard/guard#readme
 
-guard 'rspec', keep_failed: false do
+guard 'rspec', cmd: "bundle exec rspec" do
   watch('spec/spec_helper.rb') { 'spec' }
   watch(%r{lib/(.+)\.rb})      { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{spec/.+_spec\.rb})

data/README.md

@@ -1,12 +1,10 @@
 # VideoInfo
 
-[![Gem Version](https://badge.fury.io/rb/video_info.svg)](http://badge.fury.io/rb/video_info) [![Build Status](https://travis-ci.org/thibaudgg/video_info.svg?branch=master)](https://travis-ci.org/thibaudgg/video_info) [![Code Climate](https://codeclimate.com/github/thibaudgg/video_info.svg)](https://codeclimate.com/github/thibaudgg/video_info) [![Coverage Status](https://coveralls.io/repos/thibaudgg/video_info/badge.svg?branch=master)](https://coveralls.io/r/thibaudgg/video_info) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![Gem Version](https://badge.fury.io/rb/video_info.svg)](http://badge.fury.io/rb/video_info) [![Build Status](https://github.com/thibaudgg/video_info/workflows/Ruby%20Unit%20Tests/badge.svg?branch=master)](https://github.com/thibaudgg/video_info/actions?query=workflow%3A%22Ruby+Unit+Tests%22) [![Code Climate](https://codeclimate.com/github/thibaudgg/video_info.svg)](https://codeclimate.com/github/thibaudgg/video_info) [![Coverage Status](https://coveralls.io/repos/thibaudgg/video_info/badge.svg?branch=master)](https://coveralls.io/r/thibaudgg/video_info) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
-:exclamation: VideoInfo is no more actively maintained, please [contact me](mailto:thibaud@thibaud.gg) if you're interested in helping.
+Simple Ruby Gem to get video info from Dailymotion, Vimeo, Wistia and YouTube (with playlist).
 
-Simple Ruby Gem to get video info from Dailymotion, VK, Vimeo, Wistia and YouTube (with playlist).
-
-Tested against Ruby 2.3.0, 2.2.4, and the latest versions of JRuby & Rubinius.
+Tested against Ruby 2.5.x, 2.6.x and 2.7.x.
 
 Features
 --------
@@ -34,6 +32,8 @@ Scrapers has been implemented for both Youtube and Vimeo. However, the Youtube s
 
 To get a Youtube API key, [follow the instructions here](https://developers.google.com/youtube/registering_an_application)
 
+After generating a Youtube API key it is necessary to enable the YouTube Data API for the project which your API key was generated [enable Youtube Data API here](https://console.developers.google.com/apis/library/youtube.googleapis.com)
+
 To get a Vimeo API key, [follow the instructions here](https://developer.vimeo.com/api/start)
 
 To set the API keys, do the following:
@@ -91,19 +91,6 @@ video = VideoInfo.new("http://fast.wistia.com/embed/medias/pxonqr42is")
 # video.embed_url        => '//fast.wistia.net/embed/iframe/pxonqr42is'
 # video.embed_code       => "<iframe src='//fast.wistia.net/embed/iframe/pxonqr42is' frameborder='0'></iframe>"
 
-video = VideoInfo.new('http://vk.com/video39576223_108370515')
-# video.available?       => true
-# video.provider         => "Vkontakte"
-# video.video_id         => "108370515"
-# video.author           => "Alexander Maslov"
-# video.author_thumbnail => "https://pp.vk.me/c624521/v624521223/3c288/lVcVW7LNnrQ.jpg"
-# video.author_url       => "https://vk.com/videos39576223"
-# video.title            => "Я уточка)))))"
-# video.description      => "это ВЗРЫВ МОЗГА!!!<br>Просто отвал башки..."
-# video.duration         => 183 (in seconds)
-# video.embed_url        => "//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af"
-# video.embed_code       => "<iframe src=\"//vk.com/video_ext.php?oid=39576223&id=108370515&hash=15184dbd085c47af\" frameborder=\"0\" allowfullscreen=\"allowfullscreen\"></iframe>"
-
 video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
 # video.available?       => true
 # video.video_id         => 'mZqGqE0D0n4'
@@ -187,9 +174,9 @@ Author
 Maintainers
 -----------
 
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg))
-
-[Vincent Heuken](https://github.com/vheuken) ([@vheuken](https://github.com/vheuken))
+- [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg))
+- [Vincent Heuken](https://github.com/vheuken) ([@vheuken](https://github.com/vheuken))
+- [João Vieira](https://github.com/joaocv3) ([@joaocv3](https://github.com/joaocv3))
 
 Contributors
 ------------

data/lib/video_info.rb

@@ -10,8 +10,7 @@ class VideoInfo
   class HttpError < Error; end
 
   class << self
-    attr_writer :logger
-    attr_accessor :disable_providers, :provider_api_keys
+    attr_writer :logger, :disable_providers
 
     def disable_providers
       @disable_providers || []
@@ -38,7 +37,7 @@ class VideoInfo
   extend Forwardable
 
   PROVIDERS = %w[
-    Dailymotion Vkontakte Wistia
+    Dailymotion Wistia
     Vimeo Youtube YoutubePlaylist
   ].freeze
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }

data/lib/video_info/provider.rb

@@ -4,7 +4,8 @@ require 'uri'
 
 class VideoInfo
   class Provider
-    attr_accessor :url, :options, :iframe_attributes, :video_id, :data
+    attr_accessor :url, :options, :iframe_attributes, :video_id
+    attr_writer :data
 
     def initialize(url, options = {})
       @options = _clean_options(options)
@@ -109,7 +110,7 @@ class VideoInfo
     end
 
     def _set_data_from_api_impl(api_url)
-      uri = open(api_url, options)
+      uri = URI.open(api_url, options)
       JSON.load(uri.read)
     end
 

data/lib/video_info/providers/vimeo_scraper.rb

@@ -122,12 +122,22 @@ class VideoInfo
 
       def view_count
         if available?
-          json_info['interactionCount']
+          user_interaction_count(interaction_type: "http://schema.org/WatchAction")
         end
       end
 
       private
 
+      def user_interaction_count(interaction_type:)
+        interaction_statistic.find do |stat|
+          stat["interactionType"] == interaction_type
+        end["userInteractionCount"]
+      end
+
+      def interaction_statistic
+        json_info["interactionStatistic"]
+      end
+
       def json_info
         @json_info ||= JSON.parse(data.css('script').detect do |n|
           type = n.attr('type')
@@ -175,7 +185,7 @@ class VideoInfo
       end
 
       def _set_data_from_api_impl(api_url)
-        Oga.parse_html(open(api_url.to_s).read)
+        Oga.parse_html(URI.open(api_url.to_s).read)
 
       rescue OpenURI::HTTPError
         nil

data/lib/video_info/providers/youtube.rb

@@ -66,6 +66,10 @@ class VideoInfo
       def _default_url_attributes
         {}
       end
+
+      def resize_thumb(url, size)
+        url.gsub(/(https:\/\/yt3.ggpht.com\/.*\/.*=s)([0-9]*)(.*)/, "\\1#{size}\\3")
+      end
     end
   end
 end

data/lib/video_info/providers/youtube_api.rb

@@ -83,7 +83,7 @@ class VideoInfo
 
       def _channel_info
         channel_url = _channel_api_url(_video_snippet['channelId'])
-        @_channel_info ||=  JSON.load(open(channel_url).read)
+        @_channel_info ||=  JSON.load(URI.open(channel_url).read)
       end
 
       def _channel_snippet

data/lib/video_info/providers/youtube_scraper.rb

@@ -5,8 +5,12 @@ require 'net_http_timeout_errors'
 class VideoInfo
   module Providers
     module YoutubeScraper
+      BASE_URL = "https://www.youtube.com"
+      CHANNEL_URL = "#{BASE_URL}/channel/"
+      THUMB_DEFAULT_SIZE = 88
+
       def available?
-        data.css('div#unavailable-submessage').text.strip.empty?
+        !!title
       end
 
       def date
@@ -16,20 +20,25 @@ class VideoInfo
       end
 
       def author
-        data.css('.yt-user-info')[0].css('a').text
+        meta_node_value(channel_meta_nodes, 'og:title')
       end
 
       def author_thumbnail
-        data.css('.yt-thumb-clip')[0].css('img').attr('data-thumb')[0].value
+        image_hq_url = meta_node_value(channel_meta_nodes, 'og:image')
+
+        resize_thumb(image_hq_url, THUMB_DEFAULT_SIZE)
+      end
+
+      def channel_id
+        itemprop_node_value('channelId')
       end
 
       def author_url
-        path = data.css('.yt-user-info')[0].css('a')[0].attr('href').value
-        'https://www.youtube.com' + path
+        URI.join(CHANNEL_URL, channel_id).to_s
       end
 
       def description
-        meta_node_value('description')
+        meta_node_value(video_meta_nodes, 'og:description')
       end
 
       def duration
@@ -43,7 +52,9 @@ class VideoInfo
       end
 
       def keywords
-        value = meta_node_value('keywords')
+        return unless available?
+
+        value = meta_node_value(video_meta_nodes, 'keywords')
 
         value.split(', ') if value
       end
@@ -53,35 +64,41 @@ class VideoInfo
       end
 
       def view_count
-        data.css('div.watch-view-count').text.gsub(/\D/, '').to_i
+        itemprop_node_value('interactionCount').to_i
       end
 
       private
 
-      def meta_nodes
-        @meta_nodes ||= data.css('meta')
+      def video_meta_nodes
+        @video_meta_nodes ||= data.css('meta')
       end
 
-      def meta_node_value(name)
-        if available?
-          node = meta_nodes.detect do |n|
-            n.attr('name') && n.attr('name').value == name
-          end
+      def channel_meta_nodes
+        @channel_meta_nodes ||= channel_data.css('meta')
+      end
 
-          node && node.attr('content') && node.attr('content').value
+      def channel_data
+        @channel_data ||= Oga.parse_html(URI.open(author_url).read)
+      end
+
+      def meta_node_value(meta_nodes=video_meta_nodes, name)
+        node = meta_nodes.detect do |n|
+          n.attr('name')&.value == name || n.attr('property')&.value == name
         end
+
+        return unless node
+        node && node.attr('content') && node.attr('content').value
       end
 
       def itemprop_node_value(name)
-        if available?
-          node = meta_nodes.detect do |m|
-            itemprop_attr = m.attr('itemprop')
+        node = video_meta_nodes.detect do |m|
+          itemprop_attr = m.attr('itemprop')
 
-            itemprop_attr.value == name if itemprop_attr
-          end
-
-          node.attr('content').value
+          itemprop_attr.value == name if itemprop_attr
         end
+
+        return unless node
+        node.attr('content').value
       end
 
       def _set_data_from_api_impl(api_url)
@@ -89,9 +106,9 @@ class VideoInfo
         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)
+          Oga.parse_html(URI.open(new_url).read)
         else
-          Oga.parse_html(open(api_url).read)
+          Oga.parse_html(URI.open(api_url).read)
         end
       end
 

data/lib/video_info/providers/youtubeplaylist_api.rb

@@ -1,5 +1,7 @@
 class VideoInfo
   module YoutubePlaylistAPI
+    ITEMS_MAX_RESULTS = 50
+
     def available?
       !data['items'].empty?
     rescue VideoInfo::HttpError
@@ -28,6 +30,10 @@ class VideoInfo
       nil
     end
 
+    def thumbnail
+      thumbnail_small
+    end
+
     def thumbnail_small
       _video_snippet['thumbnails']['default']['url']
     end
@@ -40,6 +46,14 @@ class VideoInfo
       _video_snippet['thumbnails']['high']['url']
     end
 
+    def thumbnail_large_2x
+      _video_snippet['thumbnails']['standard']['url']
+    end
+
+    def thumbnail_maxres
+      _video_snippet['thumbnails']['maxres']['url']
+    end
+
     private
 
     def _playlist_entry
@@ -56,7 +70,7 @@ class VideoInfo
 
     def _playlist_items_api_path
       '/youtube/v3/playlistItems?part=snippet&' \
-      "playlistId=#{playlist_id}&fields=items&key=#{api_key}"
+      "playlistId=#{playlist_id}&fields=items&maxResults=#{ITEMS_MAX_RESULTS}&key=#{api_key}"
     end
 
     def _playlist_items_api_url

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.8.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

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

@@ -18,12 +18,18 @@ http_interactions:
       code: 404
       message: Not Found
     headers:
+      Content-Security-Policy-Report-Only:
+      - 'default-src https: blob: wss: data: android-webview-video-poster: android-webview:
+        chrome-extension: safari-extension: ''unsafe-eval'' ''unsafe-inline''; report-uri
+        https://www.dailymotion.com/content_security_policy_report_uri'
       Server:
       - DMS/1.0.42
       X-Dm-Api-Object:
       - video
       X-Dm-Backnode:
-      - web-292.adm.dc3.dailymotion.com:80
+      - web-118.adm.ix7.dailymotion.com:80
+      Vary:
+      - X-DM-SSL
       X-Dm-Api-Method:
       - info
       Cache-Control:
@@ -33,61 +39,44 @@ http_interactions:
       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
+      Content-Security-Policy:
+      - upgrade-insecure-requests
+      Date:
+      - Tue, 27 Oct 2020 10:44:15 GMT
       X-Dm-Lb-Ip:
       - 195.8.215.129
       Expires:
       - Fri, 01 Jan 2010 05:00:00 GMT
       X-Dm-Lb-Name:
-      - lb-10
+      - lb-03
       X-Dm-Random-Number:
-      - '6415713'
+      - '8780791'
       Access-Control-Allow-Origin:
       - "*"
       X-Dm-Backnode-Response-Time:
-      - '20'
+      - '31'
       X-Robots-Tag:
       - noindex
       X-Frame-Options:
       - DENY
+      Expect-Ct:
+      - max-age=0, report-uri="https://www.dailymotion.com/content_security_policy_report_uri"
+      X-Dm-Cache-Status:
+      - MISS
       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:
-      - d02f485cb1cc8d04e4842ee96ea037a8730d6692b5c01d60c144465f63874988
-      Content-Length:
-      - '206'
-      Accept-Ranges:
-      - bytes
-      Date:
-      - Mon, 27 Mar 2017 21:00:49 GMT
-      Age:
-      - '0'
-      Connection:
-      - keep-alive
-      X-Served-By:
-      - cache-fra1251-FRA, cache-lax8639-LAX
-      X-Cache:
-      - MISS, MISS
-      X-Cache-Hits:
-      - 0, 0
-      X-Timer:
-      - S1490648449.314252,VS0,VE179
-      Vary:
-      - X-DM-EC-Geo-Country
-      X-Dm-Cache-Status:
-      - MISS
+      Referrer-Policy:
+      - no-referrer-when-downgrade
       X-Dm-Edge:
-      - Fastly
+      - DMParis
+      Content-Length:
+      - '265'
     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: Mon, 27 Mar 2017 21:00:49 GMT
+        find object video for `id'' parameter","type":"not_found","error_data":{"reason":"object_not_found","object_type":"video","object_id":"inValIdiD","param":"id"}}}'
+    http_version:
+  recorded_at: Tue, 27 Oct 2020 10:44:15 GMT
 recorded_with: VCR 3.0.3