twitter 5.5.1 → 5.6.0

data/lib/twitter/rest/api/direct_messages.rb

@@ -1,5 +1,6 @@
 require 'twitter/arguments'
 require 'twitter/direct_message'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/user'
 require 'twitter/utils'
@@ -9,6 +10,7 @@ module Twitter
     module API
       module DirectMessages
         include Twitter::REST::API::Utils
+        include Twitter::Utils
 
         # Returns the 20 most recent direct messages sent to the authenticating user
         #
@@ -24,7 +26,7 @@ module Twitter
         # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 200.
         # @option options [Integer] :page Specifies the page of results to retrieve.
         def direct_messages_received(options = {})
-          objects_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages.json', options)
+          perform_with_objects(:get, '/1.1/direct_messages.json', options, Twitter::DirectMessage)
         end
 
         # Returns the 20 most recent direct messages sent by the authenticating user
@@ -41,7 +43,7 @@ module Twitter
         # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 200.
         # @option options [Integer] :page Specifies the page of results to retrieve.
         def direct_messages_sent(options = {})
-          objects_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages/sent.json', options)
+          perform_with_objects(:get, '/1.1/direct_messages/sent.json', options, Twitter::DirectMessage)
         end
 
         # Returns a direct message
@@ -56,7 +58,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         def direct_message(id, options = {})
           options[:id] = id
-          object_from_response(Twitter::DirectMessage, :get, '/1.1/direct_messages/show.json', options)
+          perform_with_object(:get, '/1.1/direct_messages/show.json', options, Twitter::DirectMessage)
         end
 
         # @note This method requires an access token with RWD (read, write & direct message) permissions. Consult The Application Permission Model for more information.
@@ -89,7 +91,7 @@ module Twitter
           if arguments.empty?
             direct_messages_received(arguments.options)
           else
-            Twitter::Utils.parallel_map(arguments) do |id|
+            parallel_map(arguments) do |id|
               direct_message(id, arguments.options)
             end
           end
@@ -126,7 +128,7 @@ module Twitter
         def create_direct_message(user, text, options = {})
           merge_user!(options, user)
           options[:text] = text
-          object_from_response(Twitter::DirectMessage, :post, '/1.1/direct_messages/new.json', options)
+          perform_with_object(:post, '/1.1/direct_messages/new.json', options, Twitter::DirectMessage)
         end
         alias_method :d, :create_direct_message
         alias_method :m, :create_direct_message

data/lib/twitter/rest/api/favorites.rb

@@ -1,6 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/error/already_favorited'
 require 'twitter/error/forbidden'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/tweet'
 require 'twitter/user'
@@ -11,6 +12,7 @@ module Twitter
     module API
       module Favorites
         include Twitter::REST::API::Utils
+        include Twitter::Utils
 
         # @see https://dev.twitter.com/docs/api/1.1/get/favorites/list
         # @rate_limited Yes
@@ -33,7 +35,7 @@ module Twitter
         def favorites(*args)
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop) if arguments.last
-          objects_from_response(Twitter::Tweet, :get, '/1.1/favorites/list.json', arguments.options)
+          perform_with_objects(:get, '/1.1/favorites/list.json', arguments.options, Twitter::Tweet)
         end
 
         # Un-favorites the specified Tweets as the authenticating user
