video_info 2.7.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33e589b59664cc725646602f9f4dc20466fdc7376e2d280abdc8e358c954fca
-  data.tar.gz: edecc4f652cfa5bc6bf6850a0d2d7b618807f49a8cc8c923d5c76044cd2f053b
+  metadata.gz: f960d9a256e4190a6ebde694ff7f73aa630c69e82d2b76d1caed6dca392e27e0
+  data.tar.gz: 8b8eae4ca13fd6db5afddc9de44ceb8ae4d7a0ca2508d9da7b5dd80c76b2210a
 SHA512:
-  metadata.gz: 76792e4998b6e08fba07d67168d049cc4e75261df446d849e4f7bc02965c8a1902e00959a4d42ff5d930d7516d86fdb722db937f2060c5d24a8ce9c0b065fb3b
-  data.tar.gz: dc4b9426882439bb7e662043a85285528e95b0fb66c3ca2cc59c894cdf0968db3c6183ee6a8070f292bf7fc75217b7b3fe89720d8b8b717ed00a30c6b8fe2265
+  metadata.gz: 3806b4f8e3f44c852c2adda8183fed0cd007d18c67647b59ed702be8ae8aa64e002bb019fbf6f1d54d4d61f0410924dddfca9315a74bb982994f0f8d2392d726
+  data.tar.gz: c3b416a326ec07d0c692d35e8dd0be5ef3024368d2f79c41f86e5ac7595259eb16aeb59f78d74a918e8ff5b5d838c160001f1abd1b2d049226b4e6ca727ded50

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) [![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)
 
-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
 --------
@@ -32,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:
@@ -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'
@@ -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/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)
@@ -42,6 +43,14 @@ class VideoInfo
       end
     end
 
+    def thumbnail_large_2x
+      nil
+    end
+
+    def thumbnail_maxres
+      nil
+    end
+
     private
 
     def _response_code
@@ -101,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_api.rb

@@ -1,6 +1,8 @@
 class VideoInfo
   module Providers
     module VimeoAPI
+      THUMBNAIL_LINK_REGEX = /.*\/(\d+\-[^_]+)/
+
       def api_key
         VideoInfo.provider_api_keys[:vimeo]
       end
@@ -23,7 +25,7 @@ class VideoInfo
 
       def author_thumbnail_id
         author_uri = _video['user']['pictures']['uri']
-        @author_thumbnail_id ||= _parse_picture_id(author_uri)
+        @author_thumbnail_id ||= parse_picture_id_from_user(author_uri)
       end
 
       def author_url
@@ -36,7 +38,7 @@ class VideoInfo
       end
 
       def thumbnail_id
-        @thumbnail_id ||= _parse_picture_id(_video['pictures']['uri'])
+        @thumbnail_id ||= parse_picture_id(_video.dig("pictures", "sizes").first["link"])
       end
 
       def thumbnail_small
@@ -111,9 +113,13 @@ class VideoInfo
         "https://#{_api_base}#{_api_path}"
       end
 
-      def _parse_picture_id(uri)
+      def parse_picture_id_from_user (uri)
         %r{\/pictures\/(\d+)}.match(uri)[1]
       end
+
+      def parse_picture_id(uri)
+        uri.match(THUMBNAIL_LINK_REGEX)[1]
+      end
     end
   end
 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

@@ -44,6 +44,10 @@ 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
@@ -62,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,8 +83,7 @@ class VideoInfo
 
       def _channel_info
         channel_url = _channel_api_url(_video_snippet['channelId'])
-        @channel_data ||= open(channel_url)
-        JSON.load(@channel_data.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,45 +52,54 @@ 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
 
       def title
+        return if meta_node_value('title').empty?
         meta_node_value('title')
       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 +107,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.7.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

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}" }
@@ -51,6 +50,7 @@ class VideoInfo
                  :thumbnail_small,
                  :thumbnail_medium,
                  :thumbnail_large,
+                 :thumbnail_large_2x,
                  :thumbnail_maxres
   def_delegators :@provider, :embed_code, :embed_url
   def_delegators :@provider, :available?

data/tmp/rspec_guard_result

@@ -0,0 +1,25 @@
+104 examples, 24 failures in 42.5583 seconds
+./spec/lib/video_info/providers/dailymotion_spec.rb:134
+./spec/lib/video_info/providers/dailymotion_spec.rb:139
+./spec/lib/video_info/providers/dailymotion_spec.rb:144
+./spec/lib/video_info/providers/dailymotion_spec.rb:159
+./spec/lib/video_info/providers/vimeo_spec.rb:108
+./spec/lib/video_info/providers/vimeo_spec.rb:115
+./spec/lib/video_info/providers/vimeo_spec.rb:120
+./spec/lib/video_info/providers/vimeo_spec.rb:128
+./spec/lib/video_info/providers/vimeo_spec.rb:133
+./spec/lib/video_info/providers/vimeo_spec.rb:138
+./spec/lib/video_info/providers/vimeo_spec.rb:143
+./spec/lib/video_info/providers/vimeo_spec.rb:152
+./spec/lib/video_info/providers/vimeo_spec.rb:158
+./spec/lib/video_info/providers/vimeo_spec.rb:164
+./spec/lib/video_info/providers/vimeo_spec.rb:180
+./spec/lib/video_info/providers/vimeo_spec.rb:197
+./spec/lib/video_info/providers/vimeo_spec.rb:202
+./spec/lib/video_info/providers/vimeo_spec.rb:207
+./spec/lib/video_info/providers/vimeo_spec.rb:212
+./spec/lib/video_info/providers/vimeo_spec.rb:308
+./spec/lib/video_info/providers/vimeo_spec.rb:309
+./spec/lib/video_info/providers/vimeo_spec.rb:310
+./spec/lib/video_info/providers/vimeo_spec.rb:311
+./spec/lib/video_info/providers/vimeo_spec.rb:54

data/video_info.gemspec

@@ -11,21 +11,20 @@ Gem::Specification.new do |s|
   s.author       = 'Thibaud Guillaume-Gentil'
   s.email        = 'thibaud@thibaud.gg'
   s.homepage     = 'https://rubygems.org/gems/video_info'
-  s.summary      = 'Dailymotion, Vimeo, VK and YouTube info parser.'
-  s.description  = 'Get video info from Dailymotion, Vimeo, VK and YouTube url.'
+  s.summary      = 'Dailymotion, Vimeo and YouTube info parser.'
+  s.description  = 'Get video info from Dailymotion, Vimeo and YouTube url.'
 
-  s.files        = `git ls-files`.split($/)
-  s.test_files   = s.files.grep(%r{^spec/})
+  s.files        = `git ls-files`.split($/).reject { |x| x.match?(%r{^spec/}) }
   s.require_path = 'lib'
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_dependency 'iso8601', '~> 0.9.1'
   s.add_dependency 'oga', '~> 3.0'
   s.add_dependency 'net_http_timeout_errors', '~> 0.3.0'
 
   s.add_development_dependency 'bundler', '>= 1.3.5'
-  s.add_development_dependency 'rake', '~> 11.1'
+  s.add_development_dependency 'rake', '>= 12.3.3'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rspec-its', '~> 1.2'
   s.add_development_dependency 'rubocop', '~> 0.37'