video_info 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376d921bd7baa14f2f172af3ffe91984d5168aaa
-  data.tar.gz: d8346b58fb30f413309f4a55c2d6a7742f797fb5
+  metadata.gz: 58cc86ef25f00b1ffc554c0765a0a44cdfd1431a
+  data.tar.gz: cd5cf65c26ce4431441ba20260104ea207500d31
 SHA512:
-  metadata.gz: 45ceedd2ebe3dd1942b19dd1ccd39081ed4c5acc13c52cb9446c1e742943397c0d4634782f1435da7e567d08fdb128cc212232c58fb85800a0af0199ce708b4c
-  data.tar.gz: 3974ff201a0bece40c27b2cffdb1da95ff190be94b21da79b58d395e1d2edcb68e90bf7084a4b9e27515dd8f2d68979493f15207a97cf2a46d9a237417304452
+  metadata.gz: cf64eb48e870c0d60099de9d8a7df0005fa442b6b93e1581a3fdd2aa9c603bdeeecf4b3cb41e37804d6b8064d3b081f32d6c5db32f3de471afd0b6f0f656423e
+  data.tar.gz: ecb8bbdd71b372c12cbd0749a47eb7b4a63a1a65d60a5365c113c8ca25a429015a5ff0ac5996d0e09a39ee08e0d8753791996dfc3ba1f880fafbe0f4372bb415

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Thibaud Guillaume-Gentil
+Copyright (c) 2014 Thibaud Guillaume-Gentil
 
 MIT License
 

data/README.md

