video_info 0.2.5 → 0.2.6

data/README.rdoc

@@ -1,44 +1,44 @@
-= VideoInfo
-  
-Small Ruby Gem to get video info from youtube and vimeo url.
-Tested on Ruby 1.8.6, 1.8.7 & 1.9.2
-  
-== Install
-  
-  gem install video_info
-  
-== Usage
-  
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
-  
-  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.keywords         => "alternative, bloom, cherry, clip, drum, guitar, king, knife, of, Paris-Forum, rock, the, tremplin"
-  video.duration         => 175 (in seconds)
-  video.date             => Sat Apr 12 22:25:35 UTC 2008
-  video.thumbnail_small  => "http://i.ytimg.com/vi/mZqGqE0D0n4/2.jpg"
-  video.thumbnail_large  => "http://i.ytimg.com/vi/mZqGqE0D0n4/0.jpg"
-  
-  video = VideoInfo.new("http://vimeo.com/898029")
-  
-  video.id               => "898029"
-  video.provider         => "Vimeo"
-  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.keywords         => "alternative, bloom, cherry, clip, drum, guitar, king, knife, of, Paris-Forum, rock, the, tremplin"
-  video.duration         => 175 (in seconds)
-  video.date             => Mon Apr 14 13:10:39 +0200 2008
-  video.width            => 640
-  video.height           => 360
-  video.thumbnail_small  => "http://ts.vimeo.com.s3.amazonaws.com/343/731/34373130_100.jpg"
-  video.thumbnail_large  => "http://ts.vimeo.com.s3.amazonaws.com/343/731/34373130_640.jpg"
-  
-  video = VideoInfo.new("http://badurl.com/898029")
-  
-  video.valid? => false
-  
-== Author
-
-Thibaud Guillaume-Gentil
+= VideoInfo
+  
+Small Ruby Gem to get video info from youtube and vimeo url.
+Tested against Ruby 1.8.7, 1.9.2, REE and the latest versions of JRuby & Rubinius.
+  
+== Install
+  
+  gem install video_info
+  
+== Usage
+  
+  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+  
+  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.keywords         => "alternative, bloom, cherry, clip, drum, guitar, king, knife, of, Paris-Forum, rock, the, tremplin"
+  video.duration         => 175 (in seconds)
+  video.date             => Sat Apr 12 22:25:35 UTC 2008
+  video.thumbnail_small  => "http://i.ytimg.com/vi/mZqGqE0D0n4/2.jpg"
+  video.thumbnail_large  => "http://i.ytimg.com/vi/mZqGqE0D0n4/0.jpg"
+  
+  video = VideoInfo.new("http://vimeo.com/898029")
+  
+  video.video_id         => "898029"
+  video.provider         => "Vimeo"
+  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.keywords         => "alternative, bloom, cherry, clip, drum, guitar, king, knife, of, Paris-Forum, rock, the, tremplin"
+  video.duration         => 175 (in seconds)
+  video.date             => Mon Apr 14 13:10:39 +0200 2008
+  video.width            => 640
+  video.height           => 360
+  video.thumbnail_small  => "http://ts.vimeo.com.s3.amazonaws.com/343/731/34373130_100.jpg"
+  video.thumbnail_large  => "http://ts.vimeo.com.s3.amazonaws.com/343/731/34373130_640.jpg"
+  
+  video = VideoInfo.new("http://badurl.com/898029")
+  
+  video.valid? => false
+  
+== Author
+
+Thibaud Guillaume-Gentil

data/lib/provider/youtube.rb

