t 2.0.1 → 2.0.2

data/lib/t/rcfile.rb

@@ -7,7 +7,7 @@ module T
     FILE_NAME = '.trc'
 
     def initialize
-      @path = File.join(File.expand_path("~"), FILE_NAME)
+      @path = File.join(File.expand_path('~'), FILE_NAME)
       @data = load_file
     end
 
@@ -20,7 +20,7 @@ module T
       if possibilities.size == 1
         possibilities.first
       else
-        raise ArgumentError, "Username #{username} is #{possibilities.size < 1 ? 'not found.' : 'ambiguous, matching ' + possibilities.join(', ')}"
+        fail ArgumentError, "Username #{username} is #{possibilities.size < 1 ? 'not found.' : 'ambiguous, matching ' + possibilities.join(', ')}"
       end
     end
 
@@ -93,7 +93,7 @@ module T
     end
 
     def reset
-      self.send(:initialize)
+      send(:initialize)
     end
 
   private
@@ -108,10 +108,9 @@ module T
 
     def write
       require 'yaml'
-      File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |rcfile|
+      File.open(@path, File::RDWR | File::TRUNC | File::CREAT, 0600) do |rcfile|
         rcfile.write @data.to_yaml
       end
     end
-
   end
 end

data/lib/t/requestable.rb

@@ -2,8 +2,7 @@ require 'twitter'
 
 module T
   module Requestable
-
-  private
+    private
 
     def client
       return @client if @client
@@ -15,6 +14,5 @@ module T
         config.access_token_secret = @rcfile.active_secret
       end
     end
-
   end
 end

data/lib/t/search.rb

@@ -23,11 +23,11 @@ module T
       super
     end
 
-    desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
-    method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
+    desc 'all QUERY', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS
     def all(query)
       count = options['number'] || DEFAULT_NUM_RESULTS
       tweets = collect_with_count(count) do |count_opts|
@@ -46,7 +46,7 @@ module T
         array = tweets.map do |tweet|
           [tweet.id, ls_formatted_time(tweet), "@#{tweet.user.screen_name}", decode_full_text(tweet, options['decode_uris']).gsub(/\n+/, ' ')]
         end
-        format = options['format'] || TWEET_HEADINGS.size.times.map{"%s"}
+        format = options['format'] || TWEET_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         say unless tweets.empty?
@@ -56,11 +56,11 @@ module T
       end
     end
 
-    desc "favorites [USER] QUERY", "Returns Tweets you've favorited that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    desc 'favorites [USER] QUERY', "Returns Tweets you've favorited that match the specified query."
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def favorites(*args)
       opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
@@ -68,11 +68,7 @@ module T
       opts[:include_entities] = 1 if options['decode_uris']
       if user
         require 't/core_ext/string'
-        user = if options['id']
-          user.to_i
-        else
-          user.strip_ats
-        end
+        user = options['id'] ? user.to_i : user.strip_ats
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.favorites(user, opts)
@@ -90,11 +86,11 @@ module T
     end
     map %w(faves) => :favorites
 
-    desc "list [USER/]LIST QUERY", "Returns Tweets on a list that match specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
+    desc 'list [USER/]LIST QUERY', 'Returns Tweets on a list that match the specified query.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     def list(list, query)
       owner, list = extract_owner(list, options)
       opts = {:count => MAX_NUM_RESULTS}
@@ -109,10 +105,10 @@ module T
       print_tweets(tweets)
     end
 
-    desc "mentions QUERY", "Returns Tweets mentioning you that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
+    desc 'mentions QUERY', 'Returns Tweets mentioning you that match the specified query.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
       opts[:include_entities] = 1 if options['decode_uris']
@@ -127,11 +123,11 @@ module T
     end
     map %w(replies) => :mentions
 
-    desc "retweets [USER] QUERY", "Returns Tweets you've retweeted that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
+    desc 'retweets [USER] QUERY', "Returns Tweets you've retweeted that match the specified query."
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     def retweets(*args)
       opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
@@ -139,11 +135,7 @@ module T
       opts[:include_entities] = 1 if options['decode_uris']
       if user
         require 't/core_ext/string'