@@ -2,9 +2,9 @@
 
 [![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 YouTube, Vimeo and VK url.
+Simple Ruby Gem to get video info from Dailymotion, Vimeo, VK and YouTube (with playlist support).
 
-Tested against Ruby 1.9.3, 2.0.0 and the latest versions of JRuby & Rubinius.
+Tested against Ruby 1.9.3, 2.0.0, 2.1.0 and the latest versions of JRuby & Rubinius.
 
 Install
 --------
@@ -17,19 +17,19 @@ Usage
 -----
 
 ``` ruby
-video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+video = VideoInfo.new("http://www.dailymotion.com/video/x7lni3")
 # video.available?       => true
-# video.video_id         => "mZqGqE0D0n4"
-# video.provider         => "YouTube"
-# video.title            => "Cherry Bloom - King Of The Knife"
-# video.description      => "The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net"
-# video.duration         => 175 (in seconds)
-# video.date             => Sat Apr 12 22:25:35 UTC 2008
-# video.thumbnail_small  => "http://i.ytimg.com/vi/mZqGqE0D0n4/default.jpg"
-# video.thumbnail_medium => "http://i.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg"
-# video.thumbnail_large  => "http://i.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg"
-# video.embed_url        => "http://www.youtube.com/embed/mZqGqE0D0n4"
-# video.embed_code       => "'<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
+# video.video_id         => "x7lni3"
+# video.provider         => "Dailymotion"
+# video.title            => "Mario Kart (Rémi Gaillard)"
+# video.description      => "Super Rémi Kart est un jeu vidéo de course développé et édité par N'Importe Quoi TV."
+# video.duration         => 136 (in seconds)
+# video.date             => Mon Mar 03 16:29:31 UTC 2008
+# video.thumbnail_small  => "http://s2.dmcdn.net/BgWxI/x60-kbf.jpg"
+# video.thumbnail_medium => "http://s2.dmcdn.net/BgWxI/x240-b83.jpg"
+# video.thumbnail_large  => "http://s2.dmcdn.net/BgWxI/x720-YcV.jpg"
+# video.embed_url        => "http://www.dailymotion.com/embed/video/x7lni3"
+# video.embed_code       => "'<iframe src="http://www.dailymotion.com/embed/video/x7lni3" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
 
 video = VideoInfo.new("http://vimeo.com/898029")
 # video.available?       => true
@@ -47,6 +47,32 @@ video = VideoInfo.new("http://vimeo.com/898029")
 # video.thumbnail_large  => "http://b.vimeocdn.com/ts/343/731/34373130_640.jpg"
 # video.embed_url        => "http://player.vimeo.com/video/898029"
 # video.embed_code       => "'<iframe src="http://player.vimeo.com/video/898029?title=0&amp;byline=0&amp;portrait=0&amp;autoplay=0" frameborder="0"></iframe>'"
+
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+# video.available?       => true
+# video.video_id         => "mZqGqE0D0n4"
+# video.provider         => "YouTube"
+# video.title            => "Cherry Bloom - King Of The Knife"
+# video.description      => "The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net"
+# video.duration         => 175 (in seconds)
+# video.date             => Sat Apr 12 22:25:35 UTC 2008
+# video.thumbnail_small  => "http://i.ytimg.com/vi/mZqGqE0D0n4/default.jpg"
+# video.thumbnail_medium => "http://i.ytimg.com/vi/mZqGqE0D0n4/mqdefault.jpg"
+# video.thumbnail_large  => "http://i.ytimg.com/vi/mZqGqE0D0n4/hqdefault.jpg"
+# video.embed_url        => "http://www.youtube.com/embed/mZqGqE0D0n4"
+# video.embed_code       => "'<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
+
+playlist = VideoInfo.new("http://www.youtube.com/playlist?p=PL9hW1uS6HUftLdHI6RIsaf-iXTm09qnEr")
+# playlist.available?          => true
+# playlist.playlist_id         => "PL9hW1uS6HUftLdHI6RIsaf"
+# playlist.provider            => "YouTube"
+# playlist.title               => "YouTube Policy and Copyright"
+# playlist.thumbnail_small     => "http://i.ytimg.com/vi/8b0aEoxqqC0/default.jpg"
+# 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.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')]
 ```
 
 Options

data/lib/video_info.rb

@@ -7,7 +7,7 @@ class VideoInfo
   class UrlError < StandardError; end
   extend Forwardable
 
-  PROVIDERS = %w[Vimeo Vkontakte Youtube]
+  PROVIDERS = %w[Vimeo Vkontakte Youtube YoutubePlaylist Dailymotion]
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }
 
   def_delegators :@provider, :provider, :video_id, :video_owner, :url, :data
@@ -16,6 +16,7 @@ class VideoInfo
   def_delegators :@provider, :thumbnail_small, :thumbnail_medium, :thumbnail_large
   def_delegators :@provider, :embed_code, :embed_url
   def_delegators :@provider, :available?
+  def_delegators :@provider, :playlist_id, :videos
 
   def initialize(url, options = {})
     @provider = _select_provider(url, options)
@@ -32,6 +33,10 @@ class VideoInfo
     false
   end
 
+  def ==(other)
+    url == other.url && video_id == other.video_id
+  end
+
   private
 
   def _select_provider(url, options)

data/lib/video_info/providers/dailymotion.rb

@@ -0,0 +1,85 @@
+class VideoInfo
+  module Providers
+    class Dailymotion < Provider
+
+      def self.usable?(url)
+        url =~ /(dai(?:\.ly|lymotion\.com))/
+      end
+
+      def provider
+        'Dailymotion'
+      end
+
+      %w[title description duration].each do |method|
+        define_method(method) { data[method] }
+      end
+
+      %w[width height].each do |method|
+        define_method(method) { nil }
+      end
+
+      def keywords
+        data['tags']
+      end
+
+      def embed_url
+        "www.dailymotion.com/embed/video/#{video_id}"
+      end
+
+      def date
+        Time.at(data['created_time']).utc
+      end
+
+      def thumbnail_small
+        data['thumbnail_60_url']
+      end
+
+      def thumbnail_medium
+        data['thumbnail_240_url']
+      end
+
+      def thumbnail_large
+        data['thumbnail_720_url']
+      end
+
+      def view_count
+        data['views_total'].to_i
+      end
+
+      private
+
+      def _response_code
+        response = nil
+        Net::HTTP.start(_api_base, 443, use_ssl: true) {|http|
+          response = http.get(_api_path)
+        }
+        response.code
+      end
+
+      def _url_regex
+        /dai(?:\.ly|lymotion\.com\/(?:embed\/)?video)\/([a-zA-Z0-9]*)/
+      end
+
+      def _api_base
+        "api.dailymotion.com"
+      end
+
+      def _api_path
+        "/video/#{video_id}"
+      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"
+      end
+
+      def _default_iframe_attributes
+        {}
+      end
+
+      def _default_url_attributes
+        { autoplay: 0 }
+      end
+
+    end
+  end
+end

data/lib/video_info/providers/youtube.rb

@@ -3,7 +3,7 @@ class VideoInfo
     class Youtube < Provider
 
       def self.usable?(url)
-        url =~ /(youtube\.com)|(youtu\.be)/
+        url =~ /(youtube\.com\/(?!playlist).*)|(youtu\.be)/
       end
 
       def provider

data/lib/video_info/providers/youtubeplaylist.rb

@@ -0,0 +1,55 @@
+class VideoInfo
+  module Providers
+    class YoutubePlaylist < Youtube
+
+      alias_method :playlist_id, :video_id
+
+      def self.usable?(url)
+        url =~ /(youtube\.com)\/playlist/
+      end
+
+      def videos
+        _playlist_video_ids.map do |entry_id|
+          VideoInfo.new("http://www.youtube.com/watch?v=#{entry_id}")
+        end
+      end
+
+      def embed_url
+        "www.youtube.com/embed/videoseries?list=#{playlist_id}"
+      end
+
+      def description
+        _playlist_entry['subtitle']['$t']
+      end
+
+      %w[date keywords duration view_count].each do |method|
+        define_method(method) { nil }
+      end
+
+      private
+
+      def _playlist_entry
+        data['feed']
+      end
+
+      def _video_entry
+        _playlist_entry
+      end
+
+      def _url_regex
+        /youtube.com\/playlist\?p=(\S*)/
+      end
+
+      def _api_path
+        "/feeds/api/playlists/#{playlist_id}?v=2&alt=json"
+      end
+
+      def _playlist_video_ids
+        _playlist_entry['entry'].map do |entry|
+          entry['media$group']['yt$videoid']['$t']
+        end
+      end
+
+    end
+  end
+end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_This_video_does_not_exist_or_has_been_deleted_/available_/.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/inValIdiD
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Backnode:
+      - web-104.adm.dailymotion.com:80
+      Vary:
+      - Authorization,Accept-Encoding
+      Cache-Control:
+      - private, max-age=900, no-transform, no-cache="set-cookie"
+      Content-Type:
+      - application/json
+      X-Api-Error:
+      - code="404", message="This video does not exist or has been deleted."
+      P3p:
+      - policyref="http://www.dailymotion.com/w3c/p3p.xml", CP="IDC DSP CURa ADMa
+        DEVa TAIa OUR BUS IND UNI COM NAV INT"
+      Date:
+      - Sat, 22 Feb 2014 12:37:47 GMT
+      Keep-Alive:
+      - timeout=60, max=4984
+      X-Dm-Lb:
+      - 195.8.215.129
+      Access-Control-Allow-Origin:
+      - '*'
+      Etag:
+      - W/"CcU5dNT05vkow2VzLcDLDA"
+      Connection:
+      - Keep-Alive
+      Set-Cookie:
+      - ts=332925; expires=Thu, 22-Feb-2024 12:37:47 GMT; Max-Age=315532800; path=/;
+        domain=.dailymotion.com
+      Last-Modified:
+      - Wed, 29 Jan 2014 19:37:41 GMT
+      X-Dm-Page:
+      - fr.rest.rest_api
+      Content-Length:
+      - '110'
+    body:
+      encoding: UTF-8
+      string: '{"error":{"code":404,"message":"This video does not exist or has been
+        deleted.","type":"not_found"}}'
+    http_version: 
+  recorded_at: Sat, 22 Feb 2014 12:37:47 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_valid_video/available_/.yml

@@ -0,0 +1,60 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.dailymotion.com/video/x7lni3
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - DMS/1.0.42
+      X-Dm-Backnode:
+      - web-029.adm.dailymotion.com:80
+      Vary:
+      - Authorization,Accept-Encoding
+      Cache-Control:
+      - private, max-age=900, no-transform, no-cache="set-cookie"
+      Content-Type:
+      - application/json
+      P3p:
+      - policyref="http://www.dailymotion.com/w3c/p3p.xml", CP="IDC DSP CURa ADMa
+        DEVa TAIa OUR BUS IND UNI COM NAV INT"
+      Date:
+      - Sat, 22 Feb 2014 12:37:46 GMT
+      Keep-Alive:
+      - timeout=60, max=4966
+      X-Dm-Lb:
+      - 195.8.215.129
+      Access-Control-Allow-Origin:
+      - '*'
+      Etag:
+      - W/"O1DJzTYSf9K1Wvn1OkaB4Q"
+      Connection:
+      - Keep-Alive
+      Set-Cookie:
+      - ts=227877; expires=Thu, 22-Feb-2024 12:37:46 GMT; Max-Age=315532800; path=/;
+        domain=.dailymotion.com
+      Last-Modified:
+      - Sat, 06 Jul 2013 19:32:30 GMT
+      X-Dm-Page:
+      - fr.rest.rest_api
+      Content-Length:
+      - '103'
+    body:
+      encoding: UTF-8
+      string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","channel":"fun","owner":"x4r137"}'
+    http_version: 
+  recorded_at: Sat, 22 Feb 2014 12:37:47 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_video_is_unavailable_video/available_/.yml

@@ -0,0 +1,46 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://gdata.youtube.com/feeds/api/videos/SUkXvWn1m7Q?alt=json&v=2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      X-Gdata-User-Country:
+      - FR
+      Content-Type:
+      - application/vnd.google.gdata.error+xml
+      Content-Length:
+      - '181'
+      Date:
+      - Fri, 21 Feb 2014 15:53:18 GMT
+      Expires:
+      - Fri, 21 Feb 2014 15:53:18 GMT
+      Cache-Control:
+      - private, max-age=0
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Server:
+      - GSE
+      Alternate-Protocol:
+      - 80:quic
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Fri, 21 Feb 2014 15:53:17 GMT
+recorded_with: VCR 2.8.0