t 2.2.0 → 2.2.1

data/lib/t/collectable.rb

@@ -14,7 +14,7 @@ module T
       tweets.empty? ? collection.flatten : collect_with_max_id(collection, tweets.last.id - 1, &block)
     end
 
-    def collect_with_count(count, &block)
+    def collect_with_count(count)
       opts = {}
       opts[:count] = MAX_NUM_RESULTS
       collect_with_max_id do |max_id|

data/lib/t/delete.rb

@@ -48,7 +48,7 @@ module T
         end
       end
     end
-    map %w(d m) => :dm
+    map %w[d m] => :dm
 
     desc 'favorite TWEET_ID [TWEET_ID...]', 'Delete favorites.'
     method_option 'force', :aliases => '-f', :type => :boolean, :default => false
@@ -70,7 +70,7 @@ module T
         end
       end
     end
-    map %w(fave favourite) => :favorite
+    map %w[fave favourite] => :favorite
 
     desc 'list LIST', 'Delete a list.'
     method_option 'force', :aliases => '-f', :type => :boolean, :default => false
@@ -108,6 +108,6 @@ module T
         end
       end
     end
-    map %w(post tweet update) => :status
+    map %w[post tweet update] => :status
   end
 end

data/lib/t/list.rb

@@ -73,14 +73,14 @@ module T
         print_table(array)
       end
     end
-    map %w(details) => :information
+    map %w[details] => :information
 
     desc 'members [USER/]LIST', 'Returns the members of a Twitter list.'
     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 '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 '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 members(list)
       owner, list = extract_owner(list, options)
@@ -106,6 +106,7 @@ module T
 
     desc 'timeline [USER/]LIST', 'Show tweet timeline for members of the specified list.'
     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 '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 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
@@ -113,11 +114,13 @@ module T
     def timeline(list)
       owner, list = extract_owner(list, options)
       count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       tweets = collect_with_count(count) do |count_opts|
-        client.list_timeline(owner, list, count_opts)
+        client.list_timeline(owner, list, count_opts.merge(opts))
       end
       print_tweets(tweets)
     end
-    map %w(tl) => :timeline
+    map %w[tl] => :timeline
   end
 end

data/lib/t/printable.rb

@@ -44,8 +44,7 @@ module T
 
     def print_csv_tweet(tweet)
       require 'csv'
-      require 'htmlentities'
-      say [tweet.id, csv_formatted_time(tweet), tweet.user.screen_name, decode_full_text(tweet)].to_csv
+      say [tweet.id, csv_formatted_time(tweet), tweet.user.screen_name, decode_full_text(tweet, options['decode_uris'])].to_csv
     end
 
     def print_csv_user(user)
@@ -55,17 +54,17 @@ module T
 
     def print_lists(lists)
       lists = case options['sort']
-              when 'members'
-                lists.sort_by { |user| user.member_count }
-              when 'mode'
-                lists.sort_by { |user| user.mode }
-              when 'since'
-                lists.sort_by { |user| user.created_at }
-              when 'subscribers'
-                lists.sort_by { |user| user.subscriber_count }
-              else
-                lists.sort_by { |list| list.slug.downcase }
-              end unless options['unsorted']
+      when 'members'
+        lists.sort_by { |user| user.member_count }
+      when 'mode'
+        lists.sort_by { |user| user.mode }
+      when 'since'
+        lists.sort_by { |user| user.created_at }
+      when 'subscribers'
+        lists.sort_by { |user| user.subscriber_count }
+      else
+        lists.sort_by { |list| list.slug.downcase }
+      end unless options['unsorted']
       lists.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -145,23 +144,23 @@ module T
 
     def print_users(users) # rubocop:disable CyclomaticComplexity
       users = case options['sort']
-              when 'favorites'
-                users.sort_by { |user| user.favorites_count.to_i }
-              when 'followers'
-                users.sort_by { |user| user.followers_count.to_i }
-              when 'friends'
-                users.sort_by { |user| user.friends_count.to_i }
-              when 'listed'
-                users.sort_by { |user| user.listed_count.to_i }
-              when 'since'
-                users.sort_by { |user| user.created_at }
-              when 'tweets'
-                users.sort_by { |user| user.statuses_count.to_i }
-              when 'tweeted'
-                users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) }
-              else
-                users.sort_by { |user| user.screen_name.downcase }
-              end unless options['unsorted']
+      when 'favorites'
+        users.sort_by { |user| user.favorites_count.to_i }
+      when 'followers'
+        users.sort_by { |user| user.followers_count.to_i }
+      when 'friends'
+        users.sort_by { |user| user.friends_count.to_i }
+      when 'listed'
+        users.sort_by { |user| user.listed_count.to_i }
+      when 'since'
+        users.sort_by { |user| user.created_at }
+      when 'tweets'
+        users.sort_by { |user| user.statuses_count.to_i }
+      when 'tweeted'
+        users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) }
+      else
+        users.sort_by { |user| user.screen_name.downcase }
+      end unless options['unsorted']
       users.reverse! if options['reverse']
       if options['csv']
         require 'csv'