-        user = if options['id']
-          user.to_i
-        else
-          user.strip_ats
-        end
+        user = options['id'] ? user.to_i : user.strip_ats
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.retweeted_by_user(user, opts)
@@ -161,14 +153,14 @@ module T
     end
     map %w(rts) => :retweets
 
-    desc "timeline [USER] QUERY", "Returns Tweets in your timeline that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "decode_uris", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
-    method_option "exclude", :aliases => "-e", :type => :string, :enum => %w(replies retweets), :desc => "Exclude certain types of Tweets from the results.", :banner => "TYPE"
-    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "max_id", :aliases => "-m", :type => :numeric, :desc => "Returns only the results with an ID less than the specified ID."
-    method_option "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
+    desc 'timeline [USER] QUERY', 'Returns Tweets in your timeline that match the specified query.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'exclude', :aliases => '-e', :type => :string, :enum => %w(replies retweets), :desc => 'Exclude certain types of Tweets from the results.', :banner => 'TYPE'
+    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'max_id', :aliases => '-m', :type => :numeric, :desc => 'Returns only the results with an ID less than the specified ID.'
+    method_option 'since_id', :aliases => '-s', :type => :numeric, :desc => 'Returns only the results with an ID greater than the specified ID.'
     def timeline(*args)
       query = args.pop
       user = args.pop
@@ -180,11 +172,7 @@ module T
       opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'
-        user = if options['id']
-          user.to_i
-        else
-          user.strip_ats
-        end
+        user = options['id'] ? user.to_i : user.strip_ats
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.user_timeline(user, opts)
@@ -202,18 +190,17 @@ module T
     end
     map %w(tl) => :timeline
 
-    desc "users QUERY", "Returns users that match the specified query."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option "sort", :aliases => "-s", :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => "screen_name", :desc => "Specify the order of the results.", :banner => "ORDER"
-    method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
+    desc 'users QUERY', 'Returns users that match the specified query.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def users(query)
       users = collect_with_page do |page|
         client.user_search(query, :page => page)
       end
       print_users(users)
     end
-
   end
 end

data/lib/t/set.rb

@@ -13,61 +13,60 @@ module T
       super
     end
 
-    desc "active SCREEN_NAME [CONSUMER_KEY]", "Set your active account."
-    def active(screen_name, consumer_key=nil)
+    desc 'active SCREEN_NAME [CONSUMER_KEY]', 'Set your active account.'
+    def active(screen_name, consumer_key = nil)
       require 't/core_ext/string'
       screen_name = screen_name.strip_ats
       @rcfile.path = options['profile'] if options['profile']
       consumer_key = @rcfile[screen_name].keys.last if consumer_key.nil?
-      @rcfile.active_profile = {'username' => @rcfile[screen_name][consumer_key]["username"], 'consumer_key' => consumer_key}
+      @rcfile.active_profile = {'username' => @rcfile[screen_name][consumer_key]['username'], 'consumer_key' => consumer_key}
       say "Active account has been updated to #{@rcfile.active_profile[0]}."
     end
     map %w(default) => :active
 
-    desc "bio DESCRIPTION", "Edits your Bio information on your Twitter profile."
+    desc 'bio DESCRIPTION', 'Edits your Bio information on your Twitter profile.'
     def bio(description)
       client.update_profile(:description => description)
       say "@#{@rcfile.active_profile[0]}'s bio has been updated."
     end
 
-    desc "language LANGUAGE_NAME", "Selects the language you'd like to receive notifications in."
+    desc 'language LANGUAGE_NAME', "Selects the language you'd like to receive notifications in."
     def language(language_name)
       client.settings(:lang => language_name)
       say "@#{@rcfile.active_profile[0]}'s language has been updated."
     end
 
-    desc "location PLACE_NAME", "Updates the location field in your profile."
+    desc 'location PLACE_NAME', 'Updates the location field in your profile.'
     def location(place_name)
       client.update_profile(:location => place_name)
       say "@#{@rcfile.active_profile[0]}'s location has been updated."
     end
 
-    desc "name NAME", "Sets the name field on your Twitter profile."
+    desc 'name NAME', 'Sets the name field on your Twitter profile.'
     def name(name)
       client.update_profile(:name => name)
       say "@#{@rcfile.active_profile[0]}'s name has been updated."
     end
 
