twitter 4.8.1 → 5.0.0.rc.1

data/spec/twitter/{api → rest/api}/direct_messages_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::DirectMessages do
+describe Twitter::REST::API::DirectMessages do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#direct_messages_received" do
@@ -18,7 +18,7 @@ describe Twitter::API::DirectMessages do
       direct_messages = @client.direct_messages_received
       expect(direct_messages).to be_an Array
       expect(direct_messages.first).to be_a Twitter::DirectMessage
-      expect(direct_messages.first.sender.id).to eq 7505382
+      expect(direct_messages.first.sender.id).to eq(7505382)
     end
   end
 
@@ -34,7 +34,7 @@ describe Twitter::API::DirectMessages do
       direct_messages = @client.direct_messages_sent
       expect(direct_messages).to be_an Array
       expect(direct_messages.first).to be_a Twitter::DirectMessage
-      expect(direct_messages.first.sender.id).to eq 7505382
+      expect(direct_messages.first.sender.id).to eq(7505382)
     end
   end
 
@@ -49,7 +49,7 @@ describe Twitter::API::DirectMessages do
     it "returns the specified direct message" do
       direct_message = @client.direct_message(1825786345)
       expect(direct_message).to be_a Twitter::DirectMessage
-      expect(direct_message.sender.id).to eq 7505382
+      expect(direct_message.sender.id).to eq(7505382)
     end
   end
 
@@ -66,7 +66,7 @@ describe Twitter::API::DirectMessages do
         direct_messages = @client.direct_messages(1825786345)
         expect(direct_messages).to be_an Array
         expect(direct_messages.first).to be_a Twitter::DirectMessage
-        expect(direct_messages.first.sender.id).to eq 7505382
+        expect(direct_messages.first.sender.id).to eq(7505382)
       end
     end
     context "without ids passed" do
@@ -81,7 +81,7 @@ describe Twitter::API::DirectMessages do
         direct_messages = @client.direct_messages
         expect(direct_messages).to be_an Array
         expect(direct_messages.first).to be_a Twitter::DirectMessage
-        expect(direct_messages.first.sender.id).to eq 7505382
+        expect(direct_messages.first.sender.id).to eq(7505382)
       end
     end
   end
@@ -98,7 +98,7 @@ describe Twitter::API::DirectMessages do
       direct_messages = @client.direct_message_destroy(1825785544)
       expect(direct_messages).to be_an Array
       expect(direct_messages.first).to be_a Twitter::DirectMessage
-      expect(direct_messages.first.sender.id).to eq 7505382
+      expect(direct_messages.first.sender.id).to eq(7505382)
     end
   end
 
@@ -113,7 +113,20 @@ describe Twitter::API::DirectMessages do
     it "returns the sent message" do
       direct_message = @client.direct_message_create("pengwynn", "Creating a fixture for the Twitter gem")
       expect(direct_message).to be_a Twitter::DirectMessage
-      expect(direct_message.text).to eq "Creating a fixture for the Twitter gem"
+      expect(direct_message.text).to eq("Creating a fixture for the Twitter gem")
+    end
+    context "with a URI object passed" do
+      it "requests the correct resource" do
+        user = URI.parse("https://twitter.com/pengwynn")
+        @client.direct_message_create(user, "Creating a fixture for the Twitter gem")
+        expect(a_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"})).to have_been_made
+      end
+    end
+    context "with a URI string passed" do
+      it "requests the correct resource" do
+        @client.direct_message_create("https://twitter.com/pengwynn", "Creating a fixture for the Twitter gem")
+        expect(a_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"})).to have_been_made
+      end
     end
   end
 

data/spec/twitter/{api → rest/api}/favorites_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Favorites do
+describe Twitter::REST::API::Favorites do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#favorites" do
@@ -19,7 +19,20 @@ describe Twitter::API::Favorites do
         favorites = @client.favorites("sferik")
         expect(favorites).to be_an Array
         expect(favorites.first).to be_a Twitter::Tweet
-        expect(favorites.first.user.id).to eq 7505382
+        expect(favorites.first.user.id).to eq(7505382)
+      end
+      context "with a URI object passed" do
+        it "requests the correct resource" do
+          user = URI.parse("https://twitter.com/sferik")
+          @client.favorites(user)
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:screen_name => "sferik"})).to have_been_made
+        end
+      end
+      context "with a URI string passed" do
+        it "requests the correct resource" do
+          @client.favorites("https://twitter.com/sferik")
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:screen_name => "sferik"})).to have_been_made
+        end
       end
     end
     context "without arguments passed" do
