video_info 2.6.0 → 2.6.1

data/lib/video_info/provider.rb

@@ -1,6 +1,6 @@
 require 'open-uri'
-require 'multi_json'
-require 'addressable/uri'
+require 'json'
+require 'uri'
 
 class VideoInfo
   class Provider
@@ -12,7 +12,7 @@ class VideoInfo
       _set_video_id_from_url
     end
 
-    def self.usable?(url)
+    def self.usable?(_url)
       raise NotImplementedError.new(
         'Provider class must implement .usable? public method'
       )
@@ -20,12 +20,12 @@ class VideoInfo
 
     def embed_code(options = {})
       iframe_attributes = options.fetch(:iframe_attributes, {})
-      iframe_attrs = ["src=\"#{_embed_url(options)}\"", "frameborder=\"0\""]
+      iframe_attrs = ["src=\"#{_embed_url(options)}\"", 'frameborder="0"']
       iframe_attrs << _hash_to_attributes(
         _default_iframe_attributes.merge(iframe_attributes)
       )
 
-      "<iframe #{iframe_attrs.reject(&:empty?).join(" ")}></iframe>"
+      "<iframe #{iframe_attrs.reject(&:empty?).join(' ')}></iframe>"
     end
 
     def data
@@ -42,7 +42,7 @@ class VideoInfo
       uri = URI.parse(_api_url)
       http = Net::HTTP.new(uri.host, uri.port)
 
-      if (uri.scheme == 'https')
+      if uri.scheme == 'https'
         _https_response_code(http)
       else
         _http_response_code(http)
@@ -96,7 +96,7 @@ class VideoInfo
 
     def _set_data_from_api_impl(api_url)
       uri = open(api_url, options)
-      MultiJson.load(uri.read)
+      JSON.load(uri.read)
     end
 
     def _not_openuri_option_symbol?(key)
@@ -145,9 +145,7 @@ class VideoInfo
     end
 
     def _hash_to_params(hash)
-      uri = Addressable::URI.new
-      uri.query_values = hash
-      uri.query
+      URI.encode_www_form(hash)
     end
   end
 end

data/lib/video_info/providers/dailymotion.rb

@@ -56,11 +56,11 @@ class VideoInfo
       end
 
       def _url_regex
-        /dai(?:\.ly|lymotion\.com\/(?:embed\/)?video)\/([a-zA-Z0-9]*)/
+        %r{dai(?:\.ly|lymotion\.com\/(?:embed\/)?video)\/([a-zA-Z0-9]*)}
       end
 
       def _api_base
-        "api.dailymotion.com"
+        'api.dailymotion.com'
       end
 
       def _api_path
@@ -68,7 +68,10 @@ class VideoInfo
       end
 
       def _api_url
-        "https://#{_api_base}#{_api_path}?fields=id,title,description,duration,created_time,url,views_total,tags,thumbnail_url,thumbnail_720_url,thumbnail_240_url,thumbnail_60_url"
+        "https://#{_api_base}#{_api_path}?" \
+        'fields=id,title,description,duration,created_time,' \
+        'url,views_total,tags,thumbnail_url,thumbnail_720_url,' \
+        'thumbnail_240_url,thumbnail_60_url'
       end
 
       def _default_iframe_attributes

data/lib/video_info/providers/vimeo.rb

@@ -15,7 +15,7 @@ class VideoInfo
       end
 
       def self.usable?(url)
-        url =~ /(vimeo\.com\/(?!album|hubnut\/album).*)/
+        url =~ %r{(vimeo\.com\/(?!album|hubnut\/album).*)}
       end
 
       def provider
@@ -29,12 +29,12 @@ class VideoInfo
       private
 
       def _url_regex
-        /.*\.com&&
+        %r{.*\.com&&
         |\/(?:(?:groups\/[^\/]+\/videos\/)
         |(?:ondemand|channels)(?:(?:\/less\/)
         |(?:user[0-9]+\/review\/)?([0-9]+).*
         |(?:\/\w*\/))|(?:video\/))?([0-9]+).*$
-        /x
+        }x
       end
 
       def _default_iframe_attributes

data/lib/video_info/providers/vimeo_api.rb

@@ -26,8 +26,13 @@ class VideoInfo
         @author_thumbnail_id ||= _parse_picture_id(author_uri)
       end
 
+      def author_url
+        _video['user']['link']
+      end
+
       def author_thumbnail(width = 75)
-        "https://i.vimeocdn.com/portrait/#{author_thumbnail_id}_#{width}x#{width}.jpg"
+        'https://i.vimeocdn.com/portrait/' \
+        "#{author_thumbnail_id}_#{width}x#{width}.jpg"
       end
 
       def thumbnail_id
@@ -36,7 +41,11 @@ class VideoInfo
 
       def thumbnail(width = 200, height = nil)
         base_uri = "https://i.vimeocdn.com/video/#{thumbnail_id}"
-        height ? base_uri + "_#{width}x#{height}.jpg" : base_uri + "_#{width}.jpg"
+        if height
+          base_uri + "_#{width}x#{height}.jpg"
+        else
+          base_uri + "_#{width}.jpg"
+        end
       end
 
       def thumbnail_small