@@ -1,37 +1,47 @@
-require 'hpricot'
-require 'open-uri'
-
-class Youtube
-  attr_accessor :video_id, :url, :provider, :title, :description, :keywords,
-                :duration, :date, :width, :height,
-                :thumbnail_small, :thumbnail_large,
-                :view_count
-
-  def initialize(url)
-    @video_id = url.gsub(/.*v=([^&]+).*$/i, '\1')
-    get_info unless @video_id == url
-  end
-
-private
-
-  def get_info
-    doc = Hpricot(open("http://gdata.youtube.com/feeds/api/videos/#{@video_id}"))
-    @provider         = "YouTube"
-    @url              = "http://www.youtube.com/watch?v=#{@video_id}"
-    @title            = doc.search("media:title").inner_text
-    @description      = doc.search("media:description").inner_text
-    @keywords         = doc.search("media:keywords").inner_text
-    @duration         = doc.search("yt:duration").first[:seconds].to_i
-    @date             = Time.parse(doc.search("published").inner_text, Time.now.utc)
-    @thumbnail_small  = doc.search("media:thumbnail").min { |a,b| a[:height].to_i * a[:width].to_i <=> b[:height].to_i * b[:width].to_i }[:url]
-    @thumbnail_large  = doc.search("media:thumbnail").max { |a,b| a[:height].to_i * a[:width].to_i <=> b[:height].to_i * b[:width].to_i }[:url]
-    # when your video still has no view, yt:statistics is not returned by Youtube
-    # see: https://github.com/thibaudgg/video_info/issues#issue/2
-    if doc.search("yt:statistics").first
-      @view_count     = doc.search("yt:statistics").first[:viewcount].to_i
-    else
-      @view_count     = 0
-    end
-  end
-
-end
+require 'hpricot'
+require 'open-uri'
+
+class Youtube
+  attr_accessor :video_id, :url, :provider, :title, :description, :keywords,
+                :duration, :date, :width, :height,
+                :thumbnail_small, :thumbnail_large,
+                :view_count
+
+  def initialize(url)
+    video_id_for(url)
+    get_info unless @video_id == url
+  end
+
+  def regex
+    /http:\/\/(www.)?youtube\.com\/watch\?v=([A-Za-z0-9._%-]*)(\&\S+)?|http:\/\/(www.)?youtu\.be\/([A-Za-z0-9._%-]*)?/ 
+  end
+
+  def video_id_for(url)
+    url.gsub(regex) do
+      @video_id = $2 || $5
+    end
+  end
+
+private
+
+  def get_info
+    doc = Hpricot(open("http://gdata.youtube.com/feeds/api/videos/#{@video_id}"))
+    @provider         = "YouTube"
+    @url              = "http://www.youtube.com/watch?v=#{@video_id}"
+    @title            = doc.search("media:title").inner_text
+    @description      = doc.search("media:description").inner_text
+    @keywords         = doc.search("media:keywords").inner_text
+    @duration         = doc.search("yt:duration").first[:seconds].to_i
+    @date             = Time.parse(doc.search("published").inner_text, Time.now.utc)
+    @thumbnail_small  = doc.search("media:thumbnail").min { |a,b| a[:height].to_i * a[:width].to_i <=> b[:height].to_i * b[:width].to_i }[:url]
+    @thumbnail_large  = doc.search("media:thumbnail").max { |a,b| a[:height].to_i * a[:width].to_i <=> b[:height].to_i * b[:width].to_i }[:url]
+    # when your video still has no view, yt:statistics is not returned by Youtube
+    # see: https://github.com/thibaudgg/video_info/issues#issue/2
+    if doc.search("yt:statistics").first
+      @view_count     = doc.search("yt:statistics").first[:viewcount].to_i
+    else
+      @view_count     = 0
+    end
+  end
+
+end

data/lib/video_info.rb

@@ -1,23 +1,25 @@
-require 'provider/vimeo'
-require 'provider/youtube'
-
-class VideoInfo
-  
-  def initialize(url)
-    case url
-    when /vimeo\.com/
-      @video = Vimeo.new(url)
-    when /youtube\.com/
-      @video = Youtube.new(url)
-    end
-  end
-  
-  def valid?
-    @video != nil && !["", nil].include?(title)
-  end
-  
-  def method_missing(sym, *args, &block)
-    @video.send sym, *args, &block
-  end
-  
-end
+require 'provider/vimeo'
+require 'provider/youtube'
+
+class VideoInfo
+
+  def initialize(url)
+    case url
+    when /vimeo\.com/
+      @video = Vimeo.new(url)
+    when /youtube\.com/
+      @video = Youtube.new(url)
+    when /youtu\.be/
+      @video = Youtube.new(url)
+    end
+  end
+
+  def valid?
+    @video != nil && !["", nil].include?(title)
+  end
+
+  def method_missing(sym, *args, &block)
+    @video.send sym, *args, &block
+  end
+
+end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 module VideoInfoVersion
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,160 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: video_info
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.2.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-17 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
+date: 2011-10-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &70127803224080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70127803224080
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70127803223600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70127803223600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70127803222800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70127803222800
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70127803222080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70127803222080
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70127803220980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70127803220980
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70127803208580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  type: :runtime
-  version_requirements: *id006
+  version_requirements: *70127803208580
 description: Get video info from youtube and vimeo url.
-email: 
+email:
 - thibaud@thibaud.me
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/provider/vimeo.rb
 - lib/provider/youtube.rb
 - lib/video_info/version.rb
 - lib/video_info.rb
 - LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://rubygems.org/gems/video_info
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: video_info
-rubygems_version: 1.3.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Vimeo & Youtube parser
 test_files: []
-
+has_rdoc: