video_info 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ddcd66b117bba40d3caaabd137a7f9fa2abb3eb
-  data.tar.gz: fc14527e675c4815cc266fa5220b34dbbde8310d
+  metadata.gz: 2fd291c67498dd89547251a472b9e458f7ac3277
+  data.tar.gz: 6a4bab53f9e27cdac0dccca1df65f7be4a9823c8
 SHA512:
-  metadata.gz: 0931fcb59e451f781bbe58d30a0b590f8bd4c673968b361d0023dc2696e911d1aa5bd586f0e2032f9a9f54e7d09620e752addd8dcd7c94bb32fd8cd186fdb6d8
-  data.tar.gz: 504a3ea41e0b4ad6f084cb642bec105406cb0d0197d6ccb10337536e473b934dd99ecb26e8b9b0ff9c246158626c5375b497fc3f8152d8e99cfd70ccc25b364a
+  metadata.gz: eb12467cb8f6244bc9ff5a968ac3f844a10944412d30bb00e4ba10410019f2d8a276cfa6b96098cb244f350d77fa00fb73af9fc66f146f2f66010ec6397c8a62
+  data.tar.gz: d3a72a5fd3b05cd20a13d8e16345635a9ab3f8390ed51b6dada347d92363bab66712907c851a62b6b2f1ebc14c1ad92c6b83b43bb8b87e063b789afa451b6de7

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/video_info.png)](http://badge.fury.io/rb/video_info) [![Build Status](https://travis-ci.org/thibaudgg/video_info.png?branch=master)](https://travis-ci.org/thibaudgg/video_info) [![Dependency Status](https://gemnasium.com/thibaudgg/video_info.png)](https://gemnasium.com/thibaudgg/video_info) [![Code Climate](https://codeclimate.com/github/thibaudgg/video_info.png)](https://codeclimate.com/github/thibaudgg/video_info) [![Coverage Status](https://coveralls.io/repos/thibaudgg/video_info/badge.png?branch=master)](https://coveralls.io/r/thibaudgg/video_info)
 
-Simple Ruby Gem to get video info from Dailymotion, Vimeo, VK and YouTube (with playlist support).
+Simple Ruby Gem to get video info from Dailymotion, Vimeo (with playlist support), VK and YouTube (with playlist support).
 
 Tested against Ruby 1.9.3, 2.0.0, 2.1.0 and the latest versions of JRuby & Rubinius.
 
@@ -71,8 +71,20 @@ playlist = VideoInfo.new("http://www.youtube.com/playlist?p=PL9hW1uS6HUftLdHI6RI
 # playlist.thumbnail_medium    => "http://i.ytimg.com/vi/8b0aEoxqqC0/mqdefault.jpg"
 # playlist.thumbnail_large     => "http://i.ytimg.com/vi/8b0aEoxqqC0/hqdefault.jpg"
 # playlist.embed_url           => "http://www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr"
-# playlist.embed_code          => "'<iframe src="http://www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
+# playlist.embed_code          => "<iframe src="http://www.youtube.com/embed/videoseries?list=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr" frameborder="0" allowfullscreen="allowfullscreen"></iframe>"
 # playlist.videos              => [VideoInfo.new('http://www.youtube.com/watch?v=_Bt3-WsHfB0'), VideoInfo.new('http://www.youtube.com/watch?v=9g2U12SsRns'), VideoInfo.new('http://www.youtube.com/watch?v=8b0aEoxqqC0'), VideoInfo.new('http://www.youtube.com/watch?v=6c3mHikRz0I'), VideoInfo.new('http://www.youtube.com/watch?v=OQVHWsTHcoc')]
+
+playlist = VideoInfo.new("http://vimeo.com/album/2755718")
+# playlist.available?          => true
+# playlist.playlist_id         => "2755718"
+# playlist.provider            => "Vimeo"
+# playlist.title               => "The Century Of Self"
+# playlist.thumbnail_small     => "http://b.vimeocdn.com/ts/443/595/443595474_100.jpg"
+# playlist.thumbnail_medium    => "http://b.vimeocdn.com/ts/443/595/443595474_200.jpg"
+# playlist.thumbnail_large     => "http://b.vimeocdn.com/ts/443/595/443595474_640.jpg"
+# playlist.embed_url           => "player.vimeo.com/hubnut/album/2755718"
+# playlist.embed_code          => "<iframe src="http://player.vimeo.com/hubnut/album/2755718?autoplay=0&byline=0&portrait=0&title=0" frameborder="0"></iframe>"
+# playlist.videos              => [VideoInfo.new('http://vimeo.com/67977038'), VideoInfo.new('http://vimeo.com/68843810'), VideoInfo.new('http://vimeo.com/69949597'), VideoInfo.new('http://vimeo.com/70388245')]
 ```
 
 Options

data/lib/video_info.rb

@@ -7,7 +7,7 @@ class VideoInfo
   class UrlError < StandardError; end
   extend Forwardable
 
-  PROVIDERS = %w[Vimeo Vkontakte Youtube YoutubePlaylist Dailymotion]
+  PROVIDERS = %w[Vimeo VimeoPlaylist Vkontakte Youtube YoutubePlaylist Dailymotion]
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }
 
   def_delegators :@provider, :provider, :video_id, :video_owner, :url, :data

data/lib/video_info/providers/vimeo.rb

@@ -3,7 +3,7 @@ class VideoInfo
     class Vimeo < Provider
 
       def self.usable?(url)
-        url =~ /vimeo\.com/
+        url =~ /(vimeo\.com\/(?!album|hubnut\/album).*)/
       end
 
       def provider
@@ -11,15 +11,15 @@ class VideoInfo
       end
 
       %w[title description thumbnail_small thumbnail_medium thumbnail_large].each do |method|
-        define_method(method) { video[method] }
+        define_method(method) { _video[method] }
       end
 
       %w[duration width height].each do |method|
-        define_method(method) { video[method].to_i }
+        define_method(method) { _video[method].to_i }
       end
 
       def keywords
-        video['tags']
+        _video['tags']
       end
 
       def embed_url
@@ -27,19 +27,19 @@ class VideoInfo
       end
 
       def date
-        Time.parse(video['upload_date'], Time.now.utc).utc
+        Time.parse(_video['upload_date'], Time.now.utc).utc
       end
 
       def view_count
-        video['stats_number_of_plays'].to_i
+        _video['stats_number_of_plays'].to_i
       end
 
-      def video
+      private
+
+      def _video
         data && data.first
       end
 
-      private
-
       def _url_regex
         /.*\.com\/(?:(?:groups\/[^\/]+\/videos\/)|(?:video\/))?([0-9]+).*$/i
       end

data/lib/video_info/providers/vimeoplaylist.rb

@@ -0,0 +1,64 @@
+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
+        _playlist_video_ids.map do |entry_id|
+          VideoInfo.new("http://vimeo.com/#{entry_id}")
+        end
+      end
+
+      def embed_url
+        "player.vimeo.com/hubnut/album/#{playlist_id}"
+      end
+
+      %w[width height date keywords duration 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
+        "/api/v2/album/#{video_id}/info.json"
+      end
+
+      def _api_videos_path
+        "/api/v2/album/#{video_id}/videos.json"
+      end
+
+      def _api_videos_url
+        "http://#{_api_base}#{_api_videos_path}"
+      end
+
+      def _data_videos
+        @data_videos ||= _set_videos_from_api
+      end
+
+      def _set_videos_from_api
+        uri = open(_api_videos_url, options)
+        MultiJson.load(uri.read)
+      end
+
+      def _playlist_video_ids
+        _data_videos.map do |entry|
+          entry['id']
+        end
+      end
+
+    end
+  end
+end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_VimeoPlaylist/_available_/with_invalid_playlist/available_/.yml

@@ -0,0 +1,152 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/video/2755718.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 28 Feb 2014 23:49:05 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3595'
+      X-Ratelimit-Reset:
+      - '1393634120'
+      Cache-Control:
+      - max-age=60
+      Expires:
+      - Fri, 28 Feb 2014 23:50:05 GMT
+      Last-Modified:
+      - Fri, 21 Feb 2014 06:05:40 GMT
+      Etag:
+      - '"0ad6ab03cab8ef64f7f7261e3c1b374c"'
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Cneonction:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 28 Feb 2014 23:49:07 GMT
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/album/2755718/info.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 28 Feb 2014 23:53:57 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3593'
+      X-Ratelimit-Reset:
+      - '1393634120'
+      Cache-Control:
+      - max-age=60
+      Expires:
+      - Fri, 28 Feb 2014 23:54:57 GMT
+      Last-Modified:
+      - Fri, 28 Feb 2014 23:19:45 GMT
+      Etag:
+      - '"066770d7b5e5c4a8ac2e5d2178671420"'
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Cneonction:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 28 Feb 2014 23:53:59 GMT
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/album/2/info.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Fri, 28 Feb 2014 23:56:09 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3592'
+      X-Ratelimit-Reset:
+      - '1393634120'
+      Cache-Control:
+      - max-age=300, must-revalidate
+      Expires:
+      - Sat, 01 Mar 2014 00:01:09 GMT
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Nncoection:
+      - close
+      Content-Type:
+      - text/html; charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 28 Feb 2014 23:56:11 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_VimeoPlaylist/_available_/with_valid_playlist/available_/.yml

@@ -0,0 +1,105 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/video/2755718.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 28 Feb 2014 23:49:05 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3596'
+      X-Ratelimit-Reset:
+      - '1393634120'
+      Cache-Control:
+      - max-age=60
+      Expires:
+      - Fri, 28 Feb 2014 23:50:05 GMT
+      Last-Modified:
+      - Fri, 21 Feb 2014 06:05:40 GMT
+      Etag:
+      - '"0ad6ab03cab8ef64f7f7261e3c1b374c"'
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Cneonction:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 28 Feb 2014 23:49:07 GMT
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/album/2755718/info.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 28 Feb 2014 23:53:56 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3594'
+      X-Ratelimit-Reset:
+      - '1393634120'
+      Cache-Control:
+      - max-age=60
+      Expires:
+      - Fri, 28 Feb 2014 23:54:56 GMT
+      Last-Modified:
+      - Fri, 28 Feb 2014 23:19:45 GMT
+      Etag:
+      - '"066770d7b5e5c4a8ac2e5d2178671420"'
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Cneonction:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 28 Feb 2014 23:53:59 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_VimeoPlaylist/with_playlist_2755718/date/.yml

@@ -0,0 +1,75 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://vimeo.com/api/v2/album/2755718/info.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.2.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Age:
+      - '2'
+      Date:
+      - Sat, 01 Mar 2014 00:10:32 GMT
+      Expires:
+      - Sat, 01 Mar 2014 00:11:32 GMT
+      Connection:
+      - Keep-Alive
+      Via:
+      - 1.1 varnish
+      - dnet-dca
+      Etag:
+      - '"f9075c16b5f1158ce5ea0e7c4f82dad0"'
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - '*'
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3597'
+      X-Ratelimit-Reset:
+      - '1393634121'
+      Last-Modified:
+      - Sat, 01 Mar 2014 00:07:48 GMT
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '349'
+      Accept-Ranges:
+      - bytes
+      X-Varnish:
+      - '1775345710'
+      X-Varnish-Cache:
+      - '0'
+      Nncoection:
+      - close
+      X-Vserver:
+      - 10.90.128.196
+    body:
+      encoding: UTF-8
+      string: '{"id":2755718,"created_on":"2014-02-28 18:18:21","last_modified":"2014-02-28
+        19:07:48","title":"The Century Of Self","description":"The Century of the
+        Self is an award-winning British television documentary series by Adam Curtis,
+        released in 2002.","url":"http:\/\/vimeo.com\/album\/2755718","thumbnail_small":"http:\/\/b.vimeocdn.com\/ts\/443\/595\/443595474_100.jpg","thumbnail_medium":"http:\/\/b.vimeocdn.com\/ts\/443\/595\/443595474_200.jpg","thumbnail_large":"http:\/\/b.vimeocdn.com\/ts\/443\/595\/443595474_640.jpg","total_videos":4,"user_id":2618747,"user_display_name":"Karl
+        Entwistle","user_url":"http:\/\/vimeo.com\/user2618747"}'
+    http_version: 
+  recorded_at: Sat, 01 Mar 2014 00:10:35 GMT
+recorded_with: VCR 2.8.0