t 0.9.4 → 0.9.5

data/lib/t/authorizable.rb

@@ -1,3 +1,5 @@
+require 'oauth'
+
 module T
   module Authorizable
 

data/lib/t/cli.rb

@@ -6,9 +6,6 @@ require 'active_support/core_ext/numeric/time'
 require 'csv'
 # 'fastercsv' required on Ruby versions < 1.9
 require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-require 'geokit'
-require 'launchy'
-require 'oauth'
 require 'open-uri'
 require 't/authorizable'
 require 't/collectable'
@@ -83,6 +80,7 @@ module T
         ask "Press [Enter] to open the Twitter app authorization page."
         say
       end
+      require 'launchy'
       Launchy.open(url, :dry_run => options['display-url'])
       pin = ask "Paste in the supplied PIN:"
       access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
@@ -113,7 +111,7 @@ module T
       end
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.block(user, :include_entities => false)
+          client.block(user)
         end
       end
       number = users.length
@@ -129,7 +127,9 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def direct_messages
       count = options['number'] || DEFAULT_NUM_RESULTS
-      direct_messages = client.direct_messages(:count => count, :include_entities => false)
+      direct_messages = collect_with_count(count) do |opts|
+        client.direct_messages(opts)
+      end
       direct_messages.reverse! if options['reverse']
       if options['csv']
         say ["ID", "Posted at", "Screen name", "Text"].to_csv unless direct_messages.empty?
@@ -163,7 +163,9 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def direct_messages_sent
       count = options['number'] || DEFAULT_NUM_RESULTS
-      direct_messages = client.direct_messages_sent(:count => count, :include_entities => false)
+      direct_messages = collect_with_count(count) do |opts|
+        client.direct_messages_sent(opts)
+      end
       direct_messages.reverse! if options['reverse']
       if options['csv']
         say ["ID", "Posted at", "Screen name", "Text"].to_csv unless direct_messages.empty?
@@ -219,7 +221,7 @@ module T
       disciple_ids = (follower_ids - following_ids)
       users = disciple_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |disciple_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.users(disciple_id_group, :include_entities => false)
+          client.users(disciple_id_group)
         end
       end.flatten
       print_users(users)
@@ -233,7 +235,7 @@ module T
       else
         user.strip_ats
       end
-      direct_message = client.direct_message_create(user, message, :include_entities => false)
+      direct_message = client.direct_message_create(user, message)
       say "Direct Message sent from @#{@rcfile.active_profile[0]} to @#{direct_message.recipient.screen_name} (#{time_ago_in_words(direct_message.created_at)} ago)."
     end
     map %w(d m) => :dm
@@ -247,7 +249,7 @@ module T
         owner = @rcfile.active_profile[0]
       else
         owner = if options['id']
-          client.user(owner.to_i, :include_entities => false).screen_name
+          client.user(owner.to_i).screen_name
         else
           owner.strip_ats
         end
@@ -256,7 +258,7 @@ module T
         user = @rcfile.active_profile[0]
       else
         user = if options['id']
-          user = client.user(user.to_i, :include_entities => false).screen_name
+          user = client.user(user.to_i).screen_name
         else
           user.strip_ats
         end
@@ -274,7 +276,7 @@ module T
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     def does_follow(user1, user2=nil)
       user1 = if options['id']
-        client.user(user1.to_i, :include_entities => false).screen_name
+        client.user(user1.to_i).screen_name
       else
         user1.strip_ats
       end
@@ -282,7 +284,7 @@ module T
         user2 = @rcfile.active_profile[0]
       else
         user2 = if options['id']
-          client.user(user2.to_i, :include_entities => false).screen_name
+          client.user(user2.to_i).screen_name
         else
           user2.strip_ats
         end
@@ -302,7 +304,7 @@ module T
       status_ids.map!(&:strip_commas)
       favorites = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.favorite(status_id.to_i, :include_entities => false)
+          client.favorite(status_id.to_i)
         end
       end
       number = favorites.length
@@ -327,7 +329,9 @@ module T
         end
       end
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = client.favorites(user, :count => count, :include_entities => false)
+      statuses = collect_with_count(count) do |opts|
+        client.favorites(user, opts)
+      end
       print_statuses(statuses)
     end
     map %w(faves favourites) => :favorites
