video_info 0.4.0 → 1.0.0

data/README.md

@@ -15,21 +15,21 @@ Usage
 -----
 
 ``` ruby
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+  video = VideoInfo.get("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.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 = VideoInfo.new("http://vimeo.com/898029")
+  video = VideoInfo.get("http://vimeo.com/898029")
 
   # video.video_id         => "898029"
   # video.provider         => "Vimeo"
@@ -40,29 +40,26 @@ Usage
   # 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.thumbnail_small  => "http://b.vimeocdn.com/ts/343/731/34373130_100.jpg"
+  # video.thumbnail_medium => "http://b.vimeocdn.com/ts/343/731/34373130_200.jpg"
+  # 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://badurl.com/898029")
-
-  # video.valid? => false
 ```
 
 Options
 -------
 
 ``` ruby
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "User-Agent" => "My Youtube Mashup Robot/1.0")
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/")
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/",
+  video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "User-Agent" => "My Youtube Mashup Robot/1.0")
+  video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/")
+  video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/",
                                                                       "User-Agent" => "My Youtube Mashup Robot/1.0")
 ```
 You can also use **symbols** instead of strings (any non-word (`/[^a-z]/i`) character would be converted to hyphen).
 
 ``` ruby
-  video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", :referer    => "http://my-youtube-mashup.com/",
+  video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", :referer    => "http://my-youtube-mashup.com/",
                                                                       :user_agent => "My Youtube Mashup Robot/1.0")
 ```
 