@@ -52,7 +61,7 @@ class VideoInfo
       end
 
       def keywords
-        keywords_array.join(', ')
+        keywords_array
       end
 
       def keywords_array
@@ -103,7 +112,7 @@ class VideoInfo
       end
 
       def _parse_picture_id(uri)
-        /\/pictures\/(\d+)/.match(uri)[1]
+        %r{\/pictures\/(\d+)}.match(uri)[1]
       end
     end
   end

data/lib/video_info/providers/vimeo_scraper.rb

@@ -6,18 +6,36 @@ class VideoInfo
   module Providers
     module VimeoScraper
       def author
-       json_info['author']['name']
+        json_info['author']['name']
       end
 
       def author_thumbnail
-        d = data.css('script')[5].text.split('window.vimeo.clip_page_config =')[1]
-        JSON.parse(d.split(";\n")[0])['owner']['portrait']['src']
+        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)
+        end
+
+        script_text = script_tags[script_index].text
+
+        split_script_text = script_text.split(split_point)[1]
+
+        parsed_data = JSON.parse(split_script_text.split(";\n")[0])
+
+        parsed_data['owner']['portrait']['src']
+      end
+
+      def author_url
+        json_info['author']['url']
       end
 
       def available?
         is_available = super
 
-        if is_available
+        if data.nil?
+          is_available = false
+        elsif is_available
           page_header = data.css('#page_header')
 
           if page_header.text == "\n Private Video\n "
@@ -47,19 +65,19 @@ class VideoInfo
       end
 
       def keywords
-        keywords_str = ''
-
-        json_info['keywords'].each { |keyword| keywords_str << keyword << ", " }
-
-        keywords_str.chop.chop # remove trailing ", "
+        if json_info['keywords']
+          json_info['keywords']
+        else
+          []
+        end
       end
 
       def height
-        meta_node_value('og:video:height').to_i
+        json_info['height']
       end
 
       def width
-        meta_node_value('og:video:width').to_i
+        json_info['width']
       end
 
       def thumbnail_small
@@ -117,7 +135,10 @@ class VideoInfo
       end
 
       def _set_data_from_api_impl(api_url)
-        Oga.parse_html(open(api_url.to_s, allow_redirections: :safe).read)
+        Oga.parse_html(open(api_url.to_s).read)
+
+      rescue OpenURI::HTTPError
+        nil
       end
 
       def _api_url
@@ -132,4 +153,3 @@ class VideoInfo
     end
   end
 end
-

data/lib/video_info/providers/vkontakte.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
-require 'htmlentities'
+require 'cgi'
 require 'net/http'
+require 'oga'
 
 class VideoInfo
   module Providers
@@ -14,8 +15,9 @@ class VideoInfo
 
       def self.usable?(url)
         url.strip!
