video_info 2.5.0 → 2.6.0

data/lib/video_info/providers/vimeo_scraper.rb

@@ -0,0 +1,135 @@
+require 'oga'
+require 'open-uri'
+require 'json'
+
+class VideoInfo
+  module Providers
+    module VimeoScraper
+      def author
+       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']
+      end
+
+      def available?
+        is_available = super
+
+        if is_available
+          page_header = data.css('#page_header')
+
+          if page_header.text == "\n Private Video\n "
+            is_available = false
+          end
+        end
+
+        is_available
+      end
+
+      def title
+        meta_node_value('og:title')
+      end
+
+      def description
+        meta_node_value('og:description')
+      end
+
+      def date
+        upload_date = json_info['uploadDate']
+        ISO8601::DateTime.new(upload_date).to_time
+      end
+
+      def duration
+        duration = json_info['duration']
+        ISO8601::Duration.new(duration).to_seconds.to_i
+      end
+
+      def keywords
+        keywords_str = ''
+
+        json_info['keywords'].each { |keyword| keywords_str << keyword << ", " }
+
+        keywords_str.chop.chop # remove trailing ", "
+      end
+
+      def height
+        meta_node_value('og:video:height').to_i
+      end
+
+      def width
+        meta_node_value('og:video:width').to_i
+      end
+
+      def thumbnail_small
+        thumbnail_url.split('_')[0] + '_100x75.jpg'
+      end
+
+      def thumbnail_medium
+        thumbnail_url.split('_')[0] + '_200x150.jpg'
+      end
+
+      def thumbnail_large
+        thumbnail_url.split('_')[0] + '_640.jpg'
+      end
+
+      def view_count
+        json_info['interactionCount']
+      end
+
+      private
+
+      def json_info
+        @json_info ||= JSON.parse(data.css('script').detect do |n|
+          type = n.attr('type')
+
+          if type.nil?
+            false
+          else
+            type.value == 'application/ld+json'
+          end
+        end.text)[0]
+      end
+
+      def thumbnail_url
+        @thumbnail_url ||= json_info['thumbnailUrl']
+      end
+
+      def meta_nodes
+        @meta_nodes ||= data.css('meta')
+      end
+
+      def meta_node_value(name)
+        if available?
+          node = meta_nodes.detect do |n|
+            property = n.attr('property')
+
+            if property.nil?
+              false
+            else
+              property.value == name
+            end
+          end
+
+          node.attr('content').value
+        end
+      end
+
+      def _set_data_from_api_impl(api_url)
+        Oga.parse_html(open(api_url.to_s, allow_redirections: :safe).read)
+      end
+
+      def _api_url
+        uri = URI.parse(@url)
+        uri.scheme = 'https'
+        uri.to_s
+      end
+
+      def _api_path
+        _api_url
+      end
+    end
+  end
+end
+

data/lib/video_info/providers/vkontakte.rb

@@ -50,17 +50,21 @@ class VideoInfo
       end
 
       def embed_url