data/lib/t/search.rb

@@ -32,15 +32,14 @@ module T
     def all(query)
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {:count => MAX_SEARCH_RESULTS}
-      opts[:include_entities] = 1 if options['decode_uris']
+      opts[:include_entities] = !!options['decode_uris']
       tweets = client.search(query, opts).take(count)
       tweets.reverse! if options['reverse']
-      require 'htmlentities'
       if options['csv']
         require 'csv'
         say TWEET_HEADINGS.to_csv unless tweets.empty?
         tweets.each do |tweet|
-          say [tweet.id, csv_formatted_time(tweet), tweet.user.screen_name, decode_full_text(tweet)].to_csv
+          say [tweet.id, csv_formatted_time(tweet), tweet.user.screen_name, decode_full_text(tweet, options['decode_uris'])].to_csv
         end
       elsif options['long']
         array = tweets.map do |tweet|
@@ -62,10 +61,10 @@ module T
     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.'
     def favorites(*args)
-      opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
       user = args.pop
-      opts[:include_entities] = 1 if options['decode_uris']
+      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
@@ -84,17 +83,17 @@ module T
       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, :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 '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}
-      opts[:include_entities] = 1 if options['decode_uris']
+      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, opts)
@@ -107,11 +106,11 @@ module T
 
     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.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
-      opts[:include_entities] = 1 if options['decode_uris']
+      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)
@@ -121,18 +120,18 @@ module T
       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, :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 '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
       user = args.pop
-      opts[:include_entities] = 1 if options['decode_uris']
+      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
@@ -151,12 +150,12 @@ module T
       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, :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 '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.'
@@ -165,8 +164,8 @@ module T
       query = args.pop
       user = args.pop
       opts = {:count => MAX_NUM_RESULTS}
-      opts[:include_entities] = 1 if options['decode_uris']
       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']
@@ -188,13 +187,13 @@ module T
       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, :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 '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|

data/lib/t/set.rb

@@ -22,7 +22,7 @@ module T
       @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
+    map %w[account default] => :active
 
     desc 'bio DESCRIPTION', 'Edits your Bio information on your Twitter profile.'
     def bio(description)
@@ -54,14 +54,14 @@ module T
       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
+    map %w[background background_image] => :profile_background_image
 
     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
+    map %w[avatar image] => :profile_image
 
     desc 'website URI', 'Sets the website field on your profile.'
     def website(uri)

data/lib/t/stream.rb

@@ -72,7 +72,7 @@ module T
         search.options = search.options.merge(:format => TWEET_HEADINGS_FORMATTING)
         search.all(keywords.join(' OR '))
       end
-      client.filter(:track => keywords) do |tweet|
+      client.filter(:track => keywords.join(',')) do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
@@ -131,7 +131,7 @@ module T
           print_table([headings])
         end
       end
-      client.follow(user_ids) do |tweet|
+      client.filter(:follow => user_ids.join(',')) do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)

data/lib/t/utils.rb

@@ -47,7 +47,7 @@ module T
     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)
+    def fetch_users(users, options)
       format_users!(users, options)
       require 'retryable'
       users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
@@ -87,10 +87,10 @@ module T
       "#{count || 0} " + (count == 1 || count =~ /^1(\.0+)?$/ ? singular : (plural || "#{singular}s"))
     end
 
-    def decode_full_text(tweet, decode_full_uris = false)
+    def decode_full_text(message, decode_full_uris = false)
       require 'htmlentities'
-      text = HTMLEntities.new.decode(tweet.full_text)
-      text = decode_uris(text, tweet.uris) if decode_full_uris
+      text = HTMLEntities.new.decode(message.full_text)
+      text = decode_uris(text, message.uris) if decode_full_uris
       text
     end
 

data/lib/t/version.rb

