twitter 4.2.0 → 4.3.0

data/lib/twitter/client.rb

@@ -1,6 +1,20 @@
 require 'faraday'
 require 'multi_json'
-require 'twitter/api'
+require 'twitter/api/direct_messages'
+require 'twitter/api/favorites'
+require 'twitter/api/friends_and_followers'
+require 'twitter/api/help'
+require 'twitter/api/lists'
+require 'twitter/api/places_and_geo'
+require 'twitter/api/saved_searches'
+require 'twitter/api/search'
+require 'twitter/api/spam_reporting'
+require 'twitter/api/suggested_users'
+require 'twitter/api/timelines'
+require 'twitter/api/trends'
+require 'twitter/api/tweets'
+require 'twitter/api/undocumented'
+require 'twitter/api/users'
 require 'twitter/configurable'
 require 'twitter/error/client_error'
 require 'twitter/error/decode_error'
@@ -14,6 +28,21 @@ module Twitter
   # @see http://dev.twitter.com/pages/every_developer
   class Client
     include Twitter::API
+    include Twitter::API::DirectMessages
+    include Twitter::API::Favorites
+    include Twitter::API::FriendsAndFollowers
+    include Twitter::API::Help
+    include Twitter::API::Lists
+    include Twitter::API::PlacesAndGeo
+    include Twitter::API::SavedSearches
+    include Twitter::API::Search
+    include Twitter::API::SpamReporting
+    include Twitter::API::SuggestedUsers
+    include Twitter::API::Timelines
+    include Twitter::API::Trends
+    include Twitter::API::Tweets
+    include Twitter::API::Undocumented
+    include Twitter::API::Users
     include Twitter::Configurable
 
     # Initializes a new Client object
@@ -27,23 +56,23 @@ module Twitter
     end
 
     # Perform an HTTP DELETE request
-    def delete(path, params={}, options={})
-      request(:delete, path, params, options)
+    def delete(path, params={})
+      request(:delete, path, params)
     end
 
     # Perform an HTTP GET request
-    def get(path, params={}, options={})
-      request(:get, path, params, options)
+    def get(path, params={})
+      request(:get, path, params)
     end
 
     # Perform an HTTP POST request
-    def post(path, params={}, options={})
-      request(:post, path, params, options)
+    def post(path, params={})
+      request(:post, path, params)
     end
 
     # Perform an HTTP UPDATE request
-    def put(path, params={}, options={})
-      request(:put, path, params, options)
+    def put(path, params={})
+      request(:put, path, params)
     end
 
   private
@@ -58,16 +87,15 @@ module Twitter
     # Perform an HTTP request
     #
     # @raise [Twitter::Error::ClientError, Twitter::Error::DecodeError]
-    def request(method, path, params={}, options={})
-      uri = options[:endpoint] || @endpoint
-      uri = URI(uri) unless uri.respond_to?(:host)
+    def request(method, path, params={})
+      uri = URI(@endpoint) unless uri.respond_to?(:host)
       uri += path
       request_headers = {}
       if credentials?
         authorization = auth_header(method, uri, params)
         request_headers[:authorization] = authorization.to_s
       end
-      connection.url_prefix = options[:endpoint] || @endpoint
+      connection.url_prefix = @endpoint
       response = connection.run_request(method.to_sym, path, nil, request_headers) do |request|
         unless params.empty?
           case request.method

data/lib/twitter/core_ext/enumerable.rb

@@ -10,7 +10,7 @@ module Enumerable
     end
   end
 
-  private
+private
 
   def abort_on_exception
     initial_abort_on_exception = Thread.abort_on_exception

data/lib/twitter/default.rb

@@ -22,24 +22,22 @@ module Twitter
       :timeout => 10,
     } unless defined? CONNECTION_OPTIONS
     IDENTITY_MAP = false unless defined? IDENTITY_MAP
