t 2.2.0 → 2.2.1

data/spec/fixtures/geo_no_state.json

@@ -0,0 +1,299 @@
+{
+   "results" : [
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "location" : {
+               "lat" : 37.759658,
+               "lng" : -122.410229
+            },
+            "location_type" : "ROOFTOP",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 37.7610069802915,
+                  "lng" : -122.4088800197085
+               },
+               "southwest" : {
+                  "lat" : 37.75830901970851,
+                  "lng" : -122.4115779802915
+               }
+            }
+         },
+         "types" : [ "street_address" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 37.7719876,
+                  "lng" : -122.4027825
+               },
+               "southwest" : {
+                  "lat" : 37.7478217,
+                  "lng" : -122.4309111
+               }
+            },
+            "location" : {
+               "lat" : 37.7598648,
+               "lng" : -122.4147977
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 37.7719876,
+                  "lng" : -122.4027825
+               },
+               "southwest" : {
+                  "lat" : 37.7478217,
+                  "lng" : -122.4309111
+               }
+            }
+         },
+         "types" : [ "neighborhood", "political" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 37.76578300000001,
+                  "lng" : -122.402855
+               },
+               "southwest" : {
+                  "lat" : 37.731608,
+                  "lng" : -122.427269
+               }
+            },
+            "location" : {
+               "lat" : 37.7485824,
+               "lng" : -122.4184108
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 37.76578300000001,
+                  "lng" : -122.402855
+               },
+               "southwest" : {
+                  "lat" : 37.731608,
+                  "lng" : -122.427269
+               }
+            }
+         },
+         "types" : [ "postal_code" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 37.9297707,
+                  "lng" : -122.3279148
+               },
+               "southwest" : {
+                  "lat" : 37.6933354,
+                  "lng" : -123.1077733
+               }
+            },
+            "location" : {
+               "lat" : 37.7749295,
+               "lng" : -122.4194155
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 37.812,
+                  "lng" : -122.3482
+               },
+               "southwest" : {
+                  "lat" : 37.70339999999999,
+                  "lng" : -122.527
+               }
+            }
+         },
+         "types" : [ "locality", "political" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 37.9297707,
+                  "lng" : -122.3279148
+               },
+               "southwest" : {
+                  "lat" : 37.6933354,
+                  "lng" : -123.1077733
+               }
+            },
+            "location" : {
+               "lat" : 37.7749073,
+               "lng" : -122.4193878
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 37.833827,
+                  "lng" : -122.3551997
+               },
+               "southwest" : {
+                  "lat" : 37.708086,
+                  "lng" : -122.5300999
+               }
+            }
+         },
+         "types" : [ "administrative_area_level_2", "political" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "United States",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 38.320945,
+                  "lng" : -121.469275
+               },
+               "southwest" : {
+                  "lat" : 37.1073458,
+                  "lng" : -123.024066
+               }
+            },
+            "location" : {
+               "lat" : 37.8043507,
+               "lng" : -121.8107079
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 38.320945,
+                  "lng" : -121.469275
+               },
+               "southwest" : {
+                  "lat" : 37.1073458,
+                  "lng" : -123.024066
+               }
+            }
+         },
+         "types" : [ "political" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "USA",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 42.0095169,
+                  "lng" : -114.131211
+               },
+               "southwest" : {
+                  "lat" : 32.5342321,
+                  "lng" : -124.4096195
+               }
+            },
+            "location" : {
+               "lat" : 36.778261,
+               "lng" : -119.4179324
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 42.0095169,
+                  "lng" : -114.131211
+               },
+               "southwest" : {
+                  "lat" : 32.5342321,
+                  "lng" : -124.4096195
+               }
+            }
+         },
+         "types" : [ "administrative_area_level_1", "political" ]
+      },
+      {
+         "address_components" : [
+            {
+               "long_name" : "United States",
+               "short_name" : "US",
+               "types" : [ "country", "political" ]
+            }
+         ],
+         "formatted_address" : "United States",
+         "geometry" : {
+            "bounds" : {
+               "northeast" : {
+                  "lat" : 90,
+                  "lng" : 180
+               },
+               "southwest" : {
+                  "lat" : -90,
+                  "lng" : -180
+               }
+            },
+            "location" : {
+               "lat" : 37.09024,
+               "lng" : -95.712891
+            },
+            "location_type" : "APPROXIMATE",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 49.38,
+                  "lng" : -66.94
+               },
+               "southwest" : {
+                  "lat" : 25.82,
+                  "lng" : -124.39
+               }
+            }
+         },
+         "types" : [ "country", "political" ]
+      }
+   ],
+   "status" : "OK"
+}