@@ -1,29 +1,14 @@
 module T
   class Version
-    class << self
-      # @return [Integer]
-      def major
-        2
-      end
-
-      # @return [Integer]
-      def minor
-        2
-      end
-
-      # @return [Integer]
-      def patch
-        0
-      end
-
-      # @return [String, NilClass]
-      def pre
-        nil
-      end
+    MAJOR = 2
+    MINOR = 2
+    PATCH = 1
+    PRE = nil
 
+    class << self
       # @return [String]
       def to_s
-        [major, minor, patch, pre].compact.join('.')
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
       end
     end
   end

data/spec/cli_spec.rb

@@ -29,69 +29,6 @@ describe T::CLI do
     $stdout = @old_stdout
   end
 
-  describe '--relative-dates' do
-    before do
-      stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status.json'))
-      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
-      @cli.options = @cli.options.merge('relative_dates' => true)
-    end
-    it 'status has the correct output (absolute and relative date together)' do
-      @cli.status('55709764298092545')
-      expect($stdout.string).to eq <<-eos
-ID           55709764298092545
-Text         The problem with your code is that it's doing exactly what you told it to do.
-Screen name  @sferik
-Posted at    Apr  6  2011 (8 months ago)
-Retweets     320
-Favorites    50
-Source       Twitter for iPhone
-Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States
-      eos
-    end
-    it 'whois has the correct output (absolute and relative date together)' do
-      @cli.whois('sferik')
-      expect($stdout.string).to eq <<-eos
-ID           7505382
-Since        Jul 16  2007 (4 years ago)
-Last update  @goldman You're near my home town! Say hi to Woodstock for me. (7 months ago)
-Screen name  @sferik
-Name         Erik Michaels-Ober
-Tweets       7,890
-Favorites    3,755
-Listed       118
-Following    212
-Followers    2,262
-Bio          Vagabond.
-Location     San Francisco
-URL          https://github.com/sferik
-      eos
-    end
-    context '--csv' do
-      before do
-        @cli.options = @cli.options.merge('csv' => true)
-      end
-      it 'has the correct output (absolute date in csv)' do
-        @cli.status('55709764298092545')
-        expect($stdout.string).to eq <<-eos
-ID,Posted at,Screen name,Text,Retweets,Favorites,Source,Location
-55709764298092545,2011-04-06 19:13:37 +0000,sferik,The problem with your code is that it's doing exactly what you told it to do.,320,50,Twitter for iPhone,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States"
-        eos
-      end
-    end
-    context '--long' do
-      before do
-        @cli.options = @cli.options.merge('long' => true)
-      end
-      it 'outputs in long format' do
-        @cli.status('55709764298092545')
-        expect($stdout.string).to eq <<-eos
-ID                 Posted at     Screen name  Text                           ...
-55709764298092545  8 months ago  @sferik      The problem with your code is t...
-        eos
-      end
-    end
-  end
-
   describe '#account' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
@@ -211,12 +148,12 @@ testcli
 
   describe '#direct_messages' do
     before do
-      stub_get('/1.1/direct_messages.json').with(:query => {:count => '20'}).to_return(:body => fixture('direct_messages.json'))
-      stub_get('/1.1/direct_messages.json').with(:query => {:count => '10', 'max_id' => '1624782205'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
+      stub_get('/1.1/direct_messages.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @cli.direct_messages
-      expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '20'})).to have_been_made
+      expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.direct_messages
@@ -280,6 +217,17 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'true'}).to_return(:body => fixture('empty_array.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.direct_messages
+        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+    end
     context '--long' do
       before do
         @cli.options = @cli.options.merge('long' => true)
@@ -303,20 +251,20 @@ ID          Posted at     Screen name  Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1'}).to_return(:body => fixture('direct_messages.json'))
-        stub_get('/1.1/direct_messages.json').with(:query => {:count => '200'}).to_return(:body => fixture('200_direct_messages.json'))
-        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1', :max_id => '235851563443306495'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_direct_messages.json'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1', :max_id => '235851563443306495', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.direct_messages
-        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '1'})).to have_been_made
+        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.direct_messages
-        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '200'})).to have_been_made
-        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '1', :max_id => '235851563443306495'})).to have_been_made
+        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/direct_messages.json').with(:query => {:count => '1', :max_id => '235851563443306495', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--reverse' do
@@ -369,12 +317,12 @@ ID          Posted at     Screen name  Text
 
   describe '#direct_messages_sent' do
     before do
