Permalink
Browse files

Rename Twitter::Util module to Twitter::Utils

For consistency with Twitter::REST::API::Utils (and Faraday::Utils). See
discussion with @charliesome: #503
  • Loading branch information...
1 parent 9671a66 commit ca21c5b395232bd984f74c297a6fedfa948effd3 @sferik committed Dec 18, 2013
View
1 lib/twitter.rb
@@ -29,4 +29,3 @@
require 'twitter/trend'
require 'twitter/tweet'
require 'twitter/user'
-require 'twitter/util'
View
3 lib/twitter/rest/api/direct_messages.rb
@@ -2,6 +2,7 @@
require 'twitter/direct_message'
require 'twitter/rest/api/utils'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -88,7 +89,7 @@ def direct_messages(*args)
if arguments.empty?
direct_messages_received(arguments.options)
else
- Util.parallel_map(arguments.flatten) do |id|
+ Twitter::Utils.parallel_map(arguments.flatten) do |id|
direct_message(id, arguments.options)
end
end
View
5 lib/twitter/rest/api/favorites.rb
@@ -4,6 +4,7 @@
require 'twitter/rest/api/utils'
require 'twitter/tweet'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -67,7 +68,7 @@ def unfavorite(*args)
# @param options [Hash] A customizable set of options.
def favorite(*args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
begin
object_from_response(Twitter::Tweet, :post, '/1.1/favorites/create.json', arguments.options.merge(:id => id))
@@ -95,7 +96,7 @@ def favorite(*args)
# @param options [Hash] A customizable set of options.
def favorite!(*args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
begin
object_from_response(Twitter::Tweet, :post, '/1.1/favorites/create.json', arguments.options.merge(:id => id))
View
3 lib/twitter/rest/api/friends_and_followers.rb
@@ -4,6 +4,7 @@
require 'twitter/relationship'
require 'twitter/rest/api/utils'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -136,7 +137,7 @@ def follow(*args)
# @option options [Boolean] :follow (false) Enable notifications for the target user.
def follow!(*args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |user|
+ Twitter::Utils.parallel_map(arguments.flatten) do |user|
object_from_response(Twitter::User, :post, '/1.1/friendships/create.json', merge_user(arguments.options, user))
end.compact
end
View
3 lib/twitter/rest/api/lists.rb
@@ -6,6 +6,7 @@
require 'twitter/rest/api/utils'
require 'twitter/tweet'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -444,7 +445,7 @@ def list_from_response_with_users(request_method, path, args)
members = arguments.pop
merge_list!(arguments.options, arguments.pop)
merge_owner!(arguments.options, arguments.pop)
- Util.parallel_map(members.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
+ Twitter::Utils.parallel_map(members.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
object_from_response(Twitter::List, request_method, path, merge_users(arguments.options, users))
end.last
end
View
5 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
@@ -33,7 +34,7 @@ def saved_searches(*args)
if arguments.empty?
objects_from_response(Twitter::SavedSearch, :get, '/1.1/saved_searches/list.json', arguments.options)
else
- Util.parallel_map(arguments.flatten) do |id|
+ Twitter::Utils.parallel_map(arguments.flatten) do |id|
saved_search(id, arguments.options)
end
end
@@ -81,7 +82,7 @@ def create_saved_search(query, options = {})
# @param options [Hash] A customizable set of options.
def destroy_saved_search(*args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |id|
+ Twitter::Utils.parallel_map(arguments.flatten) do |id|
object_from_response(Twitter::SavedSearch, :post, "/1.1/saved_searches/destroy/#{id}.json", arguments.options)
end
end
View
9 lib/twitter/rest/api/tweets.rb
@@ -5,6 +5,7 @@
require 'twitter/oembed'
require 'twitter/rest/api/utils'
require 'twitter/tweet'
+require 'twitter/utils'
module Twitter
module REST
@@ -142,7 +143,7 @@ def update(status, 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 retweet(*args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
begin
post_retweet(id, arguments.options)
@@ -168,7 +169,7 @@ def retweet(*args)
# @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)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
begin
post_retweet(id, arguments.options)
@@ -249,7 +250,7 @@ def oembed(tweet, options = {})
# @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)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
oembed(id, arguments.options)
end
@@ -281,7 +282,7 @@ def retweeters_ids(*args)
# @return [Array<Twitter::Tweet>]
def threaded_tweets_from_response(request_method, path, args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |tweet|
+ Twitter::Utils.parallel_map(arguments.flatten) do |tweet|
id = extract_id(tweet)
object_from_response(Twitter::Tweet, request_method, path + "/#{id}.json", arguments.options)
end
View
3 lib/twitter/rest/api/users.rb
@@ -4,6 +4,7 @@
require 'twitter/rest/api/utils'
require 'twitter/settings'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -226,7 +227,7 @@ def unblock(*args)
def users(*args)
arguments = Twitter::Arguments.new(args)
method = arguments.options.delete(:method) || :post
- Util.parallel_map(arguments.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
+ Twitter::Utils.parallel_map(arguments.flatten.each_slice(MAX_USERS_PER_REQUEST)) do |users|
objects_from_response(Twitter::User, method, '/1.1/users/lookup.json', merge_users(arguments.options, users))
end.flatten
end
View
5 lib/twitter/rest/api/utils.rb
@@ -2,6 +2,7 @@
require 'twitter/arguments'
require 'twitter/cursor'
require 'twitter/user'
+require 'twitter/utils'
module Twitter
module REST
@@ -50,7 +51,7 @@ def extract_id(object)
# @return [Array<Twitter::User>]
def threaded_user_objects_from_response(request_method, path, args)
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |user|
+ Twitter::Utils.parallel_map(arguments.flatten) do |user|
object_from_response(Twitter::User, request_method, path, merge_user(arguments.options, user))
end
end
@@ -102,7 +103,7 @@ def objects_from_array(klass, array)
# @return [Array]
def threaded_objects_from_response(klass, request_method, path, args) # rubocop:disable ParameterLists
arguments = Twitter::Arguments.new(args)
- Util.parallel_map(arguments.flatten) do |object|
+ Twitter::Utils.parallel_map(arguments.flatten) do |object|
id = extract_id(object)
object_from_response(klass, request_method, path, arguments.options.merge(:id => id))
end
View
2 lib/twitter/util.rb → lib/twitter/utils.rb
@@ -1,5 +1,5 @@
module Twitter
- module Util
+ module Utils
class << self
def parallel_map(enumerable)
# Don't bother spawning a new thread if there's only one item

0 comments on commit ca21c5b

Please sign in to comment.