twitter 5.5.1 → 5.6.0

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

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

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

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

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

@@ -1,3 +1,4 @@
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/tweet'
 require 'twitter/user'
@@ -24,7 +25,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 = {})
-          objects_from_response(Twitter::Tweet, :get, '/1.1/statuses/mentions_timeline.json', options)
+          perform_with_objects(:get, '/1.1/statuses/mentions_timeline.json', options, Twitter::Tweet)
         end
         alias_method :mentions, :mentions_timeline
 
@@ -112,7 +113,7 @@ module Twitter
         # @option options [Boolean, String, Integer] :contributor_details Specifies that the contributors element should be enhanced to include the screen_name of the contributor.
         # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
         def home_timeline(options = {})
-          objects_from_response(Twitter::Tweet, :get, '/1.1/statuses/home_timeline.json', options)
+          perform_with_objects(:get, '/1.1/statuses/home_timeline.json', options, Twitter::Tweet)
         end
 
         # Returns the 20 most recent retweets posted by users the authenticating user follow.
@@ -152,7 +153,7 @@ module Twitter
         # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
         # @option options [Boolean, String, Integer] :include_user_entities The user entities node will be disincluded when set to false.
         def retweets_of_me(options = {})
-          objects_from_response(Twitter::Tweet, :get, '/1.1/statuses/retweets_of_me.json', options)
+          perform_with_objects(:get, '/1.1/statuses/retweets_of_me.json', options, Twitter::Tweet)
         end
 
       private
@@ -173,7 +174,7 @@ module Twitter
 
         # @param count [Integer]
         # @return [Array<Twitter::Tweet>]
-        def collect_with_count(count, &block)
+        def collect_with_count(count)
           options = {}
           options[:count] = MAX_TWEETS_PER_REQUEST
           collect_with_max_id do |max_id|

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

@@ -1,5 +1,6 @@
-require 'twitter/rest/api/utils'
 require 'twitter/place'
+require 'twitter/request'
+require 'twitter/rest/api/utils'
 require 'twitter/trend_results'
 
 module Twitter
@@ -20,7 +21,7 @@ module Twitter
         # @return [Array<Twitter::Trend>]
         def trends(id = 1, options = {})
           options[:id] = id
-          object_from_response(Twitter::TrendResults, :get, '/1.1/trends/place.json', options)
+          perform_with_object(:get, '/1.1/trends/place.json', options, Twitter::TrendResults)
         end
         alias_method :local_trends, :trends
         alias_method :trends_place, :trends
@@ -34,7 +35,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @return [Array<Twitter::Place>]
         def trends_available(options = {})
-          objects_from_response(Twitter::Place, :get, '/1.1/trends/available.json', options)
+          perform_with_objects(:get, '/1.1/trends/available.json', options, Twitter::Place)
         end
         alias_method :trend_locations, :trends_available
 
@@ -49,7 +50,7 @@ module Twitter
         # @option options [Float] :long If provided with a :lat option the available trend locations will be sorted by distance, nearest to furthest, to the co-ordinate pair. The valid ranges for longitude are -180.0 to +180.0 (East is positive) inclusive.
         # @return [Array<Twitter::Place>]
         def trends_closest(options = {})
-          objects_from_response(Twitter::Place, :get, '/1.1/trends/closest.json', options)
+          perform_with_objects(:get, '/1.1/trends/closest.json', options, Twitter::Place)
         end
       end
     end

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

@@ -3,6 +3,7 @@ require 'twitter/error/already_posted'
 require 'twitter/error/already_retweeted'
 require 'twitter/error/forbidden'
 require 'twitter/oembed'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/tweet'
 require 'twitter/utils'
@@ -12,6 +13,7 @@ module Twitter
     module API
       module Tweets
         include Twitter::REST::API::Utils
+        include Twitter::Utils
 
         # Returns up to 100 of the first retweets of a given tweet
         #
@@ -25,8 +27,7 @@ module Twitter
         # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 100.
         # @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 retweets(tweet, options = {})
-          id = extract_id(tweet)
-          objects_from_response(Twitter::Tweet, :get, "/1.1/statuses/retweets/#{id}.json", options)
+          perform_with_objects(:get, "/1.1/statuses/retweets/#{extract_id(tweet)}.json", options, Twitter::Tweet)
         end
 
         # Show up to 100 users who retweeted the Tweet
@@ -43,8 +44,8 @@ module Twitter
         # @option options [Boolean] :ids_only ('false') Only return user ids instead of full user objects.
         def retweeters_of(tweet, options = {})
           ids_only = !!options.delete(:ids_only)
