t 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21fe202b12086232bb16595821aa4ac6a0b91ce8
-  data.tar.gz: f2039d17a4b7906bb14c374755a58ca335f2d50a
+  metadata.gz: a36794a31632b69bee475211d077c05789f18b46
+  data.tar.gz: 29e6d1355b9beaac16d45070dcbd0f6ad7f59063
 SHA512:
-  metadata.gz: 4c03e3b542d43a71f756e74389c43ba5ed6e29f0f84631ea69ac341e4adf4b2ff53a8c082d3e458edff9310ea36fb805d404685c0289eaac8a688e6076df7ca6
-  data.tar.gz: 2aaf61577aeba5a14e9471fa4ba0e175a7830a27cdf1f4a14233560f651de713eff8bb5135c41d6a6d861d86fc7542bd706843af282e4d436b7da42863145fc8
+  metadata.gz: 17032a375d4e948ee86e8dc8edb334e0a1432719a2c578f5f68c743b663c35e5766e6550f68ff04736f708cca0dff0457e634dcd3bfa3784e5f46b9c94cd812c
+  data.tar.gz: 34e246d704562a5f0cbda8eb889fcc0e7e193af0fb2754a619873c90fdb85c7af21c236b270782b0b9f9bb34c38e134e4ef9f81eab67e0bcc8269fe9f6d2152e

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013 Erik Michaels-Ober
+Copyright (c) 2011-2014 Erik Michaels-Ober
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -112,8 +112,11 @@ TASK` to get help for a specific command.
 
 **Note**: If your tweet includes special characters (e.g. `!`), make sure to
 wrap it in single quotes instead of double quotes, so those characters are not
-interpreted by your shell. (However, if you use single quotes, your Tweet
-obviously can't contain any apostrophes.)
+interpreted by your shell.
+If you use single quotes, your Tweet obviously can't contain any
+apostrophes unless you prefix them with a backslash `\`:
+
+    t update 'I\'m tweeting from the command line. Isn\'t that special?'
 
 #### Retrieve detailed information about a Twitter user
     t whois @sferik
@@ -151,6 +154,9 @@ example, here's how to send a user a direct message only if they already follow
 #### List all your leaders (people you follow who don't follow you back)
     t leaders -l --sort=followers
 
+#### Mute everyone you follow
+    t followings | xargs t mute
+
 #### Unfollow everyone you follow who doesn't follow you back
     t leaders | xargs t unfollow
 
@@ -301,7 +307,7 @@ If you are running t on a remote computer you can use the flag --display-uri dur
     t authorize --display-uri
 
 ## Copyright
-Copyright (c) 2011-2013 Erik Michaels-Ober. See [LICENSE][] for details.
+Copyright (c) 2011-2014 Erik Michaels-Ober. See [LICENSE][] for details.
 Application icon by [@nvk][nvk].
 
 [license]: https://github.com/sferik/t/blob/master/LICENSE.md

data/bin/t

@@ -36,7 +36,7 @@ rescue Twitter::Error::Forbidden, Twitter::Error::Unauthorized => error
     require 'thor'
     Thor::Shell::Basic.new.ask 'Press [Enter] to open the Twitter Developer site.'
     require 'launchy'
-    Launchy.open('https://dev.twitter.com/apps') { |u, o, e| $stderr.puts "Manually open #{u}" }
+    Launchy.open('https://dev.twitter.com/apps') { |u, _, _| $stderr.puts "Manually open #{u}" }
   else
     pute error.message
   end

data/lib/t/cli.rb

@@ -44,7 +44,7 @@ module T
       @rcfile.profiles.each do |profile|
         say profile[0]
         profile[1].keys.each do |key|
-          say "  #{key}#{@rcfile.active_profile[0] == profile[0] && @rcfile.active_profile[1] == key ? " (active)" : nil}"
+          say "  #{key}#{@rcfile.active_profile[0] == profile[0] && @rcfile.active_profile[1] == key ? ' (active)' : nil}"
         end
       end
     end
@@ -413,10 +413,10 @@ module T
       end
       follower_ids = Thread.new { client.follower_ids(user).to_a }
       following_ids = Thread.new { client.friend_ids(user).to_a }
-      disciple_ids = (follower_ids.value - following_ids.value)
+      groupie_ids = (follower_ids.value - following_ids.value)
       require 'retryable'
       users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
-        client.users(disciple_ids)
+        client.users(groupie_ids)
       end
       print_users(users)
     end
@@ -525,6 +525,17 @@ module T
     end
     map %w[replies] => :mentions
 
+    desc 'mute USER [USER...]', 'Mute users.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
+    def mute(user, *users)
+      muted_users, number = fetch_users(users.unshift(user), options) do |users_to_mute|
+        client.mute(users_to_mute)
+      end
+      say "@#{@rcfile.active_profile[0]} muted #{pluralize(number, 'user')}."
+      say
+      say "Run `#{File.basename($PROGRAM_NAME)} delete mute #{muted_users.collect { |muted_user| "@#{muted_user.screen_name}" }.join(' ')}` to unmute."
+    end
+
     desc 'open USER', "Opens that user's profile in a web browser."
     method_option 'display-uri', :aliases => '-d', :type => :boolean, :desc => 'Display the requested URL instead of attempting to open it.'
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
@@ -543,6 +554,27 @@ module T
       end
     end
 
