twitter 5.0.0 → 5.4.1

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

@@ -1,5 +1,4 @@
 require 'twitter/arguments'
-require 'twitter/core_ext/enumerable'
 require 'twitter/cursor'
 require 'twitter/error/forbidden'
 require 'twitter/error/not_found'
@@ -7,6 +6,7 @@ require 'twitter/list'
 require 'twitter/rest/api/utils'
 require 'twitter/tweet'
 require 'twitter/user'
+require 'twitter/utils'
 
 module Twitter
   module REST
@@ -14,7 +14,7 @@ module Twitter
       module Lists
         include Twitter::REST::API::Utils
         MAX_USERS_PER_REQUEST = 100
-        URI_SUBSTRING = "://"
+        URI_SUBSTRING = '://'
 
         # Returns all lists the authenticating or specified user subscribes to, including their own
         #
@@ -23,17 +23,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::List>]
-        # @overload lists(options={})
+        # @overload lists(options = {})
         #   @param options [Hash] A customizable set of options.
         #   @option options [Boolean] :reverse Set this to true if you would like owned lists to be returned first.
-        # @overload lists(user, options={})
+        # @overload lists(user, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param options [Hash] A customizable set of options.
         #   @option options [Boolean] :reverse Set this to true if you would like owned lists to be returned first.
         def lists(*args)
-          objects_from_response_with_user(Twitter::List, :get, "/1.1/lists/list.json", args)
+          objects_from_response_with_user(Twitter::List, :get, '/1.1/lists/list.json', args)
         end
-        alias lists_subscribed_to lists
+        alias_method :lists_subscribed_to, :lists
 
         # Show tweet timeline for members of the specified list
         #
@@ -42,13 +42,13 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::Tweet>]
-        # @overload list_timeline(list, options={})
+        # @overload list_timeline(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         #   @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID.
         #   @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
         #   @option options [Integer] :count The number of results to retrieve.
-        # @overload list_timeline(user, list, options={})
+        # @overload list_timeline(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
@@ -59,7 +59,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)
+          objects_from_response(Twitter::Tweet, :get, '/1.1/lists/statuses.json', arguments.options)
         end
 
         # Removes the specified member from the list
@@ -69,17 +69,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The list.
-        # @overload remove_list_member(list, user_to_remove, options={})
+        # @overload remove_list_member(list, user_to_remove, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload remove_list_member(user, list, user_to_remove, options={})
+        # @overload remove_list_member(user, list, user_to_remove, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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(:post, '/1.1/lists/members/destroy.json', args)
         end
         deprecate_alias :list_remove_member, :remove_list_member
 
@@ -90,17 +90,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::Cursor]
-        # @overload memberships(options={})
+        # @overload memberships(options = {})
         #   @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.
         #   @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.
-        # @overload memberships(user, options={})
+        # @overload memberships(user, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @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.
         #   @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, :get, '/1.1/lists/memberships.json', args)
         end
 
         # Returns the subscribers of the specified list
@@ -110,17 +110,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::Cursor] The subscribers of the specified list.
-        # @overload list_subscribers(list, options={})
+        # @overload list_subscribers(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload list_subscribers(user, list, options={})
+        # @overload list_subscribers(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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 list_subscribers(*args)
-          cursor_from_response_with_list(:get, "/1.1/lists/subscribers.json", args)
+          cursor_from_response_with_list(:get, '/1.1/lists/subscribers.json', args)
         end
 
         # Make the authenticated user follow the specified list
@@ -130,15 +130,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The specified list.
-        # @overload list_subscribe(list, options={})
+        # @overload list_subscribe(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
-        # @overload list_subscribe(user, list, options={})
+        # @overload list_subscribe(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         def list_subscribe(*args)
-          list_from_response(:post, "/1.1/lists/subscribers/create.json", args)
+          list_from_response(:post, '/1.1/lists/subscribers/create.json', args)
         end
 
         # Check if a user is a subscriber of the specified list
@@ -148,18 +148,18 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Boolean] true if user is a subscriber of the specified list, otherwise false.
-        # @overload list_subscriber?(list, user_to_check, options={})
+        # @overload list_subscriber?(list, user_to_check, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param user_to_check [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param options [Hash] A customizable set of options.
-        # @overload list_subscriber?(user, list, user_to_check, options={})
+        # @overload list_subscriber?(user, list, user_to_check, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param user_to_check [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param options [Hash] A customizable set of options.
         # @return [Boolean] true if user is a subscriber of the specified list, otherwise false.
         def list_subscriber?(*args)