@@ -34,7 +47,7 @@ describe Twitter::API::Favorites do
         favorites = @client.favorites
         expect(favorites).to be_an Array
         expect(favorites.first).to be_a Twitter::Tweet
-        expect(favorites.first.user.id).to eq 7505382
+        expect(favorites.first.user.id).to eq(7505382)
       end
     end
   end
@@ -51,7 +64,27 @@ describe Twitter::API::Favorites do
       tweets = @client.unfavorite(25938088801)
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "The problem with your code is that it's doing exactly what you told it to do."
+      expect(tweets.first.text).to eq("The problem with your code is that it's doing exactly what you told it to do.")
+    end
+    context "with a URI object passed" do
+      it "requests the correct resource" do
+        tweet = URI.parse("https://twitter.com/sferik/status/25938088801")
+        @client.unfavorite(tweet)
+        expect(a_post("/1.1/favorites/destroy.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a URI string passed" do
+      it "requests the correct resource" do
+        @client.unfavorite("https://twitter.com/sferik/status/25938088801")
+        expect(a_post("/1.1/favorites/destroy.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a Tweet passed" do
+      it "requests the correct resource" do
+        tweet = Twitter::Tweet.new(:id => 25938088801)
+        @client.unfavorite(tweet)
+        expect(a_post("/1.1/favorites/destroy.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
     end
   end
 
@@ -67,7 +100,7 @@ describe Twitter::API::Favorites do
       tweets = @client.favorite(25938088801)
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "The problem with your code is that it's doing exactly what you told it to do."
+      expect(tweets.first.text).to eq("The problem with your code is that it's doing exactly what you told it to do.")
     end
     context "already favorited" do
       before do
@@ -77,6 +110,26 @@ describe Twitter::API::Favorites do
         expect{@client.favorite(25938088801)}.not_to raise_error
       end
     end
+    context "with a URI object passed" do
+      it "requests the correct resource" do
+        tweet = URI.parse("https://twitter.com/sferik/status/25938088801")
+        @client.favorite(tweet)
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a URI string passed" do
+      it "requests the correct resource" do
+        @client.favorite("https://twitter.com/sferik/status/25938088801")
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a Tweet passed" do
+      it "requests the correct resource" do
+        tweet = Twitter::Tweet.new(:id => 25938088801)
+        @client.favorite(tweet)
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
   end
 
   describe "#favorite!" do
@@ -91,7 +144,7 @@ describe Twitter::API::Favorites do
       tweets = @client.favorite!(25938088801)
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq "The problem with your code is that it's doing exactly what you told it to do."
+      expect(tweets.first.text).to eq("The problem with your code is that it's doing exactly what you told it to do.")
     end
     context "forbidden" do
       before do
@@ -109,6 +162,26 @@ describe Twitter::API::Favorites do
         expect{@client.favorite!(25938088801)}.to raise_error Twitter::Error::AlreadyFavorited
       end
     end
+    context "with a URI object passed" do
+      it "requests the correct resource" do
+        tweet = URI.parse("https://twitter.com/sferik/status/25938088801")
+        @client.favorite!(tweet)
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a URI string passed" do
+      it "requests the correct resource" do
+        @client.favorite!("https://twitter.com/sferik/status/25938088801")
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
+    context "with a Tweet passed" do
+      it "requests the correct resource" do
+        tweet = Twitter::Tweet.new(:id => 25938088801)
+        @client.favorite!(tweet)
+        expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+      end
+    end
   end
 
 end

data/spec/twitter/{api → rest/api}/friends_and_followers_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::FriendsAndFollowers do
+describe Twitter::REST::API::FriendsAndFollowers do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#friend_ids" do
@@ -18,15 +18,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns an array of numeric IDs for every user the specified user is following" do
         friend_ids = @client.friend_ids("sferik")
         expect(friend_ids).to be_a Twitter::Cursor
-        expect(friend_ids.ids).to be_an Array
-        expect(friend_ids.ids.first).to eq 14100886
+        expect(friend_ids.first).to eq(20009713)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friend_ids("sferik").all
+          @client.friend_ids("sferik").each{}
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
         end
@@ -40,12 +39,12 @@ describe Twitter::API::FriendsAndFollowers do
         @client.friend_ids(7505382)
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :user_id => "7505382"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friend_ids(7505382).all
+          @client.friend_ids(7505382).each{}
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :user_id => "7505382"})).to have_been_made
         end
@@ -64,15 +63,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns an array of numeric IDs for every user the specified user is following" do
         friend_ids = @client.friend_ids
         expect(friend_ids).to be_a Twitter::Cursor
-        expect(friend_ids.ids).to be_an Array
-        expect(friend_ids.ids.first).to eq 14100886
+        expect(friend_ids.first).to eq(20009713)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friend_ids.all
+          @client.friend_ids.each{}
           expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
@@ -93,15 +91,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns an array of numeric IDs for every user following the specified user" do
         follower_ids = @client.follower_ids("sferik")
         expect(follower_ids).to be_a Twitter::Cursor
-        expect(follower_ids.ids).to be_an Array
-        expect(follower_ids.ids.first).to eq 14100886
+        expect(follower_ids.first).to eq(20009713)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.follower_ids("sferik").all
+          @client.follower_ids("sferik").each{}
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
         end
@@ -115,12 +112,12 @@ describe Twitter::API::FriendsAndFollowers do
         @client.follower_ids(7505382)
         expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :user_id => "7505382"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.follower_ids(7505382).all
+          @client.follower_ids(7505382).each{}
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :user_id => "7505382"})).to have_been_made
         end