@@ -73,7 +70,7 @@ It supports all openURI header fields (options), for more information see: [open
 You can also include an `iframe_attributes` hash to include arbitrary attributes in the iframe embed code:
 
 ``` ruby
-VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", :iframe_attributes => { :width => 800, :height => 600, "data-key" => "value" } ).embed_code
+VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", :iframe_attributes => { :width => 800, :height => 600, "data-key" => "value" } ).embed_code
 => '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen" width="800" height="600" data-key="value"></iframe>'
 ```
 

data/lib/providers/vimeo.rb

@@ -0,0 +1,49 @@
+module VideoInfo
+  class Vimeo
+    attr_accessor :video_id, :embed_url, :embed_code, :url, :provider, :title, :description, :keywords,
+                  :duration, :date, :width, :height,
+                  :thumbnail_small, :thumbnail_medium, :thumbnail_large,
+                  :view_count,
+                  :openURI_options
+
+    def initialize(url, options = {})
+      if iframe_attributes = options.delete(:iframe_attributes)
+        @iframe_attributes = VideoInfo.hash_to_attributes iframe_attributes
+      end
+
+      @openURI_options = options
+      @video_id = url.gsub(/.*\.com\/(?:groups\/[^\/]+\/videos\/)?([0-9]+).*$/i, '\1')
+      get_info unless @video_id == url || @video_id.nil? || @video_id.empty?
+    end
+
+    def valid?
+      !@video_id.nil? && !['', nil].include?(@title)
+    end
+
+    private
+
+    def get_info
+      begin
+        uri   = open("http://vimeo.com/api/v2/video/#{@video_id}.json", @openURI_options)
+        video = MultiJson.load(uri.read).first
+        @provider         = "Vimeo"
+        @url              = video['url']
+        @embed_url        = "http://player.vimeo.com/video/#{@video_id}"
+        @embed_code       = "<iframe src=\"#{@embed_url}?title=0&amp;byline=0&amp;portrait=0&amp;autoplay=0\" frameborder=\"0\"#{@iframe_attributes}></iframe>"
+        @title            = video['title']
+        @description      = video['description']
+        @keywords         = video['tags']
+        @duration         = video['duration'].to_i # seconds
+        @width            = video['width'].to_i
+        @height           = video['height'].to_i
+        @date             = Time.parse(video['upload_date'], Time.now.utc).utc
+        @thumbnail_small  = video['thumbnail_small']
+        @thumbnail_medium = video['thumbnail_medium']
+        @thumbnail_large  = video['thumbnail_large']
+        @view_count       = video['stats_number_of_plays'].to_i
+      rescue
+        nil
+      end
+    end
+  end
+end

data/lib/providers/youtube.rb

@@ -0,0 +1,63 @@
+module VideoInfo
+  class Youtube
+    attr_accessor :video_id, :embed_url, :embed_code, :url, :provider, :title, :description, :keywords,
+                  :duration, :date, :width, :height,
+                  :thumbnail_small, :thumbnail_medium, :thumbnail_large,
+                  :view_count,
+                  :openURI_options
+
+    def initialize(url, options = {})
+      if iframe_attributes = options.delete(:iframe_attributes)
+        @iframe_attributes = VideoInfo.hash_to_attributes iframe_attributes
+      end
+
+      @openURI_options = options
+      video_id_for(url)
+      get_info unless @video_id == url || @video_id.nil? || @video_id.empty?
+    end
+
+    def regex
+      /youtu(.be)?(be.com)?.*(?:\/|v=)([\w-]+)/
+    end
+
+    def video_id_for(url)
+      url.gsub(regex) do
+        @video_id = $3
+      end
+    end
+
+    def valid?
+      !@video_id.nil? && !['', nil].include?(@title)
+    end
+
+    private
+
+    def get_info
+      begin
+        uri   = open("http://gdata.youtube.com/feeds/api/videos/#{@video_id}?v=2&alt=json", @openURI_options)
+        video = MultiJson.load(uri.read)
+        @provider         = "YouTube"
+        @url              = "http://www.youtube.com/watch?v=#{@video_id}"
+        @embed_url        = "http://www.youtube.com/embed/#{@video_id}"
+        @embed_code       = "<iframe src=\"#{@embed_url}\" frameborder=\"0\" allowfullscreen=\"allowfullscreen\"#{@iframe_attributes}></iframe>"
+        @title            = video['entry']['title']['$t']
+        @description      = video['entry']['media$group']['media$description']['$t']
+        @keywords         = video['entry']['media$group']['media$keywords']['$t']
+        @duration         = video['entry']['media$group']['yt$duration']['seconds'].to_i
+        @date             = Time.parse(video['entry']['published']['$t'], Time.now.utc)
+        @thumbnail_small  = video['entry']['media$group']['media$thumbnail'][0]['url']
+        @thumbnail_medium = video['entry']['media$group']['media$thumbnail'][1]['url']
+        @thumbnail_large  = video['entry']['media$group']['media$thumbnail'][2]['url']
+        # when your video still has no view, yt:statistics is not returned by Youtube
+        # see: https://github.com/thibaudgg/video_info/issues/2
+        if video['entry']['yt$statistics']
+          @view_count     = video['entry']['yt$statistics']['viewCount'].to_i
+        else
+          @view_count     = 0
+        end
+      rescue
+        nil
+      end
+    end
+  end
+end

data/lib/video_info.rb

@@ -1,15 +1,13 @@
 require 'open-uri'
-require 'hpricot'
+require 'multi_json'
 require 'video_info/version'
-require 'provider/vimeo'
-require 'provider/youtube'
+require 'providers/vimeo'
+require 'providers/youtube'
 
-class VideoInfo
-
-  def initialize(url, options = {})
-
-    options = { "User-Agent" => "VideoInfo/#{VideoInfoVersion::VERSION}" }.merge options
-    options.dup.each do |key,value|
+module VideoInfo
+  def self.get(url, options = {})
+    options = { "User-Agent" => "VideoInfo/#{VideoInfo::VERSION}" }.merge options
+    options.dup.each do |key, value|
       unless OpenURI::Options.keys.include?(key) || options[:iframe_attributes]
         if key.is_a? Symbol
           options[key.to_s.split(/[^a-z]/i).map(&:capitalize).join('-')] = value
@@ -21,18 +19,12 @@ class VideoInfo
     case url
     when /vimeo\.com/
       @video = Vimeo.new(url, options)
-    when /youtube\.com/
-      @video = Youtube.new(url, options)
-    when /youtu\.be/
+    when /(youtube\.com)|(youtu\.be)/
       @video = Youtube.new(url, options)
     end
   end
 
-  def valid?
-    @video != nil && !["", nil].include?(title)
-  end
-
-  def method_missing(sym, *args, &block)
+  def self.method_missing(sym, *args, &block)
     @video.send sym, *args, &block
   end
 
@@ -40,5 +32,4 @@ class VideoInfo
     s = hash.map{|k,v| "#{k}=\"#{v}\""}.join(' ')
     " #{s}"
   end
-
 end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
-module VideoInfoVersion
-  VERSION = "0.4.0"
+module VideoInfo
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_info
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 description: Get video info from youtube and vimeo url.
 email:
 - thibaud@thibaud.me
@@ -114,8 +114,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/provider/vimeo.rb
-- lib/provider/youtube.rb
+- lib/providers/vimeo.rb
+- lib/providers/youtube.rb
 - lib/video_info/version.rb
 - lib/video_info.rb
 - LICENSE

data/lib/provider/vimeo.rb

@@ -1,39 +0,0 @@
-class Vimeo
-  attr_accessor :video_id, :embed_url, :embed_code, :url, :provider, :title, :description, :keywords,
-                :duration, :date, :width, :height,
-                :thumbnail_small, :thumbnail_large,
-                :view_count,
-                :openURI_options
-
-  def initialize(url, options = {})
-    @iframe_attributes = VideoInfo.hash_to_attributes options.delete(:iframe_attributes) if options[:iframe_attributes]
-    @openURI_options = options
-    @video_id = url.gsub(/.*\.com\/(?:groups\/[^\/]+\/videos\/)?([0-9]+).*$/i, '\1')
-    get_info unless @video_id == url || @video_id.nil? || @video_id.empty?
-  end
-
-private
-
-  def get_info
-    begin
-      doc = Hpricot(open("http://vimeo.com/api/v2/video/#{@video_id}.xml", @openURI_options))
-      @provider         = "Vimeo"
-      @url              = doc.search("url").inner_text
-      @embed_url        = "http://player.vimeo.com/video/#{@video_id}"
-      @embed_code       = "<iframe src=\"#{@embed_url}?title=0&amp;byline=0&amp;portrait=0&amp;autoplay=0\" frameborder=\"0\"#{@iframe_attributes}></iframe>"
-      @title            = doc.search("title").inner_text
-      @description      = doc.search("description").inner_text
-      @keywords         = doc.search("tags").inner_text
-      @duration         = doc.search("duration").inner_text.to_i # seconds
-      @width            = doc.search("width").inner_text.to_i
-      @height           = doc.search("height").inner_text.to_i
-      @date             = Time.parse(doc.search("upload_date").inner_text, Time.now.utc).utc
-      @thumbnail_small  = doc.search("thumbnail_small").inner_text
-      @thumbnail_large  = doc.search("thumbnail_large").inner_text
-      @view_count       = doc.search("stats_number_of_plays").inner_text.to_i
-    rescue
-      nil
-    end
-  end
-
-end

data/lib/provider/youtube.rb

@@ -1,53 +0,0 @@
-class Youtube
-  attr_accessor :video_id, :embed_url, :embed_code, :url, :provider, :title, :description, :keywords,
-                :duration, :date, :width, :height,
-                :thumbnail_small, :thumbnail_large,
-                :view_count,
-                :openURI_options
-
-  def initialize(url, options = {})
-    @iframe_attributes = VideoInfo.hash_to_attributes options.delete(:iframe_attributes) if options[:iframe_attributes]    
-    @openURI_options = options
-    video_id_for(url)
-    get_info unless @video_id == url || @video_id.nil? || @video_id.empty?
-  end
-
-  def regex
-    /youtu(.be)?(be.com)?.*(?:\/|v=)([\w-]+)/
-  end
-
-  def video_id_for(url)
-    url.gsub(regex) do
-      @video_id = $3
-    end
-  end
-
-private
-
-  def get_info
-    begin
-      doc = Hpricot(open("http://gdata.youtube.com/feeds/api/videos/#{@video_id}", @openURI_options))
-      @provider         = "YouTube"
-      @url              = "http://www.youtube.com/watch?v=#{@video_id}"
-      @embed_url        = "http://www.youtube.com/embed/#{@video_id}"
-      @embed_code       = "<iframe src=\"#{@embed_url}\" frameborder=\"0\" allowfullscreen=\"allowfullscreen\"#{@iframe_attributes}></iframe>"
-      @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
-    rescue
-      nil
-    end
-  end
-
-end