video_info 2.5.0 → 2.6.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: video_info
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -42,58 +42,72 @@ dependencies:
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: net_http_timeout_errors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -193,11 +207,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- foo.txt
 - lib/video_info.rb
 - lib/video_info/provider.rb
 - lib/video_info/providers/dailymotion.rb
 - lib/video_info/providers/vimeo.rb
-- lib/video_info/providers/vimeoplaylist.rb
+- lib/video_info/providers/vimeo_api.rb
+- lib/video_info/providers/vimeo_scraper.rb
 - lib/video_info/providers/vkontakte.rb
 - lib/video_info/providers/wistia.rb
 - lib/video_info/providers/youtube.rb
@@ -209,7 +225,7 @@ files:
 - lib/video_info/version.rb
 - spec/lib/video_info/provider_spec.rb
 - spec/lib/video_info/providers/dailymotion_spec.rb
-- spec/lib/video_info/providers/vimeo_playlist_spec.rb
+- spec/lib/video_info/providers/vimeo_api_spec.rb
 - spec/lib/video_info/providers/vimeo_spec.rb
 - spec/lib/video_info/providers/vkontakte_spec.rb
 - spec/lib/video_info/providers/wistia_spec.rb
@@ -240,14 +256,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dailymotion, Vimeo, VK and YouTube info parser.
 test_files:
 - spec/lib/video_info/provider_spec.rb
 - spec/lib/video_info/providers/dailymotion_spec.rb
-- spec/lib/video_info/providers/vimeo_playlist_spec.rb
+- spec/lib/video_info/providers/vimeo_api_spec.rb
 - spec/lib/video_info/providers/vimeo_spec.rb
 - spec/lib/video_info/providers/vkontakte_spec.rb
 - spec/lib/video_info/providers/wistia_spec.rb

data/lib/video_info/providers/vimeoplaylist.rb

@@ -1,63 +0,0 @@
-class VideoInfo
-  module Providers
-    class VimeoPlaylist < Vimeo
-      alias_method :playlist_id, :video_id
-
-      def self.usable?(url)
-        url =~ /((vimeo\.com)\/album)|((vimeo\.com)\/hubnut\/album)/
-      end
-
-      def videos
-        @videos ||= _data_videos.map do |video_data|
-          video = Vimeo.new(video_data['link'])
-          video.data = video
-          video
-        end
-      end
-
-      def embed_url
-        "//player.vimeo.com/hubnut/album/#{playlist_id}"
-      end
-
-      %w[width height keywords view_count].each do |method|
-        define_method(method) { nil }
-      end
-
-      private
-
-      def _video
-        data
-      end
-
-      def _url_regex
-        /vimeo.com\/album\/([0-9]*)|vimeo.com\/hubnut\/album\/([0-9]*)/
-      end
-
-      def _api_path
-        "/albums/#{playlist_id}"
-      end
-
-      def _api_path_album_videos
-        "/albums/#{playlist_id}/videos"
-      end
-
-      def _api_videos_path
-        "/videos/#{video_id}"
-      end
-
-      def _api_videos_url
-        "https://#{_api_base}#{_api_path_album_videos}"
-      end
-
-      def _data_videos
-        @data_videos ||= _set_videos_from_api
-      end
-
-      def _set_videos_from_api
-        uri = open(_api_videos_url, options)
-        json = MultiJson.load(uri.read)
-        json['data']
-      end
-    end
-  end
-end

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