@@ -139,15 +136,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns an array of numeric IDs for every user following the specified user" do
         follower_ids = @client.follower_ids
         expect(follower_ids).to be_a Twitter::Cursor
-        expect(follower_ids.ids).to be_an Array
-        expect(follower_ids.ids.first).to eq 14100886
+        expect(follower_ids.first).to eq(20009713)
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.follower_ids.all
+          @client.follower_ids.each{}
           expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
@@ -169,8 +165,8 @@ describe Twitter::API::FriendsAndFollowers do
         friendships = @client.friendships("sferik", "pengwynn")
         expect(friendships).to be_an Array
         expect(friendships.first).to be_a Twitter::User
-        expect(friendships.first.id).to eq 7505382
-        expect(friendships.first.connections).to eq ["none"]
+        expect(friendships.first.id).to eq(7505382)
+        expect(friendships.first.connections).to eq(["none"])
       end
     end
     context "with numeric screen names passed" do
@@ -215,8 +211,8 @@ describe Twitter::API::FriendsAndFollowers do
         friendships = @client.friendships("sferik", "pengwynn")
         expect(friendships).to be_an Array
         expect(friendships.first).to be_a Twitter::User
-        expect(friendships.first.id).to eq 7505382
-        expect(friendships.first.connections).to eq ["none"]
+        expect(friendships.first.id).to eq(7505382)
+        expect(friendships.first.connections).to eq(["none"])
       end
     end
     context "with numeric screen names passed" do
@@ -259,15 +255,14 @@ describe Twitter::API::FriendsAndFollowers do
     it "returns an array of numeric IDs for every user who has a pending request to follow the authenticating user" do
       friendships_incoming = @client.friendships_incoming
       expect(friendships_incoming).to be_a Twitter::Cursor
-      expect(friendships_incoming.ids).to be_an Array
-      expect(friendships_incoming.ids.first).to eq 14100886
+      expect(friendships_incoming.first).to eq(20009713)
     end
