vimeo 1.0.0 → 1.1.0

data/test/vimeo/advanced/base_test.rb

@@ -7,17 +7,15 @@ class BaseTest < Test::Unit::TestCase
     setup do
       @base = Vimeo::Advanced::Base.new("12345", "secret")
     end
-    
-    should "generate a valid web based authentication login link" do
-      link = @base.web_login_link("delete")
-      
-      assert_equal "http://vimeo.com/services/auth/?api_key=12345&perms=delete&api_sig=b1a1a1f87a3a8bd84da1d3d464a72706", link
+
+    should "test something" do
+      # TODO: add tests for authorization_url
     end
     
-    should "generate a valid desktop based authentication login link" do
-      link = @base.desktop_login_link("delete", "67890")
-      
-      assert_equal "http://vimeo.com/services/auth/?api_key=12345&perms=delete&frob=67890&api_sig=deaee5c67d94df716ebe97d3bac180df", link
+    should "allow camel-cased methods" do
+      [:check_access_token, :checkAccessToken].each do |method|
+        @base.send method
+      end
     end
 
   end

data/test/vimeo/advanced/channels_test.rb

@@ -5,14 +5,14 @@ class ChannelTest < Test::Unit::TestCase
   context "vimeo advanced channel" do
     
     setup do
-      @channel = Vimeo::Advanced::Channel.new("12345", "secret")
+      @channel = Vimeo::Advanced::Channel.new("12345", "secret", :token => "token", :secret => "secret")
     end
     
     # context "making api calls" do
       
       should "be able to add a video to a channel" do
         stub_post("?auth_token=token&api_key=12345&api_sig=2065e5d5c0836428a2d2e945d160e504&format=json&method=vimeo.channels.addVideo&channel_id=channel_id&video_id=video_id", "advanced/channel/add_video.json")
-        response = @channel.add_video("token", "channel_id", "video_id")
+        response = @channel.add_video("channel_id", "video_id")
         
         assert_equal "ok", response["stat"]
       end
@@ -54,21 +54,21 @@ class ChannelTest < Test::Unit::TestCase
       
       should "be able to remove a video from a channel" do
         stub_post("?video_id=video_id&api_key=12345&auth_token=token&format=json&api_sig=0d2fe81099d253f45b25c85033507a6f&method=vimeo.channels.removeVideo&channel_id=channel_id", "advanced/channel/remove_video.json")
-        response = @channel.remove_video("token", "channel_id", "video_id")
+        response = @channel.remove_video("channel_id", "video_id")
         
         assert_equal "ok", response["stat"]
       end
       
       should "be able to subscribe a user to a channel" do
         stub_post("?api_key=12345&auth_token=token&format=json&api_sig=cb0c7a3eed35bdd06b575d734e61b815&method=vimeo.channels.subscribe&channel_id=channel_id", "advanced/channel/subscribe.json")
-        response = @channel.subscribe("token", "channel_id")
+        response = @channel.subscribe("channel_id")
         
         assert_equal "ok", response["stat"]
       end
       
       should "be able to unsubscribe a user from a channel" do
         stub_post("?api_key=12345&auth_token=token&format=json&api_sig=a6424de0df3134bf69390c9cb2e1653d&method=vimeo.channels.unsubscribe&channel_id=channel_id", "advanced/channel/unsubscribe.json")
-        response = @channel.unsubscribe("token", "channel_id")
+        response = @channel.unsubscribe("channel_id")
         
         assert_equal "ok", response["stat"]
       end

data/test/vimeo/advanced/contacts_test.rb

@@ -5,7 +5,7 @@ class ContactTest < Test::Unit::TestCase
   context "vimeo advanced channel" do
     
     setup do
-      @contact = Vimeo::Advanced::Contact.new("12345", "secret")
+      @contact = Vimeo::Advanced::Contact.new("12345", "secret", :token => "token", :secret => "secret")
     end
       
     should "be able to get a list of contacts for a specified user" do

data/test/vimeo/advanced/group_events_test.rb

@@ -5,7 +5,7 @@ class GroupEventsTest < Test::Unit::TestCase
   context "vimeo advanced group events" do
     
     setup do
-      @group_events = Vimeo::Advanced::GroupEvents.new("12345", "secret")
+      @group_events = Vimeo::Advanced::GroupEvents.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to get a list of events by month" do

data/test/vimeo/advanced/group_forums_test.rb