-          list_user?(:get, "/1.1/lists/subscribers/show.json", args)
+          list_user?(:get, '/1.1/lists/subscribers/show.json', args)
         end
 
         # Unsubscribes the authenticated user form the specified list
@@ -169,15 +169,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The specified list.
-        # @overload list_unsubscribe(list, options={})
+        # @overload list_unsubscribe(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
-        # @overload list_unsubscribe(user, list, options={})
+        # @overload list_unsubscribe(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         def list_unsubscribe(*args)
-          list_from_response(:post, "/1.1/lists/subscribers/destroy.json", args)
+          list_from_response(:post, '/1.1/lists/subscribers/destroy.json', args)
         end
 
         # Adds specified members to a list
@@ -188,17 +188,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The list.
-        # @overload add_list_members(list, users, options={})
+        # @overload add_list_members(list, users, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload add_list_members(user, list, users, options={})
+        # @overload add_list_members(user, list, users, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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(:post, '/1.1/lists/members/create_all.json', args)
         end
         deprecate_alias :list_add_members, :add_list_members
 
@@ -209,17 +209,17 @@ module Twitter
         # @rate_limited Yes
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Boolean] true if user is a member of the specified list, otherwise false.
-        # @overload list_member?(list, user_to_check, options={})
+        # @overload list_member?(list, user_to_check, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param user_to_check [Integer, String] The user ID or screen name of the list member.
         #   @param options [Hash] A customizable set of options.
-        # @overload list_member?(user, list, user_to_check, options={})
+        # @overload list_member?(user, list, user_to_check, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param user_to_check [Integer, String] The user ID or screen name of the list member.
         #   @param options [Hash] A customizable set of options.
         def list_member?(*args)
-          list_user?(:get, "/1.1/lists/members/show.json", args)
+          list_user?(:get, '/1.1/lists/members/show.json', args)
         end
 
         # Returns the members of the specified list
@@ -229,17 +229,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::Cursor]
-        # @overload list_members(list, options={})
+        # @overload list_members(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload list_members(user, list, options={})
+        # @overload list_members(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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 list_members(*args)
-          cursor_from_response_with_list(:get, "/1.1/lists/members.json", args)
+          cursor_from_response_with_list(:get, '/1.1/lists/members.json', args)
         end
 
         # Add a member to a list
@@ -250,17 +250,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The list.
-        # @overload add_list_member(list, user_to_add, options={})
+        # @overload add_list_member(list, user_to_add, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload add_list_member(user, list, user_to_add, options={})
+        # @overload add_list_member(user, list, user_to_add, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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(:post, '/1.1/lists/members/create.json', args)
         end
         deprecate_alias :list_add_member, :add_list_member
 
@@ -272,15 +272,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The deleted list.
-        # @overload destroy_list(list, options={})
+        # @overload destroy_list(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
-        # @overload destroy_list(user, list, options={})
+        # @overload destroy_list(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         def destroy_list(*args)
-          list_from_response(:post, "/1.1/lists/destroy.json", args)
+          list_from_response(:post, '/1.1/lists/destroy.json', args)
         end
         deprecate_alias :list_destroy, :destroy_list
 
@@ -291,19 +291,19 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The created list.
-        # @overload list_update(list, options={})
+        # @overload list_update(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         #   @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.
-        # @overload list_update(user, list, options={})
+        # @overload list_update(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         #   @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 list_update(*args)
-          list_from_response(:post, "/1.1/lists/update.json", args)
+          list_from_response(:post, '/1.1/lists/update.json', args)
         end
 
         # Creates a new list for the authenticated user
@@ -318,8 +318,8 @@ module Twitter
         # @param options [Hash] A customizable set of options.
         # @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))
+        def create_list(name, options = {})
+          object_from_response(Twitter::List, :post, '/1.1/lists/create.json', options.merge(:name => name))
         end
         deprecate_alias :list_create, :create_list
 
@@ -331,15 +331,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The specified list.
-        # @overload list(list, options={})
+        # @overload list(list, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
-        # @overload list(user, list, options={})
+        # @overload list(user, list, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @param options [Hash] A customizable set of options.
         def list(*args)
-          list_from_response(:get, "/1.1/lists/show.json", args)
+          list_from_response(:get, '/1.1/lists/show.json', args)
         end
 
         # List the lists the specified user follows