@@ -343,7 +347,7 @@ module T
       end
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.follow(user, :include_entities => false)
+          client.follow(user)
         end
       end
       number = users.length
@@ -377,7 +381,7 @@ module T
       end
       users = following_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |following_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.users(following_id_group, :include_entities => false)
+          client.users(following_id_group)
         end
       end.flatten
       print_users(users)
@@ -408,7 +412,7 @@ module T
       end
       users = follower_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |follower_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.users(follower_id_group, :include_entities => false)
+          client.users(follower_id_group)
         end
       end.flatten
       print_users(users)
@@ -443,7 +447,7 @@ module T
       friend_ids = (following_ids & follower_ids)
       users = friend_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |friend_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.users(friend_id_group, :include_entities => false)
+          client.users(friend_id_group)
         end
       end.flatten
       print_users(users)
@@ -478,7 +482,7 @@ module T
       leader_ids = (following_ids - follower_ids)
       users = leader_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |leader_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.users(leader_id_group, :include_entities => false)
+          client.users(leader_id_group)
         end
       end.flatten
       print_users(users)
@@ -515,7 +519,9 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def mentions
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = client.mentions(:count => count, :include_entities => false)
+      statuses = collect_with_count(count) do |opts|
+        client.mentions(opts)
+      end
       print_statuses(statuses)
     end
     map %w(replies) => :mentions
@@ -525,11 +531,12 @@ module T
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "status", :aliases => "-s", :type => :boolean, :default => false, :desc => "Specify input as a Twitter status ID instead of a screen name."
     def open(user)
+      require 'launchy'
       if options['id']
-        user = client.user(user.to_i, :include_entities => false)
+        user = client.user(user.to_i)
         Launchy.open("https://twitter.com/#{user.screen_name}", :dry_run => options['display-url'])
       elsif options['status']
-        status = client.status(user.to_i, :include_entities => false, :include_my_retweet => false)
+        status = client.status(user.to_i, :include_my_retweet => false)
         Launchy.open("https://twitter.com/#{status.user.screen_name}/status/#{status.id}", :dry_run => options['display-url'])
       else
         Launchy.open("https://twitter.com/#{user.strip_ats}", :dry_run => options['display-url'])
@@ -541,7 +548,7 @@ module T
     method_option "location", :aliases => "-l", :type => :boolean, :default => false
     def reply(status_id, message)
       status_id = status_id.strip_commas
-      status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false)
+      status = client.status(status_id.to_i, :include_my_retweet => false)
       users = Array(status.user.screen_name)
       if options['all']
         # twitter-text requires $KCODE to be set to UTF8 on Ruby versions < 1.8
@@ -552,7 +559,7 @@ module T
         users.uniq!
       end
       users.map!(&:prepend_at)
-      opts = {:in_reply_to_status_id => status.id, :include_entities => false, :trim_user => true}
+      opts = {:in_reply_to_status_id => status.id, :trim_user => true}
       opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
       reply = client.update("#{users.join(' ')} #{message}", opts)
       say "Reply created by @#{@rcfile.active_profile[0]} to #{users.join(' ')} (#{time_ago_in_words(reply.created_at)} ago)."
@@ -571,7 +578,7 @@ module T
       end
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.report_spam(user, :include_entities => false)
+          client.report_spam(user)
         end
       end
       number = users.length
@@ -585,7 +592,7 @@ module T
       status_ids.map!(&:strip_commas)
       retweets = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.retweet(status_id.to_i, :include_entities => false, :trim_user => true)
+          client.retweet(status_id.to_i, :trim_user => true)
         end
       end
       number = retweets.length
@@ -610,7 +617,9 @@ module T
         end
       end
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = client.retweeted_by(user, :count => count, :include_entities => false)
+      statuses = collect_with_count(count) do |opts|
+        client.retweeted_by(user, opts)
+      end
       print_statuses(statuses)
     end
     map %w(rts) => :retweets
@@ -624,18 +633,23 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def status(status_id)
       status_id = status_id.strip_commas