-      stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20'}).to_return(:body => fixture('direct_messages.json'))
-      stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '10', 'max_id' => '1624782205'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
+      stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @cli.direct_messages_sent
-      expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20'})).to have_been_made
+      expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.direct_messages_sent
@@ -438,6 +386,17 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'true'}).to_return(:body => fixture('empty_array.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.direct_messages_sent
+        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+    end
     context '--long' do
       before do
         @cli.options = @cli.options.merge('long' => true)
@@ -461,20 +420,20 @@ ID          Posted at     Screen name  Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1'}).to_return(:body => fixture('direct_messages.json'))
-        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '200'}).to_return(:body => fixture('200_direct_messages.json'))
-        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :max_id => '235851563443306495'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_direct_messages.json'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :max_id => '235851563443306495', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'))
       end
       it 'limits the number of results 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.direct_messages_sent
-        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1'})).to have_been_made
+        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.direct_messages_sent
-        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '200'})).to have_been_made
-        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :max_id => '235851563443306495'})).to have_been_made
+        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :max_id => '235851563443306495', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--reverse' do
@@ -854,11 +813,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#favorites' do
     before do
-      stub_get('/1.1/favorites/list.json').with(:query => {:count => '20'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
     end
     it 'requests the correct resource' do
       @cli.favorites
-      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20'})).to have_been_made
+      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.favorites
@@ -971,6 +930,20 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.favorites
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+      it 'decodes URLs' do
+        @cli.favorites
+        expect($stdout.string).to include 'https://twitter.com/sferik/status/243988000076337152'
+      end
+    end
     context '--long' do
       before do
         @cli.options = @cli.options.merge('long' => true)
@@ -1036,95 +1009,95 @@ ID                   Posted at     Screen name       Text
     context '--max-id' do
       before do
         @cli.options = @cli.options.merge('max_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.favorites
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :max_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--number' do
       before do
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200'}).to_return(:body => fixture('200_statuses.json'))
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :max_id => '265500541700956160'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.favorites
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.favorites
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200'})).to have_been_made
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :max_id => '265500541700956160'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--since-id' do
       before do
         @cli.options = @cli.options.merge('since_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.favorites
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :since_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.favorites('sferik')
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/favorites/list.json').with(:query => {:user_id => '7505382', :count => '20'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:user_id => '7505382', :count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.favorites('7505382')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:user_id => '7505382', :count => '20'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:user_id => '7505382', :count => '20', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--max-id' do
         before do
           @cli.options = @cli.options.merge('max_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.favorites('sferik')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--number' do
         before do
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik'}).to_return(:body => fixture('200_statuses.json'))
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'limits the number of results to 1' do
           @cli.options = @cli.options.merge('number' => 1)
           @cli.favorites('sferik')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
         end
         it 'limits the number of results to 201' do
           @cli.options = @cli.options.merge('number' => 201)
           @cli.favorites('sferik')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik'})).to have_been_made
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--since-id' do
         before do
           @cli.options = @cli.options.merge('since_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.favorites('sferik')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
         end
       end
     end
@@ -1896,11 +1869,11 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
 
   describe '#mentions' do
     before do
-      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
     end
     it 'requests the correct resource' do
       @cli.mentions
-      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20'})).to have_been_made
+      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.mentions
@@ -2013,6 +1986,20 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.mentions
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+      it 'decodes URLs' do
+        @cli.mentions
+        expect($stdout.string).to include 'https://twitter.com/sferik/status/243988000076337152'
+      end
+    end
     context '--long' do
       before do
         @cli.options = @cli.options.merge('long' => true)
@@ -2077,20 +2064,20 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'}).to_return(:body => fixture('200_statuses.json'))
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.mentions
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1'})).to have_been_made
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.mentions
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'})).to have_been_made
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160'})).to have_been_made
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'})).to have_been_made
       end
     end
   end
@@ -2247,14 +2234,14 @@ ID                   Posted at     Screen name       Text
 
   describe '#retweets' do
     before do
-      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
     end
     context 'without arguments' do
       it 'requests the correct resource' do
         @cli.retweets
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983'})).to have_been_made.times(3)
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(3)
       end
       it 'has the correct output' do
         @cli.retweets
@@ -2373,6 +2360,18 @@ ID,Posted at,Screen name,Text
        eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.retweets
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'true'})).to have_been_made.times(3)
+      end
+    end
     context '--long' do
       before do
         @cli.options = @cli.options.merge('long' => true)
@@ -2437,41 +2436,41 @@ ID                  Posted at     Screen name      Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244107823733174271'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244107823733174271', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.retweets
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.retweets
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244107823733174271'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244107823733174271', :include_entities => 'false'})).to have_been_made
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.retweets('sferik')
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983'})).to have_been_made.times(3)
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(3)
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.retweets('7505382')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382'})).to have_been_made
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983'})).to have_been_made.times(3)
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(3)
         end
       end
     end
