twitter 5.12.0 → 5.13.0

data/lib/twitter/rest/help.rb

@@ -1,6 +1,6 @@
 require 'twitter/configuration'
 require 'twitter/language'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 
 module Twitter
@@ -16,7 +16,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Configuration] Twitter's configuration.
       def configuration(options = {})
-        perform_with_object(:get, '/1.1/help/configuration.json', options, Twitter::Configuration)
+        perform_get_with_object('/1.1/help/configuration.json', options, Twitter::Configuration)
       end
 
       # Returns the list of languages supported by Twitter
@@ -27,7 +27,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Array<Twitter::Language>]
       def languages(options = {})
-        perform_with_objects(:get, '/1.1/help/languages.json', options, Twitter::Language)
+        perform_get_with_objects('/1.1/help/languages.json', options, Twitter::Language)
       end
 
       # Returns {https://twitter.com/privacy Twitter's Privacy Policy}
@@ -38,7 +38,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [String]
       def privacy(options = {})
-        get('/1.1/help/privacy.json', options).body[:privacy]
+        perform_get('/1.1/help/privacy.json', options)[:privacy]
       end
 
       # Returns {https://twitter.com/tos Twitter's Terms of Service}
@@ -49,7 +49,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [String]
       def tos(options = {})
-        get('/1.1/help/tos.json', options).body[:tos]
+        perform_get('/1.1/help/tos.json', options)[:tos]
       end
     end
   end

data/lib/twitter/rest/lists.rb

@@ -2,7 +2,7 @@ require 'twitter/arguments'
 require 'twitter/cursor'
 require 'twitter/error'
 require 'twitter/list'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'
@@ -60,7 +60,7 @@ module Twitter
         arguments = Twitter::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
         merge_owner!(arguments.options, arguments.pop)
-        perform_with_objects(:get, '/1.1/lists/statuses.json', arguments.options, Twitter::Tweet)
+        perform_get_with_objects('/1.1/lists/statuses.json', arguments.options, Twitter::Tweet)
       end
 
       # Removes the specified member from the list
@@ -81,7 +81,7 @@ module Twitter
       #   @param user_to_remove [Integer, String] The user id or screen name of the list member to remove.
       #   @param options [Hash] A customizable set of options.
       def remove_list_member(*args)
-        list_from_response_with_user(:post, '/1.1/lists/members/destroy.json', args)
+        list_from_response_with_user('/1.1/lists/members/destroy.json', args)
       end
       deprecate_alias :list_remove_member, :remove_list_member
 
@@ -102,7 +102,7 @@ module Twitter
       #   @option options [Integer] :count The amount of results to return per page. Defaults to 20. No more than 1000 results will ever be returned in a single page.
       #   @option options [Boolean, String, Integer] :filter_to_owned_lists When set to true, t or 1, will return just lists the authenticating user owns, and the user represented by user_id or screen_name is a member of.
       def memberships(*args)
-        cursor_from_response_with_user(:lists, Twitter::List, :get, '/1.1/lists/memberships.json', args)
+        cursor_from_response_with_user(:lists, Twitter::List, '/1.1/lists/memberships.json', args)
       end
 
       # Returns the subscribers of the specified list
@@ -121,7 +121,7 @@ module Twitter
       #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
       #   @param options [Hash] A customizable set of options.
       def list_subscribers(*args)
-        cursor_from_response_with_list(:get, '/1.1/lists/subscribers.json', args)
+        cursor_from_response_with_list('/1.1/lists/subscribers.json', args)
       end
 
       # Make the authenticated user follow the specified list
@@ -204,7 +204,7 @@ module Twitter
       #   @param users [Enumerable<Integer, String, Twitter::User>] A collection of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       def add_list_members(*args)
-        list_from_response_with_users(:post, '/1.1/lists/members/create_all.json', args)
+        list_from_response_with_users('/1.1/lists/members/create_all.json', args)
       end
       deprecate_alias :list_add_members, :add_list_members
 
@@ -245,7 +245,7 @@ module Twitter
       #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
       #   @param options [Hash] A customizable set of options.
       def list_members(*args)
-        cursor_from_response_with_list(:get, '/1.1/lists/members.json', args)
+        cursor_from_response_with_list('/1.1/lists/members.json', args)
       end
 
       # Add a member to a list