@@ -68,10 +70,9 @@ module Twitter
         #   @param options [Hash] A customizable set of options.
         def favorite(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
+          parallel_map(arguments) do |tweet|
             begin
-              object_from_response(Twitter::Tweet, :post, '/1.1/favorites/create.json', arguments.options.merge(:id => id))
+              perform_with_object(:post, '/1.1/favorites/create.json', arguments.options.merge(:id => extract_id(tweet)), Twitter::Tweet)
             rescue Twitter::Error::Forbidden => error
               raise unless error.message == Twitter::Error::AlreadyFavorited::MESSAGE
             end
@@ -96,10 +97,9 @@ module Twitter
         #   @param options [Hash] A customizable set of options.
         def favorite!(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
+          parallel_map(arguments) do |tweet|
             begin
-              object_from_response(Twitter::Tweet, :post, '/1.1/favorites/create.json', arguments.options.merge(:id => id))
+              perform_with_object(:post, '/1.1/favorites/create.json', arguments.options.merge(:id => extract_id(tweet)), Twitter::Tweet)
             rescue Twitter::Error::Forbidden => error
               handle_forbidden_error(Twitter::Error::AlreadyFavorited, error)
             end

data/lib/twitter/rest/api/friends_and_followers.rb

@@ -2,6 +2,7 @@ require 'twitter/arguments'
 require 'twitter/cursor'
 require 'twitter/error/forbidden'
 require 'twitter/relationship'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/user'
 require 'twitter/utils'
@@ -11,6 +12,7 @@ module Twitter
     module API
       module FriendsAndFollowers
         include Twitter::REST::API::Utils
+        include Twitter::Utils
 
         # @see https://dev.twitter.com/docs/api/1.1/get/friends/ids
         # @rate_limited Yes
@@ -67,7 +69,7 @@ module Twitter
         def friendships(*args)
           arguments = Twitter::Arguments.new(args)
           merge_users!(arguments.options, arguments)
-          objects_from_response(Twitter::User, :get, '/1.1/friendships/lookup.json', arguments.options)
+          perform_with_objects(:get, '/1.1/friendships/lookup.json', arguments.options, Twitter::User)
         end
 
         # Returns an array of numeric IDs for every user who has a pending request to follow the authenticating user
@@ -80,7 +82,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @option options [Integer] :cursor (-1) Breaks the results into pages. Provide values as returned in the response objects's next_cursor and previous_cursor attributes to page back and forth in the list.
         def friendships_incoming(options = {})
-          cursor_from_response(:ids, nil, :get, '/1.1/friendships/incoming.json', options)
+          perform_with_cursor(:get, '/1.1/friendships/incoming.json', options, :ids)
         end
 
         # Returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request
@@ -93,7 +95,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @option options [Integer] :cursor (-1) Breaks the results into pages. Provide values as returned in the response objects's next_cursor and previous_cursor attributes to page back and forth in the list.
         def friendships_outgoing(options = {})
-          cursor_from_response(:ids, nil, :get, '/1.1/friendships/outgoing.json', options)
+          perform_with_cursor(:get, '/1.1/friendships/outgoing.json', options, :ids)
         end
 
         # Allows the authenticating user to follow the specified users, unless they are already followed
@@ -115,7 +117,7 @@ module Twitter
             friend_ids.to_a
           end
           new_friends = Thread.new do
-            users(args).map(&:id)
+            users(args).collect(&:id)
           end
           follow!(new_friends.value - existing_friends.value, arguments.options)
         end
@@ -137,8 +139,8 @@ module Twitter
         #   @option options [Boolean] :follow (false) Enable notifications for the target user.
         def follow!(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |user|
-            object_from_response(Twitter::User, :post, '/1.1/friendships/create.json', merge_user(arguments.options, user))
+          parallel_map(arguments) do |user|
+            perform_with_object(:post, '/1.1/friendships/create.json', merge_user(arguments.options, user), Twitter::User)
           end.compact
         end
         alias_method :create_friendship!, :follow!
@@ -175,7 +177,7 @@ module Twitter
         # @option options [Boolean] :retweets Enable/disable retweets from the target user.
         def friendship_update(user, options = {})
           merge_user!(options, user)
-          object_from_response(Twitter::Relationship, :post, '/1.1/friendships/update.json', options)
+          perform_with_object(:post, '/1.1/friendships/update.json', options, Twitter::Relationship)
         end
 
         # Returns detailed information about the relationship between two users
@@ -193,7 +195,7 @@ module Twitter
           options[:source_id] = options.delete(:source_user_id) unless options[:source_user_id].nil?
           merge_user!(options, target, 'target')
           options[:target_id] = options.delete(:target_user_id) unless options[:target_user_id].nil?
-          object_from_response(Twitter::Relationship, :get, '/1.1/friendships/show.json', options)
+          perform_with_object(:get, '/1.1/friendships/show.json', options, Twitter::Relationship)
         end
         alias_method :friendship_show, :friendship
         alias_method :relationship, :friendship
@@ -273,7 +275,7 @@ module Twitter
         # @return [Array<Integer>]
         # @param options [Hash] A customizable set of options.
         def no_retweet_ids(options = {})
-          get('/1.1/friendships/no_retweets/ids.json', options)[:body].map(&:to_i)
+          get('/1.1/friendships/no_retweets/ids.json', options)[:body].collect(&:to_i)
         end
         alias_method :no_retweets_ids, :no_retweet_ids
       end

data/lib/twitter/rest/api/help.rb

@@ -1,6 +1,7 @@
-require 'twitter/rest/api/utils'
 require 'twitter/configuration'
 require 'twitter/language'
+require 'twitter/request'
+require 'twitter/rest/api/utils'
 
 module Twitter
   module REST
@@ -16,7 +17,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 = {})
-          object_from_response(Twitter::Configuration, :get, '/1.1/help/configuration.json', options)
+          perform_with_object(:get, '/1.1/help/configuration.json', options, Twitter::Configuration)
         end
 
         # Returns the list of languages supported by Twitter
@@ -27,7 +28,7 @@ module Twitter
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::Language>]
         def languages(options = {})
-          objects_from_response(Twitter::Language, :get, '/1.1/help/languages.json', options)
+          perform_with_objects(:get, '/1.1/help/languages.json', options, Twitter::Language)
         end
 
         # Returns {https://twitter.com/privacy Twitter's Privacy Policy}

data/lib/twitter/rest/api/lists.rb

@@ -3,6 +3,7 @@ require 'twitter/cursor'
 require 'twitter/error/forbidden'
 require 'twitter/error/not_found'
 require 'twitter/list'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/tweet'
 require 'twitter/user'
@@ -13,6 +14,7 @@ module Twitter
     module API
       module Lists
         include Twitter::REST::API::Utils
+        include Twitter::Utils
         MAX_USERS_PER_REQUEST = 100
         URI_SUBSTRING = '://'
 
@@ -59,7 +61,7 @@ module Twitter
           arguments = Twitter::Arguments.new(args)
           merge_list!(arguments.options, arguments.pop)
           merge_owner!(arguments.options, arguments.pop)
-          objects_from_response(Twitter::Tweet, :get, '/1.1/lists/statuses.json', arguments.options)
+          perform_with_objects(:get, '/1.1/lists/statuses.json', arguments.options, Twitter::Tweet)
         end
 
         # Removes the specified member from the list
@@ -319,7 +321,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 = {})
-          object_from_response(Twitter::List, :post, '/1.1/lists/create.json', options.merge(:name => name))
+          perform_with_object(:post, '/1.1/lists/create.json', options.merge(:name => name), Twitter::List)
         end
         deprecate_alias :list_create, :create_list
 
