vimeo 1.2.0 → 1.2.2

data/Rakefile

@@ -11,9 +11,10 @@ begin
     gem.homepage = "http://github.com/matthooks/vimeo"
     gem.authors = ["Matt Hooks"]
     gem.rubyforge_project = "vimeo"
-    gem.add_development_dependency "shoulda", ">= 2.11.1"
+    gem.add_development_dependency "shoulda", ">= 2.11.3"
     gem.add_development_dependency "fakeweb", ">= 1.2.6"
     gem.add_development_dependency "crack", ">= 0.1.4"
+    gem.add_development_dependency "ruby-prof", ">= 0.9.2"
     
     gem.has_rdoc = true
     
@@ -23,6 +24,7 @@ begin
     gem.add_dependency "httparty", ">= 0.4.5"
     gem.add_dependency "json", ">= 1.1.9"
     gem.add_dependency "oauth", ">= 0.3.6"
+    gem.add_dependency "httpclient", ">= 2.1.5.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 0
-:major: 1
-:build: 
 :minor: 2
+:build: 
+:patch: 2
+:major: 1

data/lib/vimeo.rb

@@ -3,7 +3,6 @@ require 'httparty'
 require 'digest/md5'
 
 $:.unshift(File.dirname(__FILE__))
-require 'oauth_client'
 require 'vimeo/simple'
 require 'vimeo/advanced'
 

data/lib/vimeo/advanced/base.rb

@@ -1,3 +1,5 @@
+require 'oauth'
+
 module CreateApiMethod
   
   # Creates a method that calls a Vimeo Method through the Advanced API.
@@ -18,6 +20,7 @@ module CreateApiMethod
     
     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.blank?}#{',' unless required.blank?}options={#{optional}})"
     
@@ -34,7 +37,7 @@ 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
+        make_request sig_options, #{authorized ? "true" : "false"}
       end
       
       alias #{camelized_method} #{method}
@@ -65,7 +68,7 @@ module Vimeo
       extend CreateApiMethod
 
       def initialize(consumer_key, consumer_secret, options = {})
-        @oauth_consumer = OAuth::Consumer.new(consumer_key, consumer_secret, :site => 'http://vimeo.com', :http_method => :get, :scheme => :query_string)
+        @oauth_consumer = OAuth::Consumer.new(consumer_key, consumer_secret, :site => 'http://vimeo.com', :http_method => :get, :scheme => :header)
         unless options[:token].nil? && options[:secret].nil?
           @access_token = OAuth::AccessToken.new(@oauth_consumer, options[:token], options[:secret])
         end
@@ -76,7 +79,7 @@ module Vimeo
       end
       
       def get_request_token
-        @request_token ||= @oauth_consumer.get_request_token :scheme => :query_string
+        @request_token ||= @oauth_consumer.get_request_token :scheme => :header
       end
       
       def get_access_token(oauth_token=nil, oauth_secret=nil, oauth_verifier=nil)
@@ -89,8 +92,14 @@ module Vimeo
       
 private
 
-      def make_request(options)
-        response = Crack::JSON.parse @oauth_consumer.request(:post, "http://vimeo.com/api/rest/v2", get_access_token, {}, options).body
+      def make_request(options, authorized)
+        if authorized
+          raw_response = @oauth_consumer.request(:post, "http://vimeo.com/api/rest/v2", get_access_token, {}, options).body
+        else
+          raw_response = @oauth_consumer.request(:post, "http://vimeo.com/api/rest/v2", nil, {}, options).body
+        end
+        
+        response = Crack::JSON.parse(raw_response)
         validate_response! response
         response
       end

data/lib/vimeo/advanced/upload.rb

@@ -45,7 +45,7 @@ module Vimeo
       # Verifies a file manifest.
       create_api_method :verify_manifest,
                         "vimeo.videos.upload.verifyManifest",
-                        :required => [:auth_token, :ticket_id]
+                        :required => [:ticket_id]
 
       # TODO: Make this more flexible for split uploads?
       def self.create_json_manifest(md5s)

data/lib/vimeo/advanced/video.rb

@@ -87,7 +87,8 @@ module Vimeo
       create_api_method :search,
                         "vimeo.videos.search",
                         :required => [:query],
-                        :optional => [:page, :per_page, :full_response, :sort, :user_id]
+                        :optional => [:page, :per_page, :full_response, :sort, :user_id],
+                        :authorized => false
 
       create_api_method :set_description,
                         "vimeo.videos.setDescription",

data/lib/vimeo/advanced/video_embed.rb

@@ -5,7 +5,6 @@ module Vimeo
       # Returns a list of presets for a video embed.
       create_api_method :get_presets,
                         "vimeo.video.embed.getPresets",
-                        :required => [:auth_token],
                         :optional => [:page, :per_page]
 
       # Sets a preset for a video embed.

data/test/fixtures/advanced/auth/access_token.txt