-          retweeters = retweets(tweet, options).map(&:user)
-          ids_only ? retweeters.map(&:id) : retweeters
+          retweeters = retweets(tweet, options).collect(&:user)
+          ids_only ? retweeters.collect(&:id) : retweeters
         end
 
         # Returns a Tweet
@@ -59,8 +60,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @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 status(tweet, options = {})
-          id = extract_id(tweet)
-          object_from_response(Twitter::Tweet, :get, "/1.1/statuses/show/#{id}.json", options)
+          perform_with_object(:get, "/1.1/statuses/show/#{extract_id(tweet)}.json", options, Twitter::Tweet)
         end
 
         # Returns Tweets
@@ -123,7 +123,7 @@ module Twitter
           hash = options.dup
           hash[:in_reply_to_status_id] = hash.delete(:in_reply_to_status).id unless hash[:in_reply_to_status].nil?
           hash[:place_id] = hash.delete(:place).woeid unless hash[:place].nil?
-          object_from_response(Twitter::Tweet, :post, '/1.1/statuses/update.json', hash.merge(:status => status))
+          perform_with_object(:post, '/1.1/statuses/update.json', hash.merge(:status => status), Twitter::Tweet)
         rescue Twitter::Error::Forbidden => error
           handle_forbidden_error(Twitter::Error::AlreadyPosted, error)
         end
