slainer68-easy-vimeo 0.1.0 → 0.2.0

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2009 slainer68
+Copyright © 2009 Novelys & Promopixel.
+
+Written by Nicolas Blanco.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -0,0 +1,48 @@
+h1. EasyVimeo
+
+EasyVimeo aims to be a very easy and Ruby wrapper around the Vimeo API.
+
+With EasyVimeo, you can upload a video file to the Vimeo website and set its basic properties in a few lines of code.
+
+h1. Example
+
+h2. Send a video in just a few lines of code...
+
+<pre>
+<code>
+  v = Vimeo::Easy.new :api_key => VIMEO_API_KEY, :secret_key => VIMEO_SECRET_KEY, :auth_token => VIMEO_AUTH_TOKEN
+  v.title = "Ma great video"
+  v.caption = "Great cool video"
+  v.tags = "youpi, super, cool"
+  v.privacy = :anybody
+  
+  v.file = "/Users/nicolas/test.mov"
+  v.save
+</code>
+</pre>
+
+h2. Or just get the attributes from an existing video...
+
+<pre>
+<code>
+  v = Vimeo::Easy.find 2052244, :api_key => VIMEO_API_KEY, :secret_key => VIMEO_SECRET_KEY
+</code>
+</pre>
+  
+h2. Other interesting methods...
+
+<pre>
+<code>
+  v.available? # => returns true if the video is currenly available on Vimeo (uploaded & transcoded)
+  v.destroy    # => destroy the video
+  v.reload     # => reload the attributes
+</code>
+</pre>
+
+And that's all for now ;). Thanks!
+
+h1. Copyright
+
+Copyright (c) 2009 Novelys & Promopixel. See LICENSE for details.
+
+Written by Nicolas Blanco.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/easy-vimeo.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy-vimeo}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["slainer68"]
-  s.date = %q{2009-05-07}
+  s.date = %q{2009-05-11}
   s.email = %q{slainer68@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.textile"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.textile",
      "Rakefile",
      "VERSION",
      "easy-vimeo.gemspec",

data/lib/easy-vimeo.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "vimeo"
 require "curb"
 
@@ -36,6 +37,10 @@ module Vimeo
       end
     end
     
+    def self.find(video_id, options = {})
+      self.new(options.merge(:video_id => video_id))
+    end
+    
     def new_record?
       @new_record
     end
@@ -53,7 +58,7 @@ module Vimeo
     # This method destroys the Vimeo Video
     #
     def destroy
-      check_video_and_token
+      check_presence_of :video_id, :auth_token
       
       self.vimeo_video.delete(self.video_id, self.auth_token)
       true
@@ -66,28 +71,30 @@ module Vimeo
     end
     
     def reload
-      check_video_and_token
-      
-      video_response = self.vimeo_video.get_info(self.video_id)['rsp']['video']
-      self.title = video_response['title']
-      self.caption = video_response['caption']
-      self.privacy = video_response['privacy'].to_sym
-      self.thumbnail = (video_response['thumbnails']['thumbnail'].first rescue nil)
-      @tags = (video_response['tags']['tag'].join(', ') rescue nil)
-      @availability = video_response['is_transcoding'].to_i.zero? && video_response['is_uploading'].to_i.zero?
-      @new_record = false
-      
-      true
-    rescue
-      false
+      check_presence_of :video_id
+
+      begin
+        video_response = self.vimeo_video.get_info(self.video_id)['rsp']['video']
+        self.title = video_response['title']
+        self.caption = video_response['caption']
+        self.privacy = video_response['privacy'].to_sym
+        self.thumbnail = (video_response['thumbnails']['thumbnail'].first rescue nil)
+        @tags = (video_response['tags']['tag'].join(', ') rescue nil)
+        @availability = video_response['is_transcoding'].to_i.zero? && video_response['is_uploading'].to_i.zero?
+        @new_record = false
+
+        true
+      rescue
+        false
+      end
     end
     
     def save
       if self.file
         raise "Cannot upload a video file on an existing video! Create a new instance instead." unless new_record?
-        post_video! if self.file
+        post_video!
       end
-      check_video_and_token
+      check_presence_of :video_id, :auth_token
       
       begin
         self.vimeo_video.set_privacy(self.video_id, self.privacy.to_s, self.auth_token)
@@ -108,8 +115,8 @@ module Vimeo
     end
     
     private
-    def check_video_and_token
-      raise "You must set video_id and auth_token to use this method." unless self.video_id && self.auth_token
+    def check_presence_of(*attributes)
+      raise "You must set #{attributes.join(' and ')} to use this method." unless attributes.all? { |a| self.send(a) != nil }
     end
     
     
@@ -132,8 +139,8 @@ module Vimeo
                   Curl::PostField.content('api_sig', self.vimeo_upload.signature_for_file_upload(self.ticket_id, self.auth_token))
                   )
       self.video_id = self.vimeo_upload.check_upload_status(self.ticket_id, self.auth_token)["rsp"]["ticket"]["video_id"]