+    desc 'reach TWEET_ID', 'Shows the maximum number of people who may have seen the specified tweet in their timeline.'
+    def reach(tweet_id)
+      require 't/core_ext/string'
+      require 'set'
+      status_thread = Thread.new { client.status(tweet_id.to_i, :include_my_retweet => false) }
+      threads = []
+      client.retweeters_ids(tweet_id.to_i).each do |retweeter_id|
+        threads << Thread.new(retweeter_id) do |user_id|
+          client.follower_ids(user_id).to_a
+        end
+      end
+      status = status_thread.value
+      threads << Thread.new(status.user.id) do |user_id|
+        client.follower_ids(user_id).to_a
+      end
+      reach = ::Set.new
+      threads.each { |thread| reach += thread.value }
+      reach.delete(status.user.id)
+      say number_with_delimiter(reach.size)
+    end
+
     desc 'reply TWEET_ID MESSAGE', 'Post your Tweet as a reply directed at another person.'
     method_option 'all', :aliases => '-a', :type => :boolean, :desc => 'Reply to all users mentioned in the Tweet.'
     method_option 'location', :aliases => '-l', :type => :string, :default => nil, :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
@@ -585,7 +617,7 @@ module T
       number = retweets.length
       say "@#{@rcfile.active_profile[0]} retweeted #{pluralize(number, 'tweet')}."
       say
-      say "Run `#{File.basename($PROGRAM_NAME)} delete status #{retweets.collect { |tweet| tweet.retweeted_status.id }.join(' ')}` to undo."
+      say "Run `#{File.basename($PROGRAM_NAME)} delete status #{retweets.collect(&:id).join(' ')}` to undo."
     end
     map %w[rt] => :retweet
 
@@ -619,12 +651,11 @@ module T
     desc 'retweets_of_me', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets of the authenticated user that have been retweeted by others."
     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 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
     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.'
-    def retweets_of_me(user = nil)
+    def retweets_of_me
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {}
       opts[:include_entities] = !!options['decode_uris']
