video_info 3.0.2 → 4.2.0

data/lib/video_info/providers/youtube_scraper.rb

@@ -1,6 +1,5 @@
-require 'oga'
-require 'open-uri'
-require 'net_http_timeout_errors'
+require "oga"
+require "net_http_timeout_errors"
 
 class VideoInfo
   module Providers
@@ -14,23 +13,27 @@ class VideoInfo
       end
 
       def date
-        date = itemprop_node_value('datePublished')
+        date = itemprop_node_value("datePublished")
 
         Time.parse(date) if date
       end
 
       def author
-        meta_node_value(channel_meta_nodes, 'og:title')
+        meta_node_value(channel_meta_nodes, "og:title")
       end
 
       def author_thumbnail
-        image_hq_url = meta_node_value(channel_meta_nodes, 'og:image')
+        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')
+        # NOTE the previous implementation, based on itemprop_node_value("channelId"),
+        # does not work well, probably due to some YouTube change
+        page_content = data.to_s
+        matches = page_content.match(/"channelId":"([a-zA-Z0-9_-]+)"/)
+        matches[1] if matches
       end
 
       def author_url
@@ -38,11 +41,11 @@ class VideoInfo
       end
 
       def description
-        meta_node_value(video_meta_nodes, 'og:description')
+        meta_node_value(video_meta_nodes, "og:description")
       end
 
       def duration
-        duration = itemprop_node_value('duration')
+        duration = itemprop_node_value("duration")
 
         if duration
           ISO8601::Duration.new(duration).to_seconds.to_i
@@ -54,62 +57,68 @@ class VideoInfo
       def keywords
         return unless available?
 
-        value = meta_node_value(video_meta_nodes, 'keywords')
+        value = meta_node_value(video_meta_nodes, "keywords")
 
-        value.split(', ') if value
+        value&.split(", ")
       end
 
       def title
-        return if meta_node_value('title').empty?
-        meta_node_value('title')
+        return if meta_node_value(video_meta_nodes, "title").empty?
+        meta_node_value(video_meta_nodes, "title")
       end
 
       def view_count
-        itemprop_node_value('interactionCount').to_i
+        itemprop_node_value("interactionCount").to_i
+      end
+
+      def stats
+        {
+          "viewCount" => view_count
+        }
       end
 
       private
 
       def video_meta_nodes
-        @video_meta_nodes ||= data.css('meta')
+        @video_meta_nodes ||= data.css("meta")
       end
 
       def channel_meta_nodes
-        @channel_meta_nodes ||= channel_data.css('meta')
+        @channel_meta_nodes ||= channel_data.css("meta")
       end
 
       def channel_data
-        @channel_data ||= Oga.parse_html(URI.open(author_url).read)
+        @channel_data ||= Oga.parse_html(URI.parse(author_url).read)
       end
 
-      def meta_node_value(meta_nodes=video_meta_nodes, name)
+      def meta_node_value(meta_nodes, name)
         node = meta_nodes.detect do |n|
-          n.attr('name')&.value == name || n.attr('property')&.value == name
+          n.attr("name")&.value == name || n.attr("property")&.value == name
         end
 
         return unless node
-        node && node.attr('content') && node.attr('content').value
+        node&.attr("content") && node.attr("content").value
       end
 
       def itemprop_node_value(name)
         node = video_meta_nodes.detect do |m|
-          itemprop_attr = m.attr('itemprop')
+          itemprop_attr = m.attr("itemprop")
 
           itemprop_attr.value == name if itemprop_attr
         end
 
         return unless node
-        node.attr('content').value
+        node.attr("content").value
       end
 
       def _set_data_from_api_impl(api_url)
         # 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(URI.open(new_url).read)
+        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(URI.parse(new_url).read)
         else
-          Oga.parse_html(URI.open(api_url).read)
+          Oga.parse_html(URI.parse(api_url).read)
         end
       end
 
@@ -117,10 +126,10 @@ class VideoInfo
         uri = URI.parse(@url)
 
         unless uri.scheme
-          uri.path = uri.path.prepend('//')
+          uri.path = uri.path.prepend("//")
         end
 
-        uri.scheme = 'https'
+        uri.scheme = "https"
 
         uri.to_s
       end

data/lib/video_info/providers/youtubeplaylist.rb

@@ -1,5 +1,5 @@
-require_relative 'youtubeplaylist_api'
-require_relative 'youtubeplaylist_scraper'
+require_relative "youtubeplaylist_api"
+require_relative "youtubeplaylist_scraper"
 
 class VideoInfo
   module Providers
@@ -18,8 +18,7 @@ class VideoInfo
       end
 
       def self.usable?(url)
-        url =~ %r{((youtube\.com)\/playlist)|
-                  ((youtube\.com)\/embed\/videoseries)}x
+        url.match?(/((youtube\.com)\/playlist)|((youtube\.com)\/embed\/videoseries)/)
       end
 
       def date