@@ -349,15 +349,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::Cursor]
-        # @overload subscriptions(options={})
+        # @overload subscriptions(options = {})
         #   @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.
-        # @overload subscriptions(user, options={})
+        # @overload subscriptions(user, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @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 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, :get, '/1.1/lists/subscriptions.json', args)
         end
 
         # Removes specified members from the list
@@ -367,17 +367,17 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Twitter::List] The list.
-        # @overload remove_list_members(list, users, options={})
+        # @overload remove_list_members(list, users, options = {})
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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.
-        # @overload remove_list_members(user, list, users, options={})
+        # @overload remove_list_members(user, list, users, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @param list [Integer, String, Twitter::List] A Twitter list ID, slug, URI, or object.
         #   @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(:post, '/1.1/lists/members/destroy_all.json', args)
         end
         deprecate_alias :list_remove_members, :remove_list_members
 
@@ -388,15 +388,15 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::List>]
-        # @overload owned_lists(options={})
+        # @overload owned_lists(options = {})
         #   @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.
-        # @overload owned_lists(user, options={})
+        # @overload owned_lists(user, options = {})
         #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
         #   @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, :get, '/1.1/lists/ownerships.json', args)
         end
         deprecate_alias :lists_ownerships, :owned_lists
         deprecate_alias :lists_owned, :owned_lists
@@ -441,12 +441,13 @@ module Twitter
         end
 
         def list_from_response_with_users(request_method, path, args)
-          arguments = Twitter::Arguments.new(args)
+          arguments = args.dup
+          options = arguments.last.is_a?(::Hash) ? arguments.pop : {}
           members = arguments.pop
-          merge_list!(arguments.options, arguments.pop)
-          merge_owner!(arguments.options, arguments.pop)
-          members.flatten.each_slice(MAX_USERS_PER_REQUEST).threaded_map do |users|
-            object_from_response(Twitter::List, request_method, path, merge_users(arguments.options, users))
+          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))
           end.last
         end
 
@@ -455,20 +456,20 @@ module Twitter
         # @param hash [Hash]
         # @param list [Integer, String, URI, Twitter::List] A Twitter list ID, slug, URI, or object.
         # @return [Hash]
-        def merge_list!(hash, list)
+        def merge_list!(hash, list) # rubocop:disable MethodLength
           case list
           when Integer
             hash[:list_id] = list
           when String
             if list[URI_SUBSTRING]
-              list = list.split("/")
+              list = list.split('/')
               hash[:slug] = list.pop
               hash[:owner_screen_name] = list.pop
             else
               hash[:slug] = list
             end
           when URI
-            list = list.path.split("/")
+            list = list.path.split('/')
             hash[:slug] = list.pop
             hash[:owner_screen_name] = list.pop
           when Twitter::List
@@ -486,12 +487,11 @@ module Twitter
         def merge_owner!(hash, user)
           unless hash[:owner_id] || hash[:owner_screen_name]
             user ||= screen_name
-            merge_user!(hash, user, "owner")
+            merge_user!(hash, user, 'owner')
             hash[:owner_id] = hash.delete(:owner_user_id) unless hash[:owner_user_id].nil?
           end
           hash
         end
-
       end
     end
   end

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

@@ -23,9 +23,9 @@ module Twitter
         #   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)
+          object_from_response(Twitter::Token, :post, '/oauth2/token', :grant_type => 'client_credentials', :bearer_token_request => true)
         end
-        alias bearer_token token
+        alias_method :bearer_token, :token
 
         # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
         #
@@ -37,7 +37,7 @@ module Twitter
         # @return [Twitter::Token] The invalidated token. token_type should be nil.
         def invalidate_token(access_token)
           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)
+          object_from_response(Twitter::Token, :post, '/oauth2/invalidate_token', :access_token => access_token)
         end
 
         # Allows a registered application to revoke an issued OAuth 2 Bearer Token by presenting its client credentials.
@@ -55,7 +55,6 @@ module Twitter
           end
           response.body
         end
-
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Twitter
         # @param place_id [String] A place in the world. These IDs can be retrieved from {Twitter::REST::API::PlacesAndGeo#reverse_geocode}.
         # @param options [Hash] A customizable set of options.
         # @return [Twitter::Place] The requested place.
-        def place(place_id, options={})
+        def place(place_id, options = {})
           object_from_response(Twitter::Place, :get, "/1.1/geo/id/#{place_id}.json", options)
         end
 
