twitter 5.12.0 → 5.13.0

data/lib/twitter/rest/trends.rb

@@ -1,5 +1,5 @@
 require 'twitter/place'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 require 'twitter/trend_results'
 
@@ -20,7 +20,7 @@ module Twitter
       # @return [Array<Twitter::Trend>]
       def trends(id = 1, options = {})
         options[:id] = id
-        response = get('/1.1/trends/place.json', options).body.first
+        response = perform_get('/1.1/trends/place.json', options).first
         Twitter::TrendResults.new(response)
       end
       alias_method :local_trends, :trends
@@ -35,7 +35,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @return [Array<Twitter::Place>]
       def trends_available(options = {})
-        perform_with_objects(:get, '/1.1/trends/available.json', options, Twitter::Place)
+        perform_get_with_objects('/1.1/trends/available.json', options, Twitter::Place)
       end
       alias_method :trend_locations, :trends_available
 
@@ -50,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 = {})
-        perform_with_objects(:get, '/1.1/trends/closest.json', options, Twitter::Place)
+        perform_get_with_objects('/1.1/trends/closest.json', options, Twitter::Place)
       end
     end
   end

data/lib/twitter/rest/tweets.rb

@@ -1,7 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/error'
 require 'twitter/oembed'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 require 'twitter/tweet'
 require 'twitter/utils'
@@ -25,7 +25,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 = {})
-        perform_with_objects(:get, "/1.1/statuses/retweets/#{extract_id(tweet)}.json", options, Twitter::Tweet)
+        perform_get_with_objects("/1.1/statuses/retweets/#{extract_id(tweet)}.json", options, Twitter::Tweet)
       end
 
       # Show up to 100 users who retweeted the Tweet
@@ -58,7 +58,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 = {})
-        perform_with_object(:get, "/1.1/statuses/show/#{extract_id(tweet)}.json", options, Twitter::Tweet)
+        perform_get_with_object("/1.1/statuses/show/#{extract_id(tweet)}.json", options, Twitter::Tweet)
       end
 
       # Returns Tweets
@@ -72,13 +72,11 @@ module Twitter
       # @overload statuses(*tweets, options)
       #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
       #   @param options [Hash] A customizable set of options.
-      #   @option options [Symbol, String] :method Requests users via a GET request instead of the standard POST request if set to ':get'.
       #   @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 statuses(*args)
         arguments = Twitter::Arguments.new(args)
-        request_method = arguments.options.delete(:method) || :post
         flat_pmap(arguments.each_slice(MAX_TWEETS_PER_REQUEST)) do |tweets|
-          perform_with_objects(request_method, '/1.1/statuses/lookup.json', arguments.options.merge(:id => tweets.collect { |u| extract_id(u) }.join(',')), Twitter::Tweet)
+          perform_post_with_objects('/1.1/statuses/lookup.json', arguments.options.merge(:id => tweets.collect { |u| extract_id(u) }.join(',')), Twitter::Tweet)
         end
       end
 
@@ -99,7 +97,7 @@ module Twitter
       def destroy_status(*args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |tweet|
-          perform_with_object(:post, "/1.1/statuses/destroy/#{extract_id(tweet)}.json", arguments.options, Twitter::Tweet)
+          perform_post_with_object("/1.1/statuses/destroy/#{extract_id(tweet)}.json", arguments.options, Twitter::Tweet)
         end
       end
       alias_method :destroy_tweet, :destroy_status
@@ -157,7 +155,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?
-        perform_with_object(:post, '/1.1/statuses/update.json', hash.merge(:status => status), Twitter::Tweet)
+        perform_post_with_object('/1.1/statuses/update.json', hash.merge(:status => status), Twitter::Tweet)
       end
 
       # Retweets the specified Tweets as the authenticating user
@@ -232,7 +230,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?
-        perform_with_object(:post, '/1.1/statuses/update_with_media.json', hash.merge('media[]' => media, 'status' => status), Twitter::Tweet)
+        perform_post_with_object('/1.1/statuses/update_with_media.json', hash.merge('media[]' => media, 'status' => status), Twitter::Tweet)
       end
 
       # Returns oEmbed for a Tweet
@@ -253,7 +251,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)
-        perform_with_object(:get, '/1.1/statuses/oembed.json', options, Twitter::OEmbed)
+        perform_get_with_object('/1.1/statuses/oembed.json', options, Twitter::OEmbed)
       end
 
       # Returns oEmbeds for Tweets