@@ -143,10 +143,9 @@ 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.
         def retweet(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
+          parallel_map(arguments) do |tweet|
             begin
-              post_retweet(id, arguments.options)
+              post_retweet(extract_id(tweet), arguments.options)
             rescue Twitter::Error::Forbidden => error
               raise unless error.message == Twitter::Error::AlreadyRetweeted::MESSAGE
             end
@@ -169,10 +168,9 @@ 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.
         def retweet!(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
+          parallel_map(arguments) do |tweet|
             begin
-              post_retweet(id, arguments.options)
+              post_retweet(extract_id(tweet), arguments.options)
             rescue Twitter::Error::Forbidden => error
               handle_forbidden_error(Twitter::Error::AlreadyRetweeted, error)
             end
@@ -203,7 +201,7 @@ module Twitter
           hash = options.dup
           hash[:in_reply_to_status_id] = hash.delete(:in_reply_to_status).id unless hash[:in_reply_to_status].nil?
           hash[:place_id] = hash.delete(:place).woeid unless hash[:place].nil?
-          object_from_response(Twitter::Tweet, :post, '/1.1/statuses/update_with_media.json', hash.merge('media[]' => media, 'status' => status))
+          perform_with_object(:post, '/1.1/statuses/update_with_media.json', hash.merge('media[]' => media, 'status' => status), Twitter::Tweet)
         rescue Twitter::Error::Forbidden => error
           handle_forbidden_error(Twitter::Error::AlreadyPosted, error)
         end
@@ -226,7 +224,7 @@ module Twitter
         # @option options [String] :lang Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
         def oembed(tweet, options = {})
           options[:id] = extract_id(tweet)
-          object_from_response(Twitter::OEmbed, :get, '/1.1/statuses/oembed.json', options)
+          perform_with_object(:get, '/1.1/statuses/oembed.json', options, Twitter::OEmbed)
         end
 
         # Returns oEmbeds for Tweets
@@ -250,9 +248,8 @@ module Twitter
         #   @option options [String] :lang Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
         def oembeds(*args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
-            oembed(id, arguments.options)
+          parallel_map(arguments) do |tweet|
+            oembed(extract_id(tweet), arguments.options)
           end
         end
 
@@ -271,7 +268,7 @@ module Twitter
         def retweeters_ids(*args)
           arguments = Twitter::Arguments.new(args)
           arguments.options[:id] ||= extract_id(arguments.first)
-          cursor_from_response(:ids, nil, :get, '/1.1/statuses/retweeters/ids.json', arguments.options)
+          perform_with_cursor(:get, '/1.1/statuses/retweeters/ids.json', arguments.options, :ids)
         end
 
       private
@@ -282,15 +279,13 @@ module Twitter
         # @return [Array<Twitter::Tweet>]
         def parallel_tweets_from_response(request_method, path, args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |tweet|
-            id = extract_id(tweet)
-            object_from_response(Twitter::Tweet, request_method, path + "/#{id}.json", arguments.options)
+          parallel_map(arguments) do |tweet|
+            perform_with_object(request_method, path + "/#{extract_id(tweet)}.json", arguments.options, Twitter::Tweet)
           end
         end
 
         def post_retweet(tweet, options)
-          id = extract_id(tweet)
-          response = post("/1.1/statuses/retweet/#{id}.json", options)
+          response = post("/1.1/statuses/retweet/#{extract_id(tweet)}.json", options)
           retweeted_status = response.dup
           retweeted_status[:body] = response[:body].delete(:retweeted_status)
           retweeted_status[:body][:retweeted_status] = response[:body]

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

@@ -1,6 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/error/not_found'
 require 'twitter/profile_banner'
+require 'twitter/request'
 require 'twitter/rest/api/utils'
 require 'twitter/settings'
 require 'twitter/user'
@@ -11,6 +12,7 @@ module Twitter
     module API
       module Users
         include Twitter::REST::API::Utils
+        include Twitter::Utils
         MAX_USERS_PER_REQUEST = 100
 
         # Updates the authenticating user's settings.
@@ -47,7 +49,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @option options [Boolean, String, Integer] :skip_status Do not include user's Tweets when set to true, 't' or 1.
         def verify_credentials(options = {})
-          object_from_response(Twitter::User, :get, '/1.1/account/verify_credentials.json', options)
+          perform_with_object(:get, '/1.1/account/verify_credentials.json', options, Twitter::User)
         end
         alias_method :current_user, :verify_credentials
 
@@ -61,7 +63,7 @@ module Twitter
         # @param device [String] Must be one of: 'sms', 'none'.
         # @param options [Hash] A customizable set of options.
         def update_delivery_device(device, options = {})
-          object_from_response(Twitter::User, :post, '/1.1/account/update_delivery_device.json', options.merge(:device => device))
+          perform_with_object(:post, '/1.1/account/update_delivery_device.json', options.merge(:device => device), Twitter::User)
         end
 
         # Sets values that users are able to set under the "Account" tab of their settings page
@@ -78,7 +80,7 @@ module Twitter
         # @option options [String] :location The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
         # @option options [String] :description A description of the user owning the account. Maximum of 160 characters.
         def update_profile(options = {})
-          object_from_response(Twitter::User, :post, '/1.1/account/update_profile.json', options)
+          perform_with_object(:post, '/1.1/account/update_profile.json', options, Twitter::User)
         end
 
         # Updates the authenticating user's profile background image
@@ -92,7 +94,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @option options [Boolean] :tile Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
         def update_profile_background_image(image, options = {})
-          object_from_response(Twitter::User, :post, '/1.1/account/update_profile_background_image.json', options.merge(:image => image))
+          perform_with_object(:post, '/1.1/account/update_profile_background_image.json', options.merge(:image => image), Twitter::User)
         end
 
         # Sets one or more hex values that control the color scheme of the authenticating user's profile
@@ -109,7 +111,7 @@ module Twitter
         # @option options [String] :profile_sidebar_fill_color Profile sidebar's background color.
         # @option options [String] :profile_sidebar_border_color Profile sidebar's border color.
         def update_profile_colors(options = {})
-          object_from_response(Twitter::User, :post, '/1.1/account/update_profile_colors.json', options)
+          perform_with_object(:post, '/1.1/account/update_profile_colors.json', options, Twitter::User)
         end
 
         # Updates the authenticating user's profile image
@@ -124,7 +126,7 @@ module Twitter
         # @param image [File] The avatar image for the profile, base64-encoded. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down. Animated GIFs will be converted to a static GIF of the first frame, removing the animation.
         # @param options [Hash] A customizable set of options.
         def update_profile_image(image, options = {})
-          object_from_response(Twitter::User, :post, '/1.1/account/update_profile_image.json', options.merge(:image => image))
+          perform_with_object(:post, '/1.1/account/update_profile_image.json', options.merge(:image => image), Twitter::User)
         end
 
         # Returns an array of user objects that the authenticating user is blocking
@@ -137,7 +139,7 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @option options [Integer] :page Specifies the page of results to retrieve.
         def blocking(options = {})
-          cursor_from_response(:users, Twitter::User, :get, '/1.1/blocks/list.json', options)
+          perform_with_cursor(:get, '/1.1/blocks/list.json', options, :users, Twitter::User)
         end
 
         # Returns an array of numeric user ids the authenticating user is blocking
@@ -152,7 +154,7 @@ module Twitter
         def blocked_ids(*args)
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop)
-          cursor_from_response(:ids, nil, :get, '/1.1/blocks/ids.json', arguments.options)
+          perform_with_cursor(:get, '/1.1/blocks/ids.json', arguments.options, :ids)
         end
 
         # Returns true if the authenticating user is blocking a target user
@@ -165,7 +167,6 @@ module Twitter
         # @param user [Integer, String, URI, Twitter::User] A Twitter user ID, screen name, URI, or object.
         # @param options [Hash] A customizable set of options.
         def block?(user, options = {})
-          merge_default_cursor!(options)
           user_id = case user
           when Integer
             user
@@ -174,7 +175,7 @@ module Twitter
           when Twitter::User
             user.id
           end
-          blocked_ids(options).map(&:to_i).include?(user_id)
+          blocked_ids(options).collect(&:to_i).include?(user_id)
         end
 
         # Blocks the users specified by the authenticating user
@@ -226,9 +227,9 @@ module Twitter
         #   @option options [Boolean] :include_entities The tweet entities node will be disincluded when set to false.
         def users(*args)
           arguments = Twitter::Arguments.new(args)
-          method = arguments.options.delete(:method) || :post
-          Twitter::Utils.parallel_map(arguments.each_slice(MAX_USERS_PER_REQUEST)) do |users|
-            objects_from_response(Twitter::User, method, '/1.1/users/lookup.json', merge_users(arguments.options, users))
+          request_method = arguments.options.delete(:method) || :post
+          parallel_map(arguments.each_slice(MAX_USERS_PER_REQUEST)) do |users|
+            perform_with_objects(request_method, '/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
           end.flatten
         end
 
@@ -254,7 +255,7 @@ module Twitter
           arguments = Twitter::Arguments.new(args)
           if arguments.last
             merge_user!(arguments.options, arguments.pop)
-            object_from_response(Twitter::User, :get, '/1.1/users/show.json', arguments.options)
+            perform_with_object(:get, '/1.1/users/show.json', arguments.options, Twitter::User)
           else
             verify_credentials(arguments.options)
           end
@@ -287,7 +288,7 @@ module Twitter
         # @option options [Integer] :count The number of people to retrieve. Maxiumum of 20 allowed per page.
         # @option options [Integer] :page Specifies the page of results to retrieve.
         def user_search(query, options = {})
-          objects_from_response(Twitter::User, :get, '/1.1/users/search.json', options.merge(:q => query))
+          perform_with_objects(:get, '/1.1/users/search.json', options.merge(:q => query), Twitter::User)
         end
 
         # Returns an array of users that the specified user can contribute to
@@ -374,7 +375,7 @@ module Twitter
         def profile_banner(*args)
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
-          object_from_response(Twitter::ProfileBanner, :get, '/1.1/users/profile_banner.json', arguments.options)
+          perform_with_object(:get, '/1.1/users/profile_banner.json', arguments.options, Twitter::ProfileBanner)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 require 'addressable/uri'
 require 'twitter/arguments'
-require 'twitter/cursor'
+require 'twitter/request'
 require 'twitter/user'
 require 'twitter/utils'
 
@@ -8,23 +8,9 @@ module Twitter
   module REST
     module API
       module Utils
-        DEFAULT_CURSOR = -1
+        include Twitter::Utils
         URI_SUBSTRING = '://'
-
-        class << self
-          def included(base)
-            base.extend(ClassMethods)
-          end
-        end
-
-        module ClassMethods
-          def deprecate_alias(new_name, old_name)
-            define_method(new_name) do |*args, &block|
-              warn "#{Kernel.caller.first}: [DEPRECATION] ##{new_name} is deprecated. Use ##{old_name} instead."
-              send(old_name, *args, &block)
-            end
-          end
-        end
+        DEFAULT_CURSOR = -1
 
       private
 
@@ -45,14 +31,42 @@ module Twitter
           end
         end
 
+        # @param request_method [Symbol]
+        # @param path [String]
+        # @param options [Hash]
+        # @param klass [Class]
+        def perform_with_object(request_method, path, options, klass)
+          request = Twitter::Request.new(self, request_method, path, options)
+          request.perform_with_object(klass)
+        end
+
+        # @param request_method [Symbol]
+        # @param path [String]
+        # @param options [Hash]
+        # @param klass [Class]
+        def perform_with_objects(request_method, path, options, klass)
+          request = Twitter::Request.new(self, request_method, path, options)
+          request.perform_with_objects(klass)
+        end
+
+        # @param request_method [Symbol]
+        # @param path [String]
+        # @param options [Hash]
+        # @param klass [Class]
+        def perform_with_cursor(request_method, path, options, collection_name, klass = nil) # rubocop:disable ParameterLists
+          merge_default_cursor!(options)
+          request = Twitter::Request.new(self, request_method, path, options)
+          request.perform_with_cursor(collection_name.to_sym, klass)
+        end
+
         # @param request_method [Symbol]
         # @param path [String]
         # @param args [Array]
         # @return [Array<Twitter::User>]
         def parallel_user_objects_from_response(request_method, path, args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |user|
-            object_from_response(Twitter::User, request_method, path, merge_user(arguments.options, user))
+          parallel_map(arguments) do |user|
+            perform_with_object(request_method, path, merge_user(arguments.options, user), Twitter::User)
           end
         end
 
@@ -63,7 +77,7 @@ module Twitter
         def user_objects_from_response(request_method, path, args)
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
-          objects_from_response(Twitter::User, request_method, path, arguments.options)
+          perform_with_objects(request_method, path, arguments.options, Twitter::User)
         end
 
         # @param klass [Class]
@@ -71,29 +85,10 @@ module Twitter
         # @param path [String]
         # @param args [Array]
         # @return [Array]
-        def objects_from_response_with_user(klass, request_method, path, args) # rubocop:disable ParameterLists
+        def objects_from_response_with_user(klass, request_method, path, args)
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop)
-          objects_from_response(klass, request_method, path, arguments.options)
-        end
-
-        # @param klass [Class]
-        # @param request_method [Symbol]
-        # @param path [String]
-        # @param options [Hash]
-        # @return [Array]
-        def objects_from_response(klass, request_method, path, options = {}) # rubocop:disable ParameterLists
-          response = send(request_method.to_sym, path, options)[:body]
-          objects_from_array(klass, response)
-        end
-
-        # @param klass [Class]
-        # @param array [Array]
-        # @return [Array]
-        def objects_from_array(klass, array)
-          array.map do |element|
-            klass.new(element)
-          end
+          perform_with_objects(request_method, path, arguments.options, klass)
         end
 
         # @param klass [Class]
@@ -101,24 +96,13 @@ module Twitter
         # @param path [String]
         # @param args [Array]
         # @return [Array]
-        def parallel_objects_from_response(klass, request_method, path, args) # rubocop:disable ParameterLists
+        def parallel_objects_from_response(klass, request_method, path, args)
           arguments = Twitter::Arguments.new(args)
-          Twitter::Utils.parallel_map(arguments) do |object|
-            id = extract_id(object)
-            object_from_response(klass, request_method, path, arguments.options.merge(:id => id))
+          parallel_map(arguments) do |object|
+            perform_with_object(request_method, path, arguments.options.merge(:id => extract_id(object)), klass)
           end
         end
 
-        # @param klass [Class]
-        # @param request_method [Symbol]
-        # @param path [String]
-        # @param options [Hash]
-        # @return [Object]
-        def object_from_response(klass, request_method, path, options = {}) # rubocop:disable ParameterLists
-          response = send(request_method.to_sym, path, options)
-          klass.from_response(response)
-        end
-
         # @param collection_name [Symbol]
         # @param klass [Class]
         # @param request_method [Symbol]
@@ -128,19 +112,7 @@ module Twitter
         def cursor_from_response_with_user(collection_name, klass, request_method, path, args) # rubocop:disable ParameterLists
           arguments = Twitter::Arguments.new(args)
           merge_user!(arguments.options, arguments.pop || screen_name) unless arguments.options[:user_id] || arguments.options[:screen_name]
-          cursor_from_response(collection_name, klass, request_method, path, arguments.options)
-        end
-
-        # @param collection_name [Symbol]
-        # @param klass [Class]
-        # @param request_method [Symbol]
-        # @param path [String]
-        # @param options [Hash]
-        # @return [Twitter::Cursor]
-        def cursor_from_response(collection_name, klass, request_method, path, options) # rubocop:disable ParameterLists
-          merge_default_cursor!(options)
-          response = send(request_method.to_sym, path, options)
-          Twitter::Cursor.from_response(response, collection_name.to_sym, klass, self, request_method, path, options)
+          perform_with_cursor(request_method, path, arguments.options, collection_name, klass)
         end
 
         def handle_forbidden_error(klass, error)
@@ -148,14 +120,14 @@ module Twitter
           fail(error)
         end
 
-        def merge_default_cursor!(options)
-          options[:cursor] = DEFAULT_CURSOR unless options[:cursor]
-        end
-
         def screen_name
           @screen_name ||= verify_credentials.screen_name
         end
 
+        def merge_default_cursor!(options)
+          options[:cursor] = DEFAULT_CURSOR unless options[:cursor]
+        end
+
         # Take a user and merge it into the hash with the correct key
         #
         # @param hash [Hash]
@@ -187,7 +159,7 @@ module Twitter
           end
         end
 
-        def set_compound_key(key, value, hash, prefix = nil) # rubocop:disable ParameterLists
+        def set_compound_key(key, value, hash, prefix = nil)
           compound_key = [prefix, key].compact.join('_').to_sym
           hash[compound_key] = value
           hash