@@ -5,7 +5,7 @@ class GroupForumsTest < Test::Unit::TestCase
   context "vimeo advanced group events" do
     
     setup do
-      @group_forums = Vimeo::Advanced::GroupForums.new("12345", "secret")
+      @group_forums = Vimeo::Advanced::GroupForums.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to get a list comments for a group forum topic" do

data/test/vimeo/advanced/groups_test.rb

@@ -5,12 +5,12 @@ class GroupTest < Test::Unit::TestCase
   context "vimeo advanced group" do
     
     setup do
-      @group = Vimeo::Advanced::Group.new("12345", "secret")
+      @group = Vimeo::Advanced::Group.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to add a video to a group" do
       stub_post("?video_id=video_id&api_key=12345&auth_token=token&format=json&api_sig=e37ae534be5b03cdc1cb9ed28ed99317&method=vimeo.groups.addVideo&group_id=group_id", "advanced/group/add_video.json")
-      response = @group.add_video("token", "group_id", "video_id")
+      response = @group.add_video("group_id", "video_id")
       
       assert_equal "ok", response["stat"]
     end
@@ -66,14 +66,14 @@ class GroupTest < Test::Unit::TestCase
     
     should "be able to join a group" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=99114c85438cb286adbfba05a1b921ed&method=vimeo.groups.join&group_id=group_id", "advanced/group/join.json")