data/spec/helper.rb

@@ -10,7 +10,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 
 SimpleCov.start do
   add_filter '/spec/'
-  minimum_coverage(99.16)
+  minimum_coverage(99.18)
 end
 
 require 't'

data/spec/list_spec.rb

@@ -328,11 +328,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe '#timeline' do
     before do
       @list.options = @list.options.merge('color' => 'always')
-      stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
     end
     it 'requests the correct resource' do
       @list.timeline('presidents')
-      expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents'})).to have_been_made
+      expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @list.timeline('presidents')
@@ -697,6 +697,20 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context '--decode-uris' do
+      before do
+        @list.options = @list.options.merge('decode_uris' => true)
+        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @list.timeline('presidents')
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents', :include_entities => 'true'})).to have_been_made
+      end
+      it 'decodes URLs' do
+        @list.timeline('presidents')
+        expect($stdout.string).to include 'https://twitter.com/sferik/status/243988000076337152'
+      end
+    end
     context '--long' do
       before do
         @list.options = @list.options.merge('long' => true)
@@ -761,35 +775,35 @@ ID                   Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '200', :slug => 'presidents'}).to_return(:body => fixture('200_statuses.json'))
-        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :max_id => '265500541700956160', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '200', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('200_statuses.json'))
+        stub_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :max_id => '265500541700956160', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'limits the number of results to 1' do
         @list.options = @list.options.merge('number' => 1)
         @list.timeline('presidents')
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :slug => 'presidents'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @list.options = @list.options.merge('number' => 201)
         @list.timeline('presidents')
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '200', :slug => 'presidents'})).to have_been_made
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :max_id => '265500541700956160', :slug => 'presidents'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '200', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '1', :max_id => '265500541700956160', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
       end
     end
     context 'with a user passed' do
       it 'requests the correct resource' do
         @list.timeline('testcli/presidents')
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_screen_name => 'testcli', :count => '20', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
       end
       context '--id' do
         before do
           @list.options = @list.options.merge('id' => true)
-          stub_get('/1.1/lists/statuses.json').with(:query => {:owner_id => '7505382', :count => '20', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/lists/statuses.json').with(:query => {:owner_id => '7505382', :count => '20', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @list.timeline('7505382/presidents')
-          expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_id => '7505382', :count => '20', :slug => 'presidents'})).to have_been_made
+          expect(a_get('/1.1/lists/statuses.json').with(:query => {:owner_id => '7505382', :count => '20', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
         end
       end
     end

data/spec/search_spec.rb

@@ -31,11 +31,11 @@ describe T::Search do
 
   describe '#all' do
     before do
-      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100'}).to_return(:body => fixture('search.json'))
+      stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => 'false'}).to_return(:body => fixture('search.json'))
     end
     it 'requests the correct resource' do
       @search.all('twitter')
-      expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100'})).to have_been_made
+      expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @search.all('twitter')
@@ -180,19 +180,19 @@ ID                  Posted at     Screen name       Text
     end
     context '--number' do
       before do
-        stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '1'}).to_return(:body => fixture('search2.json'))
-        stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100'}).to_return(:body => fixture('search.json'))
+        stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '1', :include_entities => 'false'}).to_return(:body => fixture('search2.json'))
+        stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => 'false'}).to_return(:body => fixture('search.json'))
         stub_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => '1', :max_id => '415600158693675007'}).to_return(:body => fixture('search2.json'))
       end
       it 'limits the number of results to 1' do
         @search.options = @search.options.merge('number' => 1)
         @search.all('twitter')
-        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100'})).to have_been_made
+        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => 'false'})).to have_been_made
       end
       it 'limits the number of results to 201' do
         @search.options = @search.options.merge('number' => 201)
         @search.all('twitter')
