video_info 3.0.2 → 4.2.0

data/lib/video_info/providers/vimeo_api.rb

@@ -1,7 +1,7 @@
 class VideoInfo
   module Providers
     module VimeoAPI
-      THUMBNAIL_LINK_REGEX = /.*\/(\d+\-[^_]+)/
+      THUMBNAIL_LINK_REGEX = /.*\/(\d+-[^_]+)/
 
       def api_key
         VideoInfo.provider_api_keys[:vimeo]
@@ -16,24 +16,24 @@ class VideoInfo
       end
 
       def title
-        _video['name']
+        _video["name"]
       end
 
       def author
-        _video['user']['name']
+        _video["user"]["name"]
       end
 
       def author_thumbnail_id
-        author_uri = _video['user']['pictures']['uri']
+        author_uri = _video["user"]["pictures"]["uri"]
         @author_thumbnail_id ||= parse_picture_id_from_user(author_uri)
       end
 
       def author_url
-        _video['user']['link']
+        _video["user"]["link"]
       end
 
       def author_thumbnail(width = 75)
-        'https://i.vimeocdn.com/portrait/' \
+        "https://i.vimeocdn.com/portrait/" \
         "#{author_thumbnail_id}_#{width}x#{width}.jpg"
       end
 
@@ -58,15 +58,19 @@ class VideoInfo
       end
 
       def keywords_array
-        _video['tags'].map { |t| t['tag'] }
+        _video["tags"].map { |t| t["tag"] }
       end
 
       def date
-        Time.parse(_video['created_time'], Time.now.utc).utc
+        Time.parse(_video["created_time"], Time.now.utc).utc
       end
 
       def view_count
-        _video['stats']['plays'].to_i
+        stats["plays"].to_i
+      end
+
+      def stats
+        _video["stats"]
       end
 
       private
@@ -86,15 +90,15 @@ class VideoInfo
       end
 
       def _api_version
-        '3.2'
+        "3.2"
       end
 
       def _authorization_headers
-        { 'Authorization' => "bearer #{api_key}" }
+        {"Authorization" => "bearer #{api_key}"}
       end
 
       def _api_version_headers
-        { 'Accept' => "application/vnd.vimeo.*+json;version=#{_api_version}" }
+        {"Accept" => "application/vnd.vimeo.*+json;version=#{_api_version}"}
       end
 
       def _video
@@ -102,7 +106,7 @@ class VideoInfo
       end
 
       def _api_base
-        'api.vimeo.com'
+        "api.vimeo.com"
       end
 
       def _api_path
@@ -113,8 +117,8 @@ class VideoInfo
         "https://#{_api_base}#{_api_path}"
       end
 
-      def parse_picture_id_from_user (uri)
-        %r{\/pictures\/(\d+)}.match(uri)[1]
+      def parse_picture_id_from_user(uri)
+        %r{/pictures/(\d+)}.match(uri)[1]
       end
 
       def parse_picture_id(uri)

data/lib/video_info/providers/vimeo_scraper.rb

@@ -1,15 +1,12 @@
-require 'oga'
-require 'open-uri'
-require 'json'
-require 'openssl'
-require 'cgi'
+require "oga"
+require "cgi"
 
 class VideoInfo
   module Providers
     module VimeoScraper
       def author
         if available?
-          json_info['author']['name']
+          json_info["author"]["name"]
         end
       end
 
@@ -18,8 +15,8 @@ class VideoInfo
           return nil
         end
 
-        split_point = 'window.vimeo.clip_page_config ='
-        script_tags = data.css('script')
+        split_point = "window.vimeo.clip_page_config ="
+        script_tags = data.css("script")
 
         script_index = script_tags.find_index do |x|
           x.text.include?(split_point)
@@ -31,12 +28,12 @@ class VideoInfo
 
         parsed_data = JSON.parse(split_script_text.split(";\n")[0])
 
-        parsed_data['owner']['portrait']['src']
+        parsed_data["owner"]["portrait"]["src"]
       end
 
       def author_url
         if available?
-          json_info['author']['url']
+          json_info["author"]["url"]
         end
       end
 
@@ -46,7 +43,7 @@ class VideoInfo
         if data.nil?
           is_available = false
         elsif is_available
-          password_elements = data.css('.exception_title--password')
+          password_elements = data.css(".exception_title--password")
 
           unless password_elements.empty?
             is_available = false
@@ -57,23 +54,23 @@ class VideoInfo
       end
 
       def title
-        meta_node_value('og:title')
+        meta_node_value("og:title")
       end
 
       def description
-        meta_node_value('og:description')
+        meta_node_value("og:description")
       end
 
       def date
         if available?
-          upload_date = json_info['uploadDate']
+          upload_date = json_info["uploadDate"]
           ISO8601::DateTime.new(upload_date).to_time
         end
       end
 
       def duration
         if available?