@@ -850,7 +881,7 @@ module T
         array << ['Since', "#{ls_formatted_time(user, :created_at, false)} (#{time_ago_in_words(user.created_at)} ago)"]
         array << ['Last update', "#{decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
         array << ['Screen name', "@#{user.screen_name}"]
-        array << [user.verified ? 'Name (Verified)' : 'Name', user.name] unless user.name.nil? # rubocop:disable BlockNesting
+        array << [user.verified? ? 'Name (Verified)' : 'Name', user.name] unless user.name.nil? # rubocop:disable BlockNesting
         array << ['Tweets', number_with_delimiter(user.statuses_count)]
         array << ['Favorites', number_with_delimiter(user.favorites_count)]
         array << ['Listed', number_with_delimiter(user.listed_count)]
@@ -902,7 +933,7 @@ module T
 
       return [] if text !~ at_signs
 
-      text.to_s.scan(valid_mentions).collect do |before, at, screen_name|
+      text.to_s.scan(valid_mentions).collect do |_, _, screen_name|
         screen_name
       end
     end

data/lib/t/collectable.rb

@@ -1,9 +1,11 @@
 require 'twitter'
 require 'retryable'
+require 'set'
 
 module T
   module Collectable
     MAX_NUM_RESULTS = 200
+    MAX_PAGE = 51
 
     def collect_with_max_id(collection = [], max_id = nil, &block)
       tweets = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
@@ -28,13 +30,13 @@ module T
       end.flatten.compact
     end
 
-    def collect_with_page(collection = [], page = 1, &block)
+    def collect_with_page(collection = ::Set.new, page = 1, previous = nil, &block) # rubocop:disable ParameterLists
       tweets = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
-        yield page
+        block.call(page)
       end
-      return collection if tweets.nil?
+      return collection if tweets.nil? || tweets == previous || page >= MAX_PAGE
       collection += tweets
-      tweets.empty? ? collection.flatten.uniq : collect_with_page(collection, page + 1, &block)
+      tweets.empty? ? collection.flatten : collect_with_page(collection, page + 1, tweets, &block)
     end
   end
 end

data/lib/t/core_ext/kernel.rb

@@ -7,7 +7,7 @@ module Kernel
     Integer(arg, base)
   end
 
-  def NilClass(arg) # rubocop:disable MethodName
+  def NilClass(_) # rubocop:disable MethodName
     nil
   end
 end

data/lib/t/delete.rb

@@ -88,6 +88,18 @@ module T
       say "@#{@rcfile.active_profile[0]} deleted the list \"#{list.name}\"."
     end
 
+    desc 'mute USER [USER...]', 'Unmute users.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
+    method_option 'force', :aliases => '-f', :type => :boolean
+    def mute(user, *users)
+      unmuted_users, number = fetch_users(users.unshift(user), options) do |users_to_unmute|
+        client.unmute(users_to_unmute)
+      end
+      say "@#{@rcfile.active_profile[0]} unmuted #{pluralize(number, 'user')}."
+      say
+      say "Run `#{File.basename($PROGRAM_NAME)} mute #{unmuted_users.collect { |unmuted_user| "@#{unmuted_user.screen_name}" }.join(' ')}` to mute."
+    end
+
     desc 'status TWEET_ID [TWEET_ID...]', 'Delete Tweets.'
     method_option 'force', :aliases => '-f', :type => :boolean
     def status(status_id, *status_ids)

data/lib/t/list.rb

@@ -67,7 +67,7 @@ module T
         array << ['Created at', "#{ls_formatted_time(list, :created_at, false)} (#{time_ago_in_words(list.created_at)} ago)"]
         array << ['Members', number_with_delimiter(list.member_count)]
         array << ['Subscribers', number_with_delimiter(list.subscriber_count)]
-        array << ['Status', list.following ? 'Following' : 'Not following']
+        array << ['Status', list.following? ? 'Following' : 'Not following']
         array << ['Mode', list.mode]
         array << ['URL', list.uri]
         print_table(array)

data/lib/t/version.rb

@@ -1,7 +1,7 @@
 module T
   class Version
     MAJOR = 2
-    MINOR = 5
+    MINOR = 6
     PATCH = 0
     PRE = nil
 

data/spec/cli_spec.rb

@@ -47,19 +47,14 @@ testcli
       @cli.options = @cli.options.merge('profile' => project_path + '/tmp/authorize', 'display-uri' => true)
       stub_post('/oauth/request_token').to_return(:body => fixture('request_token'))
       stub_post('/oauth/access_token').to_return(:body => fixture('access_token'))
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
-      expect($stdout).to receive(:print)
-      expect($stdin).to receive(:gets).and_return("\n")
-      expect($stdout).to receive(:print).with('Enter your API key: ')
-      expect($stdin).to receive(:gets).and_return('abc123')
-      expect($stdout).to receive(:print).with('Enter your API secret: ')
-      expect($stdin).to receive(:gets).and_return('asdfasd223sd2')
-      expect($stdout).to receive(:print).with('Press [Enter] to open the Twitter app authorization page. ')
-      expect($stdin).to receive(:gets).and_return("\n")
-      expect($stdout).to receive(:print).with('Enter the supplied PIN: ')
-      expect($stdin).to receive(:gets).and_return('1234567890')
+      expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter Developer site. ', true).and_return("\n")
+      expect(Readline).to receive(:readline).with('Enter your API key: ', true).and_return('abc123')
+      expect(Readline).to receive(:readline).with('Enter your API secret: ', true).and_return('asdfasd223sd2')
+      expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter app authorization page. ', true).and_return("\n")
+      expect(Readline).to receive(:readline).with('Enter the supplied PIN: ', true).and_return('1234567890')
       @cli.authorize
       expect(a_post('/oauth/request_token')).to have_been_made
       expect(a_post('/oauth/access_token')).to have_been_made
@@ -67,16 +62,11 @@ testcli
     end
     it 'does not raise error' do
       expect do
-        expect($stdout).to receive(:print)
-        expect($stdin).to receive(:gets).and_return("\n")
-        expect($stdout).to receive(:print).with('Enter your API key: ')
-        expect($stdin).to receive(:gets).and_return('abc123')
-        expect($stdout).to receive(:print).with('Enter your API secret: ')
-        expect($stdin).to receive(:gets).and_return('asdfasd223sd2')
-        expect($stdout).to receive(:print).with('Press [Enter] to open the Twitter app authorization page. ')
-        expect($stdin).to receive(:gets).and_return("\n")
-        expect($stdout).to receive(:print).with('Enter the supplied PIN: ')
-        expect($stdin).to receive(:gets).and_return('1234567890')
+        expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter Developer site. ', true).and_return("\n")
+        expect(Readline).to receive(:readline).with('Enter your API key: ', true).and_return('abc123')
+        expect(Readline).to receive(:readline).with('Enter your API secret: ', true).and_return('asdfasd223sd2')
+        expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter app authorization page. ', true).and_return("\n")
+        expect(Readline).to receive(:readline).with('Enter the supplied PIN: ', true).and_return('1234567890')
         @cli.authorize
       end.not_to raise_error
     end
@@ -88,16 +78,11 @@ testcli
         File.delete(project_path + '/tmp/empty')
       end
       it 'requests the correct resource' do
-        expect($stdout).to receive(:print)
-        expect($stdin).to receive(:gets).and_return("\n")
-        expect($stdout).to receive(:print).with('Enter your API key: ')
-        expect($stdin).to receive(:gets).and_return('abc123')
-        expect($stdout).to receive(:print).with('Enter your API secret: ')
-        expect($stdin).to receive(:gets).and_return('asdfasd223sd2')
-        expect($stdout).to receive(:print).with('Press [Enter] to open the Twitter app authorization page. ')
-        expect($stdin).to receive(:gets).and_return("\n")
-        expect($stdout).to receive(:print).with('Enter the supplied PIN: ')
-        expect($stdin).to receive(:gets).and_return('1234567890')
+        expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter Developer site. ', true).and_return("\n")
+        expect(Readline).to receive(:readline).with('Enter your API key: ', true).and_return('abc123')
+        expect(Readline).to receive(:readline).with('Enter your API secret: ', true).and_return('asdfasd223sd2')
+        expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter app authorization page. ', true).and_return("\n")
+        expect(Readline).to receive(:readline).with('Enter the supplied PIN: ', true).and_return('1234567890')
         @cli.authorize
         expect(a_post('/oauth/request_token')).to have_been_made
         expect(a_post('/oauth/access_token')).to have_been_made
@@ -105,16 +90,11 @@ testcli
       end
       it 'does not raise error' do
         expect do
-          expect($stdout).to receive(:print)
-          expect($stdin).to receive(:gets).and_return("\n")
-          expect($stdout).to receive(:print).with('Enter your API key: ')
-          expect($stdin).to receive(:gets).and_return('abc123')
-          expect($stdout).to receive(:print).with('Enter your API secret: ')
-          expect($stdin).to receive(:gets).and_return('asdfasd223sd2')
-          expect($stdout).to receive(:print).with('Press [Enter] to open the Twitter app authorization page. ')
-          expect($stdin).to receive(:gets).and_return("\n")
-          expect($stdout).to receive(:print).with('Enter the supplied PIN: ')
-          expect($stdin).to receive(:gets).and_return('1234567890')
+          expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter Developer site. ', true).and_return("\n")
+          expect(Readline).to receive(:readline).with('Enter your API key: ', true).and_return('abc123')
+          expect(Readline).to receive(:readline).with('Enter your API secret: ', true).and_return('asdfasd223sd2')
+          expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter app authorization page. ', true).and_return("\n")
+          expect(Readline).to receive(:readline).with('Enter the supplied PIN: ', true).and_return('1234567890')
           @cli.authorize
         end.not_to raise_error
       end
@@ -124,7 +104,7 @@ testcli
   describe '#block' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/blocks/create.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
+      stub_post('/1.1/blocks/create.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.block('sferik')
@@ -137,7 +117,7 @@ testcli
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_post('/1.1/blocks/create.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'))
+        stub_post('/1.1/blocks/create.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.block('7505382')
@@ -148,8 +128,8 @@ testcli
 
   describe '#direct_messages' do
     before do
-      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'))
+      stub_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/direct_messages.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.direct_messages
@@ -220,8 +200,8 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '10', :max_id => '1624782205', :include_entities => 'true'}).to_return(:body => fixture('empty_array.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.direct_messages
@@ -251,9 +231,9 @@ ID          Posted at     Screen name  Text
     end
     context '--number' do
       before do
-        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'))
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/direct_messages.json').with(:query => {:count => '1', :max_id => '235851563443306495', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -317,8 +297,8 @@ 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', :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'))
+      stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.direct_messages_sent
@@ -389,8 +369,8 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.direct_messages_sent
@@ -420,9 +400,9 @@ ID          Posted at     Screen name  Text
     end
     context '--number' do
       before do
-        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'))
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/direct_messages/sent.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_direct_messages.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -487,7 +467,7 @@ ID          Posted at     Screen name  Text
   describe '#dm' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/direct_messages/new.json').with(:body => {:screen_name => 'pengwynn', :text => 'Creating a fixture for the Twitter gem'}).to_return(:body => fixture('direct_message.json'))
+      stub_post('/1.1/direct_messages/new.json').with(:body => {:screen_name => 'pengwynn', :text => 'Creating a fixture for the Twitter gem'}).to_return(:body => fixture('direct_message.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.dm('pengwynn', 'Creating a fixture for the Twitter gem')
@@ -500,7 +480,7 @@ ID          Posted at     Screen name  Text
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_post('/1.1/direct_messages/new.json').with(:body => {:user_id => '14100886', :text => 'Creating a fixture for the Twitter gem'}).to_return(:body => fixture('direct_message.json'))
+        stub_post('/1.1/direct_messages/new.json').with(:body => {:user_id => '14100886', :text => 'Creating a fixture for the Twitter gem'}).to_return(:body => fixture('direct_message.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.dm('14100886', 'Creating a fixture for the Twitter gem')
@@ -512,7 +492,7 @@ ID          Posted at     Screen name  Text
   describe '#does_contain' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_get('/1.1/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('list.json'))
+      stub_get('/1.1/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.does_contain('presidents')
@@ -525,8 +505,8 @@ ID          Posted at     Screen name  Text
     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/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture('list.json'))
+        stub_get('/1.1/users/show.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.does_contain('presidents', '7505382')
@@ -542,8 +522,8 @@ ID          Posted at     Screen name  Text
       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/lists/members/show.json').with(:query => {:owner_id => '7505382', :screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture('list.json'))
+          stub_get('/1.1/users/show.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/lists/members/show.json').with(:query => {:owner_id => '7505382', :screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.does_contain('7505382/presidents', '7505382')
@@ -560,7 +540,7 @@ ID          Posted at     Screen name  Text
     end
     context 'false' do
       before do
-        stub_get('/1.1/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('not_found.json'), :status => 404)
+        stub_get('/1.1/lists/members/show.json').with(:query => {:owner_screen_name => 'testcli', :screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('not_found.json'), :status => 404, :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'exits' do
         expect do
@@ -574,7 +554,7 @@ ID          Posted at     Screen name  Text
   describe '#does_follow' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'testcli'}).to_return(:body => fixture('following.json'))
+      stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'testcli'}).to_return(:body => fixture('following.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.does_follow('ev')
@@ -587,8 +567,8 @@ ID          Posted at     Screen name  Text
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_get('/1.1/users/show.json').with(:query => {:user_id => '20'}).to_return(:body => fixture('sferik.json'))
-        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'sferik', :target_screen_name => 'testcli'}).to_return(:body => fixture('following.json'))
+        stub_get('/1.1/users/show.json').with(:query => {:user_id => '20'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'sferik', :target_screen_name => 'testcli'}).to_return(:body => fixture('following.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.does_follow('20')
@@ -602,7 +582,7 @@ ID          Posted at     Screen name  Text
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'sferik'}).to_return(:body => fixture('following.json'))
+        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'sferik'}).to_return(:body => fixture('following.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.does_follow('ev', 'sferik')
@@ -615,9 +595,9 @@ ID          Posted at     Screen name  Text
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/users/show.json').with(:query => {:user_id => '20'}).to_return(:body => fixture('sferik.json'))
-          stub_get('/1.1/users/show.json').with(:query => {:user_id => '428004849'}).to_return(:body => fixture('sferik.json'))
-          stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'sferik', :target_screen_name => 'sferik'}).to_return(:body => fixture('following.json'))
+          stub_get('/1.1/users/show.json').with(:query => {:user_id => '20'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/users/show.json').with(:query => {:user_id => '428004849'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'sferik', :target_screen_name => 'sferik'}).to_return(:body => fixture('following.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.does_follow('20', '428004849')
@@ -633,7 +613,7 @@ ID          Posted at     Screen name  Text
     end
     context 'false' do
       before do
-        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'testcli'}).to_return(:body => fixture('not_following.json'))
+        stub_get('/1.1/friendships/show.json').with(:query => {:source_screen_name => 'ev', :target_screen_name => 'testcli'}).to_return(:body => fixture('not_following.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'exits' do
         expect do
@@ -647,7 +627,7 @@ ID          Posted at     Screen name  Text
   describe '#favorite' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/favorites/create.json').with(:body => {:id => '26755176471724032'}).to_return(:body => fixture('status.json'))
+      stub_post('/1.1/favorites/create.json').with(:body => {:id => '26755176471724032'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.favorite('26755176471724032')
@@ -661,7 +641,7 @@ ID          Posted at     Screen name  Text
 
   describe '#favorites' do
     before do
-      stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.favorites
@@ -781,7 +761,7 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.favorites
@@ -857,7 +837,7 @@ 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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.favorites
@@ -866,9 +846,9 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        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'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -885,7 +865,7 @@ ID                   Posted at     Screen name       Text
     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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.favorites
@@ -894,7 +874,7 @@ ID                   Posted at     Screen name       Text
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.favorites('sferik')
@@ -903,7 +883,7 @@ ID                   Posted at     Screen name       Text
       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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.favorites('7505382')
@@ -913,7 +893,7 @@ 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', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.favorites('sferik')
@@ -922,9 +902,9 @@ ID                   Posted at     Screen name       Text
       end
       context '--number' do
         before do
-          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'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'limits the number of results to 1' do
           @cli.options = @cli.options.merge('number' => 1)
@@ -941,7 +921,7 @@ ID                   Posted at     Screen name       Text
       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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.favorites('sferik')
@@ -957,15 +937,15 @@ ID                   Posted at     Screen name       Text
     end
     context 'one user' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'))
-        stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:body => fixture('sferik.json'))
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.follow('sferik', 'pengwynn')
-        expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
         expect(a_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'})).to have_been_made
         expect(a_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'})).to have_been_made
       end
@@ -976,26 +956,26 @@ ID                   Posted at     Screen name       Text
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-          stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382,14100886'}).to_return(:body => fixture('users.json'))
-          stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:body => fixture('sferik.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382,14100886'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.follow('7505382', '14100886')
-          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
           expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382,14100886'})).to have_been_made
           expect(a_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'})).to have_been_made
         end
       end
       context 'Twitter is down' do
         it 'retries 3 times and then raise an error' do
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-          stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'))
-          stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:status => 502)
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:status => 502, :headers => {:content_type => 'application/json; charset=utf-8'})
           expect do
             @cli.follow('sferik', 'pengwynn')
           end.to raise_error(Twitter::Error::BadGateway)
-          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made.times(3)
+          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made.times(3)
           expect(a_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'})).to have_been_made.times(3)
           expect(a_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'})).to have_been_made.times(3)
         end
@@ -1005,14 +985,14 @@ ID                   Posted at     Screen name       Text
 
   describe '#followings' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.followings
-      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
@@ -1128,7 +1108,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.followings('sferik')
@@ -1139,7 +1119,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.followings('7505382')
@@ -1151,9 +1131,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#followings_following' do
     before do
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.followings_following('sferik')
@@ -1274,8 +1254,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with two users passed' do
       before do
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'))
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.followings_following('sferik', 'pengwynn')
@@ -1286,8 +1266,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'))
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.followings_following('7505382', '14100886')
@@ -1301,14 +1281,14 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#followers' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.followers
-      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
@@ -1424,8 +1404,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.followers('sferik')
@@ -1435,7 +1415,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.followers('7505382')
@@ -1448,10 +1428,10 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#friends' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.friends
@@ -1573,8 +1553,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.friends('sferik')
@@ -1585,8 +1565,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.friends('7505382')
@@ -1600,10 +1580,10 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#groupies' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.groupies
@@ -1725,8 +1705,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.groupies('sferik')
@@ -1737,8 +1717,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'))
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.groupies('7505382')
@@ -1753,9 +1733,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe '#intersection' do
     before do
       @cli.options = @cli.options.merge('type' => 'followings')
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.intersection('sferik')
@@ -1868,9 +1848,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context '--type=followers' do
       before do
         @cli.options = @cli.options.merge('type' => 'followers')
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('followers_ids.json'))
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.intersection('sferik')
@@ -1894,8 +1874,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with two users passed' do
       before do
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'))
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.intersection('sferik', 'pengwynn')
@@ -1906,8 +1886,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'))
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.intersection('7505382', '14100886')
@@ -1921,10 +1901,10 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#leaders' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.leaders
@@ -2046,8 +2026,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.leaders('sferik')
@@ -2058,8 +2038,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.leaders('7505382')
@@ -2073,7 +2053,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#lists' do
     before do
-      stub_get('/1.1/lists/list.json').to_return(:body => fixture('lists.json'))
+      stub_get('/1.1/lists/list.json').to_return(:body => fixture('lists.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.lists
@@ -2167,7 +2147,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/lists/list.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('lists.json'))
+        stub_get('/1.1/lists/list.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('lists.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.lists('sferik')
@@ -2176,7 +2156,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/lists/list.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('lists.json'))
+          stub_get('/1.1/lists/list.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('lists.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.lists('7505382')
@@ -2188,8 +2168,8 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
 
   describe '#matrix' do
     before do
-      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'lang:ja', :count => 100, :include_entities => 'false'}).to_return(:body => fixture('matrix.json'))
-      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'lang:ja', :count => 100, :max_id => '434642935557021697'}).to_return(:body => fixture('empty_cursor.json'))
+      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'lang:ja', :count => 100, :include_entities => 'false'}).to_return(:body => fixture('matrix.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'lang:ja', :count => 100, :max_id => '434642935557021697'}).to_return(:body => fixture('empty_cursor.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.matrix
@@ -2204,7 +2184,7 @@ 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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.mentions
@@ -2324,7 +2304,7 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.mentions
@@ -2399,9 +2379,9 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        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'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -2417,6 +2397,31 @@ ID                   Posted at     Screen name       Text
     end
   end
 
+  describe '#mute' do
+    before do
+      @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
+      stub_post('/1.1/mutes/users/create.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resource' do
+      @cli.mute('sferik')
+      expect(a_post('/1.1/mutes/users/create.json').with(:body => {:screen_name => 'sferik'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.mute('sferik')
+      expect($stdout.string).to match(/^@testcli muted 1 user/)
+    end
+    context '--id' do
+      before do
+        @cli.options = @cli.options.merge('id' => true)
+        stub_post('/1.1/mutes/users/create.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      end
+      it 'requests the correct resource' do
+        @cli.mute('7505382')
+        expect(a_post('/1.1/mutes/users/create.json').with(:body => {:user_id => '7505382'})).to have_been_made
+      end
+    end
+  end
+
   describe '#open' do
     before do
       @cli.options = @cli.options.merge('display-uri' => true)
@@ -2429,7 +2434,7 @@ ID                   Posted at     Screen name       Text
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_get('/1.1/users/show.json').with(:query => {:user_id => '420'}).to_return(:body => fixture('sferik.json'))
+        stub_get('/1.1/users/show.json').with(:query => {:user_id => '420'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.open('420')
@@ -2439,7 +2444,7 @@ ID                   Posted at     Screen name       Text
     context '--status' do
       before do
         @cli.options = @cli.options.merge('status' => true)
-        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'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.open('55709764298092545')
@@ -2453,11 +2458,35 @@ ID                   Posted at     Screen name       Text
     end
   end
 
+  describe '#reach' do
+    before do
+      stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/statuses/retweeters/ids.json').with(:query => {:id => '55709764298092545', :cursor => '-1'}).to_return(:body => fixture('ids_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/statuses/retweeters/ids.json').with(:query => {:id => '55709764298092545', :cursor => '1305102810874389703'}).to_return(:body => fixture('ids_list2.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '20009713'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('followers_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resources' do
+      @cli.reach('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/retweeters/ids.json').with(:query => {:id => '55709764298092545', :cursor => '-1'})).to have_been_made
+      expect(a_get('/1.1/statuses/retweeters/ids.json').with(:query => {:id => '55709764298092545', :cursor => '1305102810874389703'})).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '20009713'})).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.reach('55709764298092545')
+      expect($stdout.string.split("\n").first).to eq '2'
+    end
+  end
+
   describe '#reply' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc', 'location' => nil)
-      stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'))
-      stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+      stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_request(:get, 'http://checkip.dyndns.org/').to_return(:body => fixture('checkip.html'), :headers => {:content_type => 'text/html'})
       stub_request(:get, 'http://www.geoplugin.net/xml.gp?ip=50.131.22.169').to_return(:body => fixture('geoplugin.xml'), :headers => {:content_type => 'application/xml'})
     end
@@ -2475,7 +2504,7 @@ ID                   Posted at     Screen name       Text
     context '--all' do
       before do
         @cli.options = @cli.options.merge('all' => true)
-        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench @sferik Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench @sferik Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.reply('263813522369159169', 'Testing')
@@ -2492,8 +2521,8 @@ ID                   Posted at     Screen name       Text
     context '--location' do
       before do
         @cli.options = @cli.options.merge('location' => 'location')
-        stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'))
-        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :lat => '37.76969909668', :long => '-122.39330291748', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+        stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :lat => '37.76969909668', :long => '-122.39330291748', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.reply('263813522369159169', 'Testing')
@@ -2510,8 +2539,8 @@ ID                   Posted at     Screen name       Text
     context "--location 'latitude,longitude'" do
       before do
         @cli.options = @cli.options.merge('location' => '41.03132,28.9869')
-        stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'))
-        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :lat => '41.03132', :long => '28.9869', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+        stub_get('/1.1/statuses/show/263813522369159169.json').with(:query => {:include_my_retweet => 'false'}).to_return(:body => fixture('status_with_mention.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_post('/1.1/statuses/update.json').with(:body => {:in_reply_to_status_id => '263813522369159169', :status => '@joshfrench Testing', :lat => '41.03132', :long => '28.9869', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.reply('263813522369159169', 'Testing')
@@ -2530,7 +2559,7 @@ ID                   Posted at     Screen name       Text
   describe '#report_spam' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/users/report_spam.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
+      stub_post('/1.1/users/report_spam.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.report_spam('sferik')
@@ -2543,7 +2572,7 @@ ID                   Posted at     Screen name       Text
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_post('/1.1/users/report_spam.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'))
+        stub_post('/1.1/users/report_spam.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.report_spam('7505382')
@@ -2555,7 +2584,7 @@ ID                   Posted at     Screen name       Text
   describe '#retweet' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/statuses/retweet/26755176471724032.json').to_return(:body => fixture('retweet.json'))
+      stub_post('/1.1/statuses/retweet/26755176471724032.json').to_return(:body => fixture('retweet.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.retweet('26755176471724032')
@@ -2569,8 +2598,8 @@ 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', :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'))
+      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     context 'without arguments' do
       it 'requests the correct resource' do
@@ -2698,8 +2727,8 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.retweets
@@ -2771,8 +2800,8 @@ 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', :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'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -2788,8 +2817,8 @@ ID                  Posted at     Screen name      Text
     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', :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'))
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.retweets('sferik')
@@ -2799,8 +2828,8 @@ ID                  Posted at     Screen name      Text
       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', :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'))
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.retweets('7505382')
@@ -2813,7 +2842,7 @@ ID                  Posted at     Screen name      Text
 
   describe '#retweets_of_me' do
     before do
-      stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     context 'without arguments' do
       it 'requests the correct resource' do
@@ -2935,7 +2964,7 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before do
         @cli.options = @cli.options.merge('decode_uris' => true)
-        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.retweets_of_me
@@ -3006,10 +3035,10 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         (1..181).step(20) do |count|
-          stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => count, :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => count, :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
       end
       it 'limits the number of results to 1' do
@@ -3048,7 +3077,7 @@ 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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resources' do
       @cli.status('55709764298092545')
@@ -3081,7 +3110,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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3099,7 +3128,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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3117,7 +3146,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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3135,7 +3164,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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3153,7 +3182,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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3171,7 +3200,7 @@ 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', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'))
+        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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         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
@@ -3189,7 +3218,7 @@ Location     San Francisco, CA, United States
       end
       context 'with no city' 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_no_place.json'))
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
           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
@@ -3208,7 +3237,7 @@ Location     CA, United States
       end
       context 'with no state' 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_no_place.json'))
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
           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
@@ -3240,8 +3269,8 @@ ID                 Posted at     Screen name  Text                           ...
     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'))
+        stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         @cli.options = @cli.options.merge('relative_dates' => true)
       end
       it 'status has the correct output (absolute and relative date together)' do
@@ -3304,7 +3333,7 @@ ID                 Posted at     Screen name  Text                           ...
 
   describe '#timeline' do
     before do
-      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     context 'without user' do
       it 'requests the correct resource' do
@@ -3426,7 +3455,7 @@ ID,Posted at,Screen name,Text
     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'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.timeline
@@ -3440,7 +3469,7 @@ ID,Posted at,Screen name,Text
     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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'excludes replies' do
         @cli.timeline
@@ -3450,7 +3479,7 @@ ID,Posted at,Screen name,Text
     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', :include_entities => '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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'excludes retweets' do
         @cli.timeline
@@ -3522,7 +3551,7 @@ 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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.timeline
@@ -3531,9 +3560,9 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        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'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '1', :max_id => '265500541700956160', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'limits the number of results to 1' do
         @cli.options = @cli.options.merge('number' => 1)
@@ -3550,7 +3579,7 @@ ID                   Posted at     Screen name       Text
     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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.timeline
@@ -3559,7 +3588,7 @@ ID                   Posted at     Screen name       Text
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.timeline('sferik')
@@ -3568,7 +3597,7 @@ ID                   Posted at     Screen name       Text
       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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.timeline('7505382')
@@ -3578,7 +3607,7 @@ 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/user_timeline.json').with(:query => {:count => '20', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.timeline('sferik')
@@ -3587,9 +3616,9 @@ ID                   Posted at     Screen name       Text
       end
       context '--number' do
         before do
-          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'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '1', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
+          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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'limits the number of results to 1' do
           @cli.options = @cli.options.merge('number' => 1)
@@ -3606,7 +3635,7 @@ ID                   Posted at     Screen name       Text
       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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.timeline('sferik')
@@ -3618,7 +3647,7 @@ ID                   Posted at     Screen name       Text
 
   describe '#trends' do
     before do
-      stub_get('/1.1/trends/place.json').with(:query => {:id => '1'}).to_return(:body => fixture('trends.json'))
+      stub_get('/1.1/trends/place.json').with(:query => {:id => '1'}).to_return(:body => fixture('trends.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.trends
@@ -3631,7 +3660,7 @@ ID                   Posted at     Screen name       Text
     context '--exclude-hashtags' do
       before do
         @cli.options = @cli.options.merge('exclude-hashtags' => true)
-        stub_get('/1.1/trends/place.json').with(:query => {:id => '1', :exclude => 'hashtags'}).to_return(:body => fixture('trends.json'))
+        stub_get('/1.1/trends/place.json').with(:query => {:id => '1', :exclude => 'hashtags'}).to_return(:body => fixture('trends.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.trends
@@ -3644,7 +3673,7 @@ ID                   Posted at     Screen name       Text
     end
     context 'with a WOEID passed' do
       before do
-        stub_get('/1.1/trends/place.json').with(:query => {:id => '2487956'}).to_return(:body => fixture('trends.json'))
+        stub_get('/1.1/trends/place.json').with(:query => {:id => '2487956'}).to_return(:body => fixture('trends.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.trends('2487956')
@@ -3659,7 +3688,7 @@ ID                   Posted at     Screen name       Text
 
   describe '#trend_locations' do
     before do
-      stub_get('/1.1/trends/available.json').to_return(:body => fixture('locations.json'))
+      stub_get('/1.1/trends/available.json').to_return(:body => fixture('locations.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.trend_locations
@@ -3761,19 +3790,19 @@ WOEID     Parent ID  Type       Name           Country
     end
     context 'one user' do
       it 'requests the correct resource' do
-        stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
+        stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         @cli.unfollow('sferik')
         expect(a_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'})).to have_been_made
       end
       it 'has the correct output' do
-        stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
+        stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         @cli.unfollow('sferik')
         expect($stdout.string).to match(/^@testcli is no longer following 1 user\.$/)
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_post('/1.1/friendships/destroy.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'))
+          stub_post('/1.1/friendships/destroy.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         end
         it 'requests the correct resource' do
           @cli.unfollow('7505382')
@@ -3782,7 +3811,7 @@ WOEID     Parent ID  Type       Name           Country
       end
       context 'Twitter is down' do
         it 'retries 3 times and then raise an error' do
-          stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:status => 502)
+          stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:status => 502, :headers => {:content_type => 'application/json; charset=utf-8'})
           expect do
             @cli.unfollow('sferik')
           end.to raise_error(Twitter::Error::BadGateway)
@@ -3795,7 +3824,7 @@ WOEID     Parent ID  Type       Name           Country
   describe '#update' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
-      stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+      stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_request(:get, 'http://checkip.dyndns.org/').to_return(:body => fixture('checkip.html'), :headers => {:content_type => 'text/html'})
       stub_request(:get, 'http://www.geoplugin.net/xml.gp?ip=50.131.22.169').to_return(:body => fixture('geoplugin.xml'), :headers => {:content_type => 'application/xml'})
     end
@@ -3812,7 +3841,7 @@ WOEID     Parent ID  Type       Name           Country
     context 'with file' do
       before do
         @cli.options = @cli.options.merge('file' => fixture_path + '/long.png')
-        stub_post('/1.1/statuses/update_with_media.json').to_return(:body => fixture('status.json'))
+        stub_post('/1.1/statuses/update_with_media.json').to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.update('Testing')
@@ -3826,7 +3855,7 @@ WOEID     Parent ID  Type       Name           Country
     context '--location' do
       before do
         @cli.options = @cli.options.merge('location' => 'location')
-        stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :lat => '37.76969909668', :long => '-122.39330291748', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+        stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :lat => '37.76969909668', :long => '-122.39330291748', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.update('Testing')
@@ -3842,7 +3871,7 @@ WOEID     Parent ID  Type       Name           Country
     context "--location 'latitude,longitude'" do
       before do
         @cli.options = @cli.options.merge('location' => '41.03132,28.9869')
-        stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :lat => '41.03132', :long => '28.9869', :trim_user => 'true'}).to_return(:body => fixture('status.json'))
+        stub_post('/1.1/statuses/update.json').with(:body => {:status => 'Testing', :lat => '41.03132', :long => '28.9869', :trim_user => 'true'}).to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.update('Testing')
@@ -3859,7 +3888,7 @@ WOEID     Parent ID  Type       Name           Country
 
   describe '#users' do
     before do
-      stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'))
+      stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.users('sferik', 'pengwynn')
@@ -3934,7 +3963,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context '--id' do
       before do
         @cli.options = @cli.options.merge('id' => true)
-        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382,14100886'}).to_return(:body => fixture('users.json'))
+        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382,14100886'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.users('7505382', '14100886')
@@ -3997,7 +4026,7 @@ 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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.whois('sferik')
@@ -4036,7 +4065,7 @@ 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', :include_entities => 'false'}).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'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.whois('7505382')
@@ -4059,7 +4088,7 @@ ID       Since         Last tweeted at  Tweets  Favorites  Listed  Following ...
 
   describe '#whoami' do
     before do
-      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'testcli', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'testcli', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.whoami