-        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100'})).to have_been_made
+        expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => 'false'})).to have_been_made
         expect(a_get('/1.1/search/tweets.json').with(:query => {:q => 'twitter', :count => '100', :include_entities => '1', :max_id => '415600158693675007'})).to have_been_made
       end
     end
@@ -200,13 +200,13 @@ ID                  Posted at     Screen name       Text
 
   describe '#favorites' do
     before do
-      stub_get('/1.1/favorites/list.json').with(:query => {:count => '200'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @search.favorites('twitter')
-      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200'})).to have_been_made
-      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937'})).to have_been_made
+      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+      expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @search.favorites('twitter')
@@ -236,13 +236,13 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before(:each) do
         @search.options = @search.options.merge('decode_uris' => true)
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 1}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'true', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.favorites('twitter')
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 1})).to have_been_made
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'true', :max_id => '244099460672679937'})).to have_been_made
       end
       it 'decodes URLs' do
         @search.favorites('twitter')
@@ -264,22 +264,22 @@ ID                  Posted at     Screen name  Text
     end
     context 'Twitter is down' do
       it 'retries 3 times and then raise an error' do
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200'}).to_return(:status => 502)
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:status => 502)
         expect do
           @search.favorites('twitter')
         end.to raise_error(Twitter::Error::BadGateway)
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200'})).to have_been_made.times(3)
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made.times(3)
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.favorites('sferik', 'twitter')
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
       end
       it 'has the correct output' do
         @search.favorites('sferik', 'twitter')
@@ -296,13 +296,13 @@ ID                  Posted at     Screen name  Text
       context '--id' do
         before do
           @search.options = @search.options.merge('id' => true)
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :user_id => '7505382'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382'}).to_return(:body => fixture('empty_array.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
         end
         it 'requests the correct resource' do
           @search.favorites('7505382', 'twitter')
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :user_id => '7505382'})).to have_been_made
-          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/favorites/list.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
         end
         it 'has the correct output' do
           @search.favorites('7505382', 'twitter')
@@ -322,13 +322,13 @@ ID                  Posted at     Screen name  Text
 
   describe '#mentions' do
     before do
-      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @search.mentions('twitter')
-      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'})).to have_been_made
-      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937'})).to have_been_made
+      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+      expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @search.mentions('twitter')
@@ -358,13 +358,13 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before(:each) do
         @search.options = @search.options.merge('decode_uris' => true)
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 1}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'true', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.mentions('twitter')
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 1})).to have_been_made
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937'})).to have_been_made
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'true', :max_id => '244099460672679937'})).to have_been_made
       end
       it 'decodes URLs' do
         @search.mentions('twitter')
@@ -386,24 +386,24 @@ ID                  Posted at     Screen name  Text
     end
     context 'Twitter is down' do
       it 'retries 3 times and then raise an error' do
-        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'}).to_return(:status => 502)
+        stub_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:status => 502)
         expect do
           @search.mentions('twitter')
         end.to raise_error(Twitter::Error::BadGateway)
-        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200'})).to have_been_made.times(3)
+        expect(a_get('/1.1/statuses/mentions_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made.times(3)
       end
     end
   end
 
   describe '#list' do
     before do
-      stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @search.list('presidents', 'twitter')
-      expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made
-      expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made
+      expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
+      expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @search.list('presidents', 'twitter')
@@ -433,13 +433,13 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before(:each) do
         @search.options = @search.options.merge('decode_uris' => true)
-        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :include_entities => 1, :owner_screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'true'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.list('presidents', 'twitter')
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :include_entities => 1, :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :include_entities => 1, :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'true'})).to have_been_made
       end
       it 'decodes URLs' do
         @search.list('presidents', 'twitter')
@@ -462,41 +462,41 @@ ID                  Posted at     Screen name  Text
     context 'with a user passed' do
       it 'requests the correct resource' do
         @search.list('testcli/presidents', 'twitter')
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
       end
       context '--id' do
         before do
           @search.options = @search.options.merge('id' => true)