-          duration = json_info['duration']
+          duration = json_info["duration"]
           ISO8601::Duration.new(duration).to_seconds.to_i
         end
       end
@@ -83,55 +80,60 @@ class VideoInfo
           return nil
         end
 
-        if json_info['keywords']
-          json_info['keywords']
-        else
-          []
-        end
+        json_info["keywords"] || []
       end
 
       def height
         if available?
-          json_info['height']
+          json_info["height"]
         end
       end
 
       def width
         if available?
-          json_info['width']
+          json_info["width"]
         end
       end
 
       def thumbnail_small
         if available?
-          thumbnail_url.split('_')[0] + '_100x75.jpg'
+          thumbnail_url.split("_")[0] + "_100x75.jpg"
         end
       end
 
       def thumbnail_medium
         if available?
-          thumbnail_url.split('_')[0] + '_200x150.jpg'
+          thumbnail_url.split("_")[0] + "_200x150.jpg"
         end
       end
 
       def thumbnail_large
         if available?
-          thumbnail_url.split('_')[0] + '_640.jpg'
+          thumbnail_url.split("_")[0] + "_640.jpg"
         end
       end
 
       def view_count
         if available?
-          user_interaction_count(interaction_type: "http://schema.org/WatchAction")
+          user_interaction_count(interaction_type: "WatchAction")
         end
       end
 
+      def stats
+        return {} unless available?
+        {
+          "plays" => view_count,
+          "likes" => user_interaction_count(interaction_type: "LikeAction"),
+          "comments" => user_interaction_count(interaction_type: "CommentAction")
+        }
+      end
+
       private
 
       def user_interaction_count(interaction_type:)
-        interaction_statistic.find do |stat|
-          stat["interactionType"] == interaction_type
-        end["userInteractionCount"]
+        interaction_statistic&.find do |stat|
+          stat["interactionType"] == "http://schema.org/#{interaction_type}"
+        end&.public_send(:[], "userInteractionCount")
       end
 
       def interaction_statistic
@@ -139,39 +141,39 @@ class VideoInfo
       end
 
       def json_info
-        @json_info ||= JSON.parse(data.css('script').detect do |n|
-          type = n.attr('type')
+        @json_info ||= JSON.parse(data.css("script").detect do |n|
+          type = n.attr("type")
 
           if type.nil?
             false
           else
-            type.value == 'application/ld+json'
+            type.value == "application/ld+json"
           end
         end.text)[0]
       end
 
       def thumbnail_url
-        @thumbnail_url ||= remove_overlay(meta_node_value('og:image'))
+        @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]
+
+        if uri.path == "/filter/overlay"
+          CGI.parse(uri.query)["src0"][0]
         else
           url
         end
       end
 
       def meta_nodes
-        @meta_nodes ||= data.css('meta')
+        @meta_nodes ||= data.css("meta")
       end
 
       def meta_node_value(name)
         if available?
           node = meta_nodes.detect do |n|
-            property = n.attr('property')
+            property = n.attr("property")
 
             if property.nil?
               false
@@ -180,20 +182,19 @@ class VideoInfo
             end
           end
 
-          node.attr('content').value
+          node.attr("content").value
         end
       end
 
       def _set_data_from_api_impl(api_url)
-        Oga.parse_html(URI.open(api_url.to_s).read)
-
+        Oga.parse_html(URI.parse(api_url.to_s).read)
       rescue OpenURI::HTTPError
         nil
       end
 
       def _api_url
         uri = URI.parse(@url)
-        uri.scheme = 'https'
+        uri.scheme = "https"
         uri.to_s
       end
 

data/lib/video_info/providers/wistia.rb

@@ -2,11 +2,11 @@ class VideoInfo
   module Providers
     class Wistia < Provider
       def self.usable?(url)
-        url =~ /(.*)(wistia.com|wistia.net|wi.st)/
+        url.match?(/(.*)(wistia.com|wistia.net|wi.st)/)
       end
 
       def provider
-        'Wistia'
+        "Wistia"
       end
 
       %w[title duration width height].each do |method|
@@ -22,26 +22,26 @@ class VideoInfo
       end
 
       def thumbnail_small
-        data['thumbnail_url']
+        data["thumbnail_url"]
       end
 
       def thumbnail_medium
-        data['thumbnail_url']
+        data["thumbnail_url"]
       end
 
       def thumbnail_large
-        data['thumbnail_url']
+        data["thumbnail_url"]
       end
 
       private
 
       def _url_regex
         %r{(?:.*)(?:wistia.com|wi.st|wistia.net)
-           \/(?:embed\/)?(?:medias\/)?(?:iframe\/)?(.+)}x
+           /(?:embed/)?(?:medias/)?(?:iframe/)?(.+)}x
       end
 
       def _api_base
-        'fast.wistia.com'
+        "fast.wistia.com"
       end
 
       def _api_path