-      status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false)
-      if status.geo
-        geoloc = Geokit::Geocoders::MultiGeocoder.reverse_geocode(status.geo.coordinates)
-        location = if geoloc.city && geoloc.state && geoloc.country
-          [geoloc.city, geoloc.state, geoloc.country].join(", ")
-        elsif geoloc.state && geoloc.country
-          [geoloc.state, geoloc.country].join(", ")
+      status = client.status(status_id.to_i, :include_my_retweet => false)
+      location = if status.place
+        if status.place.name && status.place.attributes && status.place.attributes['street_address'] && status.place.attributes['locality'] && status.place.attributes['region'] && status.place.country
+          [status.place.name, status.place.attributes['street_address'], status.place.attributes['locality'], status.place.attributes['region'], status.place.country].join(", ")
+        elsif status.place.name && status.place.attributes && status.place.attributes['locality'] && status.place.attributes['region'] && status.place.country
+          [status.place.name, status.place.attributes['locality'], status.place.attributes['region'], status.place.country].join(", ")
+        elsif status.place.full_name && status.place.attributes && status.place.attributes['region'] && status.place.country
+          [status.place.full_name, status.place.attributes['region'], status.place.country].join(", ")
+        elsif status.place.full_name && status.place.country
+          [status.place.full_name, status.place.country].join(", ")
+        elsif status.place.full_name
+          status.place.full_name
         else
-          geoloc.country
+          status.place.name
         end
-      else
-        location = nil
+      elsif status.geo
+        reverse_geocode(status.geo)
       end
       if options['csv']
         say ["ID", "Text", "Screen name", "Posted at", "Location", "Retweets", "Source", "URL"].to_csv
@@ -677,7 +691,7 @@ module T
         end
       end
       limit = options['number'] || DEFAULT_NUM_RESULTS
-      users = client.recommendations(user, :limit => limit, :include_entities => false)
+      users = client.recommendations(user, :limit => limit)
       print_users(users)
     end
 
@@ -695,9 +709,13 @@ module T
         else
           user.strip_ats
         end
-        statuses = client.user_timeline(user, :count => count, :include_entities => false)
+        statuses = collect_with_count(count) do |opts|
+          client.user_timeline(user, opts)
+        end
       else
-        statuses = client.home_timeline(:count => count, :include_entities => false)
+        statuses = collect_with_count(count) do |opts|
+          client.home_timeline(opts)
+        end
       end
       print_statuses(statuses)
     end
@@ -766,7 +784,7 @@ module T
       end
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.unfollow(user, :include_entities => false)
+          client.unfollow(user)
         end
       end
       number = users.length
@@ -778,7 +796,7 @@ module T
     desc "update MESSAGE", "Post a Tweet."
     method_option "location", :aliases => "-l", :type => :boolean, :default => false
     def update(message)
-      opts = {:include_entities => false, :trim_user => true}
+      opts = {:trim_user => true}
       opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
       status = client.update(message, opts)
       say "Tweet created by @#{@rcfile.active_profile[0]} (#{time_ago_in_words(status.created_at)} ago)."
@@ -806,7 +824,7 @@ module T
       else
         users.map!(&:strip_ats)
       end
-      users = client.users(users, :include_entities => false)
+      users = client.users(users)
       print_users(users)
     end
     map %w(stats) => :users
@@ -826,7 +844,7 @@ module T
       else
         user.strip_ats
       end
-      user = client.user(user, :include_entities => false)
+      user = client.user(user)
       if options['csv']
         say ["ID", "Verified", "Name", "Screen name", "Bio", "Location", "Following", "Last update", "Lasted updated at", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "URL"].to_csv
         say [user.id, user.verified?, user.name, user.screen_name, user.description, user.location, user.following?, HTMLEntities.new.decode(user.status.text), user.status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.url].to_csv
@@ -872,11 +890,24 @@ module T
 
     def location
       return @location if @location
+      require 'geokit'
       ip_address = Kernel::open("http://checkip.dyndns.org/") do |body|
         /(?:\d{1,3}\.){3}\d{1,3}/.match(body.read)[0]
       end
       @location = Geokit::Geocoders::MultiGeocoder.geocode(ip_address)
     end
 
