video_info 2.6.0 → 3.0.0

data/lib/video_info/provider.rb

@@ -1,10 +1,11 @@
 require 'open-uri'
-require 'multi_json'
-require 'addressable/uri'
+require 'json'
+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)
@@ -12,7 +13,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 +21,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
@@ -36,13 +37,27 @@ 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
       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)
@@ -95,8 +110,8 @@ class VideoInfo
     end
 
     def _set_data_from_api_impl(api_url)
-      uri = open(api_url, options)
-      MultiJson.load(uri.read)
+      uri = URI.open(api_url, options)
+      JSON.load(uri.read)
     end
 
     def _not_openuri_option_symbol?(key)
@@ -145,9 +160,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

@@ -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
@@ -56,11 +68,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 +80,11 @@ 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,' \
+        'owner.url,owner.screenname,owner.avatar_60_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,33 +26,33 @@ 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
         @thumbnail_id ||= _parse_picture_id(_video['pictures']['uri'])
       end
 
-      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"
-      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
-        keywords_array.join(', ')
+        keywords_array
       end
 
       def keywords_array
@@ -69,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)
@@ -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

@@ -1,26 +1,54 @@
 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
-        d = data.css('script')[5].text.split('window.vimeo.clip_page_config =')[1]
-        JSON.parse(d.split(";\n")[0])['owner']['portrait']['src']
+        unless available?
+          return nil
+        end
+
+        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
+        if available?
+          json_info['author']['url']
+        end
       end
 
       def available?
         is_available = super
 
-        if is_available
-          page_header = data.css('#page_header')
+        if data.nil?
+          is_available = false
+        elsif is_available
+          password_elements = data.css('.exception_title--password')
 
-          if page_header.text == "\n Private Video\n "
+          unless password_elements.empty?
             is_available = false
           end
         end
@@ -37,49 +65,79 @@ 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
-        keywords_str = ''
-
-        json_info['keywords'].each { |keyword| keywords_str << keyword << ", " }
+        unless available?
+          return nil
+        end
 
-        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
+        if available?
+          json_info['height']
+        end
       end
 
       def width
-        meta_node_value('og:video:width').to_i
+        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')
@@ -93,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
@@ -117,7 +185,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(URI.open(api_url.to_s).read)
+
+      rescue OpenURI::HTTPError
+        nil
       end
 
       def _api_url
@@ -132,4 +203,3 @@ class VideoInfo
     end
   end
 end
-

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
@@ -43,10 +44,19 @@ 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
-        /(?: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
@@ -56,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