-      response = @group.join("token", "group_id")
+      response = @group.join("group_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to leave a group" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=a465333190c89f9eedc06a148db018be&method=vimeo.groups.leave&group_id=group_id", "advanced/group/leave.json")
-      response = @group.leave("token", "group_id")
+      response = @group.leave("group_id")
       
       assert_equal "ok", response["stat"]
     end

data/test/vimeo/advanced/person_test.rb

@@ -5,19 +5,19 @@ class PersonTest < Test::Unit::TestCase
   context "vimeo advanced person" do
     
     setup do
-      @person = Vimeo::Advanced::Person.new("12345", "secret")
+      @person = Vimeo::Advanced::Person.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to add a contact" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=da78079bb036f66f6ccca31014650371&method=vimeo.people.addContact&user_id=user_id", "advanced/person/add_contact.json")
-      response = @person.add_contact("token", "user_id")
+      response = @person.add_contact("user_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to get add a subscription" do
       stub_post("?api_key=12345&types=likes&auth_token=token&format=json&api_sig=f02dae35e4eb7a7e2ca0ad9c026ad311&method=vimeo.people.addSubscription&user_id=user_id", "advanced/person/add_subscription.json")
-      response = @person.add_subscription("token", "user_id", "likes")
+      response = @person.add_subscription("user_id", "likes")
       
       assert_equal "ok", response["stat"]
     end
@@ -31,9 +31,10 @@ class PersonTest < Test::Unit::TestCase
     
     should "be able to get the remaining number of hd embeds" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=3ac165886cbfc8dbf0f5a1cbc49c2943&method=vimeo.people.getHDEmbeds", "advanced/person/get_hd_embeds.json")
-      response = @person.get_hd_embeds("token")
-      
-      assert_equal "fail", response["stat"]
+
+      assert_raise(Vimeo::Advanced::RequestFailed) do
+        response = @person.get_hd_embeds
+      end
     end
     
     should "be able to get a user's info" do
@@ -52,14 +53,14 @@ class PersonTest < Test::Unit::TestCase
     
     should "be able to get remove a user from your contacts" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=0d21943588aae94c65575f4a49e05b63&method=vimeo.people.removeContact&user_id=user_id", "advanced/person/remove_contact.json")
-      response = @person.remove_contact("token", "user_id")
+      response = @person.remove_contact("user_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to remove you from a subscription" do
       stub_post("?api_key=12345&types=likes&auth_token=token&format=json&api_sig=8f63f6fc9988250db4ff4d92bbb2b9c1&method=vimeo.people.removeSubscription&user_id=user_id", "advanced/person/remove_subscription.json")
-      response = @person.remove_subscription("token", "user_id", "likes")
+      response = @person.remove_subscription("user_id", "likes")
       
       assert_equal "ok", response["stat"]
     end

data/test/vimeo/advanced/test_test.rb

@@ -5,7 +5,7 @@ class TestTest < Test::Unit::TestCase
   context "vimeo advanced test" do
     
     setup do
-      @test = Vimeo::Advanced::Test.new("12345", "secret")
+      @test = Vimeo::Advanced::Test.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to get an echo" do
@@ -17,14 +17,14 @@ class TestTest < Test::Unit::TestCase
     
     should "be able to test if a user is logged in" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=9753d04b7b5b3c47101aace3f314ed84&method=vimeo.test.login", "advanced/test/login.json")
-      response = @test.login("token")
+      response = @test.login
       
       assert_equal "matthooks", response["user"]["username"]
     end
     
     should "be able to ping the Vimeo advanced API" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=5f45b34d1e7078636f5386b8db7408ee&method=vimeo.test.null", "advanced/test/null.json")
-      response = @test.null("token")
+      response = @test.null
       
       assert_equal "ok", response["stat"]
     end

data/test/vimeo/advanced/upload_test.rb

@@ -5,26 +5,26 @@ class UploadTest < Test::Unit::TestCase
   context "vimeo advanced upload" do
     
     setup do
-      @upload = Vimeo::Advanced::Upload.new("12345", "secret")
+      @upload = Vimeo::Advanced::Upload.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able confirm an upload" do
       stub_post("?api_key=12345&ticket_id=ticket_id&format=json&auth_token=token&api_sig=576b41966709651aead8754b3c5d370d&method=vimeo.videos.upload.confirm", "advanced/upload/confirm.json")
-      response = @upload.confirm("token", "ticket_id", "json_manifest")
+      response = @upload.confirm("ticket_id")
 
       assert_equal "ticket_id", response["ticket"]["id"]
     end
     
     should "be able to get a user's quota" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=4eb2da55156fca5ab81bfe1a67a016ec&method=vimeo.videos.upload.getQuota", "advanced/upload/get_quota.json")
-      response = @upload.get_quota("token")
+      response = @upload.get_quota
       
       assert_equal "888046", response["user"]["id"]
     end
     
     should "be able to get an upload ticket" do
       stub_post("?api_key=12345&auth_token=token&format=json&api_sig=0eabe7404e1c1fd22a269190c36e4093&method=vimeo.videos.upload.getTicket", "advanced/upload/get_ticket.json")
-      response = @upload.get_ticket("token")
+      response = @upload.get_ticket
       
       assert_equal "ticket_id", response["ticket"]["id"]
     end
@@ -33,7 +33,7 @@ class UploadTest < Test::Unit::TestCase
     # should "be able to upload a file to vimeo" do
     #   HTTPClient.any_instance.stubs(:post)
     #   file_path = File.expand_path(File.dirname(__FILE__) + "../../../fixtures/advanced/upload/sample_iTunes.mov")
-    #   response = @upload.upload("token", file_path, "ticket_id", "http:\/\/67.202.6.15\/upload_multi?ticket_id=ticket_id")
+    #   response = @upload.upload(file_path, "ticket_id", "http:\/\/67.202.6.15\/upload_multi?ticket_id=ticket_id")
     # 
     #   assert_equal "MD5", response
     # end
@@ -41,7 +41,7 @@ class UploadTest < Test::Unit::TestCase
     # TODO: Make sure this manifest fixture file is right.
     should "be able to verify a file manifest" do
       stub_post("?api_key=12345&ticket_id=ticket_id&format=json&auth_token=token&api_sig=3b1c022ba0be09e5901bd91fb5a4426c&method=vimeo.videos.upload.verifyManifest", "advanced/upload/verify_manifest.json")
-      response = @upload.verify_manifest("token", "ticket_id", "json_manifest")
+      response = @upload.verify_manifest("ticket_id")
       
       assert_equal "ticket_id", response["ticket"]["id"]
     end

data/test/vimeo/advanced/videos_embed_test.rb

@@ -5,19 +5,20 @@ class VideoEmbedTest < Test::Unit::TestCase
   context "vimeo advanced video embed" do
     
     setup do
-      @video_embed = Vimeo::Advanced::VideoEmbed.new("12345", "secret")
+      @video_embed = Vimeo::Advanced::VideoEmbed.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to get a list presets for video embeds" do
       stub_post("?api_key=12345&format=json&method=vimeo.video.embed.getPresets&auth_token=token&api_sig=37baebafad1eafc408b9789e9f0115be", "advanced/video_embed/get_presets.json")
-      response = @video_embed.get_presets("token")
-      
-      assert_equal "fail", response["stat"]
+
+      assert_raise(Vimeo::Advanced::RequestFailed) do
+        response = @video_embed.get_presets
+      end
     end
     
     should "be able to set the preset of a video embed" do
       stub_post("?preset_id=preset_id&video_id=video_id&api_key=12345&format=json&method=vimeo.video.embed.setPreset&auth_token=token&api_sig=116e80503e8273a6b4475b8561c2818b", "advanced/video_embed/set_preset.json")
-      response = @video_embed.set_preset("token", "video_id", "preset_id")
+      response = @video_embed.set_preset("video_id", "preset_id")
       
       assert_equal "ok", response["stat"]
     end

data/test/vimeo/advanced/videos_test.rb

@@ -5,40 +5,40 @@ class VideoTest < Test::Unit::TestCase
   context "vimeo advanced video" do
     
     setup do
-      @video = Vimeo::Advanced::Video.new("12345", "secret")
+      @video = Vimeo::Advanced::Video.new("12345", "secret", :token => "token", :secret => "secret")
     end
 
     should "be able to add cast to a video" do
       stub_post("?video_id=video_id&api_key=12345&user_id=user_id&format=json&method=vimeo.videos.addCast&auth_token=token&api_sig=d4490b9ebe5914fe2e05756dd6fb1db0", "advanced/video/add_cast.json")
-      response = @video.add_cast("token", "video_id", "user_id")
+      response = @video.add_cast("video_id", "user_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to add photos to a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.addPhotos&photo_urls=photo_urls&auth_token=token&api_sig=25e09737829e9a0c3a57201ada350b03", "advanced/video/add_photos.json")
-      response = @video.add_photos("token", "video_id", "photo_urls")
+      response = @video.add_photos("video_id", "photo_urls")
       
       assert_equal "ok", response["stat"]
     end
 
     should "be able to add tags to a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.addTags&auth_token=token&tags=tags&api_sig=9969e062d985a91363630d2003843341", "advanced/video/add_tags.json")
-      response = @video.add_tags("token", "video_id", "tags")
+      response = @video.add_tags("video_id", "tags")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to clear tags from a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.clearTags&auth_token=token&api_sig=b901229a90f9f2d99d82d71da269573f", "advanced/video/clear_tags.json")
-      response = @video.clear_tags("token", "video_id")
+      response = @video.clear_tags("video_id")
       
       assert_equal "ok", response["stat"]
     end
 
     should "be able to delete a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.delete&auth_token=token&api_sig=55a6902be853ed835d5f9f359fd66719", "advanced/video/delete.json")