+    def reverse_geocode(geo)
+      require 'geokit'
+      geoloc = Geokit::Geocoders::MultiGeocoder.reverse_geocode(geo.coordinates)
+      if geoloc.city && geoloc.state && geoloc.country
+        [geoloc.city, geoloc.state, geoloc.country].join(", ")
+      elsif geoloc.state && geoloc.country
+        [geoloc.state, geoloc.country].join(", ")
+      else
+        geoloc.country
+      end
+    end
+
   end
 end

data/lib/t/collectable.rb

@@ -1,6 +1,12 @@
 module T
   module Collectable
 
+    MAX_NUM_RESULTS = 200
+
+    def collect_with_count(count, &block)
+      collect_with_number(count, :count, &block)
+    end
+
     def collect_with_cursor(collection=[], cursor=-1, &block)
       object = yield cursor
       collection += object.collection
@@ -9,9 +15,33 @@ module T
 
     def collect_with_max_id(collection=[], max_id=nil, &block)
       array = yield max_id
+      return collection unless !array.nil?
       collection += array
       array.empty? ? collection : collect_with_max_id(collection, array.last.id - 1, &block)
     end
 
+    def collect_with_number(number, key, &block)
+      opts = {}
+      opts[key] = MAX_NUM_RESULTS
+      statuses = collect_with_max_id do |max_id|
+        opts[:max_id] = max_id unless max_id.nil?
+        opts[key] = number unless number >= MAX_NUM_RESULTS
+        if number > 0
+          number -= MAX_NUM_RESULTS
+          retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+            yield opts
+          end
+        end
+      end.flatten.compact
+    end
+
+    def collect_with_per_page(per_page, &block)
+      collect_with_number(per_page, :per_page, &block)
+    end
+
+    def collect_with_rpp(rpp, &block)
+      collect_with_number(rpp, :rpp, &block)
+    end
+
   end
 end

data/lib/t/delete.rb

@@ -27,7 +27,7 @@ module T
       end
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.unblock(user, :include_entities => false)
+          client.unblock(user)
         end
       end
       number = users.length
@@ -43,10 +43,10 @@ module T
       direct_message_ids.map!(&:strip_commas)
       direct_message_ids.each do |direct_message_id|
         unless options['force']
-          direct_message = client.direct_message(direct_message_id.to_i, :include_entities => false)
+          direct_message = client.direct_message(direct_message_id.to_i)
           return unless yes? "Are you sure you want to permanently delete the direct message to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\"? [y/N]"
         end
-        direct_message = client.direct_message_destroy(direct_message_id.to_i, :include_entities => false)
+        direct_message = client.direct_message_destroy(direct_message_id.to_i)
         say "@#{@rcfile.active_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
       end
     end
@@ -59,10 +59,10 @@ module T
       status_ids.map!(&:strip_commas)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id.to_i, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to remove @#{status.user.screen_name}'s status: \"#{status.text}\" from your favorites? [y/N]"
         end
-        status = client.unfavorite(status_id.to_i, :include_entities => false)
+        status = client.unfavorite(status_id.to_i)
         say "@#{@rcfile.active_profile[0]} unfavorited @#{status.user.screen_name}'s status: \"#{status.text}\""
       end
     end
@@ -88,10 +88,10 @@ module T
       status_ids.map!(&:strip_commas)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id.to_i, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to permanently delete @#{status.user.screen_name}'s status: \"#{status.text}\"? [y/N]"
         end
-        status = client.status_destroy(status_id.to_i, :include_entities => false, :trim_user => true)
+        status = client.status_destroy(status_id.to_i, :trim_user => true)
         say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.text}\""
       end
     end

data/lib/t/list.rb

@@ -126,7 +126,7 @@ module T
         end
       end
       users = collect_with_cursor do |cursor|
-        client.list_members(owner, list, :cursor => cursor, :include_entities => false, :skip_status => true)
+        client.list_members(owner, list, :cursor => cursor, :skip_status => true)
       end
       print_users(users)
     end
@@ -174,7 +174,9 @@ module T
         end
       end
       per_page = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = client.list_timeline(owner, list, :include_entities => false, :per_page => per_page)
+      statuses = collect_with_per_page(per_page) do |opts|
+        client.list_timeline(owner, list, opts)
+      end
       print_statuses(statuses)
     end
     map %w(tl) => :timeline