@@ -49,9 +48,9 @@ class VideoInfo
       private
 
       def _url_regex
-        %r{youtube.com\/playlist\?p=(\S*)|
-          youtube.com\/playlist\?list=(\S*)|
-          youtube.com\/embed\/videoseries\?list=([a-zA-Z0-9-]*)}x
+        %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

@@ -3,13 +3,13 @@ class VideoInfo
     ITEMS_MAX_RESULTS = 50
 
     def available?
-      !data['items'].empty?
+      !data["items"].empty?
     rescue VideoInfo::HttpError
       false
     end
 
     def description
-      data['items'][0]['snippet']['description']
+      data["items"][0]["snippet"]["description"]
     end
 
     def date
@@ -35,33 +35,33 @@ class VideoInfo
     end
 
     def thumbnail_small
-      _video_snippet['thumbnails']['default']['url']
+      _video_snippet["thumbnails"]["default"]["url"]
     end
 
     def thumbnail_medium
-      _video_snippet['thumbnails']['medium']['url']
+      _video_snippet["thumbnails"]["medium"]["url"]
     end
 
     def thumbnail_large
-      _video_snippet['thumbnails']['high']['url']
+      _video_snippet["thumbnails"]["high"]["url"]
     end
 
     def thumbnail_large_2x
-      _video_snippet['thumbnails']['standard']['url']
+      _video_snippet["thumbnails"]["standard"]["url"]
     end
 
     def thumbnail_maxres
-      _video_snippet['thumbnails']['maxres']['url']
+      _video_snippet["thumbnails"]["maxres"]["url"]
     end
 
     private
 
     def _playlist_entry
-      data['items']
+      data["items"]
     end
 
     def _playlist_items
-      data['items']
+      data["items"]
     end
 
     def _api_path
@@ -69,7 +69,7 @@ class VideoInfo
     end
 
     def _playlist_items_api_path
-      '/youtube/v3/playlistItems?part=snippet&' \
+      "/youtube/v3/playlistItems?part=snippet&" \
       "playlistId=#{playlist_id}&fields=items&maxResults=#{ITEMS_MAX_RESULTS}&key=#{api_key}"
     end
 
@@ -82,8 +82,8 @@ class VideoInfo
     end
 
     def _playlist_video_ids
-      _playlist_items_data['items'].map do |item|
-        item['snippet']['resourceId']['videoId']
+      _playlist_items_data["items"].map do |item|
+        item["snippet"]["resourceId"]["videoId"]
       end
     end
   end

data/lib/video_info/providers/youtubeplaylist_scraper.rb

@@ -1,5 +1,3 @@
-require 'oga'
-
 class VideoInfo
   module Providers
     module YoutubePlaylistScraper
@@ -16,22 +14,22 @@ class VideoInfo
       end
 
       def author
-        data.css('.channel-header-profile-image').attr('title')[0].value
+        data.css(".channel-header-profile-image").attr("title")[0].value
       end
 
       def author_thumbnail
-        data.css('.channel-header-profile-image').attr('src')[0].value
+        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
+        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')
+          "To access videos, you must provide an API key " \
+          "to VideoInfo.provider_api_keys")
       end
 
       def view_count
@@ -39,21 +37,21 @@ class VideoInfo
       end
 
       def thumbnail_small
-        thumbnail_medium.sub('mqdefault.jpg', 'default.jpg')
+        thumbnail_medium.sub("mqdefault.jpg", "default.jpg")
       end
 
       def thumbnail_medium
-        'https:' + data.css('div.pl-header-thumb img').attr('src')[0].value
+        "https:" + data.css("div.pl-header-thumb img").attr("src")[0].value
       end
 
       def thumbnail_large
-        thumbnail_medium.sub('mqdefault.jpg', 'hqdefault.jpg')
+        thumbnail_medium.sub("mqdefault.jpg", "hqdefault.jpg")
       end
 
       private
 
       def available?
-        !data.css('div#page').attr('class')[0].value.include?('oops-content')
+        !data.css("div#page").attr("class")[0].value.include?("oops-content")
       end
     end
   end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '3.0.2'.freeze
+  VERSION = "4.2.0".freeze
 end

data/lib/video_info.rb

@@ -1,12 +1,13 @@
-require 'video_info/version'
-require 'video_info/provider'
-require 'forwardable'
-require 'net/http'
-require 'logger'
+require "video_info/version"
+require "video_info/provider"
+require "forwardable"
+require "logger"
 
 class VideoInfo
   class Error < StandardError; end
+
   class UrlError < Error; end
+
   class HttpError < Error; end
 
   class << self
@@ -22,7 +23,7 @@ class VideoInfo
 
     def provider_api_keys=(api_keys)
       api_keys.keys.each do |key|
-        raise ArgumentError, 'Key must be a symbol!' unless key.is_a?(Symbol)
+        raise ArgumentError, "Key must be a symbol!" unless key.is_a?(Symbol)
       end
       @provider_api_keys = api_keys
     end
