t 1.6.0 → 1.7.0

data/spec/delete_spec.rb

@@ -21,7 +21,7 @@ describe T::Delete do
   describe "#block" do
     before do
       @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/blocks/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/blocks/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"))
     end
     it "requests the correct resource" do
       @delete.block("sferik")
@@ -34,7 +34,7 @@ describe T::Delete do
     context "--id" do
       before do
         @delete.options = @delete.options.merge("id" => true)
-        stub_post("/1.1/blocks/destroy.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/blocks/destroy.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"))
       end
       it "requests the correct resource" do
         @delete.block("7505382")
@@ -46,8 +46,8 @@ describe T::Delete do
   describe "#dm" do
     before do
       @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/direct_messages/show.json").with(:query => {:id => "1773478249"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1773478249"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages/show.json").with(:query => {:id => "1773478249"}).to_return(:body => fixture("direct_message.json"))
+      stub_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1773478249"}).to_return(:body => fixture("direct_message.json"))
     end
     it "requests the correct resource" do
       $stdout.should_receive(:print).with("Are you sure you want to permanently delete the direct message to @pengwynn: \"Creating a fixture for the Twitter gem\"? [y/N] ")
@@ -90,14 +90,14 @@ describe T::Delete do
   describe "#favorite" do
     before do
       @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/statuses/show/28439861609.json").with(:query => {:include_my_retweet => "false", :trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/favorites/destroy.json").with(:body => {:id => "28439861609"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/show/28439861609.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"))
+      stub_post("/1.1/favorites/destroy.json").with(:body => {:id => "28439861609"}).to_return(:body => fixture("status.json"))
     end
     it "requests the correct resource" do
       $stdout.should_receive(:print).with("Are you sure you want to remove @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\" from your favorites? [y/N] ")
       $stdin.should_receive(:gets).and_return("yes")
       @delete.favorite("28439861609")
-      expect(a_get("/1.1/statuses/show/28439861609.json").with(:query => {:include_my_retweet => "false", :trim_user => "true"})).to have_been_made
+      expect(a_get("/1.1/statuses/show/28439861609.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
       expect(a_post("/1.1/favorites/destroy.json").with(:body => {:id => "28439861609"})).to have_been_made
     end
     context "yes" do
@@ -134,9 +134,9 @@ describe T::Delete do
   describe "#list" do
     before do
       @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "sferik", :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/lists/destroy.json").with(:body => {:owner_id => "7505382", :list_id => "8863586"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"))
+      stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "sferik", :slug => 'presidents'}).to_return(:body => fixture("list.json"))
+      stub_post("/1.1/lists/destroy.json").with(:body => {:owner_id => "7505382", :list_id => "8863586"}).to_return(:body => fixture("list.json"))
     end
     it "requests the correct resource" do
       $stdout.should_receive(:print).with("Are you sure you want to permanently delete the list \"presidents\"? [y/N] ")
@@ -178,7 +178,7 @@ describe T::Delete do
     context "--id" do
       before do
         @delete.options = @delete.options.merge("id" => true)
-        stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "sferik", :list_id => "8863586"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "sferik", :list_id => "8863586"}).to_return(:body => fixture("list.json"))
       end
       it "requests the correct resource" do
         $stdout.should_receive(:print).with("Are you sure you want to permanently delete the list \"presidents\"? [y/N] ")