@@ -411,14 +413,14 @@ module Twitter
           arguments = Twitter::Arguments.new(args)
           merge_list!(arguments.options, arguments.pop)
           merge_owner!(arguments.options, arguments.pop)
-          object_from_response(Twitter::List, request_method, path, arguments.options)
+          perform_with_object(request_method, path, arguments.options, Twitter::List)
         end
 
         def cursor_from_response_with_list(request_method, path, args)
           arguments = Twitter::Arguments.new(args)
           merge_list!(arguments.options, arguments.pop)
           merge_owner!(arguments.options, arguments.pop)
-          cursor_from_response(:users, Twitter::User, request_method, path, arguments.options)
+          perform_with_cursor(request_method, path, arguments.options, :users, Twitter::User)
         end
 
         def list_user?(request_method, path, args)
@@ -437,7 +439,7 @@ module Twitter
           merge_user!(arguments.options, arguments.pop)
           merge_list!(arguments.options, arguments.pop)
           merge_owner!(arguments.options, arguments.pop)
-          object_from_response(Twitter::List, request_method, path, arguments.options)
+          perform_with_object(request_method, path, arguments.options, Twitter::List)
         end
 
         def list_from_response_with_users(request_method, path, args)
@@ -446,8 +448,8 @@ module Twitter
           members = arguments.pop
           merge_list!(options, arguments.pop)
           merge_owner!(options, arguments.pop)