@@ -2497,11 +2496,11 @@ ID                  Posted at     Screen name      Text
 
   describe '#status' do
     before do
-      stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status.json'))
+      stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status.json'))
     end
     it 'requests the correct resources' do
       @cli.status('55709764298092545')
-      expect(a_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'})).to have_been_made
+      expect(a_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.status('55709764298092545')
@@ -2530,7 +2529,7 @@ ID,Posted at,Screen name,Text,Retweets,Favorites,Source,Location
     end
     context 'with no street address' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_street_address.json'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_street_address.json'))
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2548,7 +2547,7 @@ Location     Blowfish Sushi To Die For, San Francisco, California, United States
     end
     context 'with no locality' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_locality.json'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_locality.json'))
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2566,7 +2565,7 @@ Location     Blowfish Sushi To Die For, San Francisco, California, United States
     end
     context 'with no attributes' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_attributes.json'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_attributes.json'))
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2584,7 +2583,7 @@ Location     Blowfish Sushi To Die For, San Francisco, United States
     end
     context 'with no country' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_country.json'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_country.json'))
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2602,7 +2601,7 @@ Location     Blowfish Sushi To Die For, San Francisco
     end
     context 'with no full name' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_full_name.json'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_full_name.json'))
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2620,8 +2619,8 @@ Location     Blowfish Sushi To Die For
     end
     context 'with no place' do
       before do
-        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_place.json'))
-        stub_request(:get, 'http://maps.google.com/maps/geo').with(:query => hash_including(:key => 'REPLACE_WITH_YOUR_GOOGLE_KEY', :oe => 'utf-8', :output => 'xml')).to_return(:body => fixture('geo.kml'), :headers => {:content_type => 'text/xml; charset=UTF-8'})
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'))
+        stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -2633,13 +2632,13 @@ Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
 Favorites    50
 Source       Twitter for iPhone
-Location     San Francisco, CA, USA
+Location     San Francisco, CA, United States
         eos
       end
       context 'with no city' do
         before do
-          stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_place.json'))
-          stub_request(:get, 'http://maps.google.com/maps/geo').with(:query => hash_including(:key => 'REPLACE_WITH_YOUR_GOOGLE_KEY', :oe => 'utf-8', :output => 'xml')).to_return(:body => fixture('geo_no_city.kml'), :headers => {:content_type => 'text/xml; charset=UTF-8'})
+          stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'))
+          stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_city.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
         end
         it 'has the correct output' do
           @cli.status('55709764298092545')
@@ -2651,14 +2650,14 @@ Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
 Favorites    50
 Source       Twitter for iPhone
-Location     CA, USA
+Location     CA, United States
           eos
         end
       end
       context 'with no state' do
         before do
-          stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_no_place.json'))
-          stub_request(:get, 'http://maps.google.com/maps/geo').with(:query => hash_including(:key => 'REPLACE_WITH_YOUR_GOOGLE_KEY', :oe => 'utf-8', :output => 'xml')).to_return(:body => fixture('geo_no_state.kml'), :headers => {:content_type => 'text/xml; charset=UTF-8'})
+          stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'))
+          stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_state.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
         end
         it 'has the correct output' do
           @cli.status('55709764298092545')
@@ -2670,7 +2669,7 @@ Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
 Favorites    50
 Source       Twitter for iPhone
-Location     USA
+Location     United States
           eos
         end
       end
@@ -2687,16 +2686,78 @@ ID                 Posted at     Screen name  Text                           ...
         eos
       end
     end
