slainer68_vimeo 1.4.4 → 1.5.2

data/README.markdown

@@ -133,10 +133,15 @@ Once the user has allowed your application to access their account, they will be
     user.secret = access_token.secret
     user.save
 
+*Note*: if you are trying to get your access tokens manually, then the above block of code will be a little different:
+
+  - `params[:oauth_token]` is the same as `request_token.token`
+  - `params[:oauth_verifier]` is the code you see on Vimeo after you visit `base.authorize_url` and allow access to your account.
+
 Now you've got everything you need to use the Advanced API. Let's get a user's videos:
 
     video = Vimeo::Advanced::Video.new("consumer_key", "consumer_secret", :token => user.token, :secret => user.secret)
-    video.get_videos("matthooks")
+    video.get_all("matthooks")
 
     # => {"videos"=> { ... }, "stat"=>"ok", "generated_in"=>"0.5753"}
 
@@ -271,6 +276,7 @@ Some methods have optional variables. Pass these as a hash at the end of a call.
     video.get_cast("video_id", { :page => "1", :per_page => "25" })
     video.get_contacts_liked("user_id", { :page => "1", :per_page => "25", :full_response => "0", :sort => "newest" })
     video.get_contacts_uploaded("user_id", { :page => "1", :per_page => "25", :full_response => "0", :sort => "newest" })
+    video.get_collections("video_id")
     video.get_info("video_id")
     video.get_likes("user_id", { :page => "1", :per_page => "25", :full_response => "0", :sort => "newest" })
     video.get_subscriptions("user_id", { :page => "1", :per_page => "25", :full_response => "0", :sort => "newest" })