-          Twitter::Utils.parallel_map(members.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
-            object_from_response(Twitter::List, request_method, path, merge_users(options, users))
+          parallel_map(members.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
+            perform_with_object(request_method, path, merge_users(options, users), Twitter::List)
           end.last
         end
 

data/lib/twitter/rest/api/oauth.rb

@@ -1,6 +1,7 @@
+require 'twitter/request'
 require 'twitter/rest/api/utils'
-require 'twitter/token'
 require 'twitter/rest/response/parse_error_json'
+require 'twitter/token'
 
 module Twitter
   module REST
@@ -19,11 +20,14 @@ module Twitter
         # @authentication Required
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::Token] The Bearer Token. token_type should be 'bearer'.
+        # @param options [Hash] A customizable set of options.
         # @example Generate a Bearer Token
         #   client = Twitter::REST::Client.new(:consumer_key => "abc", :consumer_secret => 'def')
         #   bearer_token = client.token
-        def token
-          object_from_response(Twitter::Token, :post, '/oauth2/token', :grant_type => 'client_credentials', :bearer_token_request => true)
+        def token(options = {})
+          options[:bearer_token_request] = true
+          options[:grant_type] ||= 'client_credentials'
+          perform_with_object(:post, '/oauth2/token', options, Twitter::Token)
         end
         alias_method :bearer_token, :token
 
@@ -34,10 +38,12 @@ module Twitter
         # @authentication Required
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @param access_token [String, Twitter::Token] The bearer token to revoke.
+        # @param options [Hash] A customizable set of options.
         # @return [Twitter::Token] The invalidated token. token_type should be nil.
-        def invalidate_token(access_token)
+        def invalidate_token(access_token, options = {})
           access_token = access_token.access_token if access_token.is_a?(Twitter::Token)
-          object_from_response(Twitter::Token, :post, '/oauth2/invalidate_token', :access_token => access_token)
+          options[:access_token] = access_token
+          perform_with_object(:post, '/oauth2/invalidate_token', options, Twitter::Token)
         end
 
         # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.

data/lib/twitter/rest/api/places_and_geo.rb

@@ -1,6 +1,7 @@
-require 'twitter/rest/api/utils'
 require 'twitter/geo_results'
 require 'twitter/place'
+require 'twitter/request'
+require 'twitter/rest/api/utils'
 
 module Twitter
   module REST
@@ -18,7 +19,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @return [Twitter::Place] The requested place.
         def place(place_id, options = {})
-          object_from_response(Twitter::Place, :get, "/1.1/geo/id/#{place_id}.json", options)
+          perform_with_object(:get, "/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 +37,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 = {})
-          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/reverse_geocode.json', options)
+          perform_with_object(:get, '/1.1/geo/reverse_geocode.json', options, Twitter::GeoResults)
         end
 
         # Search for places that can be attached to a {Twitter::REST::API::Tweets#update}
@@ -57,7 +58,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 = {})
-          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/search.json', options)
+          perform_with_object(:get, '/1.1/geo/search.json', options, Twitter::GeoResults)
         end
         alias_method :places_nearby, :geo_search
 
@@ -76,7 +77,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 = {})
-          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/similar_places.json', options)
+          perform_with_object(:get, '/1.1/geo/similar_places.json', options, Twitter::GeoResults)
         end
         alias_method :places_similar, :similar_places
       end

data/lib/twitter/rest/api/saved_searches.rb

@@ -1,4 +1,5 @@
 require 'twitter/arguments'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/saved_search'
 require 'twitter/utils'
@@ -8,6 +9,7 @@ module Twitter
     module API
       module SavedSearches
         include Twitter::REST::API::Utils
+        include Twitter::Utils
 
         # @rate_limited Yes
         # @authentication Requires user context
@@ -32,9 +34,9 @@ module Twitter
         def saved_searches(*args)
           arguments = Twitter::Arguments.new(args)
           if arguments.empty?
-            objects_from_response(Twitter::SavedSearch, :get, '/1.1/saved_searches/list.json', arguments.options)
+            perform_with_objects(:get, '/1.1/saved_searches/list.json', arguments.options, Twitter::SavedSearch)
           else
-            Twitter::Utils.parallel_map(arguments) do |id|
+            parallel_map(arguments) do |id|
               saved_search(id, arguments.options)
             end
           end
@@ -50,7 +52,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 = {})
-          object_from_response(Twitter::SavedSearch, :get, "/1.1/saved_searches/show/#{id}.json", options)
+          perform_with_object(:get, "/1.1/saved_searches/show/#{id}.json", options, Twitter::SavedSearch)
         end
 
         # Creates a saved search for the authenticated user
@@ -63,7 +65,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 = {})
-          object_from_response(Twitter::SavedSearch, :post, '/1.1/saved_searches/create.json', options.merge(:query => query))
+          perform_with_object(:post, '/1.1/saved_searches/create.json', options.merge(:query => query), Twitter::SavedSearch)
         end
         deprecate_alias :saved_search_create, :create_saved_search
 
@@ -82,8 +84,8 @@ module Twitter
         #   @param options [Hash] A customizable set of options.
         def destroy_saved_search(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |id|
-            object_from_response(Twitter::SavedSearch, :post, "/1.1/saved_searches/destroy/#{id}.json", arguments.options)
+          parallel_map(arguments) do |id|
+            perform_with_object(:post, "/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/api/search.rb

@@ -1,11 +1,10 @@
-require 'twitter/rest/api/utils'
+require 'twitter/request'
 require 'twitter/search_results'
 
 module Twitter
   module REST
     module API
       module Search
-        include Twitter::REST::API::Utils
         MAX_TWEETS_PER_REQUEST = 100
 
         # Returns tweets that match a specified query.
@@ -30,14 +29,9 @@ 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
-          search_results_from_response(:get, '/1.1/search/tweets.json', options.merge(:q => q))
-        end
-
-      private
-
-        def search_results_from_response(request_method, path, options = {}) # rubocop:disable ParameterLists
-          response = send(request_method.to_sym, path, options)
-          Twitter::SearchResults.from_response(response, self, request_method, path, options)
+          request = Twitter::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(:q => q))
+          response = get(request.path, request.options)
+          Twitter::SearchResults.from_response(response, request)
         end
       end
     end