twitter 4.8.1 → 5.0.0

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,119 +279,77 @@ 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
   end
 
   describe "#follow" 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_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
-      it "requests the correct resource" do
-        @client.follow("sferik", "pengwynn", :follow => true)
-        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_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382", :follow => "true"})).to have_been_made
-      end
-      it "returns an array of befriended users" 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
-      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_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
-      it "requests the correct resource" do
-        @client.follow("sferik", "pengwynn", :follow => false)
-        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_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
-      end
+    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_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
-    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_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
-      it "requests the correct resource" do
-        @client.follow("sferik", "pengwynn")
-        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_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
-      end
+    it "requests the correct resource" do
+      @client.follow("sferik", "pengwynn")
+      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_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+      expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
     end
   end
 
   describe "#follow!" do
-    context "with :follow => true passed" do
-      before do
-        stub_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik", :follow => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      end
-      it "requests the correct resource" do
-        @client.follow!("sferik", :follow => true)
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik", :follow => "true"})).to have_been_made
-      end
-      it "returns an array of befriended users" 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
-      end
+    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
-    context "with :follow => false 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!("sferik", :follow => false)
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
-      end
-      it "returns an array of befriended users" 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
-      end
+    it "requests the correct resource" do
+      @client.follow!("sferik")
+      expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
-    context "without :follow 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!("sferik")
-        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
-      end
-      it "returns an array of befriended users" 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
-      end
+    it "returns an array of befriended users" 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)
+    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
 
@@ -409,10 +362,10 @@ describe Twitter::API::FriendsAndFollowers do
       expect(a_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
     it "returns an array of unfollowed users" do
-      users = @client.friendship_destroy("sferik")
+      users = @client.unfollow("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 +380,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 +396,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 +428,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
@@ -489,11 +462,11 @@ describe Twitter::API::FriendsAndFollowers do
       end
       it "returns true if user A follows user B" do
         friendship = @client.friendship?("sferik", "pengwynn")
-        expect(friendship).to be_true
+        expect(friendship).to be true
       end
       it "returns false if user A does not follow user B" do
         friendship = @client.friendship?("pengwynn", "sferik")
-        expect(friendship).to be_false
+        expect(friendship).to be false
       end
     end
     context "with user IDs passed" do
@@ -530,15 +503,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 +524,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 +548,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 +576,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 +597,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 +621,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 +653,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

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

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::PlacesAndGeo do
+describe Twitter::REST::API::PlacesAndGeo 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 "#place" do
@@ -16,7 +16,7 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns a place" do
       place = @client.place("247f43d441defc03")
-      expect(place.name).to eq "Twitter HQ"
+      expect(place.name).to eq("Twitter HQ")
     end
   end
 
@@ -30,8 +30,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns places" do
       places = @client.reverse_geocode(:lat => "37.7821120598956", :long => "-122.400612831116")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 
@@ -45,8 +45,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns nearby places" do
       places = @client.geo_search(:ip => "74.125.19.104")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 
@@ -60,22 +60,8 @@ describe Twitter::API::PlacesAndGeo do
     end
     it "returns similar places" do
       places = @client.similar_places(:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ")
-      expect(places).to be_an Array
-      expect(places.first.name).to eq "Bernal Heights"
-    end
-  end
-
-  describe "#place_create" do
-    before do
-      stub_post("/1.1/geo/place.json").with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"}).to_return(:body => fixture("place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.place_create(:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581")
-      expect(a_post("/1.1/geo/place.json").with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"})).to have_been_made
-    end
-    it "returns a place" do
-      place = @client.place_create(:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581")
-      expect(place.name).to eq "Twitter HQ"
+      expect(places).to be_a Twitter::GeoResults
+      expect(places.first.name).to eq("Bernal Heights")
     end
   end
 

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

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Help do
+describe Twitter::REST::API::Help 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 "#configuration" do
@@ -17,7 +17,7 @@ describe Twitter::API::Help do
     it "returns Twitter's current configuration" do
       configuration = @client.configuration
       expect(configuration).to be_a Twitter::Configuration
-      expect(configuration.characters_reserved_per_media).to eq 20
+      expect(configuration.characters_reserved_per_media).to eq(20)
     end
   end
 
@@ -33,7 +33,7 @@ describe Twitter::API::Help do
       languages = @client.languages
       expect(languages).to be_an Array
       expect(languages.first).to be_a Twitter::Language
-      expect(languages.first.name).to eq "Portuguese"
+      expect(languages.first.name).to eq("Portuguese")
     end
   end
 
@@ -47,7 +47,7 @@ describe Twitter::API::Help do
     end
     it "returns Twitter's Privacy Policy" do
       privacy = @client.privacy
-      expect(privacy.split.first).to eq "Twitter"
+      expect(privacy.split.first).to eq("Twitter")
     end
   end
 
@@ -61,7 +61,7 @@ describe Twitter::API::Help do
     end
     it "returns Twitter's Terms of Service" do
       tos = @client.tos
-      expect(tos.split.first).to eq "Terms"
+      expect(tos.split.first).to eq("Terms")
     end
   end