-        vkontakte = !!(url =~ /\A(http|https):\/\/(vk\.com)|(vkontakte\.ru)\z/)
-        valid = !!(url =~ /\A#{URI::regexp(['http', 'https'])}\z/)
+        vkontakte = !!(url =~ %r{\A(http|https):\/\/(vk\.com)|
+                                 (vkontakte\.ru)\z})
+        valid = !!(url =~ /\A#{URI.regexp(%w[http https])}\z/)
         vkontakte && valid
       end
 
@@ -25,9 +27,12 @@ class VideoInfo
 
       def description
         content = data[/"desc":"(.*?)",/, 1]
-        HTMLEntities.new.decode(content)
+        CGI.unescape_html(content).gsub(' ', ' ')
+      end
+
+      def keywords
+        nil
       end
-      alias_method :keywords, :description
 
       def width
         { 240 => 320,
@@ -38,11 +43,28 @@ class VideoInfo
       end
 
       def height
-        data[/url(\d+)/,1].to_i
+        data[/url(\d+)/, 1].to_i
+      end
+
+      def author
+        data_after_author_div = data.split('<a class="mem_link" href="')[1]
+        data_after_author_div.split('</a>')[0].split('">')[1]
+      end
+
+      def author_thumbnail
+        split_point = '<img id="mv_author_img" class="mv_author_img" src="'
+        author_img_split = data.split(split_point)[1]
+        author_img_split.split('">')[0]
+      end
+
+      def author_url
+        split_point = '"author_href":"\\/'
+        author_url_path = data.split(split_point)[1].split('"')[0]
+        'https://vk.com/' + author_url_path
       end
 
       def title
-        data[/\="mv_title">(.*)<\/div>/, 1].gsub(' | ВКонтакте', '')
+        data[%r{\="mv_title">(.*)<\/div>}, 1].gsub(' | ВКонтакте', '')
       end
 
       def view_count
@@ -51,16 +73,16 @@ class VideoInfo
 
       def embed_url
         iframe_src = data[
-          /iframe\ id=\"video_player\".*src=\"([^\"]*)\".*frameborder=/, 1
+          /iframe\ id=\"video_yt_player\".*src=\"([^\"]*)\".*frameborder=/, 1
         ]
         if iframe_src
           # it may be youtube video
           VideoInfo::Providers::Youtube.new(
-            URI.unescape(iframe_src.gsub(/\\/, ''))
+            URI.unescape(iframe_src.delete(/\\/, ''))
           ).embed_url
         else
-          "//vk.com/video_ext.php?oid=#{video_owner}" +
-            "&id=#{video_id}&hash=#{_data_hash}"
+          "//vk.com/video_ext.php?oid=#{video_owner}" \
+          "&id=#{video_id}&hash=#{_data_hash}"
         end
       rescue
         # or rutube video
@@ -72,7 +94,8 @@ class VideoInfo
       end
 
       def available?
-        !%w[403 404 302 401].include?(_response_code)
+        !%w[403 404 302 401].include?(_response_code) &&
+          !(data =~ /Ошибка доступа/)
       end
 
       private
@@ -101,7 +124,7 @@ class VideoInfo
 
       def _error_found?(response)
         title = response.body[
-          /<title>(.*)<\/title>/, 1
+          %r{<title>(.*)<\/title>}, 1
         ].force_encoding(
           'cp1251'
         ).encode(
@@ -151,7 +174,8 @@ class VideoInfo
       end
 
       def _url_regex
-        /(?:vkontakte\.ru\/video|vk\.com\/video|vk\.com\/.*?video)(-?\d+_\d+)/i
+        %r{(?:vkontakte\.ru\/video|vk\.com\/video
+            |vk\.com\/.*?video)(-?\d+_\d+)}i
       end
 
       def _default_iframe_attributes

data/lib/video_info/providers/wistia.rb

@@ -36,7 +36,8 @@ class VideoInfo
       private
 
       def _url_regex
-        /(?:.*)(?:wistia.com|wi.st|wistia.net)\/(?:embed\/)?(?:medias\/)?(?:iframe\/)?(.+)/
+        %r{(?:.*)(?:wistia.com|wi.st|wistia.net)
+           \/(?:embed\/)?(?:medias\/)?(?:iframe\/)?(.+)}x
       end
 
       def _api_base

data/lib/video_info/providers/youtube.rb

@@ -16,7 +16,8 @@ class VideoInfo
       end
 
       def self.usable?(url)
-        url =~ /(youtube\.com\/(?!playlist|embed\/videoseries).*)|(youtu\.be)/
+        url =~ %r{(youtube\.com\/(?!playlist|embed\/videoseries).*)|
+                  (youtu\.be)}x
       end
 
       def provider
@@ -46,7 +47,8 @@ class VideoInfo
       private
 
       def _url_regex
-        /(?:youtube(?:-nocookie)?\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i
+        %r{(?:youtube(?:-nocookie)?\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|
+           .*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})}x
       end
 
       def _default_iframe_attributes

data/lib/video_info/providers/youtube_api.rb

@@ -5,6 +5,19 @@ class VideoInfo
         VideoInfo.provider_api_keys[:youtube]
       end
 
+      def author
+        _video_snippet['channelTitle']
+      end
+
+      def author_thumbnail
+        _channel_snippet['thumbnails']['default']['url']
+      end
+
+      def author_url
+        channel_id = _channel_info['items'][0]['id']
+        'https://www.youtube.com/channel/' + channel_id
+      end
+
       def title
         _video_snippet['title']
       end
@@ -28,13 +41,18 @@ class VideoInfo
       end
 
       def view_count
-        _video_statistics['viewCount'].to_i rescue 0
+        _video_statistics['viewCount'].to_i
       end
 
       private
 
       def available?
-        data['items'].size > 0
+        if !data['items'].empty?
+          upload_status = data['items'][0]['status']['uploadStatus']
+          'rejected' != upload_status
+        else
+          false
+        end
       rescue VideoInfo::HttpError
         false
       end
@@ -44,7 +62,9 @@ class VideoInfo
       end
 
       def _api_path
-        "/youtube/v3/videos?id=#{video_id}&part=snippet,statistics,contentDetails&fields=items(id,snippet,statistics,contentDetails)&key=#{api_key}"
+        "/youtube/v3/videos?id=#{video_id}" \
+        '&part=snippet,statistics,status,contentDetails&fields=' \
+        "items(id,snippet,statistics,status,contentDetails)&key=#{api_key}"
       end
 
       def _api_url
@@ -56,6 +76,21 @@ class VideoInfo
         data['items'][0]['snippet']
       end
 
+      def _channel_api_url(channel_id)
+        "https://#{_api_base}/youtube/v3/channels?part=snippet&id" \
+        "=#{channel_id}&key=#{api_key}"
+      end
+
+      def _channel_info
+        channel_url = _channel_api_url(_video_snippet['channelId'])
+        @channel_data ||= open(channel_url)
+        JSON.load(@channel_data.read)
+      end
+
+      def _channel_snippet
+        _channel_info['items'][0]['snippet']
+      end
+
       def _video_content_details
         return {} unless available?
         data['items'][0]['contentDetails']