@@ -194,14 +194,14 @@ describe T::Delete do
   describe "#status" do
     before do
       @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/statuses/show/26755176471724032.json").with(:query => {:include_my_retweet => "false", :trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/statuses/destroy/26755176471724032.json").with(:body => {:trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/show/26755176471724032.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"))
+      stub_post("/1.1/statuses/destroy/26755176471724032.json").with(:body => {:trim_user => "true"}).to_return(:body => fixture("status.json"))
     end
     it "requests the correct resource" do
       $stdout.should_receive(:print).with("Are you sure you want to permanently delete @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\"? [y/N] ")
       $stdin.should_receive(:gets).and_return("yes")
       @delete.status("26755176471724032")
-      expect(a_get("/1.1/statuses/show/26755176471724032.json").with(:query => {:include_my_retweet => "false", :trim_user => "true"})).to have_been_made
+      expect(a_get("/1.1/statuses/show/26755176471724032.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
       expect(a_post("/1.1/statuses/destroy/26755176471724032.json").with(:body => {:trim_user => "true"})).to have_been_made
     end
     context "yes" do

data/spec/list_spec.rb

@@ -31,8 +31,8 @@ describe T::List do
   describe "#add" do
     before do
       @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/lists/members/create_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"))
+      stub_post("/1.1/lists/members/create_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"))
     end
     it "requests the correct resource" do
       @list.add("presidents", "BarackObama")
@@ -46,7 +46,7 @@ describe T::List do
     context "--id" do
       before do
         @list.options = @list.options.merge("id" => true)
-        stub_post("/1.1/lists/members/create_all.json").with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/create_all.json").with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"))
       end
       it "requests the correct resource" do
         @list.add("presidents", "7505382")
@@ -68,7 +68,7 @@ describe T::List do
   describe "#create" do
     before do
       @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/lists/create.json").with(:body => {:name => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/lists/create.json").with(:body => {:name => "presidents"}).to_return(:body => fixture("list.json"))
     end
     it "requests the correct resource" do
       @list.create("presidents")
@@ -83,7 +83,7 @@ describe T::List do
   describe "#information" do
     before do
       @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "testcli", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => "testcli", :slug => "presidents"}).to_return(:body => fixture("list.json"))
     end
     it "requests the correct resource" do
       @list.information("presidents")
@@ -112,7 +112,7 @@ URL          https://twitter.com/sferik/presidents
       context "--id" do
         before do
           @list.options = @list.options.merge("id" => true)
-          stub_get("/1.1/lists/show.json").with(:query => {:owner_id => "7505382", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/lists/show.json").with(:query => {:owner_id => "7505382", :slug => "presidents"}).to_return(:body => fixture("list.json"))
         end
         it "requests the correct resource" do
           @list.information("7505382/presidents")
@@ -136,11 +136,11 @@ ID,Description,Slug,Screen name,Created at,Members,Subscribers,Following,Mode,UR
 
   describe "#members" do
     before do
-      stub_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :skip_status => "true", :slug => "presidents"}).to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :slug => "presidents"}).to_return(:body => fixture("users_list.json"))
     end
     it "requests the correct resource" do
       @list.members("presidents")
-      expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :skip_status => "true", :slug => "presidents"})).to have_been_made
+      expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :slug => "presidents"})).to have_been_made
     end
     it "has the correct output" do
       @list.members("presidents")
@@ -256,16 +256,16 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context "with a user passed" do
       it "requests the correct resource" do
         @list.members("testcli/presidents")
-        expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :skip_status => "true", :slug => "presidents"})).to have_been_made
+        expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_screen_name => "testcli", :slug => "presidents"})).to have_been_made
       end
       context "--id" do
         before do
           @list.options = @list.options.merge("id" => true)
-          stub_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_id => "7505382", :skip_status => "true", :slug => "presidents"}).to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_id => "7505382", :slug => "presidents"}).to_return(:body => fixture("users_list.json"))
         end
         it "requests the correct resource" do
           @list.members("7505382/presidents")
-          expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_id => "7505382", :skip_status => "true", :slug => "presidents"})).to have_been_made
+          expect(a_get("/1.1/lists/members.json").with(:query => {:cursor => "-1", :owner_id => "7505382", :slug => "presidents"})).to have_been_made
         end
       end
     end
@@ -274,23 +274,23 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe "#remove" do
     before do
       @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"))
     end
     it "requests the correct resource" do
-      stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"))
       @list.remove("presidents", "BarackObama")
       expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
       expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"})).to have_been_made
     end
     it "has the correct output" do
