lib/t/search.rb in t-2.8.0 vs lib/t/search.rb in t-2.9.0

- old
+ new

@@ -23,18 +23,18 @@ @rcfile = T::RCFile.instance 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, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, desc: 'Decodes t.co URLs into their original form.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'number', aliases: '-n', type: :numeric, default: DEFAULT_NUM_RESULTS + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' def all(query) count = options['number'] || DEFAULT_NUM_RESULTS - opts = {:count => MAX_SEARCH_RESULTS} + opts = {count: MAX_SEARCH_RESULTS} opts[:include_entities] = !!options['decode_uris'] tweets = client.search(query, opts).take(count) tweets.reverse! if options['reverse'] if options['csv'] require 'csv' @@ -55,19 +55,19 @@ end end end desc 'favorites [USER] QUERY', "Returns Tweets you've favorited that match the specified query." - method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.' - method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, desc: 'Decodes t.co URLs into their original form.' + method_option 'id', aliases: '-i', type: :boolean, desc: 'Specify user via ID instead of screen name.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' def favorites(*args) query = args.pop user = args.pop - opts = {:count => MAX_NUM_RESULTS} + opts = {count: MAX_NUM_RESULTS} opts[:include_entities] = !!options['decode_uris'] if user require 't/core_ext/string' user = options['id'] ? user.to_i : user.strip_ats tweets = collect_with_max_id do |max_id| @@ -83,21 +83,21 @@ tweets = tweets.select do |tweet| /#{query}/i.match(tweet.full_text) end print_tweets(tweets) end - map %w[faves] => :favorites + map %w(faves) => :favorites desc 'list [USER/]LIST QUERY', 'Returns Tweets on a list that match the specified query.' - method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.' - method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, desc: 'Decodes t.co URLs into their original form.' + method_option 'id', aliases: '-i', type: :boolean, desc: 'Specify user via ID instead of screen name.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' def list(user_list, query) owner, list_name = extract_owner(user_list, options) - opts = {:count => MAX_NUM_RESULTS} + opts = {count: MAX_NUM_RESULTS} opts[:include_entities] = !!options['decode_uris'] tweets = collect_with_max_id do |max_id| opts[:max_id] = max_id unless max_id.nil? client.list_timeline(owner, list_name, opts) end @@ -106,38 +106,38 @@ end print_tweets(tweets) end desc 'mentions QUERY', 'Returns Tweets mentioning you that match the specified query.' - method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, desc: 'Decodes t.co URLs into their original form.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' def mentions(query) - opts = {:count => MAX_NUM_RESULTS} + opts = {count: MAX_NUM_RESULTS} opts[:include_entities] = !!options['decode_uris'] tweets = collect_with_max_id do |max_id| opts[:max_id] = max_id unless max_id.nil? client.mentions(opts) end tweets = tweets.select do |tweet| /#{query}/i.match(tweet.full_text) end print_tweets(tweets) end - map %w[replies] => :mentions + 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, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.' - method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, desc: 'Decodes t.co URLs into their original form.' + method_option 'id', aliases: '-i', type: :boolean, desc: 'Specify user via ID instead of screen name.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' def retweets(*args) query = args.pop user = args.pop - opts = {:count => MAX_NUM_RESULTS} + opts = {count: MAX_NUM_RESULTS} opts[:include_entities] = !!options['decode_uris'] if user require 't/core_ext/string' user = options['id'] ? user.to_i : user.strip_ats tweets = collect_with_max_id do |max_id| @@ -153,25 +153,25 @@ tweets = tweets.select do |tweet| /#{query}/i.match(tweet.full_text) end print_tweets(tweets) end - map %w[rts] => :retweets + 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, :desc => 'Output in CSV format.' - method_option 'decode_uris', :aliases => '-d', :type => :boolean, :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, :desc => 'Specify user via ID instead of screen name.' - method_option 'long', :aliases => '-l', :type => :boolean, :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 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' - method_option 'since_id', :aliases => '-s', :type => :numeric, :desc => 'Returns only the results with an ID greater than the specified ID.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'decode_uris', aliases: '-d', type: :boolean, 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, desc: 'Specify user via ID instead of screen name.' + method_option 'long', aliases: '-l', type: :boolean, 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 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' + 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 - opts = {:count => MAX_NUM_RESULTS} + opts = {count: MAX_NUM_RESULTS} opts[:exclude_replies] = true if options['exclude'] == 'replies' opts[:include_entities] = !!options['decode_uris'] opts[:include_rts] = false if options['exclude'] == 'retweets' opts[:max_id] = options['max_id'] if options['max_id'] opts[:since_id] = options['since_id'] if options['since_id'] @@ -191,21 +191,21 @@ tweets = tweets.select do |tweet| /#{query}/i.match(tweet.full_text) end print_tweets(tweets) end - map %w[tl] => :timeline + map %w(tl) => :timeline desc 'users QUERY', 'Returns users that match the specified query.' - method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.' - method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.' - method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.' - method_option 'reverse', :aliases => '-r', :type => :boolean, :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, :desc => 'Output is not sorted.' + method_option 'csv', aliases: '-c', type: :boolean, desc: 'Output in CSV format.' + method_option 'long', aliases: '-l', type: :boolean, desc: 'Output in long format.' + method_option 'relative_dates', aliases: '-a', type: :boolean, desc: 'Show relative dates.' + method_option 'reverse', aliases: '-r', type: :boolean, 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, desc: 'Output is not sorted.' def users(query) users = collect_with_page do |page| - client.user_search(query, :page => page) + client.user_search(query, page: page) end print_users(users) end end end