@@ -267,7 +267,7 @@ module Twitter
       #   @param user_to_add [Integer, String] The user id or screen name to add to the list.
       #   @param options [Hash] A customizable set of options.
       def add_list_member(*args)
-        list_from_response_with_user(:post, '/1.1/lists/members/create.json', args)
+        list_from_response_with_user('/1.1/lists/members/create.json', args)
       end
       deprecate_alias :list_add_member, :add_list_member
 
@@ -328,7 +328,7 @@ module Twitter
       # @option options [String] :mode ('public') Whether your list is public or private. Values can be 'public' or 'private'.
       # @option options [String] :description The description to give the list.
       def create_list(name, options = {})
-        perform_with_object(:post, '/1.1/lists/create.json', options.merge(:name => name), Twitter::List)
+        perform_post_with_object('/1.1/lists/create.json', options.merge(:name => name), Twitter::List)
       end
       deprecate_alias :list_create, :create_list
 
@@ -365,7 +365,7 @@ module Twitter
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
       #   @param options [Hash] A customizable set of options.
       def subscriptions(*args)
-        cursor_from_response_with_user(:lists, Twitter::List, :get, '/1.1/lists/subscriptions.json', args)
+        cursor_from_response_with_user(:lists, Twitter::List, '/1.1/lists/subscriptions.json', args)
       end
 
       # Removes specified members from the list
@@ -386,7 +386,7 @@ module Twitter
       #   @param users [Enumerable<Integer, String, Twitter::User>] A collection of Twitter user IDs, screen names, or objects.
       #   @param options [Hash] A customizable set of options.
       def remove_list_members(*args)
-        list_from_response_with_users(:post, '/1.1/lists/members/destroy_all.json', args)
+        list_from_response_with_users('/1.1/lists/members/destroy_all.json', args)
       end
       deprecate_alias :list_remove_members, :remove_list_members
 
@@ -405,7 +405,7 @@ module Twitter
       #   @param options [Hash] A customizable set of options.
       #   @option options [Integer] :count The amount of results to return per page. Defaults to 20. No more than 1000 results will ever be returned in a single page.
       def owned_lists(*args)
-        cursor_from_response_with_user(:lists, Twitter::List, :get, '/1.1/lists/ownerships.json', args)
+        cursor_from_response_with_user(:lists, Twitter::List, '/1.1/lists/ownerships.json', args)
       end
       deprecate_alias :lists_ownerships, :owned_lists
       deprecate_alias :lists_owned, :owned_lists
@@ -420,14 +420,14 @@ module Twitter
         arguments = Twitter::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
         merge_owner!(arguments.options, arguments.pop)
-        perform_with_object(request_method, path, arguments.options, Twitter::List)
+        perform_request_with_object(request_method, path, arguments.options, Twitter::List)
       end
 
-      def cursor_from_response_with_list(request_method, path, args)
+      def cursor_from_response_with_list(path, args)
         arguments = Twitter::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
         merge_owner!(arguments.options, arguments.pop)
-        perform_with_cursor(request_method, path, arguments.options, :users, Twitter::User)
+        perform_get_with_cursor(path, arguments.options, :users, Twitter::User)
       end
 
       def list_user?(request_method, path, args)
@@ -435,28 +435,28 @@ module Twitter
         merge_user!(arguments.options, arguments.pop)
         merge_list!(arguments.options, arguments.pop)
         merge_owner!(arguments.options, arguments.pop)
-        send(request_method.to_sym, path, arguments.options)
+        perform_request(request_method.to_sym, path, arguments.options)
         true
       rescue Twitter::Error::Forbidden, Twitter::Error::NotFound
         false
       end
 
