t 0.9.4 → 0.9.5

data/lib/t/printable.rb

@@ -116,12 +116,11 @@ module T
 
       def print_status(status)
         if STDOUT.tty? && !options['no-color']
-          say("   #{Thor::Shell::Color::BOLD}@#{status.user.screen_name}", :yellow)
-          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+          say("   @#{status.user.screen_name}", [:bold, :yellow])
         else
           say("   @#{status.user.screen_name}")
-          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
         end
+        print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
         say
       end
 

data/lib/t/search.rb

@@ -34,7 +34,9 @@ module T
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
     def all(query)
       rpp = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = client.search(query, :include_entities => false, :rpp => rpp)
+      statuses = collect_with_rpp(rpp) do |opts|
+        client.search(query, opts)
+      end
       if options['csv']
         say ["ID", "Posted at", "Screen name", "Text"].to_csv unless statuses.empty?
         statuses.each do |status|
@@ -56,12 +58,11 @@ module T
         say unless statuses.empty?
         statuses.each do |status|
           if STDOUT.tty? && !options['no-color']
-            say("   #{Thor::Shell::Color::BOLD}@#{status.from_user}", :yellow)
-            print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+            say("   @#{status.from_user}", [:bold, :yellow])
           else
             say("   @#{status.from_user}")
-            print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
           end
+          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
           say
         end
       end

data/lib/t/set.rb

@@ -26,7 +26,7 @@ module T
 
     desc "bio DESCRIPTION", "Edits your Bio information on your Twitter profile."
     def bio(description)
-      client.update_profile(:description => description, :include_entities => false)
+      client.update_profile(:description => description)
       say "@#{@rcfile.active_profile[0]}'s bio has been updated."
     end
 
@@ -38,19 +38,19 @@ module T
 
     desc "location PLACE_NAME", "Updates the location field in your profile."
     def location(place_name)
-      client.update_profile(:location => place_name, :include_entities => false)
+      client.update_profile(:location => place_name)
       say "@#{@rcfile.active_profile[0]}'s location has been updated."
     end
 
     desc "name NAME", "Sets the name field on your Twitter profile."
     def name(name)
-      client.update_profile(:name => name, :include_entities => false)
+      client.update_profile(:name => name)
       say "@#{@rcfile.active_profile[0]}'s name has been updated."
     end
 
     desc "url URL", "Sets the URL field on your profile."
     def url(url)
-      client.update_profile(:url => url, :include_entities => false)
+      client.update_profile(:url => url)
       say "@#{@rcfile.active_profile[0]}'s URL has been updated."
     end
 

data/lib/t/stream.rb

@@ -1,4 +1,3 @@
-require 't/cli'
 require 't/printable'
 require 't/rcfile'
 require 't/search'
@@ -37,7 +36,7 @@ module T
     desc "matrix", "Unfortunately, no one can be told what the Matrix is. You have to see it for yourself."
     def matrix
       client.on_timeline_status do |status|
-        print("#{Thor::Shell::Color::BOLD}#{Thor::Shell::Color::GREEN}#{Thor::Shell::Color::ON_BLACK}#{status.text.gsub("\n", '')}#{Thor::Shell::Color::CLEAR}")
+        say(status.text.gsub("\n", ''), [:bold, :green, :on_black])
       end
       Signal.trap("TERM") do
         client.stop

data/lib/t/version.rb

@@ -13,7 +13,7 @@ module T
 
     # @return [Integer]
     def self.patch