-          stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_id => '7505382', :slug => 'presidents'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_id => '7505382', :slug => 'presidents'}).to_return(:body => fixture('empty_array.json'))
+          stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_id => '7505382', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_id => '7505382', :slug => 'presidents', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
         end
         it 'requests the correct resource' do
           @search.list('7505382/presidents', 'twitter')
-          expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_id => '7505382', :slug => 'presidents'})).to have_been_made
-          expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_id => '7505382', :slug => 'presidents'})).to have_been_made
+          expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_id => '7505382', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :max_id => '244099460672679937', :owner_id => '7505382', :slug => 'presidents', :include_entities => 'false'})).to have_been_made
         end
       end
     end
     context 'Twitter is down' do
       it 'retries 3 times and then raise an error' do
-        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents'}).to_return(:status => 502)
+        stub_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'}).to_return(:status => 502)
         expect do
           @search.list('presidents', 'twitter')
         end.to raise_error(Twitter::Error::BadGateway)
-        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents'})).to have_been_made.times(3)
+        expect(a_get('/1.1/lists/statuses.json').with(:query => {:count => '200', :owner_screen_name => 'testcli', :slug => 'presidents', :include_entities => 'false'})).to have_been_made.times(3)
       end
     end
   end
 
   describe '#retweets' do
     before do
-      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @search.retweets('mosaic')
-      expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'})).to have_been_made
-      expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983'})).to have_been_made.times(2)
+      expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'})).to have_been_made
+      expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(2)
     end
     it 'has the correct output' do
       @search.retweets('mosaic')
@@ -521,13 +521,13 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before(:each) do
         @search.options = @search.options.merge('decode_uris' => true)
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_entities => 1, :include_rts => 'true'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_entities => 1, :include_rts => 'true', :max_id => '244102729860009983'}).to_return(:body => fixture('empty_array.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'))
+        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('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.retweets('mosaic')
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_entities => 1, :include_rts => 'true'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_entities => 1, :include_rts => 'true', :max_id => '244102729860009983'})).to have_been_made.times(2)
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :max_id => '244102729860009983', :include_entities => 'true'})).to have_been_made.times(2)
       end
       it 'decodes URLs' do
         @search.retweets('mosaic')
@@ -548,22 +548,22 @@ ID                  Posted at     Screen name   Text
     end
     context 'Twitter is down' do
       it 'retries 3 times and then raise an error' do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'}).to_return(:status => 502)
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'}).to_return(:status => 502)
         expect do
           @search.retweets('mosaic')
         end.to raise_error(Twitter::Error::BadGateway)
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true'})).to have_been_made.times(3)
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :include_entities => 'false'})).to have_been_made.times(3)
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.retweets('sferik', 'mosaic')
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983'})).to have_been_made.times(2)
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :screen_name => 'sferik', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(2)
       end
       it 'has the correct output' do
         @search.retweets('sferik', 'mosaic')
@@ -576,13 +576,13 @@ ID                  Posted at     Screen name   Text
       context '--id' do
         before do
           @search.options = @search.options.merge('id' => true)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983'}).to_return(:body => fixture('empty_array.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
         end
         it 'requests the correct resource' do
           @search.retweets('7505382', 'mosaic')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382'})).to have_been_made
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983'})).to have_been_made.times(2)
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :include_rts => 'true', :user_id => '7505382', :max_id => '244102729860009983', :include_entities => 'false'})).to have_been_made.times(2)
         end
         it 'has the correct output' do
           @search.retweets('7505382', 'mosaic')
@@ -598,13 +598,13 @@ ID                  Posted at     Screen name   Text
 
   describe '#timeline' do
     before do
-      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200'}).to_return(:body => fixture('statuses.json'))
-      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+      stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
     end
     it 'requests the correct resource' do
       @search.timeline('twitter')
-      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200'})).to have_been_made
-      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937'})).to have_been_made
+      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
     end
     it 'has the correct output' do
       @search.timeline('twitter')
@@ -634,13 +634,13 @@ ID,Posted at,Screen name,Text
     context '--decode-uris' do
       before(:each) do
         @search.options = @search.options.merge('decode_uris' => true)
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 1}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 1}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'true'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.timeline('twitter')
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 1})).to have_been_made
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 1})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'true'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :include_entities => 'true'})).to have_been_made
       end
       it 'decodes URLs' do
         @search.timeline('twitter')