@@ -297,13 +295,13 @@ module Twitter
       def retweeters_ids(*args)
         arguments = Twitter::Arguments.new(args)
         arguments.options[:id] ||= extract_id(arguments.first)
-        perform_with_cursor(:get, '/1.1/statuses/retweeters/ids.json', arguments.options, :ids)
+        perform_get_with_cursor('/1.1/statuses/retweeters/ids.json', arguments.options, :ids)
       end
 
     private
 
       def post_retweet(tweet, options)
-        response = post("/1.1/statuses/retweet/#{extract_id(tweet)}.json", options).body
+        response = perform_post("/1.1/statuses/retweet/#{extract_id(tweet)}.json", options)
         Twitter::Tweet.new(response)
       end
     end

data/lib/twitter/rest/undocumented.rb

@@ -24,7 +24,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 following_followers_of(*args)
-        cursor_from_response_with_user(:users, Twitter::User, :get, '/users/following_followers_of.json', args)
+        cursor_from_response_with_user(:users, Twitter::User, '/users/following_followers_of.json', args)
       end
 
       # Returns Tweets count for a URI
@@ -36,7 +36,7 @@ module Twitter
       # @param uri [String, URI] A URI.
       # @param options [Hash] A customizable set of options.
       def tweet_count(uri, options = {})
-        connection = Faraday.new('https://cdn.api.twitter.com', connection_options.merge(:builder => middleware))
+        connection = Faraday.new('https://cdn.api.twitter.com', connection_options)
         connection.get('/1/urls/count.json', options.merge(:url => uri.to_s)).body[:count]
       end
     end

data/lib/twitter/rest/users.rb

@@ -1,7 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/error'
 require 'twitter/profile_banner'
-require 'twitter/request'
+require 'twitter/rest/request'
 require 'twitter/rest/utils'
 require 'twitter/settings'
 require 'twitter/user'
@@ -32,7 +32,7 @@ module Twitter
       # @option options [String] :lang The language which Twitter should render in for this user. The language must be specified by the appropriate two letter ISO 639-1 representation. Currently supported languages are provided by {https://dev.twitter.com/docs/api/1.1/get/help/languages GET help/languages}.
       def settings(options = {})
         request_method = options.size.zero? ? :get : :post
-        response = send(request_method.to_sym, '/1.1/account/settings.json', options).body
+        response = perform_request(request_method.to_sym, '/1.1/account/settings.json', options)
         # https://dev.twitter.com/issues/59
         response.update(:trend_location => response.fetch(:trend_location, []).first)
         Twitter::Settings.new(response)
@@ -48,7 +48,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 = {})
-        perform_with_object(:get, '/1.1/account/verify_credentials.json', options, Twitter::User)
+        perform_get_with_object('/1.1/account/verify_credentials.json', options, Twitter::User)
       end
       alias_method :current_user, :verify_credentials
 
@@ -62,7 +62,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 = {})
-        perform_with_object(:post, '/1.1/account/update_delivery_device.json', options.merge(:device => device), Twitter::User)
+        perform_post_with_object('/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
@@ -79,7 +79,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 = {})
-        perform_with_object(:post, '/1.1/account/update_profile.json', options, Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile.json', options, Twitter::User)
       end
 
       # Updates the authenticating user's profile background image
@@ -93,7 +93,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 = {})
-        perform_with_object(:post, '/1.1/account/update_profile_background_image.json', options.merge(:image => image), Twitter::User)
+        perform_post_with_object('/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
@@ -110,7 +110,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 = {})
-        perform_with_object(:post, '/1.1/account/update_profile_colors.json', options, Twitter::User)
+        perform_post_with_object('/1.1/account/update_profile_colors.json', options, Twitter::User)
       end
 
       # Updates the authenticating user's profile image