@@ -37,26 +38,19 @@ class VideoInfo
   extend Forwardable
 
   PROVIDERS = %w[
-    Dailymotion Wistia
-    Vimeo Youtube YoutubePlaylist
+    Dailymotion
+    Wistia
+    Vimeo
+    Youtube
+    YoutubePlaylist
   ].freeze
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }
 
-  def_delegators :@provider, :provider, :video_id, :video_owner, :url, :data
-  def_delegators :@provider, :title, :description, :keywords, :view_count
-  def_delegators :@provider, :date, :duration, :width, :height
-  def_delegators :@provider, :thumbnail
   def_delegators :@provider,
-                 :thumbnail_small,
-                 :thumbnail_medium,
-                 :thumbnail_large,
-                 :thumbnail_large_2x,
-                 :thumbnail_maxres
-  def_delegators :@provider, :embed_code, :embed_url
-  def_delegators :@provider, :available?
-  def_delegators :@provider, :playlist_id, :videos
-  def_delegators :@provider, :author, :author_thumbnail, :author_url
-  def_delegators :@provider, :data=
+    :available?, :provider, :video_id, :video_owner, :url, :data, :data=,
+    :title, :description, :keywords, :view_count, :date, :duration, :width, :height,
+    :thumbnail, :thumbnail_small, :thumbnail_medium, :thumbnail_large, :thumbnail_large_2x, :thumbnail_maxres,
+    :embed_code, :embed_url, :author, :author_thumbnail, :author_url, :playlist_id, :videos, :stats
 
   def initialize(url, options = {})
     @provider = _select_provider(url, options)
@@ -81,10 +75,20 @@ class VideoInfo
     disable_providers.map(&:downcase).include?(provider.downcase)
   end
 
+  def self.enabled_providers
+    PROVIDERS
+      .reject { |p| disabled_provider?(p) }
+      .map { |p| Providers.const_get(p) }
+  end
+
+  def self.valid_url?(url)
+    enabled_providers.any? { |p| p.usable?(url) }
+  end
+
   private
 
   def _select_provider(url, options)
-    if provider_const = _providers_const.detect { |p| p.usable?(url) }
+    if (provider_const = _providers_const.detect { |p| p.usable?(url) })
       const_provider = provider_const.new(url, options)
 
       if defined?(const_provider.provider) && const_provider.provider

data/video_info.gemspec

@@ -1,33 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'video_info/version'
+require "./lib/video_info/version"
 
 Gem::Specification.new do |s|
-  s.name         = 'video_info'
-  s.version      = VideoInfo::VERSION
-  s.license      = 'MIT'
+  s.name = "video_info"
+  s.version = VideoInfo::VERSION
+  s.license = "MIT"
 
-  s.author       = 'Thibaud Guillaume-Gentil'
-  s.email        = 'thibaud@thibaud.gg'
-  s.homepage     = 'https://rubygems.org/gems/video_info'
-  s.summary      = 'Dailymotion, Vimeo and YouTube info parser.'
-  s.description  = 'Get video info from Dailymotion, Vimeo and YouTube url.'
+  s.author = "Thibaud Guillaume-Gentil"
+  s.email = "thibaud@thibaud.gg"
+  s.homepage = "https://rubygems.org/gems/video_info"
+  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($/).reject { |x| x.match?(%r{^spec/}) }
-  s.require_path = 'lib'
+  s.files = `git ls-files`.split($/).reject { |x| x.match?(%r{^spec/}) }
+  s.require_path = "lib"
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = ">= 2.7.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_dependency "iso8601", "~> 0.13.0"
+  s.add_dependency "oga", "~> 3.4"
+  s.add_dependency "net_http_timeout_errors", "~> 1.0.0"
 
-  s.add_development_dependency 'bundler', '>= 1.3.5'
-  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'
-  s.add_development_dependency 'vcr', '~> 3.0.3'
-  s.add_development_dependency 'webmock', '~> 3.7'
+  s.add_development_dependency "bundler", ">= 1.3.5"
+  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 "simplecov", "~> 0.22"
+  s.add_development_dependency "standard", "~> 1.23"
+  s.add_development_dependency "vcr", "~> 6.1"
+  s.add_development_dependency "webmock", "~> 3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_info
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso8601
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: net_http_timeout_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -156,13 +170,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/unit_test.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".hound.yml"
-- ".rubocop.yml"
+- ".rspec"
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -180,7 +192,6 @@ files:
 - lib/video_info/providers/youtubeplaylist_api.rb
 - lib/video_info/providers/youtubeplaylist_scraper.rb
 - lib/video_info/version.rb
-- tmp/rspec_guard_result
 - video_info.gemspec
 homepage: https://rubygems.org/gems/video_info
 licenses:
@@ -194,14 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Dailymotion, Vimeo and YouTube info parser.

data/.github/workflows/unit_test.yml

@@ -1,42 +0,0 @@
-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