-      stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:screen_name => "BarackObama", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"))
       @list.remove("presidents", "BarackObama")
       expect($stdout.string.split("\n").first).to eq "@testcli removed 1 member from the list \"presidents\"."
     end
     context "--id" do
       before do
         @list.options = @list.options.merge("id" => true)
-        stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).to_return(:body => fixture("list.json"))
       end
       it "requests the correct resource" do
         @list.remove("presidents", "7505382")
@@ -311,7 +311,8 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#timeline" do
     before do
-      stub_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "testcli", :count => "20", :slug => "presidents"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      @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"))
     end
     it "requests the correct resource" do
       @list.timeline("presidents")
@@ -397,6 +398,258 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
       eos
     end
+    context "--color=never" do
+      before do
+        @list.options = @list.options.merge("color" => "never")
+      end
+      it "outputs without color" do
+        @list.timeline("presidents")
+        expect($stdout.string).to eq <<-eos
+   @mutgoff
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
+
+   @ironicsans
+   If you like good real-life stories, check out @NarrativelyNY's just-launched 
+   site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
+
+   @pat_shaughnessy
+   Something else to vote for: "New Rails workshops to bring more women into the 
+   Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
+
+   @calebelston
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
+
+   @calebelston
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+
+   @fivethirtyeight
+   The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
+   THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
+
+   @codeforamerica
+   RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
+   Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
+   @TheaClay
+
+   @fbjork
+   RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
+   http://t.co/kGEykswZ /cc @JRuby @headius
+
+   @mbostock
+   If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+
+   @FakeDorsey
+   “Write drunk. Edit sober.”—Ernest Hemingway
+
+   @al3x
+   RT @wcmaier: Better banking through better ops: build something new with us 
+   @Simplify (remote, PDX) http://t.co/8WgzKZH3
+
+   @calebelston
+   We just announced Mosaic, what we've been working on since the Yobongo 
+   acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
+
+   @BarackObama
+   Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
+   #Obama2012
+
+   @JEG2
+   RT @tenderlove: If corporations are people, can we use them to drive in the 
+   carpool lane?
+
+   @eveningedition
+   LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
+   China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+
+   @dhh
+   RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
+   achievement: why this goulish jingoism is so warped http://t.co/kood278s
+
+   @jasonfried
+   The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
+   http://t.co/MwCRsHQg
+
+   @sferik
+   @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
+   to be missing "1.1" from the URL.
+
+   @sferik
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+
+   @dwiskus
+   Gentlemen, you can't fight in here! This is the war room! 
+   http://t.co/kMxMYyqF
+
+        eos
+      end
+    end
+    context "--color=auto" do
+      before do
+        @list.options = @list.options.merge("color" => "auto")
+      end
+      it "outputs without color when stdout is not a tty" do
+        @list.timeline("presidents")
+        expect($stdout.string).to eq <<-eos
+   @mutgoff
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
+
+   @ironicsans
+   If you like good real-life stories, check out @NarrativelyNY's just-launched 
+   site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
+
+   @pat_shaughnessy
+   Something else to vote for: "New Rails workshops to bring more women into the 
+   Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
+
+   @calebelston
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
+
+   @calebelston
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+
+   @fivethirtyeight
+   The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
+   THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
+
+   @codeforamerica
+   RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
+   Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
+   @TheaClay
+
+   @fbjork
+   RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
+   http://t.co/kGEykswZ /cc @JRuby @headius
+
+   @mbostock
+   If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+
+   @FakeDorsey
+   “Write drunk. Edit sober.”—Ernest Hemingway
+
+   @al3x
+   RT @wcmaier: Better banking through better ops: build something new with us 
+   @Simplify (remote, PDX) http://t.co/8WgzKZH3
+
+   @calebelston
+   We just announced Mosaic, what we've been working on since the Yobongo 
+   acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
+
+   @BarackObama
+   Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
+   #Obama2012
+
+   @JEG2
+   RT @tenderlove: If corporations are people, can we use them to drive in the 
+   carpool lane?
+
+   @eveningedition
+   LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
+   China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+
+   @dhh
+   RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
+   achievement: why this goulish jingoism is so warped http://t.co/kood278s
+
+   @jasonfried
+   The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
+   http://t.co/MwCRsHQg
+
+   @sferik
+   @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
+   to be missing "1.1" from the URL.
+
+   @sferik
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+
+   @dwiskus
+   Gentlemen, you can't fight in here! This is the war room! 
+   http://t.co/kMxMYyqF
+
+        eos
+      end
+      it "outputs with color when stdout is a tty" do
+        $stdout.stub!(:"tty?").and_return(true)
+        @list.timeline("presidents")
+        expect($stdout.string).to eq <<-eos
+\e[1m\e[33m   @mutgoff\e[0m
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
+
+\e[1m\e[33m   @ironicsans\e[0m
+   If you like good real-life stories, check out @NarrativelyNY's just-launched 
+   site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
+
+\e[1m\e[33m   @pat_shaughnessy\e[0m
+   Something else to vote for: "New Rails workshops to bring more women into the 
+   Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
+
+\e[1m\e[33m   @calebelston\e[0m
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
+
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+
+\e[1m\e[33m   @fivethirtyeight\e[0m
+   The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
+   THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
+
+\e[1m\e[33m   @codeforamerica\e[0m
+   RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
+   Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
+   @TheaClay
+
+\e[1m\e[33m   @fbjork\e[0m
+   RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
+   http://t.co/kGEykswZ /cc @JRuby @headius
+
+\e[1m\e[33m   @mbostock\e[0m
+   If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+
+\e[1m\e[33m   @FakeDorsey\e[0m
+   “Write drunk. Edit sober.”—Ernest Hemingway
+
+\e[1m\e[33m   @al3x\e[0m
+   RT @wcmaier: Better banking through better ops: build something new with us 
+   @Simplify (remote, PDX) http://t.co/8WgzKZH3
+
+\e[1m\e[33m   @calebelston\e[0m
+   We just announced Mosaic, what we've been working on since the Yobongo 
+   acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
+
+\e[1m\e[33m   @BarackObama\e[0m
+   Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
+   #Obama2012
+
+\e[1m\e[33m   @JEG2\e[0m
+   RT @tenderlove: If corporations are people, can we use them to drive in the 
+   carpool lane?
+
+\e[1m\e[33m   @eveningedition\e[0m
+   LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
+   China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+
+\e[1m\e[33m   @dhh\e[0m
+   RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
+   achievement: why this goulish jingoism is so warped http://t.co/kood278s
+
+\e[1m\e[33m   @jasonfried\e[0m
+   The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
+   http://t.co/MwCRsHQg
+
+\e[1m\e[33m   @sferik\e[0m
+   @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
+   to be missing "1.1" from the URL.
+
+\e[1m\e[33m   @sferik\e[0m
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+
+\e[1m\e[33m   @dwiskus\e[0m
+   Gentlemen, you can't fight in here! This is the war room! 
+   http://t.co/kMxMYyqF
+
+        eos
+      end
+    end
+    
     context "--csv" do
       before do
         @list.options = @list.options.merge("csv" => true)
@@ -492,9 +745,9 @@ 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"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => "testcli", :count => "200", :slug => "presidents"}).to_return(:body => fixture("200_statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        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"), :headers => {:content_type => "application/json; charset=utf-8"})
+        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"))
       end
       it "limits the number of results to 1" do
         @list.options = @list.options.merge("number" => 1)
@@ -516,7 +769,7 @@ ID                   Posted at     Screen name       Text
       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"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/lists/statuses.json").with(:query => {:owner_id => "7505382", :count => "20", :slug => "presidents"}).to_return(:body => fixture("statuses.json"))
         end
         it "requests the correct resource" do
           @list.timeline("7505382/presidents")