-    desc "profile_background_image FILE", "Sets the background image on your Twitter profile."
-    method_option "tile", :aliases => "-t", :type => :boolean, :default => false, :desc => "Whether or not to tile the background image."
+    desc 'profile_background_image FILE', 'Sets the background image on your Twitter profile.'
+    method_option 'tile', :aliases => '-t', :type => :boolean, :default => false, :desc => 'Whether or not to tile the background image.'
     def profile_background_image(file)
       client.update_profile_background_image(File.new(File.expand_path(file)), :tile => options['tile'], :skip_status => true)
       say "@#{@rcfile.active_profile[0]}'s background image has been updated."
     end
     map %w(background background_image) => :profile_background_image
 
-    desc "profile_image FILE", "Sets the image on your Twitter profile."
+    desc 'profile_image FILE', 'Sets the image on your Twitter profile.'
     def profile_image(file)
       client.update_profile_image(File.new(File.expand_path(file)))
       say "@#{@rcfile.active_profile[0]}'s image has been updated."
     end
     map %w(avatar image) => :profile_image
 
-    desc "website URI", "Sets the website field on your profile."
+    desc 'website URI', 'Sets the website field on your profile.'
     def website(uri)
       client.update_profile(:url => uri)
       say "@#{@rcfile.active_profile[0]}'s website has been updated."
     end
-
   end
 end

data/lib/t/stream.rb

@@ -8,10 +8,10 @@ module T
     include T::Utils
 
     TWEET_HEADINGS_FORMATTING = [
-      "%-18s",  # Add padding to maximum length of a Tweet ID
-      "%-12s",  # Add padding to length of a timestamp formatted with ls_formatted_time
-      "%-20s",  # Add padding to maximum length of a Twitter screen name
-      "%s",     # Last element does not need special formatting
+      '%-18s',  # Add padding to maximum length of a Tweet ID
+      '%-12s',  # Add padding to length of a timestamp formatted with ls_formatted_time
+      '%-20s',  # Add padding to maximum length of a Twitter screen name
+      '%s',     # Last element does not need special formatting
     ]
 
     check_unknown_options!
@@ -21,9 +21,9 @@ module T
       super
     end
 
-    desc "all", "Stream a random sample of all Tweets (Control-C to stop)"
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    desc 'all', 'Stream a random sample of all Tweets (Control-C to stop)'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def all
       client.before_request do
         if options['csv']
@@ -37,6 +37,7 @@ module T
         end
       end
       client.sample do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
@@ -50,16 +51,17 @@ module T
       end
     end
 
-    desc "matrix", "Unfortunately, no one can be told what the Matrix is. You have to see it for yourself."
+    desc 'matrix', 'Unfortunately, no one can be told what the Matrix is. You have to see it for yourself.'
     def matrix
-      client.sample do |tweet|
-        say(tweet.full_text.gsub("\n", ''), [:bold, :green, :on_black])
+      client.sample(:language => 'ja') do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
+        say(tweet.full_text.gsub("\n", '').reverse, [:bold, :green, :on_black])
       end
     end
 
-    desc "search KEYWORD [KEYWORD...]", "Stream Tweets that contain specified keywords, joined with logical ORs (Control-C to stop)"
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    desc 'search KEYWORD [KEYWORD...]', 'Stream Tweets that contain specified keywords, joined with logical ORs (Control-C to stop)'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def search(keyword, *keywords)
       keywords.unshift(keyword)
       require 't/search'
@@ -71,6 +73,7 @@ module T
         search.all(keywords.join(' OR '))
       end
       client.filter(:track => keywords) do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
@@ -84,9 +87,9 @@ module T
       end
     end
 
-    desc "timeline", "Stream your timeline (Control-C to stop)"
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    desc 'timeline', 'Stream your timeline (Control-C to stop)'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def timeline
       require 't/cli'
       client.before_request do
@@ -97,6 +100,7 @@ module T
         cli.timeline
       end
       client.user do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
@@ -110,9 +114,9 @@ module T
       end
     end
 
-    desc "users USER_ID [USER_ID...]", "Stream Tweets either from or in reply to specified users (Control-C to stop)"
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    desc 'users USER_ID [USER_ID...]', 'Stream Tweets either from or in reply to specified users (Control-C to stop)'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def users(user_id, *user_ids)
       user_ids.unshift(user_id)
       user_ids.map!(&:to_i)