-      response = @video.delete("token", "video_id")
+      response = @video.delete("video_id")
       
       assert_equal "ok", response["stat"]
     end
@@ -122,14 +122,14 @@ class VideoTest < Test::Unit::TestCase
     
     should "be able to remove cast from a video" do
       stub_post("?video_id=video_id&api_key=12345&user_id=user_id&format=json&method=vimeo.videos.removeCast&auth_token=token&api_sig=31edc8eb16e2bc192d2b04405a7577c5", "advanced/video/remove_cast.json")
-      response = @video.remove_cast("token", "video_id", "user_id")
+      response = @video.remove_cast("video_id", "user_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to remove a tag from a video" do
       stub_post("?video_id=video_id&api_key=12345&tag_id=tag_id&format=json&method=vimeo.videos.removeTag&auth_token=token&api_sig=8a0f215d43a6cd5ecdb07525f19323d6", "advanced/video/remove_tag.json")
-      response = @video.remove_tag("token", "video_id", "tag_id")
+      response = @video.remove_tag("video_id", "tag_id")
       
       assert_equal "ok", response["stat"]
     end
@@ -143,28 +143,28 @@ class VideoTest < Test::Unit::TestCase
     
     should "be able to set the description of a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.setDescription&description=description&auth_token=token&api_sig=b80965c8c5f62f006c7d897fc9ce10b2", "advanced/video/set_description.json")
-      response = @video.set_description("token", "video_id", "description")
+      response = @video.set_description("video_id", "description")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to set the like of a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.setLike&like=like&auth_token=token&api_sig=55d3ad34bc4015cc4b0b8c1bf36ca68e", "advanced/video/set_like.json")
-      response = @video.set_like("token", "video_id", "like")
+      response = @video.set_like("video_id", "like")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to set the privacy for a video" do
       stub_post("?privacy=privacy&video_id=video_id&api_key=12345&format=json&method=vimeo.videos.setPrivacy&auth_token=token&api_sig=e34654e6260ca22869a39c0213938e80", "advanced/video/set_privacy.json")