-    MIDDLEWARE = Faraday::Builder.new(
-      &Proc.new do |builder|
-        # Convert file uploads to Faraday::UploadIO objects
-        builder.use Twitter::Request::MultipartWithFile
-        # Checks for files in the payload
-        builder.use Faraday::Request::Multipart
-        # Convert request params to "www-form-urlencoded"
-        builder.use Faraday::Request::UrlEncoded
-        # Handle 4xx server responses
-        builder.use Twitter::Response::RaiseError, Twitter::Error::ClientError
-        # Parse JSON response bodies using MultiJson
-        builder.use Twitter::Response::ParseJson
-        # Handle 5xx server responses
-        builder.use Twitter::Response::RaiseError, Twitter::Error::ServerError
-        # Set Faraday's HTTP adapter
-        builder.adapter Faraday.default_adapter
-      end
-    )
+    MIDDLEWARE = Faraday::Builder.new do |builder|
+      # Convert file uploads to Faraday::UploadIO objects
+      builder.use Twitter::Request::MultipartWithFile
+      # Checks for files in the payload
+      builder.use Faraday::Request::Multipart
+      # Convert request params to "www-form-urlencoded"
+      builder.use Faraday::Request::UrlEncoded
+      # Handle 4xx server responses
+      builder.use Twitter::Response::RaiseError, Twitter::Error::ClientError
+      # Parse JSON response bodies using MultiJson
+      builder.use Twitter::Response::ParseJson
+      # Handle 5xx server responses
+      builder.use Twitter::Response::RaiseError, Twitter::Error::ServerError
+      # Set Faraday's HTTP adapter
+      builder.adapter Faraday.default_adapter
+    end
 
     class << self
 

data/lib/twitter/error/already_favorited.rb

@@ -3,7 +3,7 @@ require 'twitter/error/forbidden'
 module Twitter
   class Error
     # Raised when a Tweet has already been favorited
-    class AlreadyFavorited < Twitter::Error::Forbidden
+    class AlreadyFavorited < Twitter::Error
       MESSAGE = "You have already favorited this status"
     end
   end

data/lib/twitter/error/already_retweeted.rb

@@ -3,7 +3,7 @@ require 'twitter/error/forbidden'
 module Twitter
   class Error
     # Raised when a Tweet has already been retweeted
-    class AlreadyRetweeted < Twitter::Error::Forbidden
+    class AlreadyRetweeted < Twitter::Error
       MESSAGE = "sharing is not permissible for this status (Share validations failed)"
     end
   end

data/lib/twitter/profile_banner.rb

@@ -0,0 +1,18 @@
+require 'twitter/base'
+require 'twitter/size'
+
+module Twitter
+  class ProfileBanner < Twitter::Base
+
+    # Returns an array of photo sizes
+    #
+    # @return [Array<Twitter::Size>]
+    def sizes
+      @sizes ||= Array(@attrs[:sizes]).inject({}) do |object, (key, value)|
+        object[key] = Twitter::Size.fetch_or_new(value)
+        object
+      end
+    end
+
+  end
+end

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 4 unless defined? Twitter::MAJOR
-    MINOR = 2 unless defined? Twitter::MINOR
+    MINOR = 3 unless defined? Twitter::MINOR
     PATCH = 0 unless defined? Twitter::PATCH
     PRE = nil unless defined? Twitter::PRE
 

data/spec/fixtures/profile_banner.json