-      def list_from_response_with_user(request_method, path, args)
+      def list_from_response_with_user(path, args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
         merge_list!(arguments.options, arguments.pop)
         merge_owner!(arguments.options, arguments.pop)
-        perform_with_object(request_method, path, arguments.options, Twitter::List)
+        perform_post_with_object(path, arguments.options, Twitter::List)
       end
 
-      def list_from_response_with_users(request_method, path, args)
+      def list_from_response_with_users(path, args)
         arguments = args.dup
         options = arguments.last.is_a?(::Hash) ? arguments.pop : {}
         members = arguments.pop
         merge_list!(options, arguments.pop)
         merge_owner!(options, arguments.pop)
-        pmap(members.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
-          perform_with_object(request_method, path, merge_users(options, users), Twitter::List)
+        pmap(members.each_slice(MAX_USERS_PER_REQUEST)) do |users|
+          perform_post_with_object(path, merge_users(options, users), Twitter::List)
         end.last
       end
 

data/lib/twitter/rest/media.rb

@@ -1,4 +1,5 @@
 require 'twitter/error'
+require 'twitter/headers'
 require 'twitter/rest/utils'
 
 module Twitter
@@ -16,11 +17,11 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       def upload(media, options = {})
         fail(Twitter::Error::UnacceptableIO.new) unless media.respond_to?(:to_io)
-        url_prefix = 'https://upload.twitter.com'
+        base_url = 'https://upload.twitter.com'
         path = '/1.1/media/upload.json'
         conn = connection.dup
-        conn.url_prefix = url_prefix
-        headers = request_headers(:post, url_prefix + path, options)
+        conn.url_prefix = base_url
+        headers = Twitter::Headers.new(self, :post, base_url + path, options).request_headers
         options.merge!(:media => media)
         conn.post(path, options) { |request| request.headers.update(headers) }.env.body[:media_id]
       end

data/lib/twitter/rest/oauth.rb

@@ -1,4 +1,4 @@
-require 'twitter/request'
+require 'twitter/headers'
 require 'twitter/rest/utils'
 require 'twitter/rest/response/parse_error_json'
 require 'twitter/token'
@@ -26,7 +26,7 @@ module Twitter
       def token(options = {})
         options[:bearer_token_request] = true
         options[:grant_type] ||= 'client_credentials'
-        perform_with_object(:post, '/oauth2/token', options, Twitter::Token)
+        perform_post_with_object('/oauth2/token', options, Twitter::Token)
       end
       alias_method :bearer_token, :token
 
@@ -42,7 +42,7 @@ module Twitter
       def invalidate_token(access_token, options = {})
         access_token = access_token.access_token if access_token.is_a?(Twitter::Token)
         options[:access_token] = access_token
-        perform_with_object(:post, '/oauth2/invalidate_token', options, Twitter::Token)
+        perform_post_with_object('/oauth2/invalidate_token', options, Twitter::Token)
       end
 
       # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
@@ -56,7 +56,7 @@ module Twitter
         conn = connection.dup
         conn.builder.swap(4, Twitter::REST::Response::ParseErrorJson)
         response = conn.post('/oauth/request_token?x_auth_mode=reverse_auth') do |request|
-          request.headers[:authorization] = oauth_auth_header(:post, 'https://api.twitter.com/oauth/request_token', :x_auth_mode => 'reverse_auth').to_s
+          request.headers[:authorization] = Twitter::Headers.new(self, :post, 'https://api.twitter.com/oauth/request_token', :x_auth_mode => 'reverse_auth').oauth_auth_header.to_s
         end
         response.body
       end

data/lib/twitter/rest/places_and_geo.rb

@@ -1,6 +1,5 @@
 require 'twitter/geo_results'
 require 'twitter/place'
-require 'twitter/request'
 require 'twitter/rest/utils'
 
 module Twitter
@@ -18,7 +17,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @return [Twitter::Place] The requested place.
       def place(place_id, options = {})
-        perform_with_object(:get, "/1.1/geo/id/#{place_id}.json", options, Twitter::Place)
+        perform_get_with_object("/1.1/geo/id/#{place_id}.json", options, Twitter::Place)
       end
 
       # Searches for up to 20 places that can be used as a place_id
@@ -36,7 +35,7 @@ module Twitter
       # @option options [Integer] :max_results A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
       # @return [Array<Twitter::Place>]
       def reverse_geocode(options = {})
-        perform_with_object(:get, '/1.1/geo/reverse_geocode.json', options, Twitter::GeoResults)
+        perform_get_with_object('/1.1/geo/reverse_geocode.json', options, Twitter::GeoResults)
       end
 
       # Search for places that can be attached to a {Twitter::REST::Tweets#update}
@@ -57,7 +56,7 @@ module Twitter
       # @option options [String] :"attribute:street_address" This option searches for places which have this given street address. There are other well-known and application-specific attributes available. Custom attributes are also permitted.
       # @return [Array<Twitter::Place>]
       def geo_search(options = {})
-        perform_with_object(:get, '/1.1/geo/search.json', options, Twitter::GeoResults)
+        perform_get_with_object('/1.1/geo/search.json', options, Twitter::GeoResults)
       end
       alias_method :places_nearby, :geo_search
 
@@ -76,7 +75,7 @@ module Twitter
       # @option options [String] :"attribute:street_address" This option searches for places which have this given street address. There are other well-known and application-specific attributes available. Custom attributes are also permitted.
       # @return [Array<Twitter::Place>]
       def similar_places(options = {})
-        perform_with_object(:get, '/1.1/geo/similar_places.json', options, Twitter::GeoResults)
+        perform_get_with_object('/1.1/geo/similar_places.json', options, Twitter::GeoResults)
       end
       alias_method :places_similar, :similar_places
     end

data/lib/twitter/rest/request.rb

@@ -0,0 +1,44 @@
+require 'addressable/uri'
+require 'faraday'
+require 'json'
+require 'timeout'
+require 'twitter/error'
+require 'twitter/headers'
+require 'twitter/rate_limit'
+
+module Twitter
+  module REST
+    class Request
+      attr_accessor :client, :headers, :options, :rate_limit, :request_method,
+                    :path, :uri
+      alias_method :verb, :request_method
+
+      # @param client [Twitter::Client]
+      # @param request_method [String, Symbol]
+      # @param path [String]
+      # @param options [Hash]
+      # @return [Twitter::REST::Request]
+      def initialize(client, request_method, path, options = {})
+        @client = client
+        @request_method = request_method.to_sym
+        @path = path
+        @uri = Addressable::URI.parse(client.connection.url_prefix + path)
+        @options = options
+      end
+
+      # @return [Array, Hash]
+      def perform
+        @headers = Twitter::Headers.new(@client, @request_method, @uri.to_s, @options).request_headers
+        begin
+          response = @client.connection.send(@request_method, @path, @options) { |request| request.headers.update(@headers) }.env
+        rescue Faraday::Error::TimeoutError, Timeout::Error => error
+          raise(Twitter::Error::RequestTimeout.new(error))
+        rescue Faraday::Error::ClientError, JSON::ParserError => error
+          raise(Twitter::Error.new(error))
+        end
+        @rate_limit = Twitter::RateLimit.new(response.response_headers)
+        response.body
+      end
+    end
+  end
+end

data/lib/twitter/rest/request/multipart_with_file.rb

@@ -2,7 +2,7 @@ require 'faraday'
 
 module Twitter
   module REST
-    module Request
+    class Request
       class MultipartWithFile < Faraday::Middleware
         CONTENT_TYPE = 'Content-Type'
         GIF_REGEX = /\.gif$/i

data/lib/twitter/rest/saved_searches.rb

@@ -1,5 +1,4 @@
 require 'twitter/arguments'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/saved_search'
 require 'twitter/utils'
@@ -33,7 +32,7 @@ module Twitter
       def saved_searches(*args)
         arguments = Twitter::Arguments.new(args)
         if arguments.empty?
-          perform_with_objects(:get, '/1.1/saved_searches/list.json', arguments.options, Twitter::SavedSearch)
+          perform_get_with_objects('/1.1/saved_searches/list.json', arguments.options, Twitter::SavedSearch)
         else
           pmap(arguments) do |id|
             saved_search(id, arguments.options)
@@ -51,7 +50,7 @@ module Twitter
       # @param id [Integer] The ID of the saved search.
       # @param options [Hash] A customizable set of options.
       def saved_search(id, options = {})
-        perform_with_object(:get, "/1.1/saved_searches/show/#{id}.json", options, Twitter::SavedSearch)
+        perform_get_with_object("/1.1/saved_searches/show/#{id}.json", options, Twitter::SavedSearch)
       end
 
       # Creates a saved search for the authenticated user
@@ -64,7 +63,7 @@ module Twitter
       # @param query [String] The query of the search the user would like to save.
       # @param options [Hash] A customizable set of options.
       def create_saved_search(query, options = {})
-        perform_with_object(:post, '/1.1/saved_searches/create.json', options.merge(:query => query), Twitter::SavedSearch)
+        perform_post_with_object('/1.1/saved_searches/create.json', options.merge(:query => query), Twitter::SavedSearch)
       end
       deprecate_alias :saved_search_create, :create_saved_search
 
@@ -84,7 +83,7 @@ module Twitter
       def destroy_saved_search(*args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |id|
-          perform_with_object(:post, "/1.1/saved_searches/destroy/#{id}.json", arguments.options, Twitter::SavedSearch)
+          perform_post_with_object("/1.1/saved_searches/destroy/#{id}.json", arguments.options, Twitter::SavedSearch)
         end
       end
       deprecate_alias :saved_search_destroy, :destroy_saved_search

data/lib/twitter/rest/search.rb

@@ -1,4 +1,4 @@
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/search_results'
 
 module Twitter
@@ -27,9 +27,8 @@ module Twitter
       # @return [Twitter::SearchResults] Return tweets that match a specified query with search metadata
       def search(q, options = {})
         options[:count] ||= MAX_TWEETS_PER_REQUEST
-        request = Twitter::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(:q => q))
-        response = get(request.path, request.options).body
-        Twitter::SearchResults.new(response, request)
+        request = Twitter::REST::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(:q => q))
+        Twitter::SearchResults.new(request)
       end
     end
   end

data/lib/twitter/rest/spam_reporting.rb

@@ -1,4 +1,3 @@
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/user'
 

data/lib/twitter/rest/suggested_users.rb

@@ -1,5 +1,4 @@
 require 'twitter/arguments'
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/suggestion'
 require 'twitter/user'
@@ -27,9 +26,9 @@ module Twitter
       def suggestions(*args)
         arguments = Twitter::Arguments.new(args)
         if arguments.last
-          perform_with_object(:get, "/1.1/users/suggestions/#{arguments.pop}.json", arguments.options, Twitter::Suggestion)
+          perform_get_with_object("/1.1/users/suggestions/#{arguments.pop}.json", arguments.options, Twitter::Suggestion)
         else
-          perform_with_objects(:get, '/1.1/users/suggestions.json', arguments.options, Twitter::Suggestion)
+          perform_get_with_objects('/1.1/users/suggestions.json', arguments.options, Twitter::Suggestion)
         end
       end
 
@@ -42,7 +41,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @return [Array<Twitter::User>]
       def suggest_users(slug, options = {})
-        perform_with_objects(:get, "/1.1/users/suggestions/#{slug}/members.json", options, Twitter::User)
+        perform_get_with_objects("/1.1/users/suggestions/#{slug}/members.json", options, Twitter::User)
       end
     end
   end

data/lib/twitter/rest/timelines.rb

@@ -1,4 +1,3 @@
-require 'twitter/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/user'
@@ -24,7 +23,7 @@ module Twitter
       # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 200.
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def mentions_timeline(options = {})
-        perform_with_objects(:get, '/1.1/statuses/mentions_timeline.json', options, Twitter::Tweet)
+        perform_get_with_objects('/1.1/statuses/mentions_timeline.json', options, Twitter::Tweet)
       end
       alias_method :mentions, :mentions_timeline
 
@@ -111,7 +110,7 @@ module Twitter
       # @option options [Boolean, String, Integer] :include_rts Specifies that the timeline should include native retweets in addition to regular tweets. Note: If you're using the trim_user parameter in conjunction with include_rts, the retweets will no longer contain a full user object.
       # @option options [Boolean, String, Integer] :contributor_details Specifies that the contributors element should be enhanced to include the screen_name of the contributor.
       def home_timeline(options = {})
-        perform_with_objects(:get, '/1.1/statuses/home_timeline.json', options, Twitter::Tweet)
+        perform_get_with_objects('/1.1/statuses/home_timeline.json', options, Twitter::Tweet)
       end
 
       # Returns the 20 most recent retweets posted by users the authenticating user follow.
@@ -149,7 +148,7 @@ module Twitter
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       # @option options [Boolean, String, Integer] :include_user_entities The user entities node will be disincluded when set to false.
       def retweets_of_me(options = {})
-        perform_with_objects(:get, '/1.1/statuses/retweets_of_me.json', options, Twitter::Tweet)
+        perform_get_with_objects('/1.1/statuses/retweets_of_me.json', options, Twitter::Tweet)
       end
 
     private