-      response = @video.set_privacy("token", "video_id", "privacy")
+      response = @video.set_privacy("video_id", "privacy")
       
       assert_equal "ok", response["stat"]
     end
 
     should "be able to set the title of a video" do
       stub_post("?title=title&video_id=video_id&api_key=12345&format=json&method=vimeo.videos.setTitle&auth_token=token&api_sig=164cc69c87f1a460169875493623f9b4", "advanced/video/set_title.json")
-      response = @video.set_title("token", "video_id", "title")
+      response = @video.set_title("video_id", "title")
       
       assert_equal "ok", response["stat"]
     end
@@ -173,21 +173,21 @@ class VideoTest < Test::Unit::TestCase
     
     should "be able to add a comment to a video" do
       stub_post("?video_id=video_id&api_key=12345&format=json&comment_text=comment_text&method=vimeo.videos.comments.addComment&auth_token=token&api_sig=cd01f8a9ed97bd68a4e1da8be337d9df", "advanced/video/add_comment.json")
-      response = @video.add_comment("token", "video_id", "comment_text")
+      response = @video.add_comment("video_id", "comment_text")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to delete a comment" do
       stub_post("?video_id=video_id&api_key=12345&format=json&method=vimeo.videos.comments.deleteComment&auth_token=token&comment_id=comment_id&api_sig=aac80a3b34f94950f4000be7e337f1a8", "advanced/video/delete_comment.json")
-      response = @video.delete_comment("token", "video_id", "comment_id")
+      response = @video.delete_comment("video_id", "comment_id")
       
       assert_equal "ok", response["stat"]
     end
     
     should "be able to edit a comment" do
       stub_post("?video_id=video_id&api_key=12345&format=json&comment_text=comment_text&method=vimeo.videos.comments.editComment&auth_token=token&comment_id=comment_id&api_sig=4f2c2503cd53ead8f1203b55241259c8", "advanced/video/edit_comment.json")
-      response = @video.edit_comment("token", "video_id", "comment_id", "comment_text")
+      response = @video.edit_comment("video_id", "comment_id", "comment_text")
       
       assert_equal "ok", response["stat"]
     end

data/vimeo.gemspec

@@ -1,33 +1,32 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{vimeo}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Hooks"]
-  s.date = %q{2009-09-28}
+  s.date = %q{2009-12-20}
   s.description = %q{A full featured Ruby implementation of the Vimeo API.}
   s.email = %q{matthooks@gmail.com}
   s.extra_rdoc_files = [
     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc"
+     "LICENSE"
   ]
   s.files = [
     ".gitignore",
      "CHANGELOG.rdoc",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "VERSION.yml",
+     "init.rb",
      "lib/vimeo.rb",
      "lib/vimeo/advanced.rb",
      "lib/vimeo/advanced/album.rb",
-     "lib/vimeo/advanced/auth.rb",
      "lib/vimeo/advanced/base.rb",
      "lib/vimeo/advanced/channel.rb",
      "lib/vimeo/advanced/contact.rb",
@@ -56,9 +55,11 @@ 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/check_access_token.json",
      "test/fixtures/advanced/auth/check_token.json",
      "test/fixtures/advanced/auth/get_frob.json",
      "test/fixtures/advanced/auth/get_token.json",
+     "test/fixtures/advanced/auth/request_token.txt",
      "test/fixtures/advanced/channel/add_video.json",
      "test/fixtures/advanced/channel/get_all.json",
      "test/fixtures/advanced/channel/get_info.json",
@@ -223,22 +224,23 @@ Gem::Specification.new do |s|
       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<curb>, [">= 0.5.4.0"])
       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<fakeweb>, [">= 1.2.6"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
       s.add_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_dependency(%q<curb>, [">= 0.5.4.0"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
+      s.add_dependency(%q<oauth>, [">= 0.3.6"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.6"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
     s.add_dependency(%q<httparty>, [">= 0.4.5"])
-    s.add_dependency(%q<curb>, [">= 0.5.4.0"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
+    s.add_dependency(%q<oauth>, [">= 0.3.6"])
   end
 end
+