@@ -0,0 +1 @@
+{"sizes":{"mobile_retina":{"h":320,"w":640,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/mobile_retina"},"ipad":{"h":313,"w":626,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/ipad"},"mobile":{"h":160,"w":320,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/mobile"},"ipad_retina":{"h":626,"w":1252,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/ipad_retina"},"web_retina":{"h":520,"w":1040,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/web_retina"},"web":{"h":260,"w":520,"url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693\/web"}}}

data/spec/twitter/api/direct_messages_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Twitter::API do
+describe Twitter::API::DirectMessages do
 
   before do
     @client = Twitter::Client.new
@@ -38,37 +38,6 @@ describe Twitter::API do
     end
   end
 
-  describe "#direct_message_destroy" do
-    before do
-      stub_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.direct_message_destroy(1825785544)
-      expect(a_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"})).to have_been_made
-    end
-    it "returns an array of deleted messages" 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
-    end
-  end
-
-  describe "#direct_message_create" do
-    before do
-      stub_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.direct_message_create("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
-    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"
-    end
-  end
-
   describe "#direct_message" do
     before do
       stub_get("/1.1/direct_messages/show.json").with(:query => {:id => "1825786345"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -117,4 +86,35 @@ describe Twitter::API do
     end
   end
 
+  describe "#direct_message_destroy" do
+    before do
+      stub_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.direct_message_destroy(1825785544)
+      expect(a_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"})).to have_been_made
+    end
+    it "returns an array of deleted messages" 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
+    end
+  end
+
+  describe "#direct_message_create" do
+    before do
+      stub_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.direct_message_create("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
+    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"
+    end
+  end
+
 end

data/spec/twitter/api/favorites_spec.rb

@@ -0,0 +1,114 @@
+require 'helper'
+
+describe Twitter::API::Favorites do
+
+  before do
+    @client = Twitter::Client.new
+  end
+
+  describe "#favorites" do
+    context "with a screen name passed" do
+      before do
+        stub_get("/1.1/favorites/list.json").with(:query => {:screen_name => "sferik"}).to_return(:body => fixture("favorites.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.favorites("sferik")
+        expect(a_get("/1.1/favorites/list.json").with(:query => {:screen_name => "sferik"})).to have_been_made
+      end
+      it "returns the 20 most recent favorite Tweets for the authenticating user or user specified by the ID parameter" 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 2404341
+      end
+    end
+    context "without arguments passed" do
+      before do
+        stub_get("/1.1/favorites/list.json").to_return(:body => fixture("favorites.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.favorites
+        expect(a_get("/1.1/favorites/list.json")).to have_been_made
+      end
+      it "returns the 20 most recent favorite Tweets for the authenticating user or user specified by the ID parameter" 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 2404341
+      end
+    end
+  end
+
+  describe "#unfavorite" do
+    before do
+      stub_post("/1.1/favorites/destroy.json").with(:body => {:id => "25938088801"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.unfavorite(25938088801)
+      expect(a_post("/1.1/favorites/destroy.json").with(:body => {:id => "25938088801"})).to have_been_made
+    end
+    it "returns an array of un-favorited Tweets" 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."
+    end
+  end
+
+  describe "#favorite" do
+    before do
+      stub_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.favorite(25938088801)
+      expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+    end
+    it "returns an array of favorited Tweets" 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."
+    end
+    context "already favorited" do
+      before do
+        stub_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"}).to_return(:status => 403, :body => fixture("already_favorited.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "does not raises an error" do
+        expect{@client.favorite(25938088801)}.not_to raise_error
+      end
+    end
+  end
+
+  describe "#favorite!" do
+    before do
+      stub_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.favorite!(25938088801)
+      expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"})).to have_been_made
+    end
+    it "returns an array of favorited Tweets" 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."
+    end
+    context "forbidden" do
+      before do
+        stub_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"}).to_return(:status => 403, :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "raises a Forbidden error" do
+        expect{@client.favorite!(25938088801)}.to raise_error(Twitter::Error::Forbidden)
+      end
+    end
+    context "already favorited" do
+      before do
+        stub_post("/1.1/favorites/create.json").with(:body => {:id => "25938088801"}).to_return(:status => 403, :body => fixture("already_favorited.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "raises an AlreadyFavorited error" do
+        expect{@client.favorite!(25938088801)}.to raise_error(Twitter::Error::AlreadyFavorited, "Tweet with the ID 25938088801 has already been favorited by the authenticated user.")
+      end
+    end
+  end
+
+end

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

@@ -1,11 +1,44 @@
 require 'helper'
 
-describe Twitter::API do
+describe Twitter::API::FriendsAndFollowers do
 
   before do
     @client = Twitter::Client.new
   end
 
+  describe "#friend_ids" do
+    context "with a screen_name passed" do
+      before do
+        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"})
+      end
+      it "requests the correct resource" do
+        @client.friend_ids("sferik")
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
+      end
+      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
+      end
+    end
+    context "without arguments passed" do
+      before do
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.friend_ids
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+      end
+      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
+      end
+    end
+  end
+
   describe "#follower_ids" do
     context "with a screen_name passed" do
       before do
@@ -39,76 +72,94 @@ describe Twitter::API do
     end
   end
 
-  describe "#friend_ids" do
-    context "with a screen_name passed" do
+  describe "#friendships" do
+    context "with screen names passed" do
       before do
-        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/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friend_ids("sferik")
-        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
+        @client.friendships("sferik", "pengwynn")
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
       end
-      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
+      it "returns up to 100 users worth of extended information" 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"]
       end
     end
-    context "without arguments passed" do
+    context "with numeric screen names passed" do
       before do
-        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friend_ids
-        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        @client.friendships("0", "311")
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
       end
-      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
+    end
+    context "with user IDs passed" do
+      before do
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.friendships(7505382, 14100886)
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
+      end
+    end
+    context "with both screen names and user IDs passed" do
+      before do
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.friendships("sferik", 14100886)
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
       end
     end
   end
 
-  describe "#friendship?" do
+  describe "#friendships" do
     context "with screen names 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"})
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "pengwynn", :target_screen_name => "sferik"}).to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendship?("sferik", "pengwynn")
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
+        @client.friendships("sferik", "pengwynn")
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
       end
-      it "returns true if user A follows user B" do
-        friendship = @client.friendship?("sferik", "pengwynn")
-        expect(friendship).to be_true
+      it "returns up to 100 users worth of extended information" 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"]
       end
-      it "returns false if user A does not follow user B" do
-        friendship = @client.friendship?("pengwynn", "sferik")
-        expect(friendship).to be_false
+    end
+    context "with numeric screen names passed" do
+      before do
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @client.friendships("0", "311")
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendship?(7505382, 14100886)
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
+        @client.friendships(7505382, 14100886)
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
       end
     end
-    context "with user objects passed" do
+    context "with both screen names and user IDs passed" do
       before do
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        user1 = Twitter::User.new(:id => '7505382')
-        user2 = Twitter::User.new(:id => '14100886')
-        @client.friendship?(user1, user2)
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
+        @client.friendships("sferik", 14100886)
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
       end
     end
   end
@@ -145,52 +196,6 @@ describe Twitter::API do
     end
   end
 
-  describe "#friendship" do
-    context "with screen names 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("sferik", "pengwynn")
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
-      end
-      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
-      end
-    end
-    context "with numeric screen names passed" do
-      before do
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      end
-      it "requests the correct resource" do
-        @client.friendship("0", "311")
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"})).to have_been_made
-      end
-    end
-    context "with user IDs passed" do
-      before do
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      end
-      it "requests the correct resource" do
-        @client.friendship(7505382, 14100886)
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
-      end
-    end
-    context "with user objects passed" do
-      before do
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      end
-      it "requests the correct resource" do
-        user1 = Twitter::User.new(:id => '7505382')
-        user2 = Twitter::User.new(:id => '14100886')
-        @client.friendship(user1, user2)
-        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
-      end
-    end
-  end
-
   describe "#follow" do
     context "with :follow => true passed" do
       before do
@@ -315,111 +320,106 @@ describe Twitter::API do
     end
   end
 
-  describe "#friendships" do
+  describe "#friendship_update" do
+    before do
+      stub_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.friendship_update("sferik", :retweets => true)
+      expect(a_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"})).to have_been_made
+    end
+    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
+    end
+  end
+
+  describe "#friendship" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        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.friendships("sferik", "pengwynn")
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
+        @client.friendship("sferik", "pengwynn")
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
       end
-      it "returns up to 100 users worth of extended information" 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"]
+      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
       end
     end
     context "with numeric screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships("0", "311")
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
+        @client.friendship("0", "311")
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships(7505382, 14100886)
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
+        @client.friendship(7505382, 14100886)
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
-    context "with both screen names and user IDs passed" do
+    context "with user objects passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships("sferik", 14100886)
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
+        user1 = Twitter::User.new(:id => '7505382')
+        user2 = Twitter::User.new(:id => '14100886')
+        @client.friendship(user1, user2)
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
   end
 
-  describe "#friendships" do
+  describe "#friendship?" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        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"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "pengwynn", :target_screen_name => "sferik"}).to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships("sferik", "pengwynn")
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
-      end
-      it "returns up to 100 users worth of extended information" 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"]
+        @client.friendship?("sferik", "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
-    context "with numeric screen names passed" do
-      before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      it "returns true if user A follows user B" do
+        friendship = @client.friendship?("sferik", "pengwynn")
+        expect(friendship).to be_true
       end
-      it "requests the correct resource" do
-        @client.friendships("0", "311")
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
+      it "returns false if user A does not follow user B" do
+        friendship = @client.friendship?("pengwynn", "sferik")
+        expect(friendship).to be_false
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships(7505382, 14100886)
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
+        @client.friendship?(7505382, 14100886)
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
-    context "with both screen names and user IDs passed" do
+    context "with user objects passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.friendships("sferik", 14100886)
-        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
+        user1 = Twitter::User.new(:id => '7505382')
+        user2 = Twitter::User.new(:id => '14100886')
+        @client.friendship?(user1, user2)
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
   end
 
-  describe "#friendship_update" do
-    before do
-      stub_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.friendship_update("sferik", :retweets => true)
-      expect(a_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"})).to have_been_made
-    end
-    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
-    end
-  end
-
 end