-        youtube = data[
-          /iframe\ id=\"video_player\".*src=\"(.*)\"\ frameborder=/, 1
+        iframe_src = data[
+          /iframe\ id=\"video_player\".*src=\"([^\"]*)\".*frameborder=/, 1
         ]
-        if youtube
+        if iframe_src
+          # it may be youtube video
           VideoInfo::Providers::Youtube.new(
-            URI.unescape(youtube.gsub(/\\/, ''))
+            URI.unescape(iframe_src.gsub(/\\/, ''))
           ).embed_url
         else
           "//vk.com/video_ext.php?oid=#{video_owner}" +
             "&id=#{video_id}&hash=#{_data_hash}"
         end
+      rescue
+        # or rutube video
+        iframe_src
       end
 
       def duration
@@ -82,15 +86,14 @@ class VideoInfo
         resp.body.force_encoding('cp1251').encode('UTF-8', undef: :replace)
       end
 
-      def _set_data_from_api
-        url = URI('https://vk.com/al_video.php')
+      def _set_data_from_api_impl(api_url)
         options['act'] = 'show'
         options['al'] = '1'
         options['video'] = "#{@video_owner}_#{@video_id}"
-        data = _make_request(url, options)
+        data = _make_request(api_url, options)
         if data.index('Ошибка доступа')
           # try second time
-          _make_request(url, options)
+          _make_request(api_url, options)
         else
           data
         end
@@ -158,6 +161,10 @@ class VideoInfo
       def _default_url_attributes
         {}
       end
+
+      def _api_url
+        URI('https://vk.com/al_video.php')
+      end
     end
   end
 end

data/lib/video_info/providers/youtube.rb

@@ -32,18 +32,15 @@ class VideoInfo
       end
 
       def thumbnail_small
-        return "https://i.ytimg.com/vi/#{video_id}/default.jpg" unless _video_snippet['thumbnails']
-        _video_snippet['thumbnails']['default']['url']
+        "https://i.ytimg.com/vi/#{video_id}/default.jpg"
       end
 
       def thumbnail_medium
-        return "https://i.ytimg.com/vi/#{video_id}/mqdefault.jpg" unless _video_snippet['thumbnails']
-        _video_snippet['thumbnails']['medium']['url']
+        "https://i.ytimg.com/vi/#{video_id}/mqdefault.jpg"
       end
 
       def thumbnail_large
-        return "https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg" unless _video_snippet['thumbnails']
-        _video_snippet['thumbnails']['high']['url']
+        "https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg"
       end
 
       private

data/lib/video_info/providers/youtube_api.rb

@@ -34,7 +34,9 @@ class VideoInfo
       private
 
       def available?
-        data['items'].size > 0 rescue false
+        data['items'].size > 0
+      rescue VideoInfo::HttpError
+        false
       end
 
       def _api_base

data/lib/video_info/providers/youtube_scraper.rb

@@ -1,5 +1,6 @@
 require 'oga'
 require 'open-uri'
+require 'net_http_timeout_errors'
 
 class VideoInfo
   module Providers
@@ -34,20 +35,8 @@ class VideoInfo
         meta_node_value('title')
       end
 
-      def thumbnail_small
-        "https://i.ytimg.com/vi/#{video_id}/default.jpg"
-      end
-
-      def thumbnail_medium
-        "https://i.ytimg.com/vi/#{video_id}/mqdefault.jpg"
-      end
-
-      def thumbnail_large
-        "https://i.ytimg.com/vi/#{video_id}/hqdefault.jpg"
-      end
-
       def view_count
-        data.css('div.watch-view-count').text.gsub(',', '').to_i
+        data.css('div.watch-view-count').text.gsub(/\D/, '').to_i
       end
 
       private
@@ -80,7 +69,7 @@ class VideoInfo
         data.css('div#unavailable-submessage').text.strip.empty?
       end
 
-      def _set_data_from_api(api_url = _api_url)
+      def _set_data_from_api_impl(api_url)
         uri = URI(api_url)
 
         unless uri.scheme
@@ -88,7 +77,14 @@ class VideoInfo
           uri.scheme = 'http'
         end
 
-        Oga.parse_html(open(uri.to_s, allow_redirections: :safe).read)
+        # 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(open(new_url).read)
+        else
+          Oga.parse_html(open(uri.to_s, allow_redirections: :safe).read)
+        end
       end
 
       def _api_url

data/lib/video_info/providers/youtubeplaylist.rb

@@ -48,7 +48,7 @@ class VideoInfo
       private
 
       def _url_regex
-        /youtube.com\/playlist\?p=(\S*)|youtube.com\/embed\/videoseries\?list=([a-zA-Z0-9-]*)/
+        /youtube.com\/playlist\?p=(\S*)|youtube.com\/playlist\?list=(\S*)|youtube.com\/embed\/videoseries\?list=([a-zA-Z0-9-]*)/
       end
     end
   end

data/lib/video_info/providers/youtubeplaylist_api.rb

@@ -22,6 +22,18 @@ class VideoInfo
       nil
     end
 
+    def thumbnail_small
+      _video_snippet['thumbnails']['default']['url']
+    end
+
+    def thumbnail_medium
+      _video_snippet['thumbnails']['medium']['url']
+    end
+
+    def thumbnail_large
+      _video_snippet['thumbnails']['high']['url']
+    end
+
     private
 
     def _playlist_entry

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/lib/video_info/providers/vimeo_api_spec.rb

@@ -0,0 +1,242 @@
+require 'spec_helper'
+
+describe VideoInfo::Providers::Vimeo do
+  before(:all) do
+    VideoInfo.provider_api_keys = { vimeo: '6b66b015a3504793b4f541d878f46ff6' }
+  end
+
+  describe '.usable?' do
+    subject { VideoInfo::Providers::Vimeo.usable?(url) }
+
+    context 'with vimeo url' do
+      let(:url) { 'http://www.vimeo.com/898029' }
+      it { is_expected.to be_truthy }
+    end
+
+    context 'with Vimeo OnDemand url' do
+      let(:url) { 'https://vimeo.com/ondemand/less/101677664' }
+      it { is_expected.to be_truthy }
+    end
+
+    context 'with Vimeo Channels url' do
+      let(:url) { 'https://vimeo.com/channels/any_channel/111431415' }
+      it { is_expected.to be_truthy }
+    end
+
+    context "with Vimeo Review url" do
+      let(:url) { 'https://vimeo.com/user39798190/review/126641548/8a56234e32' }
+      it { is_expected.to be_truthy }
+    end
+
+    context 'with vimeo album url' do
+      let(:url) { 'http://vimeo.com/album/2755718' }
+      it { is_expected.to be_falsey }
+    end
+
+    context 'with vimeo hubnub embed url' do
+      let(:url) { 'http://player.vimeo.com/hubnut/album/2755718' }
+      it { is_expected.to be_falsey }
+    end
+
+    context 'with other url' do
+      let(:url) { 'http://www.youtube.com/898029' }
+      it { is_expected.to be_falsey }
+    end
+  end
+
+  describe '#available?' do
+    context 'with valid video', :vcr do
+      subject { VideoInfo.new('http://www.vimeo.com/898029') }
+
+      describe '#available?' do
+        it { is_expected.to be_available }
+      end
+    end
+
+    context "with 'this video does not exist' video", :vcr do
+      subject { VideoInfo.new('http://vimeo.com/59312311') }
+
+      describe '#available?' do
+        it { is_expected.to_not be_available }
+      end
+    end
+
+    context "with 'password required' video", :vcr do
+      subject { VideoInfo.new('http://vimeo.com/74636562') }
+
+      describe '#available?' do
+        it { is_expected.to_not be_available }
+      end
+    end
+  end
+
+  context 'with video 898029', :vcr do
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+
+    describe '#url' do
+      subject { super().url }
+      it { is_expected.to eq 'http://www.vimeo.com/898029' }
+    end
+
+    describe '#embed_url' do
+      subject { super().embed_url }
+      it { is_expected.to eq '//player.vimeo.com/video/898029' }
+    end
+
+    describe '#embed_code' do
+      subject { super().embed_code }
+      it { is_expected.to eq '<iframe src="//player.vimeo.com/video/898029?autoplay=0&byline=0&portrait=0&title=0" frameborder="0"></iframe>' }
+    end
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq 'Cherry Bloom - King Of The Knife' }
+    end
+
+    describe '#description' do
+      subject { super().description }
+      it { is_expected.to eq 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
+    end
+
+    describe '#keywords' do
+      subject { super().keywords }
+      it { is_expected.to eq 'cherry bloom, secret sounds, king of the knife, rock, alternative' }
+    end
+
+    describe '#duration' do
+      subject { super().duration }
+      it { is_expected.to eq 175 }
+    end
+
+    describe '#width' do
+      subject { super().width }
+      it { is_expected.to eq 640 }
+    end
+
+    describe '#height' do
+      subject { super().height }
+      it { is_expected.to eq 360 }
+    end
+
+    describe '#date' do
+      subject { super().date }
+      it { is_expected.to eq Time.parse('2008-04-14T17:10:39+00:00', Time.now.utc).utc }
+    end
+
+    describe '#thumbnail_small' do
+      subject { super().thumbnail_small }
+      it { is_expected.to eq 'https://i.vimeocdn.com/video/34373130_100x75.jpg' }
+    end
+
+    describe '#thumbnail_medium' do
+      subject { super().thumbnail_medium }
+      it { is_expected.to eq 'https://i.vimeocdn.com/video/34373130_200x150.jpg' }
+    end
+
+    describe '#thumbnail_large' do
+      subject { super().thumbnail_large }
+      it { is_expected.to eq 'https://i.vimeocdn.com/video/34373130_640.jpg' }
+    end
+
+    describe '#author_thumbnail' do
+      subject { super().author_thumbnail }
+      it { is_expected.to eq 'https://i.vimeocdn.com/portrait/2577152_75x75.jpg' }
+    end
+
+    describe '#author' do
+      subject { super().author }
+      it { is_expected.to eq 'Octave Zangs' }
+    end
+
+    describe '#view_count' do
+      subject { super().view_count }
+      it { is_expected.to be > 4000 }
+    end
+  end
+
+  context 'with video 898029 and url_attributes', :vcr do
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
+
+    it { expect(subject.embed_code(url_attributes: { autoplay: 1 })).to match(/autoplay=1/) }
+  end
+
+  context 'with video 898029 and iframe_attributes', :vcr do
+    subject { VideoInfo.new('http://www.vimeo.com/898029') }
+
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/width="800"/) }
+    it { expect(subject.embed_code(iframe_attributes: { width: 800, height: 600 })).to match(/height="600"/) }
+  end
+
+  context 'with video 898029 in /group/ url', :vcr do
+    subject { VideoInfo.new('http://vimeo.com/groups/1234/videos/898029') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+  end
+
+  context 'with video 898029 in /group/ url', :vcr do
+    subject { VideoInfo.new('http://player.vimeo.com/video/898029') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+  end
+
+  context 'with video 898029 in text', :vcr do
+    subject { VideoInfo.new('<a href="http://www.vimeo.com/898029">http://www.vimeo.com/898029</a>') }
+
+    describe '#provider' do
+      subject { super().provider }
+      it { is_expected.to eq 'Vimeo' }
+    end
+
+    describe '#video_id' do
+      subject { super().video_id }
+      it { is_expected.to eq '898029' }
+    end
+  end
+
+  context 'with video 101677664 in /ondemand/ url', :vcr do
+    subject { VideoInfo.new('https://vimeo.com/ondemand/less/101677664') }
+
+    its(:provider) { should eq 'Vimeo' }
+    its(:video_id) { should eq '101677664' }
+  end
+
+  context 'with video 111431415 in /channels/*/ url', :vcr do
+    subject { VideoInfo.new('https://vimeo.com/channels/some_channel1/111431415') }
+
+    its(:provider) { should eq 'Vimeo' }
+    its(:video_id) { should eq '111431415' }
+  end
+
+  context "with video 126641548 in /user*/review/126641548/* url", :vcr do
+    subject { VideoInfo.new('http://www.vimeo.com/user39798190/review/126641548/8a56234e32') }
+
+    its(:provider) { should eq 'Vimeo' }
+    its(:video_id) { should eq '126641548' }
+  end
+end