@@ -1,157 +0,0 @@
-require 'spec_helper'
-
-describe VideoInfo::Providers::VimeoPlaylist do
-  before(:all) do
-    VideoInfo.provider_api_keys = { vimeo: '6b66b015a3504793b4f541d878f46ff6' }
-  end
-
-  describe '.usable?' do
-    subject { VideoInfo::Providers::VimeoPlaylist.usable?(url) }
-
-    context 'with vimeo album url' do
-      let(:url) { 'http://vimeo.com/album/2755718' }
-      it { is_expected.to be_truthy }
-    end
-
-    context 'with vimeo hubnub embed url' do
-      let(:url) { 'http://player.vimeo.com/hubnut/album/2755718' }
-      it { is_expected.to be_truthy }
-    end
-
-    context 'with vimeo url' do
-      let(:url) { 'http://www.vimeo.com/898029' }
-      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 playlist', :vcr do
-      subject { VideoInfo.new('http://vimeo.com/album/2755718') }
-
-      describe '#available?' do
-        subject { super().available? }
-        it { is_expected.to be_truthy }
-      end
-    end
-
-    context 'with invalid playlist', :vcr do
-      subject { VideoInfo.new('http://vimeo.com/album/2') }
-
-      describe '#available?' do
-        subject { super().available? }
-        it { is_expected.to be_falsey }
-      end
-    end
-  end
-
-  context 'with playlist 1921098', :vcr do
-    let(:videos) {
-      [
-        39837353, 40170418, 38809325, 38445453,
-        38445381, 38445243, 38394965, 42647970
-      ].map do |video_id|
-        VideoInfo.new("https://vimeo.com/#{video_id}")
-      end
-    }
-    subject { VideoInfo.new('http://vimeo.com/album/1921098') }
-
-    describe '#provider' do
-      subject { super().provider }
-      it { is_expected.to eq 'Vimeo' }
-    end
-
-    describe '#playlist_id' do
-      subject { super().playlist_id }
-      it { is_expected.to eq '1921098' }
-    end
-
-    describe '#url' do
-      subject { super().url }
-      it { is_expected.to eq 'http://vimeo.com/album/1921098' }
-    end
-
-    describe '#embed_url' do
-      subject { super().embed_url }
-      it { is_expected.to eq '//player.vimeo.com/hubnut/album/1921098' }
-    end
-
-    describe '#embed_code' do
-      subject { super().embed_code }
-      it { is_expected.to eq "<iframe src=\"//player.vimeo.com/hubnut/album/1921098?autoplay=0&byline=0&portrait=0&title=0\" frameborder=\"0\"></iframe>" }
-    end
-
-    describe '#title' do
-      subject { super().title }
-      it { is_expected.to eq 'Get To Know The New Vimeo' }
-    end
-
-    describe '#description' do
-      subject { super().description }
-      it { is_expected.to eq 'Tutorials to get you started in the brand new Vimeo!' }
-    end
-
-    describe '#keywords' do
-      subject { super().keywords }
-      it { is_expected.to be_nil }
-    end
-
-    describe '#duration' do
-      subject { super().duration }
-      it { is_expected.to eq 1254 }
-    end
-
-    describe '#width' do
-      subject { super().width }
-      it { is_expected.to be_nil }
-    end
-
-    describe '#height' do
-      subject { super().height }
-      it { is_expected.to be_nil }
-    end
-
-    describe '#date' do
-      subject { super().date }
-      it { is_expected.to eq Time.parse('2012-04-30T15:00:53+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/299773432_100x75.jpg' }
-    end
-
-    describe '#thumbnail_medium' do
-      subject { super().thumbnail_medium }
-      it { is_expected.to eq 'https://i.vimeocdn.com/video/299773432_200x150.jpg' }
-    end
-
-    describe '#thumbnail_large' do
-      subject { super().thumbnail_large }
-      it { is_expected.to eq 'https://i.vimeocdn.com/video/299773432_640.jpg' }
-    end
-
-    describe '#videos' do
-      subject { super().videos }
-      it { is_expected.to match_array(videos) }
-    end
-
-    describe '#view_count' do
-      subject { super().view_count }
-      it { is_expected.to be_nil }
-    end
-  end
-
-  context 'with playlist 2755718 in embed path', :vcr do
-    subject { VideoInfo.new('http://player.vimeo.com/hubnut/album/2755718') }
-
-    describe '#playlist_id' do
-      subject { super().playlist_id }
-      it { is_expected.to eq '2755718' }
-    end
-  end
-end