@@ -125,7 +125,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 = {})
-        perform_with_object(:post, '/1.1/account/update_profile_image.json', options.merge(:image => image), Twitter::User)
+        perform_post_with_object('/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
@@ -138,7 +138,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 blocked(options = {})
-        perform_with_cursor(:get, '/1.1/blocks/list.json', options, :users, Twitter::User)
+        perform_get_with_cursor('/1.1/blocks/list.json', options, :users, Twitter::User)
       end
       deprecate_alias :blocking, :blocked
 
@@ -154,7 +154,7 @@ module Twitter
       def blocked_ids(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_cursor(:get, '/1.1/blocks/ids.json', arguments.options, :ids)
+        perform_get_with_cursor('/1.1/blocks/ids.json', arguments.options, :ids)
       end
 
       # Returns true if the authenticating user is blocking a target user
@@ -226,12 +226,10 @@ module Twitter
       # @overload users(*users, options)
       #   @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.
-      #   @option options [Symbol, String] :method Requests users via a GET request instead of the standard POST request if set to ':get'.
       def users(*args)
         arguments = Twitter::Arguments.new(args)
-        request_method = arguments.options.delete(:method) || :post
         flat_pmap(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)
+          perform_post_with_objects('/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
         end
       end
 
@@ -255,7 +253,7 @@ module Twitter
         arguments = Twitter::Arguments.new(args)
         if arguments.last || user_id?
           merge_user!(arguments.options, arguments.pop || user_id)
-          perform_with_object(:get, '/1.1/users/show.json', arguments.options, Twitter::User)
+          perform_get_with_object('/1.1/users/show.json', arguments.options, Twitter::User)
         else
           verify_credentials(arguments.options)
         end
@@ -270,7 +268,7 @@ module Twitter
       # @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
       def user?(user, options = {})
         merge_user!(options, user)
-        get('/1.1/users/show.json', options)
+        perform_get('/1.1/users/show.json', options)
         true
       rescue Twitter::Error::NotFound
         false
@@ -288,7 +286,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 = {})
-        perform_with_objects(:get, '/1.1/users/search.json', options.merge(:q => query), Twitter::User)
+        perform_get_with_objects('/1.1/users/search.json', options.merge(:q => query), Twitter::User)
       end
 
       # Returns an array of users that the specified user can contribute to
@@ -336,7 +334,7 @@ module Twitter
       # @return [nil]
       # @param options [Hash] A customizable set of options.
       def remove_profile_banner(options = {})
-        post('/1.1/account/remove_profile_banner.json', options).body
+        perform_post('/1.1/account/remove_profile_banner.json', options)
         true
       end
       deprecate_alias :profile_banner_remove, :remove_profile_banner
@@ -359,7 +357,7 @@ module Twitter
       # @option options [Integer] :offset_left The number of pixels by which to offset the uploaded image from the left. Use with height, width, and offset_top to select the desired region of the image to use.
       # @option options [Integer] :offset_top The number of pixels by which to offset the uploaded image from the top. Use with height, width, and offset_left to select the desired region of the image to use.
       def update_profile_banner(banner, options = {})
-        post('/1.1/account/update_profile_banner.json', options.merge(:banner => banner)).body
+        perform_post('/1.1/account/update_profile_banner.json', options.merge(:banner => banner))
         true
       end
 
@@ -377,7 +375,7 @@ module Twitter
       def profile_banner(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_object(:get, '/1.1/users/profile_banner.json', arguments.options, Twitter::ProfileBanner)
+        perform_get_with_object('/1.1/users/profile_banner.json', arguments.options, Twitter::ProfileBanner)
       end
 
       # Mutes the users specified by the authenticating user
@@ -422,7 +420,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 muted(options = {})
-        perform_with_cursor(:get, '/1.1/mutes/users/list.json', options, :users, Twitter::User)
+        perform_get_with_cursor('/1.1/mutes/users/list.json', options, :users, Twitter::User)
       end
       deprecate_alias :muting, :muted
 
@@ -438,7 +436,7 @@ module Twitter
       def muted_ids(*args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_cursor(:get, '/1.1/mutes/users/ids.json', arguments.options, :ids)
+        perform_get_with_cursor('/1.1/mutes/users/ids.json', arguments.options, :ids)
       end
     end
   end

data/lib/twitter/rest/utils.rb

@@ -1,6 +1,7 @@
 require 'addressable/uri'
 require 'twitter/arguments'
-require 'twitter/request'
+require 'twitter/cursor'
+require 'twitter/rest/request'
 require 'twitter/user'
 require 'twitter/utils'
 
@@ -30,32 +31,81 @@ module Twitter
         end
       end
 
+      # @param path [String]
+      # @param options [Hash]
+      def perform_get(path, options = {})
+        perform_request(:get, path, options)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_post(path, options = {})
+        perform_request(:post, path, options)
+      end
+
       # @param request_method [Symbol]
+      # @param path [String]
+      # @param options [Hash]
+      def perform_request(request_method, path, options = {})
+        Twitter::REST::Request.new(self, request_method, path, options).perform
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_get_with_object(path, options, klass)
+        perform_request_with_object(:get, path, options, klass)
+      end
+
       # @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)
+      def perform_post_with_object(path, options, klass)
+        perform_request_with_object(:post, path, options, 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)
+      def perform_request_with_object(request_method, path, options, klass)
+        response = perform_request(request_method, path, options)
+        klass.new(response)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_get_with_objects(path, options, klass)
+        perform_request_with_objects(:get, path, options, klass)
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @param klass [Class]
+      def perform_post_with_objects(path, options, klass)
+        perform_request_with_objects(:post, path, options, 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
+      def perform_request_with_objects(request_method, path, options, klass)
+        perform_request(request_method, path, options).collect do |element|
+          klass.new(element)
+        end
+      end
+
+      # @param path [String]
+      # @param options [Hash]
+      # @collection_name [Symbol]
+      # @param klass [Class]
+      def perform_get_with_cursor(path, options, collection_name, klass = nil)
         merge_default_cursor!(options)
-        request = Twitter::Request.new(self, request_method, path, options)
-        request.perform_with_cursor(collection_name.to_sym, klass)
+        request = Twitter::REST::Request.new(self, :get, path, options)
+        Twitter::Cursor.new(collection_name.to_sym, klass, request)
       end
 
       # @param request_method [Symbol]
@@ -65,7 +115,7 @@ module Twitter
       def parallel_users_from_response(request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |user|
-          perform_with_object(request_method, path, merge_user(arguments.options, user), Twitter::User)
+          perform_request_with_object(request_method, path, merge_user(arguments.options, user), Twitter::User)
         end
       end
 
@@ -76,7 +126,7 @@ module Twitter
       def users_from_response(request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_objects(request_method, path, arguments.options, Twitter::User)
+        perform_request_with_objects(request_method, path, arguments.options, Twitter::User)
       end
 
       # @param klass [Class]
@@ -87,7 +137,7 @@ module Twitter
       def objects_from_response_with_user(klass, request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
-        perform_with_objects(request_method, path, arguments.options, klass)
+        perform_request_with_objects(request_method, path, arguments.options, klass)
       end
 
       # @param klass [Class]
@@ -98,20 +148,19 @@ module Twitter
       def parallel_objects_from_response(klass, request_method, path, args)
         arguments = Twitter::Arguments.new(args)
         pmap(arguments) do |object|
-          perform_with_object(request_method, path, arguments.options.merge(:id => extract_id(object)), klass)
+          perform_request_with_object(request_method, path, arguments.options.merge(:id => extract_id(object)), klass)
         end
       end
 
       # @param collection_name [Symbol]
       # @param klass [Class]
-      # @param request_method [Symbol]
       # @param path [String]
       # @param args [Array]
       # @return [Twitter::Cursor]
-      def cursor_from_response_with_user(collection_name, klass, request_method, path, args) # rubocop:disable ParameterLists
+      def cursor_from_response_with_user(collection_name, klass, path, args) # rubocop:disable ParameterLists
         arguments = Twitter::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop || user_id) unless arguments.options[:user_id] || arguments.options[:screen_name]
-        perform_with_cursor(request_method, path, arguments.options, collection_name, klass)
+        perform_get_with_cursor(path, arguments.options, collection_name, klass)
       end
 
       def user_id