data/lib/video_info/providers/youtube.rb

@@ -1,6 +1,6 @@
-require 'iso8601'
-require_relative 'youtube_api'
-require_relative 'youtube_scraper'
+require "iso8601"
+require_relative "youtube_api"
+require_relative "youtube_scraper"
 
 class VideoInfo
   module Providers
@@ -16,12 +16,11 @@ class VideoInfo
       end
 
       def self.usable?(url)
-        url =~ %r{(youtube\.com\/(?!playlist|embed\/videoseries).*)|
-                  (youtu\.be)}x
+        url.match?(/(youtube\.com\/(?!playlist|embed\/videoseries).*)|(youtu\.be)/)
       end
 
       def provider
-        'YouTube'
+        "YouTube"
       end
 
       %w[width height].each do |method|
@@ -55,12 +54,12 @@ class VideoInfo
       private
 
       def _url_regex
-        %r{(?:youtube(?:-nocookie)?\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|
-           .*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})}x
+        %r{(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?|live|shorts)/|
+           .*[?&]v=)|youtu\.be/)([^"&?/ ]{11})}x
       end
 
       def _default_iframe_attributes
-        { allowfullscreen: 'allowfullscreen' }
+        {allowfullscreen: "allowfullscreen"}
       end
 
       def _default_url_attributes

data/lib/video_info/providers/youtube_api.rb

@@ -2,9 +2,9 @@ class VideoInfo
   module Providers
     module YoutubeAPI
       def available?
-        if !data['items'].empty?
-          upload_status = data['items'][0]['status']['uploadStatus']
-          'rejected' != upload_status
+        if !data["items"].empty?
+          upload_status = data["items"][0]["status"]["uploadStatus"]
+          upload_status != "rejected"
         else
           false
         end
@@ -17,53 +17,58 @@ class VideoInfo
       end
 
       def author
-        _video_snippet['channelTitle']
+        _video_snippet["channelTitle"]
       end
 
       def author_thumbnail
-        _channel_snippet['thumbnails']['default']['url']
+        _channel_snippet["thumbnails"]["default"]["url"]
       end
 
       def author_url
-        channel_id = _channel_info['items'][0]['id']
-        'https://www.youtube.com/channel/' + channel_id
+        channel_id = _channel_info["items"][0]["id"]
+        "https://www.youtube.com/channel/" + channel_id
       end
 
       def title
-        _video_snippet['title']
+        _video_snippet["title"]
       end
 
       def description
-        _video_snippet['description']
+        _video_snippet["description"]
       end
 
       def keywords
-        _video_snippet['tags']
+        _video_snippet["tags"]
       end
 
       def duration
-        video_duration = _video_content_details['duration'] || 0
+        video_duration = _video_content_details["duration"] || 0
         ISO8601::Duration.new(video_duration).to_seconds.to_i
       end
 
       def date
-        return unless published_at = _video_snippet['publishedAt']
+        return unless (published_at = _video_snippet["publishedAt"])
         Time.parse(published_at, Time.now.utc)
       end
 
       def view_count
-        _video_statistics['viewCount'].to_i
+        stats["viewCount"].to_i
+      end
+
+      def stats
+        return {} unless available?
+        data["items"][0]["statistics"]
       end
 
       private
 
       def _api_base
-        'www.googleapis.com'
+        "www.googleapis.com"
       end
 
       def _api_path
         "/youtube/v3/videos?id=#{video_id}" \
-        '&part=snippet,statistics,status,contentDetails&fields=' \
+        "&part=snippet,statistics,status,contentDetails&fields=" \
         "items(id,snippet,statistics,status,contentDetails)&key=#{api_key}"
       end
 
@@ -73,7 +78,7 @@ class VideoInfo
 
       def _video_snippet
         return {} unless available?
-        data['items'][0]['snippet']
+        data["items"][0]["snippet"]
       end
 
       def _channel_api_url(channel_id)
@@ -82,26 +87,21 @@ class VideoInfo
       end
 
       def _channel_info
-        channel_url = _channel_api_url(_video_snippet['channelId'])
-        @_channel_info ||=  JSON.load(URI.open(channel_url).read)
+        channel_url = _channel_api_url(_video_snippet["channelId"])
+        @_channel_info ||= JSON.parse(URI.parse(channel_url).read)
       end
 
       def _channel_snippet
-        _channel_info['items'][0]['snippet']
+        _channel_info["items"][0]["snippet"]
       end
 
       def _video_content_details
         return {} unless available?
-        data['items'][0]['contentDetails']
-      end
-
-      def _video_statistics
-        return {} unless available?
-        data['items'][0]['statistics']
+        data["items"][0]["contentDetails"]
       end
 
       def _video_thumbnail(id)
-        _video_entry['media$group']['media$thumbnail'][id]['url']
+        _video_entry["media$group"]["media$thumbnail"][id]["url"]
       end
     end
   end