+    describe '--relative-dates' do
+      before do
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status.json'))
+        stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'))
+        @cli.options = @cli.options.merge('relative_dates' => true)
+      end
+      it 'status has the correct output (absolute and relative date together)' do
+        @cli.status('55709764298092545')
+        expect($stdout.string).to eq <<-eos
+ID           55709764298092545
+Text         The problem with your code is that it's doing exactly what you told it to do.
+Screen name  @sferik
+Posted at    Apr  6  2011 (8 months ago)
+Retweets     320
+Favorites    50
+Source       Twitter for iPhone
+Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States
+        eos
+      end
+      it 'whois has the correct output (absolute and relative date together)' do
+        @cli.whois('sferik')
+        expect($stdout.string).to eq <<-eos
+ID           7505382
+Since        Jul 16  2007 (4 years ago)
+Last update  @goldman You're near my home town! Say hi to Woodstock for me. (7 months ago)
+Screen name  @sferik
+Name         Erik Michaels-Ober
+Tweets       7,890
+Favorites    3,755
+Listed       118
+Following    212
+Followers    2,262
+Bio          Vagabond.
+Location     San Francisco
+URL          https://github.com/sferik
+        eos
+      end
+      context '--csv' do
+        before do
+          @cli.options = @cli.options.merge('csv' => true)
+        end
+        it 'has the correct output (absolute date in csv)' do
+          @cli.status('55709764298092545')
+          expect($stdout.string).to eq <<-eos
+ID,Posted at,Screen name,Text,Retweets,Favorites,Source,Location
+55709764298092545,2011-04-06 19:13:37 +0000,sferik,The problem with your code is that it's doing exactly what you told it to do.,320,50,Twitter for iPhone,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States"
+          eos
+        end
+      end
+      context '--long' do
+        before do
+          @cli.options = @cli.options.merge('long' => true)
+        end
+        it 'outputs in long format' do
+          @cli.status('55709764298092545')
+          expect($stdout.string).to eq <<-eos
+ID                 Posted at     Screen name  Text                           ...
+55709764298092545  8 months ago  @sferik      The problem with your code is t...
+          eos
+        end
+      end
+    end
   end
 
   describe '#timeline' do
     before do
-      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
     end
     context 'without user' do
       it 'requests the correct resource' do
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
       end
       it 'has the correct output' do
         @cli.timeline
@@ -2810,24 +2871,38 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.timeline
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+      it 'decodes URLs' do
+        @cli.timeline
+        expect($stdout.string).to include 'https://twitter.com/sferik/status/243988000076337152'
+      end
+    end
     context '--exclude=replies' do
       before do
         @cli.options = @cli.options.merge('exclude' => 'replies')
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :exclude_replies => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :exclude_replies => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'excludes replies' do
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :exclude_replies => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :exclude_replies => 'true', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--exclude=retweets' do
       before do
         @cli.options = @cli.options.merge('exclude' => 'retweets')
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_rts => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_rts => 'false', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'excludes retweets' do
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_rts => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_rts => 'false', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--long' do
@@ -2895,95 +2970,95 @@ ID                   Posted at     Screen name       Text
     context '--max-id' do
       before do
         @cli.options = @cli.options.merge('max_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :max_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--number' do
       before do
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200'}).to_return(:body => fixture('200_statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @cli.options = @cli.options.merge('number' => 201)
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200'})).to have_been_made
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--since-id' do
       before do
         @cli.options = @cli.options.merge('since_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :since_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @cli.timeline('sferik')
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :user_id => '7505382'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.timeline('7505382')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :user_id => '7505382'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--max-id' do
         before do
           @cli.options = @cli.options.merge('max_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.timeline('sferik')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--number' do
         before do
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik'}).to_return(:body => fixture('200_statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'limits the number of results to 1' do
           @cli.options = @cli.options.merge('number' => 1)
           @cli.timeline('sferik')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
         end
         it 'limits the number of results to 201' do
           @cli.options = @cli.options.merge('number' => 201)
           @cli.timeline('sferik')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik'})).to have_been_made
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :max_id => '265500541700956160', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--since-id' do
         before do
           @cli.options = @cli.options.merge('since_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @cli.timeline('sferik')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
         end
       end
     end
@@ -3370,11 +3445,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#whois' do
     before do
-      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'))
     end
     it 'requests the correct resource' do
       @cli.whois('sferik')
-      expect(a_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik'})).to have_been_made
+      expect(a_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @cli.whois('sferik')
@@ -3409,11 +3484,11 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_get('/1.1/users/show.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'))
+        stub_get('/1.1/users/show.json').with(:query => {:user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'))
       end
       it 'requests the correct resource' do
         @cli.whois('7505382')
-        expect(a_get('/1.1/users/show.json').with(:query => {:user_id => '7505382'})).to have_been_made
+        expect(a_get('/1.1/users/show.json').with(:query => {:user_id => '7505382', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--long' do