video_info 2.6.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18c94c937caae05276816dd3ed8ebe10df074b0b
-  data.tar.gz: 61a33b65f281e74192fd355574616281b2ef2eb9
+SHA256:
+  metadata.gz: 67a6553b4f475bfa408c26ce85d767137fc96929db2408b3d63d4ef001ccf3b7
+  data.tar.gz: f13ce187227e4e9fb2b85005ff9ee2cb533d6daca85e435051a502c5ebfd8587
 SHA512:
-  metadata.gz: 06a186d5c3fea88716f226090c797a82bbee92f1180683b5963fc96684d87c37b2eb6b25b18a2016eeca714023c7c86f3c0b558dce3dbc0881bad507c4917d07
-  data.tar.gz: 99f37329ca0c12666afd6f58e9f68af88dc62fe8d62a67ec542a074569bdd1b311c1f21fd86a56eb20ee1a7be4f8a576ffdd372050f808b439e3d8bb9f69d201
+  metadata.gz: fdfc18c5585413157163efc32673fe12e25a2a6562be97135cb3c9bd5d0813ac51ed04b1b1607da2ba8c255a4a1bae622466717d0cae5b1bdc10cf16f8c72204
+  data.tar.gz: e01f5f8358321e0c2e3e777f736341449c2929cabf351f0e5d5a918113635b130c34ec6e1e023689065207094dc147b90c14fb0171fa1e9124eb9bab8bd539b7

data/.github/workflows/unit_test.yml