-    context "with all" do
+    context "with each" do
       before do
         stub_get("/1.1/friendships/incoming.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships_incoming.all
+        @client.friendships_incoming.each{}
         expect(a_get("/1.1/friendships/incoming.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
       end
     end
@@ -284,15 +279,14 @@ describe Twitter::API::FriendsAndFollowers do
     it "returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request" do
       friendships_outgoing = @client.friendships_outgoing
       expect(friendships_outgoing).to be_a Twitter::Cursor
-      expect(friendships_outgoing.ids).to be_an Array
-      expect(friendships_outgoing.ids.first).to eq 14100886
+      expect(friendships_outgoing.first).to eq(20009713)
     end
-    context "with all" do
+    context "with each" do
       before do
         stub_get("/1.1/friendships/outgoing.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships_outgoing.all
+        @client.friendships_outgoing.each{}
         expect(a_get("/1.1/friendships/outgoing.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
       end
     end
@@ -302,7 +296,7 @@ describe Twitter::API::FriendsAndFollowers do
     context "with :follow => true passed" do
       before do
         stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382", :follow => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -317,13 +311,13 @@ describe Twitter::API::FriendsAndFollowers do
         users = @client.follow("sferik", "pengwynn", :follow => true)
         expect(users).to be_an Array
         expect(users.first).to be_a Twitter::User
-        expect(users.first.id).to eq 7505382
+        expect(users.first.id).to eq(7505382)
       end
     end
     context "with :follow => false passed" do
       before do
         stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -338,7 +332,7 @@ describe Twitter::API::FriendsAndFollowers do
     context "without :follow passed" do
       before do
         stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -365,7 +359,7 @@ describe Twitter::API::FriendsAndFollowers do
         users = @client.follow!("sferik", :follow => true)
         expect(users).to be_an Array
         expect(users.first).to be_a Twitter::User
-        expect(users.first.id).to eq 7505382
+        expect(users.first.id).to eq(7505382)
       end
     end
     context "with :follow => false passed" do
@@ -380,7 +374,7 @@ describe Twitter::API::FriendsAndFollowers do
         users = @client.follow!("sferik", :follow => false)
         expect(users).to be_an Array
         expect(users.first).to be_a Twitter::User
-        expect(users.first.id).to eq 7505382
+        expect(users.first.id).to eq(7505382)
       end
     end
     context "without :follow passed" do
@@ -395,7 +389,36 @@ describe Twitter::API::FriendsAndFollowers do
         users = @client.follow!("sferik")
         expect(users).to be_an Array
         expect(users.first).to be_a Twitter::User
-        expect(users.first.id).to eq 7505382
+        expect(users.first.id).to eq(7505382)
+      end
+    end
+    context "with a user object passed" do
+      before do
+        stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resources" do
+        user = Twitter::User.new(:id => "7505382")
+        @client.follow!(user)
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
+      end
+    end
+    context "with a URI object passed" do
+      before do
+        stub_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        user = URI.parse("https://twitter.com/sferik")
+        @client.follow!(user)
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
+      end
+    end
+    context "with a URI string passed" do
+      before do
+        stub_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.follow!("https://twitter.com/sferik")
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
       end
     end
   end
@@ -412,7 +435,7 @@ describe Twitter::API::FriendsAndFollowers do
       users = @client.friendship_destroy("sferik")
       expect(users).to be_an Array
       expect(users.first).to be_a Twitter::User
-      expect(users.first.id).to eq 7505382
+      expect(users.first.id).to eq(7505382)
     end
   end
 
@@ -427,7 +450,7 @@ describe Twitter::API::FriendsAndFollowers do
     it "returns detailed information about the relationship between two users" do
       relationship = @client.friendship_update("sferik", :retweets => true)
       expect(relationship).to be_a Twitter::Relationship
-      expect(relationship.source.id).to eq 7505382
+      expect(relationship.source.id).to eq(7505382)
     end
   end
 
@@ -443,7 +466,7 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns detailed information about the relationship between two users" do
         relationship = @client.friendship("sferik", "pengwynn")
         expect(relationship).to be_a Twitter::Relationship
-        expect(relationship.source.id).to eq 7505382
+        expect(relationship.source.id).to eq(7505382)
       end
     end
     context "with numeric screen names passed" do
@@ -475,6 +498,26 @@ describe Twitter::API::FriendsAndFollowers do
         expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
+    context "with URI objects passed" do
+      before do
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        user1 = URI.parse("https://twitter.com/sferik")
+        user2 = URI.parse("https://twitter.com/pengwynn")
+        @client.friendship(user1, user2)
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
+      end
+    end
+    context "with URI strings passed" do
+      before do
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.friendship("https://twitter.com/sferik", "https://twitter.com/pengwynn")
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
+      end
+    end
   end
 
   describe "#friendship?" do
@@ -530,15 +573,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns a cursor of followers with details for every user the specified user is followed by" do
         followers = @client.followers("sferik")
         expect(followers).to be_a Twitter::Cursor
-        expect(followers.users).to be_an Array
-        expect(followers.users.first).to be_a Twitter::User
+        expect(followers.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :screen_name => "sferik"}).to_return(:body => fixture("followers_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.followers("sferik").all
+          @client.followers("sferik").each{}
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :screen_name => "sferik"})).to have_been_made
         end
@@ -552,12 +594,12 @@ describe Twitter::API::FriendsAndFollowers do
         @client.followers(7505382)
         expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :user_id => "7505382"}).to_return(:body => fixture("followers_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.followers(7505382).all
+          @client.followers(7505382).each{}
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :user_id => "7505382"})).to have_been_made
         end
@@ -576,15 +618,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns a cursor of followers with details for every user the specified user is followed by" do
         followers = @client.followers
         expect(followers).to be_a Twitter::Cursor
-        expect(followers.users).to be_an Array
-        expect(followers.users.first).to be_a Twitter::User
+        expect(followers.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :screen_name => "sferik"}).to_return(:body => fixture("followers_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.followers.all
+          @client.followers.each{}
           expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/followers/list.json").with(:query => {:cursor => "1419103567112105362", :screen_name => "sferik"})).to have_been_made
@@ -605,15 +646,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns a cursor of friends with details for every user the specified user is following" do
         friends = @client.friends("sferik")
         expect(friends).to be_a Twitter::Cursor
-        expect(friends.users).to be_an Array
-        expect(friends.users.first).to be_a Twitter::User
+        expect(friends.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :screen_name => "sferik"}).to_return(:body => fixture("friends_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friends("sferik").all
+          @client.friends("sferik").each{}
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :screen_name => "sferik"})).to have_been_made
         end
