vimeo 1.1.0 → 1.2.0

data/README.markdown

@@ -114,15 +114,20 @@ First, instantiate the Base class:
 
     base = Vimeo::Advanced::Base.new("consumer_key", "consumer_secret")
 
+Get a request token, and save the token secret in the session hash.
+
+	request_token = base.get_request_token
+	session[:oauth_secret] = request_token.secret
+
 Then, send your user to the authorization URL:
 
     redirect_to base.authorize_url
 
-Once the user has allowed your application to access their account, they will be redirected to the callback URL you set up for your application. You will be given two parameters `oauth_token` and `oauth_verifier`. Re-instantiate your Base class, then get an access token:
+Once the user has allowed your application to access their account, they will be redirected to the callback URL you set up for your application. You will be given two parameters `oauth_token` and `oauth_verifier`. Re-instantiate your Base class, then get an access token.
 
     base = Vimeo::Advanced::Base.new("consumer_key", "consumer_secret")
-    access_token = base.get_access_token(params[:oauth_token], params[:oauth_verifier])
-    # You'll want to hold on to the user's token and secret. I'll save it to the database.
+    access_token = base.get_access_token(params[:oauth_token], session[:oauth_secret], params[:oauth_verifier])
+    # You'll want to hold on to the user's access token and secret. I'll save it to the database.
     user.token = access_token.token
     user.secret = access_token.secret
     user.save
@@ -301,12 +306,12 @@ __Uploads are not working since the move to OAuth. They will be fixed shortly.__
 
 ## Contributors
 
-* {matthooks}[http://github.com/matthooks]
-* {sirlantis}[http://github.com/sirlantis]
+* [matthooks](http://github.com/matthooks)
+* [sirlantis](http://github.com/sirlantis)
 
 ## Thanks to
 
-* {HTTParty}[http://github.com/jnunemaker/httparty/tree/master]: Easily one of the best tools I have used since I started using Ruby.
-* {Jeweler}[http://github.com/technicalpickles/jeweler/tree/master]: Great tool for creating gems for Github.
+* [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 Matt Hooks. See LICENSE for details.

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/matthooks/vimeo"
     gem.authors = ["Matt Hooks"]
     gem.rubyforge_project = "vimeo"
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 2.10.2"
+    gem.add_development_dependency "shoulda", ">= 2.11.1"
     gem.add_development_dependency "fakeweb", ">= 1.2.6"
     gem.add_development_dependency "crack", ">= 0.1.4"
     

data/VERSION.yml

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

data/lib/vimeo/advanced/base.rb

@@ -75,19 +75,19 @@ module Vimeo
         get_request_token.authorize_url :permission => permission
       end
       
-      def get_access_token(oauth_token=nil, oauth_verifier=nil)
-        @access_token ||= get_request_token.get_access_token :oauth_token => oauth_token, :oauth_verifier => oauth_verifier
+      def get_request_token
+        @request_token ||= @oauth_consumer.get_request_token :scheme => :query_string
+      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 get_request_token
-        @request_token ||= @oauth_consumer.get_request_token :scheme => :query_string
-      end
+private
 
       def make_request(options)
         response = Crack::JSON.parse @oauth_consumer.request(:post, "http://vimeo.com/api/rest/v2", get_access_token, {}, options).body

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'thoughtbot-shoulda', ">= 2.10.2"
+gem 'shoulda', ">= 2.11.1"
 gem 'fakeweb', ">= 1.2.6"
 gem 'crack', ">= 0.1.4"
 gem 'mocha', ">= 0.9.8"

data/vimeo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vimeo}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Hooks"]
-  s.date = %q{2009-12-20}
+  s.date = %q{2010-07-20}
   s.description = %q{A full featured Ruby implementation of the Vimeo API.}
   s.email = %q{matthooks@gmail.com}
   s.extra_rdoc_files = [
@@ -187,7 +187,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{vimeo}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A full featured Ruby implementation of the Vimeo API.}
   s.test_files = [
     "test/test_helper.rb",
@@ -219,15 +219,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+    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<fakeweb>, [">= 1.2.6"])
       s.add_development_dependency(%q<crack>, [">= 0.1.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.3.6"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.1"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
@@ -235,7 +235,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<oauth>, [">= 0.3.6"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.1"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
     s.add_dependency(%q<httparty>, [">= 0.4.5"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vimeo
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Matt Hooks
@@ -9,69 +15,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-20 00:00:00 -06:00
+date: 2010-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.10.2
-    version: 
+        hash: 33
+        segments: 
+        - 2
+        - 11
+        - 1
+        version: 2.11.1
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: crack
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: oauth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 3
+        - 6
         version: 0.3.6
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: A full featured Ruby implementation of the Vimeo API.
 email: matthooks@gmail.com
 executables: []
@@ -260,21 +302,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: vimeo
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A full featured Ruby implementation of the Vimeo API.