@@ -0,0 +1 @@
+oauth_token=12345&oauth_token_secret=secret

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'shoulda', ">= 2.11.1"
+gem 'thoughtbot-shoulda', ">= 2.10.2"
 gem 'fakeweb', ">= 1.2.6"
 gem 'crack', ">= 0.1.4"
 gem 'mocha', ">= 0.9.8"
@@ -19,6 +19,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'vimeo'
 
 class Test::Unit::TestCase
+  def setup
+    FakeWeb.clean_registry
+  end
 end
 
 def fixture_file(filename)

data/test/vimeo/advanced/album_test.rb

@@ -9,7 +9,7 @@ class AlbumTest < Test::Unit::TestCase
     end
     
     should "be able to add a video to an album" do
-      stub_custom_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")
+      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"]

data/test/vimeo/advanced/auth_test.rb

@@ -12,13 +12,14 @@ class AuthTest < Test::Unit::TestCase
     end
     
     should "recieve a valid OAuth url" do
-      stub_custom_post("/oauth/request_token", "advanced/auth/request_token.txt")
-      token = @auth.request_token
+      stub_custom_get("/oauth/request_token", "advanced/auth/request_token.txt")
+      token = @auth.get_request_token
       assert_equal true, token.callback_confirmed?
       assert_equal "http://vimeo.com/oauth/authorize?oauth_token=#{TOKEN}", token.authorize_url
     end
 
     should "receive the user's credentials after checking the OAuth token" do
+      stub_custom_get("/oauth/access_token", "advanced/auth/access_token.txt")
       stub_post("", "advanced/auth/check_access_token.json")
       auth = @auth.check_access_token
       assert_equal "token", auth["token"]

data/test/vimeo/advanced/base_test.rb

@@ -7,12 +7,11 @@ class BaseTest < Test::Unit::TestCase
     setup do
       @base = Vimeo::Advanced::Base.new("12345", "secret")
     end
-
-    should "test something" do
-      # TODO: add tests for authorization_url
-    end
     
     should "allow camel-cased methods" do
+      stub_custom_get("/oauth/access_token", "advanced/auth/access_token.txt")
+      stub_post("", "advanced/auth/check_access_token.json")
+      
       [:check_access_token, :checkAccessToken].each do |method|
         @base.send method
       end

data/vimeo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vimeo}
-  s.version = "1.2.0"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Hooks"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-09-18}
   s.description = %q{A full featured Ruby implementation of the Vimeo API.}
   s.email = %q{matthooks@gmail.com}
   s.extra_rdoc_files = [
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "test/fixtures/advanced/album/set_description.json",
      "test/fixtures/advanced/album/set_password.json",
      "test/fixtures/advanced/album/set_title.json",
+     "test/fixtures/advanced/auth/access_token.txt",
      "test/fixtures/advanced/auth/check_access_token.json",
      "test/fixtures/advanced/auth/check_token.json",
      "test/fixtures/advanced/auth/get_frob.json",
@@ -220,27 +221,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 2.11.1"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.6"])
       s.add_development_dependency(%q<crack>, [">= 0.1.4"])
+      s.add_development_dependency(%q<ruby-prof>, [">= 0.9.2"])
       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.3.6"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 2.1.5.2"])
     else
-      s.add_dependency(%q<shoulda>, [">= 2.11.1"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
+      s.add_dependency(%q<ruby-prof>, [">= 0.9.2"])
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
       s.add_dependency(%q<oauth>, [">= 0.3.6"])
+      s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 2.11.1"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
+    s.add_dependency(%q<ruby-prof>, [">= 0.9.2"])
     s.add_dependency(%q<httparty>, [">= 0.4.5"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
     s.add_dependency(%q<oauth>, [">= 0.3.6"])
+    s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vimeo
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Matt Hooks
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -05:00
+date: 2010-09-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 37
         segments: 
         - 2
         - 11
-        - 1
-        version: 2.11.1
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -67,9 +67,25 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: ruby-prof
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +97,11 @@ dependencies:
         - 5
         version: 0.4.5
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,11 @@ dependencies:
         - 9
         version: 1.1.9
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: oauth
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,7 +129,24 @@ dependencies:
         - 6
         version: 0.3.6
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 119
+        segments: 
+        - 2
+        - 1
+        - 5
+        - 2
+        version: 2.1.5.2
+  type: :runtime
+  version_requirements: *id008
 description: A full featured Ruby implementation of the Vimeo API.
 email: matthooks@gmail.com
 executables: []
@@ -162,6 +195,7 @@ files:
 - test/fixtures/advanced/album/set_description.json
 - test/fixtures/advanced/album/set_password.json
 - test/fixtures/advanced/album/set_title.json
+- test/fixtures/advanced/auth/access_token.txt
 - test/fixtures/advanced/auth/check_access_token.json
 - test/fixtures/advanced/auth/check_token.json
 - test/fixtures/advanced/auth/get_frob.json