@@ -128,6 +132,7 @@ module T
         end
       end
       client.follow(user_ids) do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
@@ -153,6 +158,5 @@ module T
         config.access_token_secret = @rcfile.active_secret
       end
     end
-
   end
 end

data/lib/t/utils.rb

@@ -1,9 +1,9 @@
 module T
   module Utils
-  private
+    private
 
     # https://github.com/rails/rails/blob/bd8a970/actionpack/lib/action_view/helpers/date_helper.rb
-    def distance_of_time_in_words(from_time, to_time=Time.now)
+    def distance_of_time_in_words(from_time, to_time = Time.now) # rubocop:disable CyclomaticComplexity
       seconds = (to_time - from_time).abs
       minutes = seconds / 60
       case minutes
@@ -14,38 +14,38 @@ module T
         when 1...2
           'a second'
         when 2...60
-          '%d seconds' % seconds
+          format('%d seconds', seconds)
         end
       when 1...2
         'a minute'
       when 2...60
-        '%d minutes' % minutes
+        format('%d minutes', minutes)
       when 60...120
         'an hour'
       # 120 minutes up to 23.5 hours
       when 120...1410
-        '%d hours' % (minutes.to_f / 60.0).round
+        format('%d hours', (minutes.to_f / 60.0).round)
       # 23.5 hours up to 48 hours
       when 1410...2880
         'a day'
       # 48 hours up to 29.5 days
-      when 2880...42480
-        '%d days' % (minutes.to_f / 1440.0).round
+      when 2880...42_480
+        format('%d days', (minutes.to_f / 1440.0).round)
       # 29.5 days up to 60 days
-      when 42480...86400
+      when 42_480...86_400
         'a month'
       # 60 days up to 11.5 months
-      when 86400...503700
-        '%d months' % (minutes.to_f / 43800.0).round
+      when 86_400...503_700
+        format('%d months', (minutes.to_f / 43_800.0).round)
       # 11.5 months up to 2 years
-      when 503700...1051200
+      when 503_700...1_051_200
         'a year'
       else
-        '%d years' % (minutes.to_f / 525600.0).round
+        format('%d years', (minutes.to_f / 525_600.0).round)
       end
     end
-    alias :time_ago_in_words :distance_of_time_in_words
-    alias :time_from_now_in_words :distance_of_time_in_words
+    alias_method :time_ago_in_words, :distance_of_time_in_words
+    alias_method :time_from_now_in_words, :distance_of_time_in_words
 
     def fetch_users(users, options, &block)
       format_users!(users, options)
@@ -58,11 +58,7 @@ module T
 
     def format_users!(users, options)
       require 't/core_ext/string'
-      if options['id']
-        users.map!(&:to_i)
-      else
-        users.map!(&:strip_ats)
-      end
+      options['id'] ? users.map!(&:to_i) : users.map!(&:strip_ats)
     end
 
     def extract_owner(list, options)
@@ -72,11 +68,7 @@ module T
         owner = @rcfile.active_profile[0]
       else
         require 't/core_ext/string'
-        owner = if options['id']
-          owner.to_i
-        else
-          owner.strip_ats
-        end
+        owner = options['id'] ? owner.to_i : owner.strip_ats
       end
       [owner, list]
     end
@@ -85,14 +77,14 @@ module T
       html.gsub(/<.+?>/, '')
     end
 
-    def number_with_delimiter(number, delimiter=",")
+    def number_with_delimiter(number, delimiter = ',')
       digits = number.to_s.split(//)
-      groups = digits.reverse.each_slice(3).map{|g| g.join('')}
+      groups = digits.reverse.each_slice(3).map { |g| g.join('') }
       groups.join(delimiter).reverse
     end
 
-    def pluralize(count, singular, plural=nil)
-      "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || "#{singular}s"))
+    def pluralize(count, singular, plural = nil)
+      "#{count || 0} " + (count == 1 || count =~ /^1(\.0+)?$/ ? singular : (plural || "#{singular}s"))
     end
 
     def decode_full_text(tweet, decode_full_uris = false)