video_info 0.2.0 → 0.2.1

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/guillaumegentil/video_info"
     gem.authors = ["Thibaud Guillaume-Gentil"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "hpricot", ">= 0.8.1"
+    gem.add_dependency "hpricot", ">= 0.8.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/{video → provider}/vimeo.rb

@@ -1,17 +1,20 @@
 require 'hpricot'
 require 'open-uri'
 
-class Vimeo < Video
+class Vimeo
+  attr_accessor :video_id, :url, :provider, :title, :description, :keywords,
+                :duration, :date, :width, :height,
+                :thumbnail_small, :thumbnail_large
   
   def initialize(url)
-    @id = url.gsub(/.*\.com\/([0-9]+).*$/i, '\1')
-    get_info unless @id == url
+    @video_id = url.gsub(/.*\.com\/([0-9]+).*$/i, '\1')
+    get_info unless @video_id == url
   end
   
 private
   
   def get_info
-    doc = Hpricot(open("http://vimeo.com/api/v2/video/#{@id}.xml"))
+    doc = Hpricot(open("http://vimeo.com/api/v2/video/#{@video_id}.xml"))
     @provider         = "Vimeo"
     @url              = doc.search("url").inner_text
     @title            = doc.search("title").inner_text

data/lib/{video → provider}/youtube.rb

@@ -1,19 +1,22 @@
 require 'hpricot'
 require 'open-uri'
 
-class Youtube < Video
+class Youtube
+  attr_accessor :video_id, :url, :provider, :title, :description, :keywords,
+                :duration, :date, :width, :height,
+                :thumbnail_small, :thumbnail_large
   
   def initialize(url)
-    @id = url.gsub(/.*v=([^&]+).*$/i, '\1')
-    get_info unless @id == 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/#{@id}"))
+    doc = Hpricot(open("http://gdata.youtube.com/feeds/api/videos/#{@video_id}"))
     @provider         = "YouTube"
-    @url              = "http://www.youtube.com/watch?v=#{@id}"
+    @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

data/lib/video_info.rb

@@ -1,6 +1,5 @@
-require 'video'
-require 'video/vimeo'
-require 'video/youtube'
+require 'provider/vimeo'
+require 'provider/youtube'
 
 class VideoInfo
   
@@ -14,27 +13,11 @@ class VideoInfo
   end
   
   def valid?
-    @video && !["", nil].include?(title)
+    @video != nil && !["", nil].include?(title)
   end
   
   def method_missing(sym, *args, &block)
     @video.send sym, *args, &block
   end
   
-  # def embed(options = {})
-  #   width  = options[:width]
-  #   height = options[:height]
-  #   
-  #   allowfullscreen = options[:fullscreen]
-  #   fullscreen      = options[:fullscreen]    ? 1 : 0 
-  #   show_title      = options[:show_title]    ? 1 : 0
-  #   show_byline     = options[:show_byline]   ? 1 : 0
-  #   show_portrait   = options[:show_portrait] ? 1 : 0
-  #   case provider
-  #   when "Youtub"
-  #   
-  #   %{<object width="#{width}" height="#{height}"><param name="allowfullscreen" value="#{allowfullscreen}" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=#{id}&amp;server=vimeo.com&amp;show_title=#{show_title}&amp;show_byline=#{show_byline}&amp;show_portrait=#{show_portrait}&amp;color=00adef&amp;fullscreen=#{fullscreen}" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=#{vimeo_id}&amp;server=vimeo.com&amp;show_title=#{show_title}&amp;show_byline=#{show_byline}&amp;show_portrait=#{show_portrait}&amp;color=00adef&amp;fullscreen=#{fullscreen}" type="application/x-shockwave-flash" allowfullscreen="#{allowfullscreen}" allowscriptaccess="always" width="#{options[:width]}" height="#{options[:height]}"></embed></object>}    
-  #   %{<object width="#{options[:width]}" height="#{options[:height]}"><param name="movie" value="http://www.youtube.com/v/#{youtube_id}"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/#{id}" type="application/x-shockwave-flash" wmode="transparent" width="#{options[:width]}" height="#{options[:height]}"></embed></object>}
-  # end
-  
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'video_info'
 require 'spec'
 require 'spec/autorun'

data/spec/video_info_spec.rb

@@ -6,6 +6,7 @@ describe "VideoInfo" do
     subject { VideoInfo.new('http://www.youtube.com/watch?v=mZqGqE0D0n4') }
     
     its(:provider)         { should == 'YouTube' }
+    its(:video_id)         { should == 'mZqGqE0D0n4' }
     its(:url)              { should == 'http://www.youtube.com/watch?v=mZqGqE0D0n4' }
     its(:title)            { should == 'Cherry Bloom - King Of The Knife' }
     its(:description)      { should == 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }
@@ -23,6 +24,7 @@ describe "VideoInfo" do
     subject { VideoInfo.new('http://www.vimeo.com/898029') }
     
     its(:provider)         { should == 'Vimeo' }
+    its(:video_id)         { should == '898029' }
     its(:url)              { should == 'http://vimeo.com/898029' }
     its(:title)            { should == 'Cherry Bloom - King Of The Knife' }
     its(:description)      { should == 'The first video from the upcoming album Secret Sounds, to download in-stores April 14. Checkout http://www.cherrybloom.net' }

data/video_info.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{video_info}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thibaud Guillaume-Gentil"]
@@ -23,9 +23,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "init.rb",
-     "lib/video.rb",
-     "lib/video/vimeo.rb",
-     "lib/video/youtube.rb",
+     "lib/provider/vimeo.rb",
+     "lib/provider/youtube.rb",
      "lib/video_info.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -48,14 +47,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.1"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.2"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<hpricot>, [">= 0.8.1"])
+      s.add_dependency(%q<hpricot>, [">= 0.8.2"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<hpricot>, [">= 0.8.1"])
+    s.add_dependency(%q<hpricot>, [">= 0.8.2"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: video_info
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 description: Get video info from youtube and vimeo url.
 email: thibaud@thibaud.me
@@ -48,9 +48,8 @@ files:
 - Rakefile
 - VERSION
 - init.rb
-- lib/video.rb
-- lib/video/vimeo.rb
-- lib/video/youtube.rb
+- lib/provider/vimeo.rb
+- lib/provider/youtube.rb
 - lib/video_info.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/video.rb

@@ -1,5 +0,0 @@
-class Video
-  attr_accessor :url, :id, :provider, :title, :description, :keywords,
-                :duration, :date, :width, :height,
-                :thumbnail_small, :thumbnail_large
-end