@@ -0,0 +1,42 @@
+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: Install bundler
+        run: |
+          gem install bundler
+      - 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,10 +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) [![Dependency Status](https://gemnasium.com/thibaudgg/video_info.svg)](https://gemnasium.com/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)
+[![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)
 
-Simple Ruby Gem to get video info from Dailymotion, VK, Vimeo, Wistia and YouTube (with playlist).
+Simple Ruby Gem to get video info from Dailymotion, 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
 --------
@@ -28,10 +28,12 @@ Usage
 
 Youtube and Vimeo have recently updated their APIs to require API keys.
 
-Scrapers has been implemented for both Youtube and Vimeo. However, the Youtube scraper can only get the date the video was posted, while the API is able to get the date and the exact time the video was posted. You may also wish to use the API to protect against potential HTML changes that could break the scrapesr.
+Scrapers has been implemented for both Youtube and Vimeo. However, the Youtube scraper can only get the date the video was posted, while the API is able to get the date and the exact time the video was posted. You may also wish to use the API to protect against potential HTML changes that could break the scrapers.
 
 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:
@@ -89,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'
@@ -161,7 +150,7 @@ You can also include an `iframe_attributes` or `url_attributes` hash to the `emb
 VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4').embed_code(iframe_attributes: { width: 800, height: 600, 'data-key' => 'value' })
 => '<iframe src="//www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen" width="800" height="600" data-key="value"></iframe>'
 
-'VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4').embed_code(url_attributes: { autoplay: 1 })
+VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4').embed_code(url_attributes: { autoplay: 1 })
 => '<iframe src="//www.youtube.com/embed/mZqGqE0D0n4?autoplay=1" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'
 ```
 
@@ -185,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}" }
@@ -50,7 +49,9 @@ class VideoInfo
   def_delegators :@provider,
                  :thumbnail_small,
                  :thumbnail_medium,
-                 :thumbnail_large
+                 :thumbnail_large,
+                 :thumbnail_large_2x,
+                 :thumbnail_maxres
   def_delegators :@provider, :embed_code, :embed_url
   def_delegators :@provider, :available?
   def_delegators :@provider, :playlist_id, :videos

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)
@@ -36,6 +37,20 @@ class VideoInfo
       !%w[403 404 400].include?(_response_code)
     end
 
+    def thumbnail
+      if defined?(thumbnail_large)
+        thumbnail_large
+      end
+    end
+
+    def thumbnail_large_2x
+      nil
+    end
+
+    def thumbnail_maxres
+      nil
+    end
+
     private
 
     def _response_code
@@ -95,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/dailymotion.rb

@@ -17,6 +17,18 @@ class VideoInfo
         define_method(method) { nil }
       end
 
+      def author
+        data['owner.screenname']
+      end
+
+      def author_url
+        data['owner.url']
+      end
+
+      def author_thumbnail
+        data['owner.avatar_60_url']
+      end
+
       def keywords
         data['tags']
       end
@@ -71,6 +83,7 @@ class VideoInfo
         "https://#{_api_base}#{_api_path}?" \
         'fields=id,title,description,duration,created_time,' \
         'url,views_total,tags,thumbnail_url,thumbnail_720_url,' \
+        'owner.url,owner.screenname,owner.avatar_60_url,' \
         'thumbnail_240_url,thumbnail_60_url'
       end
 

data/lib/video_info/providers/vimeo_api.rb

@@ -39,25 +39,16 @@ class VideoInfo
         @thumbnail_id ||= _parse_picture_id(_video['pictures']['uri'])
       end
 
-      def thumbnail(width = 200, height = nil)
-        base_uri = "https://i.vimeocdn.com/video/#{thumbnail_id}"
-        if height
-          base_uri + "_#{width}x#{height}.jpg"
-        else
-          base_uri + "_#{width}.jpg"
-        end
-      end
-
       def thumbnail_small
-        thumbnail(100, 75)
+        generate_thumbnail(100, 75)
       end
 
       def thumbnail_medium
-        thumbnail(200, 150)
+        generate_thumbnail(200, 150)
       end
 
       def thumbnail_large
-        thumbnail(640)
+        generate_thumbnail(640)
       end
 
       def keywords
@@ -78,6 +69,15 @@ class VideoInfo
 
       private
 
+      def generate_thumbnail(width = 200, height = nil)
+        base_uri = "https://i.vimeocdn.com/video/#{thumbnail_id}"
+        if height
+          base_uri + "_#{width}x#{height}.jpg"
+        else
+          base_uri + "_#{width}.jpg"
+        end
+      end
+
       def _clean_options(options)
         headers = [super, _authorization_headers, _api_version_headers]
         headers.inject(&:merge)

data/lib/video_info/providers/vimeo_scraper.rb

@@ -1,15 +1,23 @@
 require 'oga'
 require 'open-uri'
 require 'json'
+require 'openssl'
+require 'cgi'
 
 class VideoInfo
   module Providers
     module VimeoScraper
       def author
-        json_info['author']['name']
+        if available?
+          json_info['author']['name']
+        end
       end
 
       def author_thumbnail
+        unless available?
+          return nil
+        end
+
         split_point = 'window.vimeo.clip_page_config ='
         script_tags = data.css('script')
 
@@ -27,7 +35,9 @@ class VideoInfo
       end
 
       def author_url
-        json_info['author']['url']
+        if available?
+          json_info['author']['url']
+        end
       end
 
       def available?
@@ -36,9 +46,9 @@ class VideoInfo
         if data.nil?
           is_available = false
         elsif is_available
-          page_header = data.css('#page_header')
+          password_elements = data.css('.exception_title--password')
 
-          if page_header.text == "\n Private Video\n "
+          unless password_elements.empty?
             is_available = false
           end
         end
@@ -55,16 +65,24 @@ class VideoInfo
       end
 
       def date
-        upload_date = json_info['uploadDate']
-        ISO8601::DateTime.new(upload_date).to_time
+        if available?
+          upload_date = json_info['uploadDate']
+          ISO8601::DateTime.new(upload_date).to_time
+        end
       end
 
       def duration
-        duration = json_info['duration']
-        ISO8601::Duration.new(duration).to_seconds.to_i
+        if available?
+          duration = json_info['duration']
+          ISO8601::Duration.new(duration).to_seconds.to_i
+        end
       end
 
       def keywords
+        unless available?
+          return nil
+        end
+
         if json_info['keywords']
           json_info['keywords']
         else
@@ -73,31 +91,53 @@ class VideoInfo
       end
 
       def height
-        json_info['height']
+        if available?
+          json_info['height']
+        end
       end
 
       def width
-        json_info['width']
+        if available?
+          json_info['width']
+        end
       end
 
       def thumbnail_small
-        thumbnail_url.split('_')[0] + '_100x75.jpg'
+        if available?
+          thumbnail_url.split('_')[0] + '_100x75.jpg'
+        end
       end
 
       def thumbnail_medium
-        thumbnail_url.split('_')[0] + '_200x150.jpg'
+        if available?
+          thumbnail_url.split('_')[0] + '_200x150.jpg'
+        end
       end
 
       def thumbnail_large
-        thumbnail_url.split('_')[0] + '_640.jpg'
+        if available?
+          thumbnail_url.split('_')[0] + '_640.jpg'
+        end
       end
 
       def view_count
-        json_info['interactionCount']
+        if available?
+          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')
@@ -111,7 +151,17 @@ class VideoInfo
       end
 
       def thumbnail_url
-        @thumbnail_url ||= json_info['thumbnailUrl']
+        @thumbnail_url ||= remove_overlay(meta_node_value('og:image'))
+      end
+
+      def remove_overlay(url)
+        uri = URI.parse(url)
+        
+        if uri.path == '/filter/overlay'
+          CGI::parse(uri.query)['src0'][0]
+        else
+          url
+        end
       end
 
       def meta_nodes
@@ -135,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

@@ -44,6 +44,14 @@ class VideoInfo
         "https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg"
       end
 
+      def thumbnail_large_2x
+        "https://i.ytimg.com/vi/#{video_id}/sddefault.jpg"
+      end
+
+      def thumbnail_maxres
+        "https://i.ytimg.com/vi/#{video_id}/maxresdefault.jpg"
+      end
+
       private
 
       def _url_regex
@@ -58,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