@@ -35,8 +35,8 @@ module Twitter
         # @option options [String] :granularity ('neighborhood') This is the minimal granularity of place types to return and must be one of: 'poi', 'neighborhood', 'city', 'admin' or 'country'.
         # @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)
+        def reverse_geocode(options = {})
+          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/reverse_geocode.json', options)
         end
 
         # Search for places that can be attached to a {Twitter::REST::API::Tweets#update}
@@ -56,10 +56,10 @@ module Twitter
         # @option options [String] :contained_within This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
         # @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)
+        def geo_search(options = {})
+          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/search.json', options)
         end
-        alias places_nearby geo_search
+        alias_method :places_nearby, :geo_search
 
         # Locates places near the given coordinates which are similar in name
         #
@@ -75,11 +75,10 @@ module Twitter
         # @option options [String] :contained_within This is the place_id which you would like to restrict the search results to. Setting this value means only places within the given place_id will be found.
         # @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)
+        def similar_places(options = {})
+          object_from_response(Twitter::GeoResults, :get, '/1.1/geo/similar_places.json', options)
         end
-        alias places_similar similar_places
-
+        alias_method :places_similar, :similar_places
       end
     end
   end

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

@@ -1,6 +1,7 @@
 require 'twitter/arguments'
 require 'twitter/rest/api/utils'
 require 'twitter/saved_search'
+require 'twitter/utils'
 
 module Twitter
   module REST
@@ -12,7 +13,7 @@ module Twitter
         # @authentication Requires user context
         # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
         # @return [Array<Twitter::SavedSearch>] The saved searches.
-        # @overload saved_search(options={})
+        # @overload saved_search(options = {})
         #   Returns the authenticated user's saved search queries
         #
         #   @see https://dev.twitter.com/docs/api/1.1/get/saved_searches/list
@@ -31,9 +32,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)
+            objects_from_response(Twitter::SavedSearch, :get, '/1.1/saved_searches/list.json', arguments.options)
           else
-            arguments.flatten.threaded_map do |id|
+            Twitter::Utils.parallel_map(arguments) do |id|
               saved_search(id, arguments.options)
             end
           end
@@ -48,7 +49,7 @@ module Twitter
         # @return [Twitter::SavedSearch] The saved searches.
         # @param id [Integer] The ID of the saved search.
         # @param options [Hash] A customizable set of options.
-        def saved_search(id, options={})
+        def saved_search(id, options = {})
           object_from_response(Twitter::SavedSearch, :get, "/1.1/saved_searches/show/#{id}.json", options)
         end
 
@@ -61,8 +62,8 @@ module Twitter
         # @return [Twitter::SavedSearch] The created saved search.
         # @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))
+        def create_saved_search(query, options = {})
+          object_from_response(Twitter::SavedSearch, :post, '/1.1/saved_searches/create.json', options.merge(:query => query))
         end
         deprecate_alias :saved_search_create, :create_saved_search
 
@@ -81,12 +82,11 @@ module Twitter
         #   @param options [Hash] A customizable set of options.
         def destroy_saved_search(*args)
           arguments = Twitter::Arguments.new(args)
-          arguments.flatten.threaded_map do |id|
+          Twitter::Utils.parallel_map(arguments) do |id|
             object_from_response(Twitter::SavedSearch, :post, "/1.1/saved_searches/destroy/#{id}.json", arguments.options)
           end
         end
         deprecate_alias :saved_search_destroy, :destroy_saved_search
-
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Twitter
     module API
       module Search
         include Twitter::REST::API::Utils
+        MAX_TWEETS_PER_REQUEST = 100
 
         # Returns tweets that match a specified query.
         #
@@ -27,10 +28,17 @@ module Twitter
         # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
         # @option options [Boolean, String, Integer] :include_entities The tweet entities node will be disincluded when set to false.
         # @return [Twitter::SearchResults] Return tweets that match a specified query with search metadata
-        def search(q, options={})
-          object_from_response(Twitter::SearchResults, :get, "/1.1/search/tweets.json", options.merge(:q => q))
+        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)
+        end
       end
     end
   end

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

@@ -20,9 +20,8 @@ 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 report_spam(*args)
-          threaded_user_objects_from_response(:post, "/1.1/users/report_spam.json", args)
+          threaded_user_objects_from_response(:post, '/1.1/users/report_spam.json', args)
         end
-
       end
     end
   end