@@ -650,25 +650,25 @@ ID,Posted at,Screen name,Text
     context '--exclude=replies' do
       before do
         @search.options = @search.options.merge('exclude' => 'replies')
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'excludes replies' do
         @search.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true'})).to have_been_made
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :max_id => '244099460672679937'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :exclude_replies => 'true', :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--exclude=retweets' do
       before do
         @search.options = @search.options.merge('exclude' => 'retweets')
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :max_id => '244099460672679937'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'excludes retweets' do
         @search.timeline
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false'})).to have_been_made
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :max_id => '244099460672679937'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_rts => 'false', :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--long' do
@@ -687,43 +687,43 @@ ID                  Posted at     Screen name  Text
     context '--max-id' do
       before do
         @search.options = @search.options.merge('max_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
       end
       it 'requests the correct resource' do
         @search.timeline('twitter')
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
       end
     end
     context '--since-id' do
       before do
         @search.options = @search.options.merge('since_id' => 244_104_558_433_951_744)
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :since_id => '244104558433951744'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.timeline('twitter')
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :since_id => '244104558433951744'})).to have_been_made
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :since_id => '244104558433951744'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :since_id => '244104558433951744', :include_entities => 'false'})).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/statuses/home_timeline.json').with(:query => {:count => '200'}).to_return(:status => 502)
+        stub_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:status => 502)
         expect do
           @search.timeline('twitter')
         end.to raise_error(Twitter::Error::BadGateway)
-        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200'})).to have_been_made.times(3)
+        expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made.times(3)
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik'}).to_return(:body => fixture('statuses.json'))
-        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik'}).to_return(:body => fixture('empty_array.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
       end
       it 'requests the correct resource' do
         @search.timeline('sferik', 'twitter')
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
+        expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :screen_name => 'sferik', :include_entities => 'false'})).to have_been_made
       end
       it 'has the correct output' do
         @search.timeline('sferik', 'twitter')
@@ -753,13 +753,13 @@ ID,Posted at,Screen name,Text
       context '--id' do
         before do
           @search.options = @search.options.merge('id' => true)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :user_id => '7505382'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382'}).to_return(:body => fixture('empty_array.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
         end
         it 'requests the correct resource' do
           @search.timeline('7505382', 'twitter')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :user_id => '7505382'})).to have_been_made
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :max_id => '244099460672679937', :user_id => '7505382', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--long' do
@@ -778,32 +778,32 @@ ID                  Posted at     Screen name  Text
       context '--max-id' do
         before do
           @search.options = @search.options.merge('max_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
         end
         it 'requests the correct resource' do
           @search.timeline('sferik', 'twitter')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
         end
       end
       context '--since-id' do
         before do
           @search.options = @search.options.merge('since_id' => 244_104_558_433_951_744)
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :since_id => '244104558433951744'}).to_return(:body => fixture('statuses.json'))
-          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244099460672679937', :since_id => '244104558433951744'}).to_return(:body => fixture('empty_array.json'))
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :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 => '200', :screen_name => 'sferik', :max_id => '244099460672679937', :since_id => '244104558433951744', :include_entities => 'false'}).to_return(:body => fixture('empty_array.json'))
         end
         it 'requests the correct resource' do
           @search.timeline('sferik', 'twitter')
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :since_id => '244104558433951744'})).to have_been_made
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244099460672679937', :since_id => '244104558433951744'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :since_id => '244104558433951744', :include_entities => 'false'})).to have_been_made
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:count => '200', :screen_name => 'sferik', :max_id => '244099460672679937', :since_id => '244104558433951744', :include_entities => 'false'})).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/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik', :count => '200'}).to_return(:status => 502)
+          stub_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik', :count => '200', :include_entities => 'false'}).to_return(:status => 502)
           expect do
             @search.timeline('sferik', 'twitter')
           end.to raise_error(Twitter::Error::BadGateway)
-          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik', :count => '200'})).to have_been_made.times(3)
+          expect(a_get('/1.1/statuses/user_timeline.json').with(:query => {:screen_name => 'sferik', :count => '200', :include_entities => 'false'})).to have_been_made.times(3)
         end
       end
     end