@@ -327,4 +333,4 @@ The upload method will automatically get an upload ticket, perform the multipart
 * [HTTParty](http://github.com/jnunemaker/httparty): Easily one of the best tools I have used since I started using Ruby.
 * [Jeweler](http://github.com/technicalpickles/jeweler): Great tool for creating gems for Github.
 
-### Copyright (c) 2009-2010 Matt Hooks. See LICENSE for details.
+### Copyright (c) 2009-2010 Matt Hooks. See LICENSE for details.

data/Rakefile

@@ -20,8 +20,8 @@ begin
     gem.rdoc_options = ['--main', 'README.rdoc', '--inline-source', '--charset=UTF-8']
     gem.extra_rdoc_files = ['README.rdoc', 'LICENSE', 'CHANGELOG.rdoc']
 
-    gem.add_dependency "multi_json", ">= 1.0.4"
     gem.add_dependency "httparty", ">= 0.4.5"
+    gem.add_dependency "json", ">= 1.1.9"
     gem.add_dependency "oauth", ">= 0.4.3"
     gem.add_dependency "httpclient", ">= 2.1.5.2"
     gem.add_dependency "multipart-post", ">= 1.0.1"

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 1
-:minor: 4
-:patch: 4
-:build: 
+:minor: 5
+:patch: 2
+:build: !!null 

data/lib/vimeo/advanced/album.rb

@@ -12,24 +12,39 @@ module Vimeo
                         "vimeo.albums.create",
                         :required => [:title, :video_id],
                         :optional => [:description, :videos]
-      
+
       # Deletes an album.
       create_api_method :delete,
                         "vimeo.albums.delete",
                         :required => [:album_id]
-      
+
       # Returns a list of a user's albums.
       create_api_method :get_all,
                         "vimeo.albums.getAll",
                         :required => [:user_id],
                         :optional => [:page, :per_page, :sort]
-      
+
       # Returns a list of the videos in an album.
       create_api_method :get_videos,
                         "vimeo.albums.getVideos",
                         :required => [:album_id],
                         :optional => [:page, :per_page, :full_response, :password]
-      
+
+      # Returns a list of videos which exist in the user's watch later album
+      create_api_method :get_watch_later,
+                        "vimeo.albums.getWatchLater",
+                        :optional => [:page, :per_page, :full_response]
+
+      # Adds a video to a user's watch later album
+      create_api_method :add_to_watch_later,
+                        "vimeo.albums.addToWatchLater",
+                        :required => [:video_id]
+
+      # Adds a video to a user's watch later album
+      create_api_method :remove_from_watch_later,
+                        "vimeo.albums.removeFromWatchLater",
+                        :required => [:video_id]
+
       # Removes a video from an album.
       create_api_method :remove_video,
                         "vimeo.albums.removeVideo",
@@ -39,12 +54,12 @@ module Vimeo
       create_api_method :set_description,
                         "vimeo.albums.setDescription",
                         :required => [:album_id, :description]
-                        
+
       # Sets the password of an album.
       create_api_method :set_password,
                         "vimeo.albums.setPassword",
                         :required => [:album_id, :password]
-      
+
       # Sets the title of an album.
       create_api_method :set_title,
                         "vimeo.albums.setTitle",

data/lib/vimeo/advanced/base.rb

@@ -1,7 +1,7 @@
 require 'oauth'
 
 module CreateApiMethod
-  
+
   # Creates a method that calls a Vimeo Method through the Advanced API.
   #
   # @param [String] method The name of the method being created.
@@ -11,24 +11,24 @@ module CreateApiMethod
   # @option options [Array] :optional An array of optional parameters.
   def create_api_method(method, vimeo_method, options={})
     options = { :required => [], :optional => [] }.merge(options)
-    
+
     method = method.to_s
     camelized_method = camelize(method, false)
-    
+
     raise ArgumentError, 'Required parameters must be an array.' unless options[:required].is_a? Array
     raise ArgumentError, 'Optional parameters must be an array.' unless options[:optional].is_a? Array
-    
+
     required = options[:required].map { |r| r.to_s }.join(",")
     optional = options[:optional].map { |o| ":#{o} => nil" }.join(",")
     authorized = options.fetch(:authorized, true)
-    
+
     parameters = "(#{required unless required.empty?}#{',' unless required.empty?}options={#{optional}})"
-    
+
     method_string = <<-method
 
       def #{method}#{parameters}
         raise ArgumentError, 'Options must be a hash.' unless options.is_a? Hash
-        
+
         sig_options = {
           :method => "#{vimeo_method}",
           :format => "json"
@@ -36,19 +36,19 @@ module CreateApiMethod
 
         #{ options[:required].map { |r| "sig_options.merge! :#{r} => #{r}"}.join("\n") }
         #{ options[:optional].map { |o| "sig_options.merge! :#{o} => options[:#{o}] unless options[:#{o}].nil?" }.join("\n") }
-        
+
         make_request sig_options, #{authorized ? "true" : "false"}
       end
-      
+
       alias #{camelized_method} #{method}
-      
+
     method
-    
+
     class_eval method_string
   end
-  
+
   protected
-  
+
   # taken from ActiveSupport-2.3.4, activesupport/lib/active_support/inflector.rb, line 178
   def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
     if first_letter_in_uppercase
@@ -66,7 +66,7 @@ module Vimeo
 
     class Base
       extend CreateApiMethod
-      
+
       ENDPOINT = "http://vimeo.com/api/rest/v2"
 
       def initialize(consumer_key, consumer_secret, options = {})
@@ -75,23 +75,23 @@ module Vimeo
           @access_token = OAuth::AccessToken.new(@oauth_consumer, options[:token], options[:secret])
         end
       end
-      
+
       def authorize_url(permission = "delete")
         get_request_token.authorize_url :permission => permission
       end
-      
+
       def get_request_token
         @request_token ||= @oauth_consumer.get_request_token :scheme => :header
       end
-      
+
       def get_access_token(oauth_token=nil, oauth_secret=nil, oauth_verifier=nil)
         @access_token ||= OAuth::RequestToken.new(@oauth_consumer, oauth_token, oauth_secret).get_access_token :oauth_verifier => oauth_verifier
       end
-      
+
       # TODO: Move this to OAuth
       create_api_method :check_access_token,
                         "vimeo.oauth.checkAccessToken"
-      
+
 private
 
       def make_request(options, authorized)
@@ -100,16 +100,16 @@ private
         else
           raw_response = @oauth_consumer.request(:post, Vimeo::Advanced::Base::ENDPOINT, nil, {}, options).body
         end
-        
-        response = MultiJson.decode(raw_response)
+
+        response = JSON.parse(raw_response)
         validate_response! response
         response
       end
-      
+
       # Raises an exception if the response does contain a +stat+ different from "ok"
       def validate_response!(response)
         raise "empty response" unless response
-        
+
         status = response["stat"]
         if status and status != "ok"
           error = response["err"]

data/lib/vimeo/advanced/simple_upload/chunk.rb

@@ -18,7 +18,7 @@ module Vimeo
 
         # Performs the upload via Multipart.
         def upload
-          endpoint = "#{task.endpoint}&chunk_id=#{index}"
+          endpoint = "#{task.endpoint}"
 
           response = task.oauth_consumer.request(:post, endpoint, vimeo.get_access_token, {}, {}) do |req|
             req.set_content_type("multipart/form-data", { "boundary" => MULTIPART_BOUNDARY })
@@ -29,6 +29,8 @@ module Vimeo
             def io.content_type; "application/octet-stream"; end
 
             parts = []
+            parts << Parts::ParamPart.new(MULTIPART_BOUNDARY, "ticket_id", task.id)
+            parts << Parts::ParamPart.new(MULTIPART_BOUNDARY, "chunk_id", index)
             parts << Parts::FilePart.new(MULTIPART_BOUNDARY, "file_data", io)
             parts << Parts::EpiloguePart.new(MULTIPART_BOUNDARY)
 
@@ -47,4 +49,4 @@ module Vimeo
       end
     end
   end
-end
+end

data/lib/vimeo/advanced/simple_upload/task.rb

@@ -69,7 +69,7 @@ module Vimeo
 
         # Returns a hash of the sent chunks and their respective sizes.
         def sent_chunk_sizes
-          Hash[chunks.map { |chunk| [chunk.id, chunk.size] }]
+          Hash[chunks.map { |chunk| [chunk.index.to_s, chunk.size] }]
         end
 
         # Returns a of Vimeo's received chunks and their respective sizes.
@@ -82,4 +82,4 @@ module Vimeo
       end
     end
   end
-end
+end

data/lib/vimeo/advanced/video.rb

@@ -57,6 +57,10 @@ module Vimeo
                         "vimeo.videos.getInfo",
                         :required => [:video_id]
 
+      create_api_method :get_collections,
+                        "vimeo.videos.getCollections",
+                        :required => [:video_id]
+
       create_api_method :get_likes,
                         "vimeo.videos.getLikes",
                         :required => [:user_id],

data/slainer68_vimeo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "slainer68_vimeo"
-  s.version = "1.4.4"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Hooks"]
-  s.date = "2012-01-18"
+  s.date = "2012-06-05"
   s.description = "A full featured Ruby implementation of the Vimeo API."
   s.email = "matthooks@gmail.com"
   s.extra_rdoc_files = [
@@ -49,11 +49,14 @@ Gem::Specification.new do |s|
     "lib/vimeo/simple/user.rb",
     "lib/vimeo/simple/video.rb",
     "slainer68_vimeo.gemspec",
+    "test/fixtures/advanced/album/add_to_watch_later.json",
     "test/fixtures/advanced/album/add_video.json",
     "test/fixtures/advanced/album/create.json",
     "test/fixtures/advanced/album/delete.json",
     "test/fixtures/advanced/album/get_all.json",
     "test/fixtures/advanced/album/get_videos.json",
+    "test/fixtures/advanced/album/get_watch_later.json",
+    "test/fixtures/advanced/album/remove_from_watch_later.json",
     "test/fixtures/advanced/album/remove_video.json",
     "test/fixtures/advanced/album/set_description.json",
     "test/fixtures/advanced/album/set_password.json",
@@ -118,6 +121,7 @@ Gem::Specification.new do |s|
     "test/fixtures/advanced/video/get_appears_in.json",
     "test/fixtures/advanced/video/get_by_tag.json",
     "test/fixtures/advanced/video/get_cast.json",
+    "test/fixtures/advanced/video/get_collections.json",
     "test/fixtures/advanced/video/get_comments_list.json",
     "test/fixtures/advanced/video/get_contacts_liked.json",
     "test/fixtures/advanced/video/get_contacts_uploaded.json",
@@ -198,8 +202,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.6"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<multi_json>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.3"])
       s.add_runtime_dependency(%q<httpclient>, [">= 2.1.5.2"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 1.0.1"])
@@ -207,8 +211,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
       s.add_dependency(%q<ruby-prof>, [">= 0.9.2"])
-      s.add_dependency(%q<multi_json>, [">= 1.0.4"])
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
+      s.add_dependency(%q<json>, [">= 1.1.9"])
       s.add_dependency(%q<oauth>, [">= 0.4.3"])
       s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
       s.add_dependency(%q<multipart-post>, [">= 1.0.1"])
@@ -217,8 +221,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 2.11.3"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
     s.add_dependency(%q<ruby-prof>, [">= 0.9.2"])
-    s.add_dependency(%q<multi_json>, [">= 1.0.4"])
     s.add_dependency(%q<httparty>, [">= 0.4.5"])
+    s.add_dependency(%q<json>, [">= 1.1.9"])
     s.add_dependency(%q<oauth>, [">= 0.4.3"])
     s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
     s.add_dependency(%q<multipart-post>, [">= 1.0.1"])

data/test/fixtures/advanced/album/add_to_watch_later.json

@@ -0,0 +1,4 @@
+{
+  "generated_in":"0.0085",
+  "stat":"ok"
+}

data/test/fixtures/advanced/album/get_watch_later.json

@@ -0,0 +1,32 @@
+{
+  "on_this_page":"3",
+  "page":"1",
+  "perpage":"50",
+  "total":"3",
+  "video":[
+    {
+      "embed_privacy":"anywhere",
+      "id":"740598",
+      "is_hd":"0",
+      "owner":"101193",
+      "privacy":"anybody",
+      "title":"Time Lapse 2"
+    },
+    {
+      "embed_privacy":"anywhere",
+      "id":"740633",
+      "is_hd":"0",
+      "owner":"101193",
+      "privacy":"anybody",
+      "title":"Time Lapse"
+    },
+    {
+      "embed_privacy":"anywhere",
+      "id":"1016589",
+      "is_hd":"0",
+      "owner":"101193",
+      "privacy":"anybody",
+      "title":"3D Glasses"
+    }
+  ]
+}

data/test/fixtures/advanced/album/remove_from_watch_later.json

@@ -0,0 +1,4 @@
+{
+  "generated_in":"0.0085",
+  "stat":"ok"
+}

data/test/fixtures/advanced/video/get_collections.json

@@ -0,0 +1,58 @@
+{
+  "generated_in":"0.0352",
+  "stat":"ok",
+  "collections":{
+    "collection":[
+      {
+        "id":"238",
+        "name":"Paragliding",
+        "thumbnail":"http:\/\/b.vimeocdn.com\/ts\/271\/061\/271061013_200.jpg",
+        "type":"group"
+      },
+      {
+        "id":"69227",
+        "name":"ACRO PARAGLIDING",
+        "thumbnail":"http:\/\/b.vimeocdn.com\/ts\/269\/902\/269902809_200.jpg",
+        "type":"group"
+      },
+      {
+        "id":"3886",
+        "name":"Paragliding",
+        "thumbnail":"http:\/\/b.vimeocdn.com\/ts\/261\/654\/261654324_200.jpg",
+        "type":"channel"
+      },
+      {
+        "id":"246957",
+        "name":"Paragliding HD",
+        "thumbnail":"http:\/\/b.vimeocdn.com\/ts\/270\/993\/270993310_200.jpg",
+        "type":"channel"
+      },
+      {
+        "id":"61208",
+        "name":"VL",
+        "thumbnail":"http:\/\/b.vimeocdn.com\/ts\/252\/711\/252711076_200.jpg",
+        "type":"album"
+      }
+    ]
+  },
+  "urls":{
+    "url":[
+      {
+        "type":"group",
+        "_content":"http:\/\/vimeo.com\/groups\/paragliding\/videos\/38054508"
+      },
+      {
+        "type":"group",
+        "_content":"http:\/\/vimeo.com\/groups\/acroparagliding\/videos\/38054508"
+      },
+      {
+        "type":"channel",
+        "_content":"http:\/\/vimeo.com\/channels\/paragliding\/38054508"
+      },
+      {
+        "type":"channel",
+        "_content":"http:\/\/vimeo.com\/channels\/paraglidinghd\/38054508"
+      }
+    ]
+  }
+}

data/test/test_helper.rb

@@ -3,12 +3,12 @@ require 'test/unit'
 
 gem 'shoulda', ">= 2.10.2"
 gem 'fakeweb', ">= 1.2.6"
-gem 'multi_json', ">= 1.0.4"
+gem 'crack', ">= 0.1.4"
 gem 'mocha', ">= 0.9.8"
 
 require 'shoulda'
 require 'fakeweb'
-require 'multi_json'
+require 'Crack'
 require 'mocha'
 require 'ruby-prof'
 
@@ -43,7 +43,7 @@ def advanced_vimeo_url(url = "")
 end
 
 def stub_get(url, filename, status=nil)
-  # FIXME: We have to specify content type, otherwise HTTParty will not parse the 
+  # FIXME: We have to specify content type, otherwise HTTParty will not parse the
   # body correctly. Is there any way we can get around this? Or is this a limitation
   # of using FakeWeb?
   options = { :body => fixture_file(filename), :content_type => 'application/json' }
@@ -61,4 +61,4 @@ end
 
 def stub_custom_post(url, filename)
   FakeWeb.register_uri(:post, vimeo_base_url(url), :body => fixture_file(filename), :content_type => 'application/json')
-end
+end

data/test/vimeo/advanced/album_test.rb

@@ -3,73 +3,94 @@ require 'test_helper'
 class AlbumTest < Test::Unit::TestCase
 
   context "vimeo advanced album" do
-    
+
     setup do
       @album = Vimeo::Advanced::Album.new("12345", "secret", :token => "token", :secret => "secret")
     end
-    
+
     should "be able to add a video to an album" do
       stub_post("?oauth_nonce=3MFt5up5QljUQKJS8u9bOPzX9DXn3Xll1vdLLV2bwo&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=SgRuPWsG%2BSHGOdw6HVbfHtqSXsY%3D", "advanced/album/add_video.json")
       response = @album.add_video("album_id", "video_id")
-      
+
       assert_equal "ok", response["stat"]
     end
-    
+
     should "be able to create an album" do
       stub_post("?oauth_nonce=UkAfw5mrHZ2RiYl85vBxd9dGlpdOB1HiMs7ZXa7YGE&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=ZTGMAKrk4voVelv9Hzu2XzwlKbo%3D", "advanced/album/create.json")
       response = @album.create("title", "video_id")
-      
+
       assert_equal "129683", response["album"]["id"]
     end
-    
+
     should "be able to delete an album" do
       stub_post("?oauth_nonce=zyARBYynTJnBn9HiiKTQAGRVuDymj5kUkH72JPE9IBE&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=14SAeavDzDfbO6XY%2Bd4a05kJGGs%3D", "advanced/album/delete.json")
       response = @album.delete("album_id")
-      
+
       assert_equal "ok", response["stat"]
     end
-    
+
     should "be able to get a list of a user's albums" do
       stub_post("?oauth_nonce=4wZJ82yZnNtdnu4ccKaxBpAnyDLvf9xfiH4RrgRgK8o&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=KDczd%2F%2BEjPW64v0r6IbYL%2BJYcYs%3D", "advanced/album/get_all.json")
       response = @album.get_all("user_id")
-      
+
       assert_equal "3", response["albums"]["total"]
     end
-    
+
     should "be able to list the videos in an album" do
       stub_post("?oauth_nonce=yCIHyp8VXtFtxVzuKwMbHMwV7Z2eqKxDEeRTgOkwc&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=TwPJGzgvrYB4vOzyUKJueNTLMcI%3D", "advanced/album/get_videos.json")
       response = @album.get_videos("album_id")
-      
+
       assert_equal "2", response["videos"]["total"]
     end
-    
+
     should "be able to remove a video from an album" do
       stub_post("?oauth_nonce=fKXbUdxBFZoynegg9zzE0DS0AzhaHcNcOclSEo0&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=tztcS72SjTJxyioP3JN7KgQVUSI%3D", "advanced/album/remove_video.json")
       response = @album.remove_video("album_id", "video_id")
-      
+
       assert_equal "ok", response["stat"]
     end
-    
+
     should "be able to set the description of an album" do
       stub_post("?oauth_nonce=45zc84rri7doHXSDHtk5w3nDpfVU8EIj3do8z23tld8&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=xTB0pnxTlZsr1P42cpfFZ50EnkA%3D", "advanced/album/set_description.json")
       response = @album.set_description("album_id", "description")
-      
+
       assert_equal "ok", response["stat"]
     end
-    
+
     should "be able to set the password of an album" do
       stub_post("?oauth_nonce=ctucSZ9WBeP6lkmcmjT8tEmvQu5AJS7K5OZReGSzMk&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=7YcUkFMRryJAYRZGpBj47JFoFsQ%3D", "advanced/album/set_password.json")
       response = @album.set_password("album_id", "password")
-      
+
       assert_equal "ok", response["stat"]
     end
-    
+
     should "be able to set the title of an album" do
       stub_post("?oauth_nonce=nqVTjX53HqEvBR43v2qloK90TBJHbU7N7SdlisWHNGk&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=CpnakG4IBSfugNsi%2FUeVSN9zGu0%3D", "advanced/album/set_title.json")
       response = @album.set_title("album_id", "title")
-      
+
       assert_equal "ok", response["stat"]
     end
-      
+
+    should "be able to get a list of a user's videos in his watch later album" do
+      stub_post("?oauth_nonce=nqVTjX53HqEvBR43v2qloK90TBJHbU7N7SdlisWHNGk&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=CpnakG4IBSfugNsi%2FUeVSN9zGu0%3D", "advanced/album/get_watch_later.json")
+      response = @album.get_watch_later
+
+      assert_equal "3", response["total"]
+    end
+
+    should "be able to add a video to a user's watch later album" do
+      stub_post("?oauth_nonce=nqVTjX53HqEvBR43v2qloK90TBJHbU7N7SdlisWHNGk&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=CpnakG4IBSfugNsi%2FUeVSN9zGu0%3D", "advanced/album/add_to_watch_later.json")
+      response = @album.add_to_watch_later("video_id")
+
+      assert_equal "ok", response["stat"]
+    end
+
+    should "be able to remove a video from a user's watch later album" do
+      stub_post("?oauth_nonce=nqVTjX53HqEvBR43v2qloK90TBJHbU7N7SdlisWHNGk&oauth_signature_method=HMAC-SHA1&oauth_token=token&oauth_timestamp=1261345197&oauth_consumer_key=12345&oauth_version=1.0&oauth_signature=CpnakG4IBSfugNsi%2FUeVSN9zGu0%3D", "advanced/album/remove_from_watch_later.json")
+      response = @album.remove_from_watch_later("video_id")
+
+      assert_equal "ok", response["stat"]
+    end
+
   end
 end

data/test/vimeo/advanced/videos_test.rb

@@ -85,6 +85,13 @@ class VideoTest < Test::Unit::TestCase
       assert_equal "ok", response["stat"]
     end
     
+    should "be able to get collections for a video" do
+      stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.getCollections&api_sig=0f1a7df7325961a0cf352da6264e913f", "advanced/video/get_collections.json")
+      response = @video.get_info("video_id")
+      
+      assert_equal "ok", response["stat"]
+    end
+    
     should "be able to get info about a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.getInfo&api_sig=0f1a7df7325961a0cf352da6264e913f", "advanced/video/get_info.json")
       response = @video.get_info("video_id")

data/test/vimeo/simple/user_test.rb

@@ -1,76 +1,76 @@
 require 'test_helper'
 
 class UserTest < Test::Unit::TestCase
-  
+
   context "vimeo simple user" do
-    
+
     setup do
       @user_name = "blakewhitman"
     end
-    
+
     context "making api calls" do
-      
+
       should "be able to get info for a user" do
         stub_get("/#{@user_name}/info.json", "simple/user/info.json")
         info = Vimeo::Simple::User.info(@user_name)
-        
+
         assert_equal "Blake Whitman", info["display_name"]
       end
-      
+
       should "be able to get videos created by a user" do
-        stub_get("/#{@user_name}/videos.json", "simple/user/videos.json")
+        stub_get("/#{@user_name}/videos.json?page=1", "simple/user/videos.json")
         videos = Vimeo::Simple::User.videos(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "pulse", first["title"]
       end
-      
+
       should "be able to get videos a user likes" do
         stub_get("/#{@user_name}/likes.json", "simple/user/likes.json")
         videos = Vimeo::Simple::User.likes(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "Seed", first["title"]
       end
-      
+
       should "be able to get videos that a user appears in" do
         stub_get("/#{@user_name}/appears_in.json", "simple/user/appears_in.json")
         videos = Vimeo::Simple::User.appears_in(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "Vimeo Offline Party: London", first["title"]
       end
-      
+
       should "be able to get videos that a user appears in and/or created" do
         stub_get("/#{@user_name}/all_videos.json", "simple/user/all_videos.json")
         videos = Vimeo::Simple::User.all_videos(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "Vimeo Offline Party: London", first["title"]
       end
-      
+
       should "be able to get videos a user is subscribed to" do
         stub_get("/#{@user_name}/subscriptions.json", "simple/user/subscriptions.json")
         videos = Vimeo::Simple::User.subscriptions(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "TIDES - HD", first["title"]
       end
-      
+
       should "be able to get albums a user has created" do
         stub_get("/#{@user_name}/albums.json", "simple/user/albums.json")
         albums = Vimeo::Simple::User.albums(@user_name)
-        
+
         assert_equal 30, albums.size
         first = albums.first
         assert_equal "Amigos", first["title"]
       end
-      
+
       should "be able to get channels a user has created and subscribed to" do
         stub_get("/#{@user_name}/channels.json", "simple/user/channels.json")
         channels = Vimeo::Simple::User.channels(@user_name)
@@ -79,34 +79,34 @@ class UserTest < Test::Unit::TestCase
         first = channels.first
         assert_equal "01SHORTFILM   ______ Only the best, international, award-winning, CINEMATIC shortfilms", first["name"]
       end
-      
+
       should "be able to get groups that a user either created and/or joined" do
         stub_get("/#{@user_name}/groups.json", "simple/user/groups.json")
         groups = Vimeo::Simple::User.groups(@user_name)
-        
+
         assert_equal 97, groups.size
         first = groups.first
         assert_equal "3D Animation", first["name"]
       end
-      
+
       should "be able to get videos that a user's contacts created" do
         stub_get("/#{@user_name}/contacts_videos.json", "simple/user/contacts_videos.json")
         videos = Vimeo::Simple::User.contacts_videos(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "Star Wars Uncut - Scene 90", first["title"]
       end
-      
+
       should "be able to get videos that a user's contacts liked" do
         stub_get("/#{@user_name}/contacts_like.json", "simple/user/contacts_like.json")
         videos = Vimeo::Simple::User.contacts_like(@user_name)
-        
+
         assert_equal 20, videos.size
         first = videos.first
         assert_equal "Jaybilizer 3000 Camera Stabilizer Shooting Techniques and Montage", first["title"]
       end
-      
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slainer68_vimeo
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70344812828540 !ruby/object:Gem::Requirement
+  requirement: &70174093343880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70344812828540
+  version_requirements: *70174093343880
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70344812828040 !ruby/object:Gem::Requirement
+  requirement: &70174093343380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70344812828040
+  version_requirements: *70174093343380
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &70344812827520 !ruby/object:Gem::Requirement
+  requirement: &70174093342900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +43,32 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70344812827520
+  version_requirements: *70174093342900
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70344812826800 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &70174093342420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70344812826800
+  version_requirements: *70174093342420
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70344812826300 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70174093341920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 1.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *70344812826300
+  version_requirements: *70174093341920
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70344812825820 !ruby/object:Gem::Requirement
+  requirement: &70174093341440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70344812825820
+  version_requirements: *70174093341440
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70344812824620 !ruby/object:Gem::Requirement
+  requirement: &70174093340960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70344812824620
+  version_requirements: *70174093340960
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70344812823280 !ruby/object:Gem::Requirement
+  requirement: &70174093340480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70344812823280
+  version_requirements: *70174093340480
 description: A full featured Ruby implementation of the Vimeo API.
 email: matthooks@gmail.com
 executables: []
@@ -139,11 +139,14 @@ files:
 - lib/vimeo/simple/user.rb
 - lib/vimeo/simple/video.rb
 - slainer68_vimeo.gemspec
+- test/fixtures/advanced/album/add_to_watch_later.json
 - test/fixtures/advanced/album/add_video.json
 - test/fixtures/advanced/album/create.json
 - test/fixtures/advanced/album/delete.json
 - test/fixtures/advanced/album/get_all.json
 - test/fixtures/advanced/album/get_videos.json
+- test/fixtures/advanced/album/get_watch_later.json
+- test/fixtures/advanced/album/remove_from_watch_later.json
 - test/fixtures/advanced/album/remove_video.json
 - test/fixtures/advanced/album/set_description.json
 - test/fixtures/advanced/album/set_password.json
@@ -208,6 +211,7 @@ files:
 - test/fixtures/advanced/video/get_appears_in.json
 - test/fixtures/advanced/video/get_by_tag.json
 - test/fixtures/advanced/video/get_cast.json
+- test/fixtures/advanced/video/get_collections.json
 - test/fixtures/advanced/video/get_comments_list.json
 - test/fixtures/advanced/video/get_contacts_liked.json
 - test/fixtures/advanced/video/get_contacts_uploaded.json