@@ -627,12 +667,12 @@ describe Twitter::API::FriendsAndFollowers do
         @client.friends(7505382)
         expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :user_id => "7505382"}).to_return(:body => fixture("friends_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friends(7505382).all
+          @client.friends(7505382).each{}
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :user_id => "7505382"})).to have_been_made
         end
@@ -651,15 +691,14 @@ describe Twitter::API::FriendsAndFollowers do
       it "returns a cursor of friends with details for every user the specified user is following" do
         friends = @client.friends
         expect(friends).to be_a Twitter::Cursor
-        expect(friends.users).to be_an Array
-        expect(friends.users.first).to be_a Twitter::User
+        expect(friends.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :screen_name => "sferik"}).to_return(:body => fixture("friends_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.friends.all
+          @client.friends.each{}
           expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/1.1/friends/list.json").with(:query => {:cursor => "1418947360875712729", :screen_name => "sferik"})).to have_been_made
@@ -684,7 +723,7 @@ describe Twitter::API::FriendsAndFollowers do
       no_retweet_ids = @client.no_retweet_ids
       expect(no_retweet_ids).to be_an Array
       expect(no_retweet_ids.first).to be_an Integer
-      expect(no_retweet_ids.first).to eq 47
+      expect(no_retweet_ids.first).to eq(47)
     end
   end
 end