-      4
+      5
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -71,13 +71,13 @@ testcli
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1/blocks/create.json").
-        with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:body => {:screen_name => "sferik"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.block("sferik")
       a_post("/1/blocks/create.json").
-        with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:body => {:screen_name => "sferik"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -88,13 +88,13 @@ testcli
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1/blocks/create.json").
-          with(:body => {:user_id => "7505382", :include_entities => "false"}).
+          with(:body => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.block("7505382")
         a_post("/1/blocks/create.json").
-          with(:body => {:user_id => "7505382", :include_entities => "false"}).
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
     end
@@ -103,13 +103,13 @@ testcli
   describe "#direct_messages" do
     before do
       stub_get("/1/direct_messages.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.direct_messages
       a_get("/1/direct_messages.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -171,15 +171,31 @@ ID          Posted at     Screen name  Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/direct_messages.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/direct_messages.json").
+          with(:query => {:count => "200"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/direct_messages.json").
+          with(:query => {:count => "145", :max_id => "1624782205"}).
+          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
         @cli.direct_messages
         a_get("/1/direct_messages.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
+        @cli.direct_messages
+        a_get("/1/direct_messages.json").
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/direct_messages.json").
+          with(:query => {:count => "145", :max_id => "1624782205"}).
           should have_been_made
       end
     end
@@ -208,13 +224,13 @@ ID          Posted at     Screen name  Text
   describe "#direct_messages_sent" do
     before do
       stub_get("/1/direct_messages/sent.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.direct_messages_sent
       a_get("/1/direct_messages/sent.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -276,15 +292,31 @@ ID          Posted at     Screen name  Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/direct_messages/sent.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "200"}).
+          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "145", :max_id => "1624782205"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results 1" do
+        @cli.options = @cli.options.merge("number" => 1)
         @cli.direct_messages_sent
         a_get("/1/direct_messages/sent.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
+        @cli.direct_messages_sent
+        a_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "145", :max_id => "1624782205"}).
           should have_been_made
       end
     end
@@ -319,7 +351,7 @@ ID          Posted at     Screen name  Text
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/lookup.json").
-        with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+        with(:query => {:user_id => "213747670,428004849"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -331,7 +363,7 @@ ID          Posted at     Screen name  Text
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+        with(:query => {:user_id => "213747670,428004849"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -454,7 +486,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+          with(:query => {:user_id => "213747670,428004849"}).
           should have_been_made
       end
       context "--id" do
@@ -476,7 +508,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
           a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+            with(:query => {:user_id => "213747670,428004849"}).
             should have_been_made
         end
       end
@@ -487,13 +519,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1/direct_messages/new.json").
-        with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
+        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 "should request the correct resource" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
       a_post("/1/direct_messages/new.json").
-        with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
+        with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -504,13 +536,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1/direct_messages/new.json").
-          with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
+          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 "should request the correct resource" do
         @cli.dm("14100886", "Creating a fixture for the Twitter gem")
         a_post("/1/direct_messages/new.json").
-          with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
+          with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem"}).
           should have_been_made
       end
     end
@@ -537,7 +569,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1/users/show.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"}).
@@ -546,7 +578,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should request the correct resource" do
         @cli.does_contain("presidents", "7505382")
         a_get("/1/users/show.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
         a_get("/1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"}).
@@ -562,7 +594,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/users/show.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/lists/members/show.json").
             with(:query => {:owner_screen_name => "sferik", :screen_name => "sferik", :slug => "presidents"}).
@@ -571,7 +603,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         it "should request the correct resource" do
           @cli.does_contain("7505382/presidents", "7505382")
           a_get("/1/users/show.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             should have_been_made.times(2)
           a_get("/1/lists/members/show.json").
             with(:query => {:owner_screen_name => "sferik", :screen_name => "sferik", :slug => "presidents"}).
@@ -623,7 +655,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1/users/show.json").
-          with(:query => {:user_id => "20", :include_entities => "false"}).
+          with(:query => {:user_id => "20"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/friendships/exists.json").
           with(:query => {:user_a => "sferik", :user_b => "testcli"}).
@@ -632,7 +664,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should request the correct resource" do
         @cli.does_follow("20")
         a_get("/1/users/show.json").
-          with(:query => {:user_id => "20", :include_entities => "false"}).
+          with(:query => {:user_id => "20"}).
           should have_been_made
         a_get("/1/friendships/exists.json").
           with(:query => {:user_a => "sferik", :user_b => "testcli"}).
@@ -648,10 +680,10 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/users/show.json").
-            with(:query => {:user_id => "20", :include_entities => "false"}).
+            with(:query => {:user_id => "20"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/users/show.json").
-            with(:query => {:user_id => "428004849", :include_entities => "false"}).
+            with(:query => {:user_id => "428004849"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/friendships/exists.json").
             with(:query => {:user_a => "sferik", :user_b => "sferik"}).
@@ -660,10 +692,10 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         it "should request the correct resource" do
           @cli.does_follow("20", "428004849")
           a_get("/1/users/show.json").
-            with(:query => {:user_id => "20", :include_entities => "false"}).
+            with(:query => {:user_id => "20"}).
             should have_been_made
           a_get("/1/users/show.json").
-            with(:query => {:user_id => "428004849", :include_entities => "false"}).
+            with(:query => {:user_id => "428004849"}).
             should have_been_made
           a_get("/1/friendships/exists.json").
             with(:query => {:user_a => "sferik", :user_b => "sferik"}).
@@ -708,13 +740,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
   describe "#favorites" do
     before do
       stub_get("/1/favorites.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.favorites
       a_get("/1/favorites.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -809,41 +841,57 @@ ID                  Posted at     Screen name    Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/favorites.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/favorites.json").
+          with(:query => {:count => "200"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/favorites.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
+          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
+        @cli.favorites
+        a_get("/1/favorites.json").
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
         @cli.favorites
         a_get("/1/favorites.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/favorites.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
           should have_been_made
       end
     end
     context "with a user passed" do
       before do
         stub_get("/1/favorites/sferik.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "20"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.favorites("sferik")
         a_get("/1/favorites/sferik.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "20"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/favorites/7505382.json").
-            with(:query => {:count => "20", :include_entities => "false"}).
+            with(:query => {:count => "20"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.favorites("7505382")
           a_get("/1/favorites/7505382.json").
-            with(:query => {:count => "20", :include_entities => "false"}).
+            with(:query => {:count => "20"}).
             should have_been_made
         end
       end
@@ -857,16 +905,16 @@ ID                  Posted at     Screen name    Text
     context "one user" do
       it "should request the correct resource" do
         stub_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:body => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.follow("sferik")
         a_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:body => {:screen_name => "sferik"}).
           should have_been_made
       end
       it "should have the correct output" do
         stub_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:body => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.follow("sferik")
         $stdout.string.should =~ /^@testcli is now following 1 more user\.$/
@@ -875,26 +923,26 @@ ID                  Posted at     Screen name    Text
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_post("/1/friendships/create.json").
-            with(:body => {:user_id => "7505382", :include_entities => "false"}).
+            with(:body => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.follow("7505382")
           a_post("/1/friendships/create.json").
-            with(:body => {:user_id => "7505382", :include_entities => "false"}).
+            with(:body => {:user_id => "7505382"}).
             should have_been_made
         end
       end
       context "Twitter is down" do
         it "should retry 3 times and then raise an error" do
           stub_post("/1/friendships/create.json").
-            with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+            with(:body => {:screen_name => "sferik"}).
             to_return(:status => 502)
           lambda do
             @cli.follow("sferik")
           end.should raise_error("Twitter is down or being upgraded.")
           a_post("/1/friendships/create.json").
-            with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+            with(:body => {:screen_name => "sferik"}).
             should have_been_made.times(3)
         end
       end
@@ -907,7 +955,7 @@ ID                  Posted at     Screen name    Text
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -916,7 +964,7 @@ ID                  Posted at     Screen name    Text
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1033,7 +1081,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
     end
@@ -1050,7 +1098,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :user_id => "7505382"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
     end
@@ -1062,7 +1110,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -1071,7 +1119,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1182,7 +1230,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           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/users/lookup.json").
-          with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+          with(:query => {:user_id => "213747670,428004849"}).
           to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
@@ -1191,7 +1239,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
@@ -1207,7 +1255,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
           a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1223,7 +1271,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -1235,7 +1283,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1358,7 +1406,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
@@ -1380,7 +1428,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
           a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1396,7 +1444,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -1408,7 +1456,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        with(:query => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1531,7 +1579,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
@@ -1553,7 +1601,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
           a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1688,13 +1736,13 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
   describe "#mentions" do
     before do
       stub_get("/1/statuses/mentions.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.mentions
       a_get("/1/statuses/mentions.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1789,15 +1837,31 @@ ID                  Posted at     Screen name    Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/statuses/mentions.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/mentions.json").
+          with(:query => {:count => "200"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/mentions.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
+          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
         @cli.mentions
         a_get("/1/statuses/mentions.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
+        @cli.mentions
+        a_get("/1/statuses/mentions.json").
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/statuses/mentions.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
           should have_been_made
       end
     end
@@ -1816,13 +1880,13 @@ ID                  Posted at     Screen name    Text
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1/users/show.json").
-          with(:query => {:user_id => "420", :include_entities => "false"}).
+          with(:query => {:user_id => "420"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.open("420")
         a_get("/1/users/show.json").
-          with(:query => {:user_id => "420", :include_entities => "false"}).
+          with(:query => {:user_id => "420"}).
           should have_been_made
       end
     end
@@ -1830,13 +1894,13 @@ ID                  Posted at     Screen name    Text
       before do
         @cli.options = @cli.options.merge("status" => true)
         stub_get("/1/statuses/show/55709764298092545.json").
-          with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+          with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.open("55709764298092545")
         a_get("/1/statuses/show/55709764298092545.json").
-          with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+          with(:query => {:include_my_retweet => "false"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -1851,10 +1915,10 @@ ID                  Posted at     Screen name    Text
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
       stub_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+        with(:query => {:include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1/statuses/update.json").
-        with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :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"})
@@ -1864,10 +1928,10 @@ ID                  Posted at     Screen name    Text
     it "should request the correct resource" do
       @cli.reply("55709764298092545", "Testing")
       a_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+        with(:query => {:include_my_retweet => "false"}).
         should have_been_made
       a_post("/1/statuses/update.json").
-        with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).
         should have_been_made
       a_request(:get, "http://checkip.dyndns.org/").
         should have_been_made
@@ -1885,10 +1949,10 @@ ID                  Posted at     Screen name    Text
       it "should request the correct resource" do
         @cli.reply("55709764298092545", "Testing")
         a_get("/1/statuses/show/55709764298092545.json").
-          with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+          with(:query => {:include_my_retweet => "false"}).
           should have_been_made
         a_post("/1/statuses/update.json").
-          with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+          with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).
           should have_been_made
         a_request(:get, "http://checkip.dyndns.org/").
           should have_been_made
@@ -1906,13 +1970,13 @@ ID                  Posted at     Screen name    Text
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1/report_spam.json").
-        with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:body => {:screen_name => "sferik"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.report_spam("sferik")
       a_post("/1/report_spam.json").
-        with(:body => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:body => {:screen_name => "sferik"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1923,13 +1987,13 @@ ID                  Posted at     Screen name    Text
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1/report_spam.json").
-          with(:body => {:user_id => "7505382", :include_entities => "false"}).
+          with(:body => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.report_spam("7505382")
         a_post("/1/report_spam.json").
-          with(:body => {:user_id => "7505382", :include_entities => "false"}).
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
     end
@@ -1955,14 +2019,14 @@ ID                  Posted at     Screen name    Text
   describe "#retweets" do
     before do
       stub_get("/1/statuses/retweeted_by_me.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     context "without arguments" do
       it "should request the correct resource" do
         @cli.retweets
         a_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "20"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -2058,41 +2122,57 @@ ID                  Posted at     Screen name    Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/retweeted_by_me.json").
+          with(:query => {:count => "200"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/retweeted_by_me.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
+          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
+        @cli.retweets
+        a_get("/1/statuses/retweeted_by_me.json").
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
         @cli.retweets
         a_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/statuses/retweeted_by_me.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
           should have_been_made
       end
     end
     context "with a user passed" do
       before do
         stub_get("/1/statuses/retweeted_by_user.json").
-          with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:count => "20", :screen_name => "sferik"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.retweets("sferik")
         a_get("/1/statuses/retweeted_by_user.json").
-          with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:count => "20", :screen_name => "sferik"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/statuses/retweeted_by_user.json").
-            with(:query => {:count => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:count => "20", :user_id => "7505382"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.retweets("7505382")
           a_get("/1/statuses/retweeted_by_user.json").
-            with(:query => {:count => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:count => "20", :user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -2110,13 +2190,13 @@ ID                  Posted at     Screen name    Text
   describe "#status" do
     before do
       stub_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+        with(:query => {:include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.status("55709764298092545")
       a_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
+        with(:query => {:include_my_retweet => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -2150,7 +2230,7 @@ ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
       stub_get("/1/account/verify_credentials.json").
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/users/recommendations.json").
-        with(:query => {:limit => "20", :include_entities => "false", :screen_name => "sferik"}).
+        with(:query => {:limit => "20", :screen_name => "sferik"}).
         to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
@@ -2158,7 +2238,7 @@ ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
       stub_get("/1/account/verify_credentials.json").
         should have_been_made
       a_get("/1/users/recommendations.json").
-        with(:query => {:limit => "20", :include_entities => "false", :screen_name => "sferik"}).
+        with(:query => {:limit => "20", :screen_name => "sferik"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -2237,13 +2317,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       before do
         @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/users/recommendations.json").
-          with(:query => {:limit => "1", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:limit => "1", :screen_name => "sferik"}).
           to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should limit the number of results" do
         @cli.suggest
         a_get("/1/users/recommendations.json").
-          with(:query => {:limit => "1", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:limit => "1", :screen_name => "sferik"}).
           should have_been_made
       end
     end
@@ -2287,7 +2367,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should request the correct resource" do
         @cli.suggest("sferik")
         a_get("/1/users/recommendations.json").
-          with(:query => {:limit => "20", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:limit => "20", :screen_name => "sferik"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -2298,13 +2378,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/users/recommendations.json").
-            with(:query => {:limit => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:limit => "20", :user_id => "7505382"}).
             to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.suggest("7505382")
           a_get("/1/users/recommendations.json").
-            with(:query => {:limit => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:limit => "20", :user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -2314,14 +2394,14 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
   describe "#timeline" do
     before do
       stub_get("/1/statuses/home_timeline.json").
-        with(:query => {:count => "20", :include_entities => "false"}).
+        with(:query => {:count => "20"}).
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     context "without user" do
       it "should request the correct resource" do
         @cli.timeline
         a_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "20"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -2417,41 +2497,87 @@ ID                  Posted at     Screen name    Text
     end
     context "--number" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
         stub_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/home_timeline.json").
+          with(:query => {:count => "200"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/statuses/home_timeline.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
+          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results" do
+      it "should limit the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
         @cli.timeline
         a_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "1", :include_entities => "false"}).
+          with(:query => {:count => "1"}).
+          should have_been_made
+      end
+      it "should limit the number of results to 345" do
+        @cli.options = @cli.options.merge("number" => 345)
+        @cli.timeline
+        a_get("/1/statuses/home_timeline.json").
+          with(:query => {:count => "200"}).
+          should have_been_made
+        a_get("/1/statuses/home_timeline.json").
+          with(:query => {:count => "145", :max_id => "194546264212385792"}).
           should have_been_made
       end
     end
     context "with a user passed" do
       before do
         stub_get("/1/statuses/user_timeline.json").
-          with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:count => "20", :screen_name => "sferik"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.timeline("sferik")
         a_get("/1/statuses/user_timeline.json").
-          with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
+          with(:query => {:count => "20", :screen_name => "sferik"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1/statuses/user_timeline.json").
-            with(:query => {:count => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:count => "20", :user_id => "7505382"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.timeline("7505382")
           a_get("/1/statuses/user_timeline.json").
-            with(:query => {:count => "20", :include_entities => "false", :user_id => "7505382"}).
+            with(:query => {:count => "20", :user_id => "7505382"}).
+            should have_been_made
+        end
+      end
+      context "--number" do
+        before do
+          stub_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "1", :screen_name => "sferik"}).
+            to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :screen_name => "sferik"}).
+            to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "145", :screen_name => "sferik", :max_id => "194546264212385792"}).
+            to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        end
+        it "should limit the number of results to 1" do
+          @cli.options = @cli.options.merge("number" => 1)
+          @cli.timeline("sferik")
+          a_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "1", :screen_name => "sferik"}).
+            should have_been_made
+        end
+        it "should limit the number of results to 345" do
+          @cli.options = @cli.options.merge("number" => 345)
+          @cli.timeline("sferik")
+          a_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :screen_name => "sferik"}).
+            should have_been_made
+          a_get("/1/statuses/user_timeline.json").
+            with(:query => {:count => "145", :screen_name => "sferik", :max_id => "194546264212385792"}).
             should have_been_made
         end
       end
@@ -2580,16 +2706,16 @@ WOEID     Parent ID  Type       Name           Country
     context "one user" do
       it "should request the correct resource" do
         stub_delete("/1/friendships/destroy.json").
-          with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:query => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
         a_delete("/1/friendships/destroy.json").
-          with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:query => {:screen_name => "sferik"}).
           should have_been_made
       end
       it "should have the correct output" do
         stub_delete("/1/friendships/destroy.json").
-          with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+          with(:query => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
         $stdout.string.should =~ /^@testcli is no longer following 1 user\.$/
@@ -2598,26 +2724,26 @@ WOEID     Parent ID  Type       Name           Country
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_delete("/1/friendships/destroy.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.unfollow("7505382")
           a_delete("/1/friendships/destroy.json").
-            with(:query => {:user_id => "7505382", :include_entities => "false"}).
+            with(:query => {:user_id => "7505382"}).
             should have_been_made
         end
       end
       context "Twitter is down" do
         it "should retry 3 times and then raise an error" do
           stub_delete("/1/friendships/destroy.json").
-            with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+            with(:query => {:screen_name => "sferik"}).
             to_return(:status => 502)
           lambda do
             @cli.unfollow("sferik")
           end.should raise_error("Twitter is down or being upgraded.")
           a_delete("/1/friendships/destroy.json").
-            with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+            with(:query => {:screen_name => "sferik"}).
             should have_been_made.times(3)
         end
       end
@@ -2628,7 +2754,7 @@ WOEID     Parent ID  Type       Name           Country
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
       stub_post("/1/statuses/update.json").
-        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        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"})
       stub_request(:get, "http://checkip.dyndns.org/").
         to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
@@ -2638,7 +2764,7 @@ WOEID     Parent ID  Type       Name           Country
     it "should request the correct resource" do
       @cli.update("Testing")
       a_post("/1/statuses/update.json").
-        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).
         should have_been_made
       a_request(:get, "http://checkip.dyndns.org/").
         should have_been_made
@@ -2654,13 +2780,13 @@ WOEID     Parent ID  Type       Name           Country
   describe "#users" do
     before do
       stub_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik,pengwynn", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik,pengwynn"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.users("sferik", "pengwynn")
       a_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik,pengwynn", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik,pengwynn"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -2711,13 +2837,13 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382,14100886", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382,14100886"}).
           to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.users("7505382", "14100886")
         a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382,14100886", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382,14100886"}).
           should have_been_made
       end
     end
@@ -2791,13 +2917,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
   describe "#whois" do
     before do
       stub_get("/1/users/show.json").
-        with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.whois("sferik")
       a_get("/1/users/show.json").
-        with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -2834,13 +2960,13 @@ ID,Verified,Name,Screen name,Bio,Location,Following,Last update,Lasted updated a
       before do
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1/users/show.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.whois("7505382")
         a_get("/1/users/show.json").
-          with(:query => {:user_id => "7505382", :include_entities => "false"}).
+          with(:query => {:user_id => "7505382"}).
           should have_been_made
       end
     end