-    rescue # FIXME : that's bad to rescue all exceptions, but for now, throw false.
-      false
+    #rescue # FIXME : that's bad to rescue all exceptions, but for now, throw false.
+    #  false
     end
   end
 end

data/spec/easy-vimeo_spec.rb

@@ -1,7 +1,116 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "ruby-debug"
+
+VIDEO_RESPONSE_HASH = { 'rsp' => { 'video' => { 'title' => 'Ma video', 'caption' => 'Great caption', 'privacy' => 'nobody', 'thumbnails' => { 'thumbnail' => ['http://first_thumb.jpg'] }, 'tags' => { 'tag' => ['cool', 'great'] }, 'is_transcoding' => '0', 'is_uploading' => '0' } } }
 
 describe "EasyVimeo" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+
+  def video_init(options = {})
+    @api_key = "pipo"
+    @secret_key = "molo"
+    @video = Vimeo::Easy.new :api_key => @api_key, :secret_key => @secret_key, :auth_token => options[:auth_token]
+  end
+  
+  def video_load
+    @video.vimeo_video.should_receive(:get_info).and_return(VIDEO_RESPONSE_HASH)
+    @video.video_id = 9999999
+    @video.reload
+  end
+
+  it "should not initialize without secret_key & api_key" do
+    lambda { Vimeo::Easy.new }.should raise_error
+  end
+  
+  it "should initialize with secret_key & api_key and set default attributes" do
+    video_init
+    
+    @video.api_key.should == @api_key
+    @video.privacy.should == :anybody
+    
+    @video.vimeo_upload.should be_a(Vimeo::Advanced::Upload)
+    @video.vimeo_video.should be_a(Vimeo::Advanced::Video)
+    
+    @video.should be_new_record
+  end
+  
+  it "should not accept bad privacy type" do
+    video_init
+    
+    lambda { @video.privacy = :pipo }.should raise_error
+  end
+  
+  it "should not reload the video without video_id" do
+    video_init
+    
+    lambda { @video.reload }.should raise_error
+  end
+  
+  it "should reload the video with video_id" do
+    video_init
+    video_load
+    
+    @video.title.should == 'Ma video'
+    @video.caption.should == 'Great caption'
+    @video.privacy.should == :nobody
+    @video.tags.should == 'cool, great'
+    @video.thumbnail.should == 'http://first_thumb.jpg'
+    
+    @video.should be_available
+    @video.should_not be_new_record
+  end
+  
+  it "should not be able to save with a file if video is already uploaded" do
+    video_init(:auth_token => "pipo")
+    video_load
+    
+    @video.file = '/tmp/pipo'
+    lambda { @video.save }.should raise_error
+  end
+  
+  it 'should not be able to save a video without auth_token or video_id' do
+    video_init
+    video_load
+    
+    lambda { @video.save }.should raise_error
+    
+    video_init(:auth_token => "pipo")
+    lambda { @video.save }.should raise_error
+  end
+  
+  it 'should be able to save a video' do
+    video_init(:auth_token => "pipo")
+    video_load
+    
+    @video.vimeo_video.should_receive(:set_privacy).and_return(true)
+    @video.vimeo_video.should_receive(:set_caption).and_return(true)
+    @video.vimeo_video.should_receive(:set_title).and_return(true)
+    
+    @video.save.should == true
+  end
+  
+  it 'should be able to save a video with a file' do
+    video_init(:auth_token => "pipo")
+    
+    @video.file = '/tmp/pipo'
+    
+    File.should_receive(:exists?).with('/tmp/pipo').and_return(true)
+    @video.vimeo_upload.should_receive(:get_upload_ticket).and_return({ "rsp" => { "ticket" => { "id" => "123456" } } })
+    @curl = mock("curl")
+    Curl::Easy.should_receive(:new).and_return(@curl)
+    @curl.should_receive(:'multipart_form_post=')
+    @curl.should_receive(:http_post).and_return(true)
+    @video.vimeo_upload.should_receive(:check_upload_status).and_return({ "rsp" => { "ticket" => { "video_id" => "123456" } } })
+    
+    @video.vimeo_video.should_receive(:set_privacy).and_return(true)
+    @video.vimeo_video.should_not_receive(:set_caption)
+    @video.vimeo_video.should_not_receive(:set_title)
+    
+    @video.save.should == true
+    @video.should_not be_new_record
+  end
+  
+  it 'should be able to find a video with a Vimeo ID' do
+    Vimeo::Easy.should_receive(:new).with(:toto => "pipo", :video_id => 123456).and_return(true)
+    Vimeo::Easy.find(123456, :toto => "pipo")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slainer68-easy-vimeo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - slainer68
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.textile
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.textile
 - Rakefile
 - VERSION
 - easy-vimeo.gemspec

data/README.rdoc

@@ -1,10 +0,0 @@
-= easy-vimeo
-
-EasyVimeo aims to be a very easy and Ruby-like wrapper around Vimeo API.
-
-More to come.
-
-== Copyright
-
-Copyright (c) 2009 Novelys & Promopixel. See LICENSE for details.
-Written by Nicolas Blanco.