t 1.1.1 → 1.2.0

data/lib/t/stream.rb

@@ -35,16 +35,16 @@ module T
           print_table([headings])
         end
       end
-      client.on_timeline_status do |status|
+      client.on_timeline_status do |tweet|
         if options['csv']
-          print_csv_status(status)
+          print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_status(status).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.map do |element, index|
             STATUS_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_message(status.user.screen_name, status.text)
+          print_message(tweet.user.screen_name, tweet.text)
         end
       end
       client.sample
@@ -53,8 +53,8 @@ module T
     desc "matrix", "Unfortunately, no one can be told what the Matrix is. You have to see it for yourself."
     def matrix
       require 'tweetstream'
-      client.on_timeline_status do |status|
-        say(status.full_text.gsub("\n", ''), [:bold, :green, :on_black])
+      client.on_timeline_status do |tweet|
+        say(tweet.full_text.gsub("\n", ''), [:bold, :green, :on_black])
       end
       client.sample
     end
@@ -73,16 +73,16 @@ module T
         search.options = search.options.merge(:format => STATUS_HEADINGS_FORMATTING)
         search.all(keywords.join(' OR '))
       end
-      client.on_timeline_status do |status|
+      client.on_timeline_status do |tweet|
         if options['csv']
-          print_csv_status(status)
+          print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_status(status).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.map do |element, index|
             STATUS_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_message(status.user.screen_name, status.text)
+          print_message(tweet.user.screen_name, tweet.text)
         end
       end
       client.track(keywords)
@@ -101,16 +101,16 @@ module T
         cli.options = cli.options.merge(:format => STATUS_HEADINGS_FORMATTING)
         cli.timeline
       end
-      client.on_timeline_status do |status|
+      client.on_timeline_status do |tweet|
         if options['csv']
-          print_csv_status(status)
+          print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_status(status).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.map do |element, index|
             STATUS_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_message(status.user.screen_name, status.text)
+          print_message(tweet.user.screen_name, tweet.text)
         end
       end
       client.userstream
@@ -135,16 +135,16 @@ module T
           print_table([headings])
         end
       end
-      client.on_timeline_status do |status|
+      client.on_timeline_status do |tweet|
         if options['csv']
-          print_csv_status(status)
+          print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_status(status).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.map do |element, index|
             STATUS_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_message(status.user.screen_name, status.text)
+          print_message(tweet.user.screen_name, tweet.text)
         end
       end
       client.follow(user_ids)

data/lib/t/version.rb

@@ -8,12 +8,12 @@ module T
 
     # @return [Integer]
     def self.minor
-      1
+      2
     end
 
     # @return [Integer]
     def self.patch
-      1
+      0
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -90,13 +90,13 @@ testcli
   describe "#block" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1/blocks/create.json").
+      stub_post("/1.1/blocks/create.json").
         with(:body => {:screen_name => "sferik"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.block("sferik")
-      a_post("/1/blocks/create.json").
+      a_post("/1.1/blocks/create.json").
         with(:body => {:screen_name => "sferik"}).
         should have_been_made
     end
@@ -107,13 +107,13 @@ testcli
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_post("/1/blocks/create.json").
+        stub_post("/1.1/blocks/create.json").
           with(:body => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.block("7505382")
-        a_post("/1/blocks/create.json").
+        a_post("/1.1/blocks/create.json").
           with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
@@ -122,16 +122,16 @@ testcli
 
   describe "#direct_messages" do
     before do
-      stub_get("/1/direct_messages.json").
+      stub_get("/1.1/direct_messages.json").
         with(:query => {:count => "20"}).
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1/direct_messages.json").
+      stub_get("/1.1/direct_messages.json").
         with(:query => {:count => "10", "max_id"=>"1624782205"}).
         to_return(:body => fixture("empty_array.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").
+      a_get("/1.1/direct_messages.json").
         with(:query => {:count => "20"}).
         should have_been_made
     end
@@ -220,17 +220,17 @@ ID          Posted at     Screen name  Text
     end
     context "--number" do
       before do
-        stub_get("/1/direct_messages.json").
+        stub_get("/1.1/direct_messages.json").
           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").
+        stub_get("/1.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").
+        stub_get("/1.1/direct_messages.json").
           with(:query => {:count => "200", :max_id => "1624782205"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         (5..195).step(10).to_a.reverse.each do |count|
-          stub_get("/1/direct_messages.json").
+          stub_get("/1.1/direct_messages.json").
             with(:query => {:count => count, :max_id => "1624782205"}).
             to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
@@ -238,21 +238,21 @@ ID          Posted at     Screen name  Text
       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").
+        a_get("/1.1/direct_messages.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.direct_messages
-        a_get("/1/direct_messages.json").
+        a_get("/1.1/direct_messages.json").
           with(:query => {:count => "200"}).
           should have_been_made
-        a_get("/1/direct_messages.json").
+        a_get("/1.1/direct_messages.json").
           with(:query => {:count => "200", :max_id => "1624782205"}).
           should have_been_made.times(14)
         (5..195).step(10).to_a.reverse.each do |count|
-          a_get("/1/direct_messages.json").
+          a_get("/1.1/direct_messages.json").
             with(:query => {:count => count, :max_id => "1624782205"}).
             should have_been_made
         end
@@ -308,16 +308,16 @@ ID          Posted at     Screen name  Text
 
   describe "#direct_messages_sent" do
     before do
-      stub_get("/1/direct_messages/sent.json").
+      stub_get("/1.1/direct_messages/sent.json").
         with(:query => {:count => "20"}).
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1/direct_messages/sent.json").
+      stub_get("/1.1/direct_messages/sent.json").
         with(:query => {:count => "10", "max_id"=>"1624782205"}).
         to_return(:body => fixture("empty_array.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").
+      a_get("/1.1/direct_messages/sent.json").
         with(:query => {:count => "20"}).
         should have_been_made
     end
@@ -406,17 +406,17 @@ ID          Posted at     Screen name  Text
     end
     context "--number" do
       before do
-        stub_get("/1/direct_messages/sent.json").
+        stub_get("/1.1/direct_messages/sent.json").
           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").
+        stub_get("/1.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").
+        stub_get("/1.1/direct_messages/sent.json").
           with(:query => {:count => "200", :max_id => "1624782205"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         (5..195).step(10).to_a.reverse.each do |count|
-          stub_get("/1/direct_messages/sent.json").
+          stub_get("/1.1/direct_messages/sent.json").
             with(:query => {:count => count, :max_id => "1624782205"}).
             to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
@@ -424,21 +424,21 @@ ID          Posted at     Screen name  Text
       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").
+        a_get("/1.1/direct_messages/sent.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.direct_messages_sent
-        a_get("/1/direct_messages/sent.json").
+        a_get("/1.1/direct_messages/sent.json").
           with(:query => {:count => "200"}).
           should have_been_made
-        a_get("/1/direct_messages/sent.json").
+        a_get("/1.1/direct_messages/sent.json").
           with(:query => {:count => "200", :max_id => "1624782205"}).
           should have_been_made.times(14)
         (5..195).step(10).to_a.reverse.each do |count|
-          a_get("/1/direct_messages/sent.json").
+          a_get("/1.1/direct_messages/sent.json").
             with(:query => {:count => count, :max_id => "1624782205"}).
             should have_been_made
         end
@@ -494,26 +494,26 @@ ID          Posted at     Screen name  Text
 
   describe "#groupies" do
     before do
-      stub_get("/1/followers/ids.json").
+      stub_get("/1.1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1/friends/ids.json").
+      stub_get("/1.1/friends/ids.json").
         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"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "213747670,428004849"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.groupies
-      a_get("/1/followers/ids.json").
+      a_get("/1.1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/friends/ids.json").
+      a_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "213747670,428004849"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "213747670,428004849"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -629,45 +629,45 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/followers/ids.json").
+        stub_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.groupies("sferik")
-        a_get("/1/followers/ids.json").
+        a_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "213747670,428004849"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "213747670,428004849"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/followers/ids.json").
+          stub_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/friends/ids.json").
+          stub_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.groupies("7505382")
-          a_get("/1/followers/ids.json").
+          a_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/friends/ids.json").
+          a_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "213747670,428004849"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "213747670,428004849"}).
             should have_been_made
         end
       end
@@ -677,13 +677,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe "#dm" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1/direct_messages/new.json").
+      stub_post("/1.1/direct_messages/new.json").
         with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).
         to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
-      a_post("/1/direct_messages/new.json").
+      a_post("/1.1/direct_messages/new.json").
         with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).
         should have_been_made
     end
@@ -694,13 +694,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_post("/1/direct_messages/new.json").
+        stub_post("/1.1/direct_messages/new.json").
           with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem"}).
           to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.dm("14100886", "Creating a fixture for the Twitter gem")
-        a_post("/1/direct_messages/new.json").
+        a_post("/1.1/direct_messages/new.json").
           with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem"}).
           should have_been_made
       end
@@ -710,13 +710,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe "#does_contain" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1/lists/members/show.json").
+      stub_get("/1.1/lists/members/show.json").
         with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).
         to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.does_contain("presidents")
-      a_get("/1/lists/members/show.json").
+      a_get("/1.1/lists/members/show.json").
         with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).
         should have_been_made
     end
@@ -727,19 +727,19 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/users/show.json").
+        stub_get("/1.1/users/show.json").
           with(:query => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/lists/members/show.json").
+        stub_get("/1.1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"}).
           to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.does_contain("presidents", "7505382")
-        a_get("/1/users/show.json").
+        a_get("/1.1/users/show.json").
           with(:query => {:user_id => "7505382"}).
           should have_been_made
-        a_get("/1/lists/members/show.json").
+        a_get("/1.1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"}).
           should have_been_made
       end
@@ -752,19 +752,19 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/users/show.json").
+          stub_get("/1.1/users/show.json").
             with(:query => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/lists/members/show.json").
+          stub_get("/1.1/lists/members/show.json").
             with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"}).
             to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.does_contain("7505382/presidents", "7505382")
-          a_get("/1/users/show.json").
+          a_get("/1.1/users/show.json").
             with(:query => {:user_id => "7505382"}).
             should have_been_made
-          a_get("/1/lists/members/show.json").
+          a_get("/1.1/lists/members/show.json").
             with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"}).
             should have_been_made
         end
@@ -778,7 +778,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "false" do
       before do
-        stub_get("/1/lists/members/show.json").
+        stub_get("/1.1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).
           to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -786,7 +786,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         lambda do
           @cli.does_contain("presidents")
         end.should raise_error(SystemExit)
-        a_get("/1/lists/members/show.json").
+        a_get("/1.1/lists/members/show.json").
           with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).
           should have_been_made
       end
@@ -796,14 +796,14 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe "#does_follow" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_get("/1/friendships/exists.json").
-        with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
-        to_return(:body => fixture("true.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/friendships/show.json").
+        with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).
+        to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.does_follow("ev")
-      a_get("/1/friendships/exists.json").
-        with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
+      a_get("/1.1/friendships/show.json").
+        with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -813,67 +813,73 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/users/show.json").
+        stub_get("/1.1/users/show.json").
           with(:query => {:user_id => "20"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/friendships/exists.json").
-          with(:query => {:screen_name_a => "sferik", :screen_name_b => "testcli"}).
-          to_return(:body => fixture("true.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").
+          with(:query => {:source_screen_name => "sferik", :target_screen_name => "testcli"}).
+          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.does_follow("20")
-        a_get("/1/users/show.json").
+        a_get("/1.1/users/show.json").
           with(:query => {:user_id => "20"}).
           should have_been_made
-        a_get("/1/friendships/exists.json").
-          with(:query => {:screen_name_a => "sferik", :screen_name_b => "testcli"}).
+        a_get("/1.1/friendships/show.json").
+          with(:query => {:source_screen_name => "sferik", :target_screen_name => "testcli"}).
           should have_been_made
       end
     end
     context "with a user passed" do
+      before do
+        @cli.options = @cli.options.merge("id" => true)
+        stub_get("/1.1/users/show.json").
+          with(:query => {:user_id => "0"}).
+          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").
+          with(:query => {:source_screen_name => "sferik", :target_screen_name => "sferik"}).
+          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
       it "should have the correct output" do
         @cli.does_follow("ev", "testcli")
-        $stdout.string.chomp.should == "Yes, @ev follows @testcli."
+        $stdout.string.chomp.should == "Yes, @sferik follows @sferik."
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/users/show.json").
+          stub_get("/1.1/users/show.json").
             with(:query => {:user_id => "20"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/users/show.json").
+          stub_get("/1.1/users/show.json").
             with(:query => {:user_id => "428004849"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/friendships/exists.json").
-            with(:query => {:screen_name_a => "sferik", :screen_name_b => "sferik"}).
-            to_return(:body => fixture("true.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.does_follow("20", "428004849")
-          a_get("/1/users/show.json").
+          a_get("/1.1/users/show.json").
             with(:query => {:user_id => "20"}).
             should have_been_made
-          a_get("/1/users/show.json").
+          a_get("/1.1/users/show.json").
             with(:query => {:user_id => "428004849"}).
             should have_been_made
-          a_get("/1/friendships/exists.json").
-            with(:query => {:screen_name_a => "sferik", :screen_name_b => "sferik"}).
+          a_get("/1.1/friendships/show.json").
+            with(:query => {:source_screen_name => "sferik", :target_screen_name => "sferik"}).
             should have_been_made
         end
       end
     end
     context "false" do
       before do
-        stub_get("/1/friendships/exists.json").
-          with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
-          to_return(:body => fixture("false.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").
+          with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).
+          to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should exit" do
         lambda do
           @cli.does_follow("ev")
         end.should raise_error(SystemExit)
-        a_get("/1/friendships/exists.json").
-          with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
+        a_get("/1.1/friendships/show.json").
+          with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).
           should have_been_made
       end
     end
@@ -882,12 +888,14 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe "#favorite" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1/favorites/create/26755176471724032.json").
+      stub_post("/1.1/favorites/create.json").
+        with(:body => {:id => "26755176471724032"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.favorite("26755176471724032")
-      a_post("/1/favorites/create/26755176471724032.json").
+      a_post("/1.1/favorites/create.json").
+        with(:body => {:id => "26755176471724032"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -898,86 +906,93 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#favorites" do
     before do
-      stub_get("/1/favorites.json").
+      stub_get("/1.1/favorites/list.json").
         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").
+      a_get("/1.1/favorites/list.json").
         with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
       @cli.favorites
       $stdout.string.should == <<-eos
-\e[1m\e[33m   @ryanbigg\e[0m
-   Things that have made my life better, in order of greatness: GitHub, Travis 
-   CI, the element Oxygen.
+\e[1m\e[33m   @mutgoff\e[0m
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @sfbike\e[0m
-   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
-   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+\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   @levie\e[0m
-   I know you're as rare as leprechauns, but if you're an amazing designer then 
-   Box wants to hire you. Email recruiting@box.com
+\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   @natevillegas\e[0m
-   RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a 
-   mystery. Today is a gift. That's why it's called the present.
+\e[1m\e[33m   @calebelston\e[0m
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @TD\e[0m
-   @kelseysilver how long will you be in town?
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @rusashka\e[0m
-   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+\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   @fat\e[0m
-   @stevej @xc i'm going to picket when i get back.
+\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   @wil\e[0m
-   @0x9900 @paulnivin http://t.co/bwVdtAPe
+\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   @wangtian\e[0m
-   @tianhonghe @xiangxin72 oh, you can even order specific items?
+\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   @shinypb\e[0m
-   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
-   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+\e[1m\e[33m   @FakeDorsey\e[0m
+   “Write drunk. Edit sober.”—Ernest Hemingway
 
-\e[1m\e[33m   @0x9900\e[0m
-   @wil @paulnivin if you want to take you seriously don't say daemontools!
+\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   @kpk\e[0m
-   @shinypb @skilldrick @hoverbird invented it
+\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   @skilldrick\e[0m
-   @shinypb Well played :) @hoverbird
+\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   @sam\e[0m
-   Can someone project the date that I'll get a 27\" retina display?
+\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   @shinypb\e[0m
-   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+\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   @bartt\e[0m
-   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
-   fun. Expect improvements in the weeks to come.
+\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   @skilldrick\e[0m
-   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
-   the duck tales intro at all.
+\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   @sean\e[0m
-   @mep Thanks for coming by. Was great to have you.
+\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   @hoverbird\e[0m
-   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+\e[1m\e[33m   @sferik\e[0m
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @kelseysilver\e[0m
-   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
-   92 others) http://t.co/eoLANJZw
+\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
@@ -989,26 +1004,26 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.favorites
         $stdout.string.should == <<-eos
 ID,Posted at,Screen name,Text
-194548141663027221,2011-04-23 22:08:32 +0000,ryanbigg,"Things that have made my life better, in order of greatness: GitHub, Travis CI, the element Oxygen."
-194563027248121416,2011-04-23 22:08:11 +0000,sfbike,"Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers counted in 1 hour--that's 17 per minute. Way to roll, SF!"
-194548120271416632,2011-04-23 22:07:51 +0000,levie,"I know you're as rare as leprechauns, but if you're an amazing designer then Box wants to hire you. Email recruiting@box.com"
-194548121416630272,2011-04-23 22:07:41 +0000,natevillegas,RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
-194547993607806976,2011-04-23 22:07:10 +0000,TD,@kelseysilver how long will you be in town?
-194547987593183233,2011-04-23 22:07:09 +0000,rusashka,@maciej hahaha :) @gpena together we're going to cover all core 28 languages!
-194547824690597888,2011-04-23 22:06:30 +0000,fat,@stevej @xc i'm going to picket when i get back.
-194547658562605057,2011-04-23 22:05:51 +0000,wil,@0x9900 @paulnivin http://t.co/bwVdtAPe
-194547528430137344,2011-04-23 22:05:19 +0000,wangtian,"@tianhonghe @xiangxin72 oh, you can even order specific items?"
-194547402550689793,2011-04-23 22:04:49 +0000,shinypb,"@kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird"
-194547260233760768,2011-04-23 22:04:16 +0000,0x9900,@wil @paulnivin if you want to take you seriously don't say daemontools!
-194547084349804544,2011-04-23 22:03:34 +0000,kpk,@shinypb @skilldrick @hoverbird invented it
-194546876782092291,2011-04-23 22:02:44 +0000,skilldrick,@shinypb Well played :) @hoverbird
-194546811480969217,2011-04-23 22:02:29 +0000,sam,"Can someone project the date that I'll get a 27"" retina display?"
-194546738810458112,2011-04-23 22:02:11 +0000,shinypb,"@skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain."
-194546727670390784,2011-04-23 22:02:09 +0000,bartt,"@noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come."
-194546649203347456,2011-04-23 22:01:50 +0000,skilldrick,"@hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all."
-194546583608639488,2011-04-23 22:01:34 +0000,sean,@mep Thanks for coming by. Was great to have you.
-194546388707717120,2011-04-23 22:00:48 +0000,hoverbird,"@shinypb @trammell it's all suck a ""duck blur"" sometimes."
-194546264212385793,2011-04-23 22:00:18 +0000,kelseysilver,San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+244111183165157376,2012-09-07 16:33:36 +0000,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)"
+244110336414859264,2012-09-07 16:30:14 +0000,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"
+244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107890632294400,2012-09-07 16:20:31 +0000,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)"
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244106476048764928,2012-09-07 16:14:53 +0000,mbostock,If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+244105599351148544,2012-09-07 16:11:24 +0000,FakeDorsey,“Write drunk. Edit sober.”—Ernest Hemingway
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244104146997870594,2012-09-07 16:05:38 +0000,calebelston,"We just announced Mosaic, what we've been working on since the Yobongo acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic"
+244103057175113729,2012-09-07 16:01:18 +0000,BarackObama,Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 #Obama2012
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102741125890048,2012-09-07 16:00:03 +0000,eveningedition,LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244102490646278146,2012-09-07 15:59:03 +0000,jasonfried,"The story of Mars Curiosity's gears, made by a factory in Rockford, IL: http://t.co/MwCRsHQg"
+244102209942458368,2012-09-07 15:57:56 +0000,sferik,"@episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem to be missing ""1.1"" from the URL."
+244100411563339777,2012-09-07 15:50:47 +0000,sferik,@episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+244099460672679938,2012-09-07 15:47:01 +0000,dwiskus,"Gentlemen, you can't fight in here! This is the war room! http://t.co/kMxMYyqF"
         eos
       end
     end
@@ -1019,27 +1034,27 @@ ID,Posted at,Screen name,Text
       it "should output in long format" do
         @cli.favorites
         $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
+ID                  Posted at     Screen name       Text
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
         eos
       end
       context "--reverse" do
@@ -1049,94 +1064,94 @@ ID                  Posted at     Screen name    Text
         it "should reverse the order of the sort" do
           @cli.favorites
           $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
+ID                  Posted at     Screen name       Text
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
           eos
         end
       end
     end
     context "--number" do
       before do
-        stub_get("/1/favorites.json").
+        stub_get("/1.1/favorites/list.json").
           with(:query => {:count => "1"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/favorites.json").
+        stub_get("/1.1/favorites/list.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 => "200", :max_id => "194546264212385792"}).
+        stub_get("/1.1/favorites/list.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1/favorites.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          stub_get("/1.1/favorites/list.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
       end
       it "should limit the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.favorites
-        a_get("/1/favorites.json").
+        a_get("/1.1/favorites/list.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").
+        a_get("/1.1/favorites/list.json").
           with(:query => {:count => "200"}).
           should have_been_made
-        a_get("/1/favorites.json").
-          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+        a_get("/1.1/favorites/list.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           should have_been_made.times(7)
         (5..185).step(20).to_a.reverse.each do |count|
-          a_get("/1/favorites.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          a_get("/1.1/favorites/list.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             should have_been_made
         end
       end
     end
     context "with a user passed" do
       before do
-        stub_get("/1/favorites/sferik.json").
-          with(:query => {:count => "20"}).
+        stub_get("/1.1/favorites/list.json").
+          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.favorites("sferik")
-        a_get("/1/favorites/sferik.json").
-          with(:query => {:count => "20"}).
+        a_get("/1.1/favorites/list.json").
+          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/favorites/7505382.json").
-            with(:query => {:count => "20"}).
+          stub_get("/1.1/favorites/list.json").
+            with(:query => {:user_id => "7505382", :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"}).
+          a_get("/1.1/favorites/list.json").
+            with(:query => {:user_id => "7505382", :count => "20"}).
             should have_been_made
         end
       end
@@ -1149,25 +1164,25 @@ ID                  Posted at     Screen name    Text
     end
     context "one user" do
       before do
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           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 => {:screen_name => "sferik,pengwynn"}).
+        stub_post("/1.1/users/lookup.json").
+          with(:body => {:screen_name => "sferik,pengwynn"}).
           to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1/friendships/create.json").
+        stub_post("/1.1/friendships/create.json").
           with(:body => {:user_id => "14100886"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.follow("sferik", "pengwynn")
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:screen_name => "sferik,pengwynn"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:screen_name => "sferik,pengwynn"}).
           should have_been_made
-        a_post("/1/friendships/create.json").
+        a_post("/1.1/friendships/create.json").
           with(:body => {:user_id => "14100886"}).
           should have_been_made
       end
@@ -1178,50 +1193,50 @@ ID                  Posted at     Screen name    Text
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/friends/ids.json").
+          stub_get("/1.1/friends/ids.json").
             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,14100886"}).
+          stub_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "7505382,14100886"}).
             to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_post("/1/friendships/create.json").
+          stub_post("/1.1/friendships/create.json").
             with(:body => {:user_id => "14100886"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.follow("7505382", "14100886")
-          a_get("/1/friends/ids.json").
+          a_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1"}).
             should have_been_made
-          a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382,14100886"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "7505382,14100886"}).
             should have_been_made
-          a_post("/1/friendships/create.json").
+          a_post("/1.1/friendships/create.json").
             with(:body => {:user_id => "14100886"}).
             should have_been_made
         end
       end
       context "Twitter is down" do
         it "should retry 3 times and then raise an error" do
-          stub_get("/1/friends/ids.json").
+          stub_get("/1.1/friends/ids.json").
             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 => {:screen_name => "sferik,pengwynn"}).
+          stub_post("/1.1/users/lookup.json").
+            with(:body => {:screen_name => "sferik,pengwynn"}).
             to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_post("/1/friendships/create.json").
+          stub_post("/1.1/friendships/create.json").
             with(:body => {:user_id => "14100886"}).
             to_return(:status => 502)
           lambda do
             @cli.follow("sferik", "pengwynn")
           end.should raise_error("Twitter is down or being upgraded.")
-          a_get("/1/friends/ids.json").
+          a_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1"}).
             should have_been_made.times(3)
-          a_get("/1/users/lookup.json").
-            with(:query => {:screen_name => "sferik,pengwynn"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:screen_name => "sferik,pengwynn"}).
             should have_been_made.times(3)
-          a_post("/1/friendships/create.json").
+          a_post("/1.1/friendships/create.json").
             with(:body => {:user_id => "14100886"}).
             should have_been_made.times(3)
         end
@@ -1231,20 +1246,20 @@ ID                  Posted at     Screen name    Text
 
   describe "#followings" do
     before do
-      stub_get("/1/friends/ids.json").
+      stub_get("/1.1/friends/ids.json").
         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"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.followings
-      a_get("/1/friends/ids.json").
+      a_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1360,34 +1375,34 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.followings("sferik")
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
     end
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :user_id => "7505382"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.followings("7505382")
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :user_id => "7505382"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
     end
@@ -1395,20 +1410,20 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#followers" do
     before do
-      stub_get("/1/followers/ids.json").
+      stub_get("/1.1/followers/ids.json").
         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"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.followers
-      a_get("/1/followers/ids.json").
+      a_get("/1.1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1524,36 +1539,36 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/followers/ids.json").
+        stub_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/users/lookup.json").
-          with(:query => {:user_id => "213747670,428004849"}).
+        stub_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "213747670,428004849"}).
           to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.followers("sferik")
-        a_get("/1/followers/ids.json").
+        a_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/followers/ids.json").
+          stub_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.followers("7505382")
-          a_get("/1/followers/ids.json").
+          a_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1562,26 +1577,26 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#friends" do
     before do
-      stub_get("/1/friends/ids.json").
+      stub_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1/followers/ids.json").
+      stub_get("/1.1/followers/ids.json").
         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"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.friends
-      a_get("/1/friends/ids.json").
+      a_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/followers/ids.json").
+      a_get("/1.1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1697,45 +1712,45 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/followers/ids.json").
+        stub_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.friends("sferik")
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/followers/ids.json").
+        a_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/friends/ids.json").
+          stub_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/followers/ids.json").
+          stub_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.friends("7505382")
-          a_get("/1/friends/ids.json").
+          a_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/followers/ids.json").
+          a_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1744,26 +1759,26 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#leaders" do
     before do
-      stub_get("/1/friends/ids.json").
+      stub_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1/followers/ids.json").
+      stub_get("/1.1/followers/ids.json").
         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"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.leaders
-      a_get("/1/friends/ids.json").
+      a_get("/1.1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/followers/ids.json").
+      a_get("/1.1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
-      a_get("/1/users/lookup.json").
-        with(:query => {:user_id => "7505382"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:user_id => "7505382"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -1879,45 +1894,45 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/friends/ids.json").
+        stub_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/followers/ids.json").
+        stub_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.leaders("sferik")
-        a_get("/1/friends/ids.json").
+        a_get("/1.1/friends/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/followers/ids.json").
+        a_get("/1.1/followers/ids.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/friends/ids.json").
+          stub_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1/followers/ids.json").
+          stub_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.leaders("7505382")
-          a_get("/1/friends/ids.json").
+          a_get("/1.1/friends/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/followers/ids.json").
+          a_get("/1.1/followers/ids.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
-          a_get("/1/users/lookup.json").
-            with(:query => {:user_id => "7505382"}).
+          a_post("/1.1/users/lookup.json").
+            with(:body => {:user_id => "7505382"}).
             should have_been_made
         end
       end
@@ -1926,13 +1941,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#lists" do
     before do
-      stub_get("/1/lists.json").
+      stub_get("/1.1/lists/list.json").
         with(:query => {:cursor => "-1"}).
         to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.lists
-      a_get("/1/lists.json").
+      a_get("/1.1/lists/list.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
     end
@@ -2022,26 +2037,26 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
     end
     context "with a user passed" do
       before do
-        stub_get("/1/lists.json").
+        stub_get("/1.1/lists/list.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.lists("sferik")
-        a_get("/1/lists.json").
+        a_get("/1.1/lists/list.json").
           with(:query => {:cursor => "-1", :screen_name => "sferik"}).
           should have_been_made
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/lists.json").
+          stub_get("/1.1/lists/list.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.lists("7505382")
-          a_get("/1/lists.json").
+          a_get("/1.1/lists/list.json").
             with(:query => {:cursor => "-1", :user_id => "7505382"}).
             should have_been_made
         end
@@ -2051,86 +2066,93 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
 
   describe "#mentions" do
     before do
-      stub_get("/1/statuses/mentions.json").
+      stub_get("/1.1/statuses/mentions_timeline.json").
         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").
+      a_get("/1.1/statuses/mentions_timeline.json").
         with(:query => {:count => "20"}).
         should have_been_made
     end
     it "should have the correct output" do
       @cli.mentions
       $stdout.string.should == <<-eos
-\e[1m\e[33m   @ryanbigg\e[0m
-   Things that have made my life better, in order of greatness: GitHub, Travis 
-   CI, the element Oxygen.
+\e[1m\e[33m   @mutgoff\e[0m
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @sfbike\e[0m
-   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
-   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+\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   @levie\e[0m
-   I know you're as rare as leprechauns, but if you're an amazing designer then 
-   Box wants to hire you. Email recruiting@box.com
+\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   @natevillegas\e[0m
-   RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a 
-   mystery. Today is a gift. That's why it's called the present.
+\e[1m\e[33m   @calebelston\e[0m
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @TD\e[0m
-   @kelseysilver how long will you be in town?
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @rusashka\e[0m
-   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+\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   @fat\e[0m
-   @stevej @xc i'm going to picket when i get back.
+\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   @wil\e[0m
-   @0x9900 @paulnivin http://t.co/bwVdtAPe
+\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   @wangtian\e[0m
-   @tianhonghe @xiangxin72 oh, you can even order specific items?
+\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   @shinypb\e[0m
-   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
-   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+\e[1m\e[33m   @FakeDorsey\e[0m
+   “Write drunk. Edit sober.”—Ernest Hemingway
 
-\e[1m\e[33m   @0x9900\e[0m
-   @wil @paulnivin if you want to take you seriously don't say daemontools!
+\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   @kpk\e[0m
-   @shinypb @skilldrick @hoverbird invented it
+\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   @skilldrick\e[0m
-   @shinypb Well played :) @hoverbird
+\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   @sam\e[0m
-   Can someone project the date that I'll get a 27\" retina display?
+\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   @shinypb\e[0m
-   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+\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   @bartt\e[0m
-   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
-   fun. Expect improvements in the weeks to come.
+\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   @skilldrick\e[0m
-   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
-   the duck tales intro at all.
+\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   @sean\e[0m
-   @mep Thanks for coming by. Was great to have you.
+\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   @hoverbird\e[0m
-   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+\e[1m\e[33m   @sferik\e[0m
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @kelseysilver\e[0m
-   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
-   92 others) http://t.co/eoLANJZw
+\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
@@ -2142,26 +2164,26 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
         @cli.mentions
         $stdout.string.should == <<-eos
 ID,Posted at,Screen name,Text
-194548141663027221,2011-04-23 22:08:32 +0000,ryanbigg,"Things that have made my life better, in order of greatness: GitHub, Travis CI, the element Oxygen."
-194563027248121416,2011-04-23 22:08:11 +0000,sfbike,"Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers counted in 1 hour--that's 17 per minute. Way to roll, SF!"
-194548120271416632,2011-04-23 22:07:51 +0000,levie,"I know you're as rare as leprechauns, but if you're an amazing designer then Box wants to hire you. Email recruiting@box.com"
-194548121416630272,2011-04-23 22:07:41 +0000,natevillegas,RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
-194547993607806976,2011-04-23 22:07:10 +0000,TD,@kelseysilver how long will you be in town?
-194547987593183233,2011-04-23 22:07:09 +0000,rusashka,@maciej hahaha :) @gpena together we're going to cover all core 28 languages!
-194547824690597888,2011-04-23 22:06:30 +0000,fat,@stevej @xc i'm going to picket when i get back.
-194547658562605057,2011-04-23 22:05:51 +0000,wil,@0x9900 @paulnivin http://t.co/bwVdtAPe
-194547528430137344,2011-04-23 22:05:19 +0000,wangtian,"@tianhonghe @xiangxin72 oh, you can even order specific items?"
-194547402550689793,2011-04-23 22:04:49 +0000,shinypb,"@kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird"
-194547260233760768,2011-04-23 22:04:16 +0000,0x9900,@wil @paulnivin if you want to take you seriously don't say daemontools!
-194547084349804544,2011-04-23 22:03:34 +0000,kpk,@shinypb @skilldrick @hoverbird invented it
-194546876782092291,2011-04-23 22:02:44 +0000,skilldrick,@shinypb Well played :) @hoverbird
-194546811480969217,2011-04-23 22:02:29 +0000,sam,"Can someone project the date that I'll get a 27"" retina display?"
-194546738810458112,2011-04-23 22:02:11 +0000,shinypb,"@skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain."
-194546727670390784,2011-04-23 22:02:09 +0000,bartt,"@noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come."
-194546649203347456,2011-04-23 22:01:50 +0000,skilldrick,"@hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all."
-194546583608639488,2011-04-23 22:01:34 +0000,sean,@mep Thanks for coming by. Was great to have you.
-194546388707717120,2011-04-23 22:00:48 +0000,hoverbird,"@shinypb @trammell it's all suck a ""duck blur"" sometimes."
-194546264212385793,2011-04-23 22:00:18 +0000,kelseysilver,San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+244111183165157376,2012-09-07 16:33:36 +0000,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)"
+244110336414859264,2012-09-07 16:30:14 +0000,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"
+244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107890632294400,2012-09-07 16:20:31 +0000,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)"
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244106476048764928,2012-09-07 16:14:53 +0000,mbostock,If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+244105599351148544,2012-09-07 16:11:24 +0000,FakeDorsey,“Write drunk. Edit sober.”—Ernest Hemingway
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244104146997870594,2012-09-07 16:05:38 +0000,calebelston,"We just announced Mosaic, what we've been working on since the Yobongo acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic"
+244103057175113729,2012-09-07 16:01:18 +0000,BarackObama,Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 #Obama2012
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102741125890048,2012-09-07 16:00:03 +0000,eveningedition,LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244102490646278146,2012-09-07 15:59:03 +0000,jasonfried,"The story of Mars Curiosity's gears, made by a factory in Rockford, IL: http://t.co/MwCRsHQg"
+244102209942458368,2012-09-07 15:57:56 +0000,sferik,"@episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem to be missing ""1.1"" from the URL."
+244100411563339777,2012-09-07 15:50:47 +0000,sferik,@episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+244099460672679938,2012-09-07 15:47:01 +0000,dwiskus,"Gentlemen, you can't fight in here! This is the war room! http://t.co/kMxMYyqF"
         eos
       end
     end
@@ -2172,27 +2194,27 @@ ID,Posted at,Screen name,Text
       it "should output in long format" do
         @cli.mentions
         $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
+ID                  Posted at     Screen name       Text
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
         eos
       end
       context "--reverse" do
@@ -2202,67 +2224,67 @@ ID                  Posted at     Screen name    Text
         it "should reverse the order of the sort" do
           @cli.mentions
           $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
+ID                  Posted at     Screen name       Text
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
           eos
         end
       end
     end
     context "--number" do
       before do
-        stub_get("/1/statuses/mentions.json").
+        stub_get("/1.1/statuses/mentions_timeline.json").
           with(:query => {:count => "1"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1/statuses/mentions.json").
+        stub_get("/1.1/statuses/mentions_timeline.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 => "200", :max_id => "194546264212385792"}).
+        stub_get("/1.1/statuses/mentions_timeline.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1/statuses/mentions.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          stub_get("/1.1/statuses/mentions_timeline.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
       end
       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").
+        a_get("/1.1/statuses/mentions_timeline.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.mentions
-        a_get("/1/statuses/mentions.json").
+        a_get("/1.1/statuses/mentions_timeline.json").
           with(:query => {:count => "200"}).
           should have_been_made
-        a_get("/1/statuses/mentions.json").
-          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+        a_get("/1.1/statuses/mentions_timeline.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           should have_been_made.times(7)
         (5..185).step(20).to_a.reverse.each do |count|
-          a_get("/1/statuses/mentions.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          a_get("/1.1/statuses/mentions_timeline.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             should have_been_made
         end
       end
@@ -2281,13 +2303,13 @@ ID                  Posted at     Screen name    Text
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/users/show.json").
+        stub_get("/1.1/users/show.json").
           with(:query => {:user_id => "420"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.open("420")
-        a_get("/1/users/show.json").
+        a_get("/1.1/users/show.json").
           with(:query => {:user_id => "420"}).
           should have_been_made
       end
@@ -2295,13 +2317,13 @@ ID                  Posted at     Screen name    Text
     context "--status" do
       before do
         @cli.options = @cli.options.merge("status" => true)
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1.1/statuses/show/55709764298092545.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.open("55709764298092545")
-        a_get("/1/statuses/show/55709764298092545.json").
+        a_get("/1.1/statuses/show/55709764298092545.json").
           with(:query => {:include_my_retweet => "false"}).
           should have_been_made
       end
@@ -2313,45 +2335,13 @@ ID                  Posted at     Screen name    Text
     end
   end
 
-  describe "#rate_limit" do
-    before do
-      stub_get("/1/account/rate_limit_status.json").
-        to_return(:body => fixture("rate_limit_status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "should request the correct resource" do
-      @cli.rate_limit
-      a_get("/1/account/rate_limit_status.json").
-        should have_been_made
-    end
-    it "should have the correct output" do
-      @cli.rate_limit
-      $stdout.string.should == <<-eos
-Hourly limit    20,000
-Remaining hits  19,993
-Reset time      Oct 26  2010 (a year from now)
-      eos
-    end
-    context "--csv" do
-      before do
-        @cli.options = @cli.options.merge("csv" => true)
-      end
-      it "should have the correct output" do
-        @cli.rate_limit
-        $stdout.string.should == <<-eos
-Hourly limit,Remaining hits,Reset time
-20000,19993,2010-10-26 12:43:08 +0000
-        eos
-      end
-    end
-  end
-
   describe "#reply" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
-      stub_get("/1/statuses/show/55709764298092545.json").
+      stub_get("/1.1/statuses/show/55709764298092545.json").
         with(:query => {:include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1/statuses/update.json").
+      stub_post("/1.1/statuses/update.json").
         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/").
@@ -2361,10 +2351,10 @@ Hourly limit,Remaining hits,Reset time
     end
     it "should request the correct resource" do
       @cli.reply("55709764298092545", "Testing")
-      a_get("/1/statuses/show/55709764298092545.json").
+      a_get("/1.1/statuses/show/55709764298092545.json").
         with(:query => {:include_my_retweet => "false"}).
         should have_been_made
-      a_post("/1/statuses/update.json").
+      a_post("/1.1/statuses/update.json").
         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/").
@@ -2382,10 +2372,10 @@ Hourly limit,Remaining hits,Reset time
       end
       it "should request the correct resource" do
         @cli.reply("55709764298092545", "Testing")
-        a_get("/1/statuses/show/55709764298092545.json").
+        a_get("/1.1/statuses/show/55709764298092545.json").
           with(:query => {:include_my_retweet => "false"}).
           should have_been_made
-        a_post("/1/statuses/update.json").
+        a_post("/1.1/statuses/update.json").
           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/").
@@ -2403,13 +2393,13 @@ Hourly limit,Remaining hits,Reset time
   describe "#report_spam" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1/report_spam.json").
+      stub_post("/1.1/report_spam.json").
         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").
+      a_post("/1.1/report_spam.json").
         with(:body => {:screen_name => "sferik"}).
         should have_been_made
     end
@@ -2420,13 +2410,13 @@ Hourly limit,Remaining hits,Reset time
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_post("/1/report_spam.json").
+        stub_post("/1.1/report_spam.json").
           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").
+        a_post("/1.1/report_spam.json").
           with(:body => {:user_id => "7505382"}).
           should have_been_made
       end
@@ -2436,12 +2426,12 @@ Hourly limit,Remaining hits,Reset time
   describe "#retweet" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1/statuses/retweet/26755176471724032.json").
+      stub_post("/1.1/statuses/retweet/26755176471724032.json").
         to_return(:body => fixture("retweet.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.retweet("26755176471724032")
-      a_post("/1/statuses/retweet/26755176471724032.json").
+      a_post("/1.1/statuses/retweet/26755176471724032.json").
         should have_been_made
     end
     it "should have the correct output" do
@@ -2452,87 +2442,105 @@ Hourly limit,Remaining hits,Reset time
 
   describe "#retweets" do
     before do
-      stub_get("/1/statuses/retweeted_by_me.json").
-        with(:query => {:count => "20"}).
+      stub_get("/1.1/statuses/user_timeline.json").
+        with(:query => {:count => "200", :include_rts => "true"}).
+        to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/user_timeline.json").
+        with(:query => {:count => "200", :include_rts => "true", :max_id => "244102729860009983"}).
         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"}).
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true"}).
           should have_been_made
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :max_id => "244102729860009983"}).
+          should have_been_made.times(3)
       end
       it "should have the correct output" do
         @cli.retweets
         $stdout.string.should == <<-eos
-\e[1m\e[33m   @ryanbigg\e[0m
-   Things that have made my life better, in order of greatness: GitHub, Travis 
-   CI, the element Oxygen.
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @sfbike\e[0m
-   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
-   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+\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   @levie\e[0m
-   I know you're as rare as leprechauns, but if you're an amazing designer then 
-   Box wants to hire you. Email recruiting@box.com
+\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   @natevillegas\e[0m
-   RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a 
-   mystery. Today is a gift. That's why it's called the present.
+\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   @TD\e[0m
-   @kelseysilver how long will you be in town?
+\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   @rusashka\e[0m
-   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+\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   @fat\e[0m
-   @stevej @xc i'm going to picket when i get back.
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @wil\e[0m
-   @0x9900 @paulnivin http://t.co/bwVdtAPe
+\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   @wangtian\e[0m
-   @tianhonghe @xiangxin72 oh, you can even order specific items?
+\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   @shinypb\e[0m
-   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
-   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+\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   @0x9900\e[0m
-   @wil @paulnivin if you want to take you seriously don't say daemontools!
+\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   @kpk\e[0m
-   @shinypb @skilldrick @hoverbird invented it
+\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   @skilldrick\e[0m
-   @shinypb Well played :) @hoverbird
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @sam\e[0m
-   Can someone project the date that I'll get a 27\" retina display?
+\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   @shinypb\e[0m
-   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+\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   @bartt\e[0m
-   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
-   fun. Expect improvements in the weeks to come.
+\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   @skilldrick\e[0m
-   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
-   the duck tales intro at all.
+\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   @sean\e[0m
-   @mep Thanks for coming by. Was great to have you.
+\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   @hoverbird\e[0m
-   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @kelseysilver\e[0m
-   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
-   92 others) http://t.co/eoLANJZw
+\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
 
         eos
       end
@@ -2545,27 +2553,27 @@ Hourly limit,Remaining hits,Reset time
         @cli.retweets
         $stdout.string.should == <<-eos
 ID,Posted at,Screen name,Text
-194548141663027221,2011-04-23 22:08:32 +0000,ryanbigg,"Things that have made my life better, in order of greatness: GitHub, Travis CI, the element Oxygen."
-194563027248121416,2011-04-23 22:08:11 +0000,sfbike,"Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers counted in 1 hour--that's 17 per minute. Way to roll, SF!"
-194548120271416632,2011-04-23 22:07:51 +0000,levie,"I know you're as rare as leprechauns, but if you're an amazing designer then Box wants to hire you. Email recruiting@box.com"
-194548121416630272,2011-04-23 22:07:41 +0000,natevillegas,RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
-194547993607806976,2011-04-23 22:07:10 +0000,TD,@kelseysilver how long will you be in town?
-194547987593183233,2011-04-23 22:07:09 +0000,rusashka,@maciej hahaha :) @gpena together we're going to cover all core 28 languages!
-194547824690597888,2011-04-23 22:06:30 +0000,fat,@stevej @xc i'm going to picket when i get back.
-194547658562605057,2011-04-23 22:05:51 +0000,wil,@0x9900 @paulnivin http://t.co/bwVdtAPe
-194547528430137344,2011-04-23 22:05:19 +0000,wangtian,"@tianhonghe @xiangxin72 oh, you can even order specific items?"
-194547402550689793,2011-04-23 22:04:49 +0000,shinypb,"@kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird"
-194547260233760768,2011-04-23 22:04:16 +0000,0x9900,@wil @paulnivin if you want to take you seriously don't say daemontools!
-194547084349804544,2011-04-23 22:03:34 +0000,kpk,@shinypb @skilldrick @hoverbird invented it
-194546876782092291,2011-04-23 22:02:44 +0000,skilldrick,@shinypb Well played :) @hoverbird
-194546811480969217,2011-04-23 22:02:29 +0000,sam,"Can someone project the date that I'll get a 27"" retina display?"
-194546738810458112,2011-04-23 22:02:11 +0000,shinypb,"@skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain."
-194546727670390784,2011-04-23 22:02:09 +0000,bartt,"@noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come."
-194546649203347456,2011-04-23 22:01:50 +0000,skilldrick,"@hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all."
-194546583608639488,2011-04-23 22:01:34 +0000,sean,@mep Thanks for coming by. Was great to have you.
-194546388707717120,2011-04-23 22:00:48 +0000,hoverbird,"@shinypb @trammell it's all suck a ""duck blur"" sometimes."
-194546264212385793,2011-04-23 22:00:18 +0000,kelseysilver,San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
-        eos
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+       eos
       end
     end
     context "--long" do
@@ -2575,27 +2583,27 @@ ID,Posted at,Screen name,Text
       it "should output in long format" do
         @cli.retweets
         $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
+ID                  Posted at     Screen name      Text
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
         eos
       end
       context "--reverse" do
@@ -2605,95 +2613,94 @@ ID                  Posted at     Screen name    Text
         it "should reverse the order of the sort" do
           @cli.retweets
           $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
+ID                  Posted at     Screen name      Text
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
+244102729860009984  Sep  7 08:00  @dhh             RT @ggreenwald: Democrats ...
+244102834398851073  Sep  7 08:00  @JEG2            RT @tenderlove: If corpora...
+244104558433951744  Sep  7 08:07  @al3x            RT @wcmaier: Better bankin...
+244107236262170624  Sep  7 08:17  @fbjork          RT @jondot: Just published...
+244107823733174272  Sep  7 08:20  @codeforamerica  RT @randomhacks: Going to ...
+244108728834592770  Sep  7 08:23  @calebelston     RT @olivercameron: Mosaic ...
           eos
         end
       end
     end
     context "--number" do
       before do
-        stub_get("/1/statuses/retweeted_by_me.json").
-          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"}).
+        stub_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true"}).
           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", :max_id => "194546264212385792"}).
+        stub_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :max_id => "244107823733174271"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1/statuses/retweeted_by_me.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
-            to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
       end
       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"}).
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true"}).
           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 => "200"}).
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true"}).
+          should have_been_made
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :max_id => "244107823733174271"}).
           should have_been_made
-        a_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "200", :max_id => "194546264212385792"}).
-          should have_been_made.times(7)
-        (5..185).step(20).to_a.reverse.each do |count|
-          a_get("/1/statuses/retweeted_by_me.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
-            should have_been_made
-        end
       end
     end
     context "with a user passed" do
       before do
-        stub_get("/1/statuses/retweeted_by_user.json").
-          with(:query => {:count => "20", :screen_name => "sferik"}).
+        stub_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik", :max_id => "244102729860009983"}).
           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", :screen_name => "sferik"}).
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik"}).
           should have_been_made
+        a_get("/1.1/statuses/user_timeline.json").
+          with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik", :max_id => "244102729860009983"}).
+          should have_been_made.times(3)
       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", :user_id => "7505382"}).
+          stub_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382"}).
+            to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382", :max_id => "244102729860009983"}).
             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", :user_id => "7505382"}).
+          a_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382"}).
             should have_been_made
+          a_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382", :max_id => "244102729860009983"}).
+            should have_been_made.times(3)
         end
       end
     end
@@ -2719,13 +2726,13 @@ ID                  Posted at     Screen name    Text
 
   describe "#status" do
     before do
-      stub_get("/1/statuses/show/55709764298092545.json").
+      stub_get("/1.1/statuses/show/55709764298092545.json").
         with(:query => {:include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.status("55709764298092545")
-      a_get("/1/statuses/show/55709764298092545.json").
+      a_get("/1.1/statuses/show/55709764298092545.json").
         with(:query => {:include_my_retweet => "false"}).
         should have_been_made
     end
@@ -2756,7 +2763,7 @@ ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
     end
     context "with no street address" do
       before do
-        stub_get("/1/statuses/show/55709764298092550.json").
+        stub_get("/1.1/statuses/show/55709764298092550.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_street_address.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -2776,7 +2783,7 @@ URL          https://twitter.com/sferik/status/55709764298092550
     end
     context "with no locality" do
       before do
-        stub_get("/1/statuses/show/55709764298092549.json").
+        stub_get("/1.1/statuses/show/55709764298092549.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_locality.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -2796,7 +2803,7 @@ URL          https://twitter.com/sferik/status/55709764298092549
     end
     context "with no attributes" do
       before do
-        stub_get("/1/statuses/show/55709764298092546.json").
+        stub_get("/1.1/statuses/show/55709764298092546.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_attributes.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -2816,7 +2823,7 @@ URL          https://twitter.com/sferik/status/55709764298092546
     end
     context "with no country" do
       before do
-        stub_get("/1/statuses/show/55709764298092547.json").
+        stub_get("/1.1/statuses/show/55709764298092547.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_country.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -2836,7 +2843,7 @@ URL          https://twitter.com/sferik/status/55709764298092547
     end
     context "with no full name" do
       before do
-        stub_get("/1/statuses/show/55709764298092548.json").
+        stub_get("/1.1/statuses/show/55709764298092548.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_full_name.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
@@ -2856,264 +2863,96 @@ URL          https://twitter.com/sferik/status/55709764298092548
     end
   end
 
-  describe "#suggest" do
-    before do
-      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", :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
-      @cli.suggest
-      stub_get("/1/account/verify_credentials.json").
-        should have_been_made
-      a_get("/1/users/recommendations.json").
-        with(:query => {:limit => "20", :screen_name => "sferik"}).
-        should have_been_made
-    end
-    it "should have the correct output" do
-      @cli.suggest
-      $stdout.string.chomp.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
-    end
-    context "--csv" do
-      before do
-        @cli.options = @cli.options.merge("csv" => true)
-      end
-      it "should output in CSV format" do
-        @cli.suggest
-        $stdout.string.should == <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-40514587,2009-05-16 18:24:33 +0000,2011-06-13 16:27:31 +0000,183,2,2,198,158,antpires,AntonioPires
-14736332,2008-05-11 19:46:06 +0000,2011-08-20 03:27:22 +0000,3850,117,99,545,802,jtrupiano,John Trupiano
-2006261,2007-03-23 12:36:14 +0000,2011-08-21 23:54:01 +0000,4497,9,171,967,2028,maccman,Alex MacCaw
-14451152,2008-04-20 12:05:38 +0000,2011-08-21 20:59:41 +0000,6251,10,20,403,299,mlroach,Matt Laroche
-16052754,2008-08-30 08:22:57 +0000,2009-11-25 06:20:05 +0000,24,0,1,5,42,stuntmann82,stuntmann82
-        eos
-      end
-    end
-    context "--long" do
-      before do
-        @cli.options = @cli.options.merge("long" => true)
-      end
-      it "should output in long format" do
-        @cli.suggest
-        $stdout.string.should == <<-eos
-ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
-40514587  May 16  2009  Jun 13 08:27        183          2       2        198...
-14736332  May 11  2008  Aug 19 19:27       3850        117      99        545...
- 2006261  Mar 23  2007  Aug 21 15:54       4497          9     171        967...
-14451152  Apr 20  2008  Aug 21 12:59       6251         10      20        403...
-16052754  Aug 30  2008  Nov 24  2009         24          0       1          5...
-        eos
-      end
-    end
-    context "--number" do
-      before do
-        @cli.options = @cli.options.merge("number" => 1)
-        stub_get("/1/users/recommendations.json").
-          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", :screen_name => "sferik"}).
-          should have_been_made
-      end
-    end
-    context "--reverse" do
-      before do
-        @cli.options = @cli.options.merge("reverse" => true)
-      end
-      it "should reverse the order of the sort" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
-      end
-    end
-    context "--sort=favorites" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "favorites")
-      end
-      it "should sort by number of favorites" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
-      end
-    end
-    context "--sort=followers" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "followers")
-      end
-      it "should sort by number of followers" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
-      end
-    end
-    context "--sort=friends" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "friends")
-      end
-      it "should sort by number of friends" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
-      end
-    end
-    context "--sort=listed" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "listed")
-      end
-      it "should sort by number of list memberships" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
-      end
-    end
-    context "--sort=since" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "since")
-      end
-      it "should sort by the time when Twitter acount was created" do
-        @cli.suggest
-        $stdout.string.chomp.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
-      end
-    end
-    context "--sort=tweets" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "tweets")
-      end
-      it "should sort by number of Tweets" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
-      end
-    end
-    context "--sort=tweeted" do
-      before do
-        @cli.options = @cli.options.merge("sort" => "tweeted")
-      end
-      it "should sort by the time of the last Tweet" do
-        @cli.suggest
-        $stdout.string.chomp.should == "stuntmann82  antpires     jtrupiano    mlroach      maccman"
-      end
-    end
-    context "--unsorted" do
-      before do
-        @cli.options = @cli.options.merge("unsorted" => true)
-      end
-      it "should not be sorted" do
-        @cli.suggest
-        $stdout.string.chomp.should == "jtrupiano    mlroach      antpires     maccman      stuntmann82"
-      end
-    end
-    context "with a user passed" do
-      it "should request the correct resource" do
-        @cli.suggest("sferik")
-        a_get("/1/users/recommendations.json").
-          with(:query => {:limit => "20", :screen_name => "sferik"}).
-          should have_been_made
-      end
-      it "should have the correct output" do
-        @cli.suggest("sferik")
-        $stdout.string.chomp.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
-      end
-      context "--id" do
-        before do
-          @cli.options = @cli.options.merge("id" => true)
-          stub_get("/1/users/recommendations.json").
-            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", :user_id => "7505382"}).
-            should have_been_made
-        end
-      end
-    end
-  end
-
   describe "#timeline" do
     before do
-      stub_get("/1/statuses/home_timeline.json").
+      stub_get("/1.1/statuses/home_timeline.json").
         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").
+        a_get("/1.1/statuses/home_timeline.json").
           with(:query => {:count => "20"}).
           should have_been_made
       end
       it "should have the correct output" do
         @cli.timeline
         $stdout.string.should == <<-eos
-\e[1m\e[33m   @ryanbigg\e[0m
-   Things that have made my life better, in order of greatness: GitHub, Travis 
-   CI, the element Oxygen.
+\e[1m\e[33m   @mutgoff\e[0m
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @sfbike\e[0m
-   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
-   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+\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   @levie\e[0m
-   I know you're as rare as leprechauns, but if you're an amazing designer then 
-   Box wants to hire you. Email recruiting@box.com
+\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   @natevillegas\e[0m
-   RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a 
-   mystery. Today is a gift. That's why it's called the present.
+\e[1m\e[33m   @calebelston\e[0m
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @TD\e[0m
-   @kelseysilver how long will you be in town?
+\e[1m\e[33m   @calebelston\e[0m
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @rusashka\e[0m
-   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+\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   @fat\e[0m
-   @stevej @xc i'm going to picket when i get back.
+\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   @wil\e[0m
-   @0x9900 @paulnivin http://t.co/bwVdtAPe
+\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   @wangtian\e[0m
-   @tianhonghe @xiangxin72 oh, you can even order specific items?
+\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   @shinypb\e[0m
-   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
-   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+\e[1m\e[33m   @FakeDorsey\e[0m
+   “Write drunk. Edit sober.”—Ernest Hemingway
 
-\e[1m\e[33m   @0x9900\e[0m
-   @wil @paulnivin if you want to take you seriously don't say daemontools!
+\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   @kpk\e[0m
-   @shinypb @skilldrick @hoverbird invented it
+\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   @skilldrick\e[0m
-   @shinypb Well played :) @hoverbird
+\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   @sam\e[0m
-   Can someone project the date that I'll get a 27\" retina display?
+\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   @shinypb\e[0m
-   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+\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   @bartt\e[0m
-   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
-   fun. Expect improvements in the weeks to come.
+\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   @skilldrick\e[0m
-   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
-   the duck tales intro at all.
+\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   @sean\e[0m
-   @mep Thanks for coming by. Was great to have you.
+\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   @hoverbird\e[0m
-   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+\e[1m\e[33m   @sferik\e[0m
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @kelseysilver\e[0m
-   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
-   92 others) http://t.co/eoLANJZw
+\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
@@ -3126,26 +2965,26 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.timeline
         $stdout.string.should == <<-eos
 ID,Posted at,Screen name,Text
-194548141663027221,2011-04-23 22:08:32 +0000,ryanbigg,"Things that have made my life better, in order of greatness: GitHub, Travis CI, the element Oxygen."
-194563027248121416,2011-04-23 22:08:11 +0000,sfbike,"Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers counted in 1 hour--that's 17 per minute. Way to roll, SF!"
-194548120271416632,2011-04-23 22:07:51 +0000,levie,"I know you're as rare as leprechauns, but if you're an amazing designer then Box wants to hire you. Email recruiting@box.com"
-194548121416630272,2011-04-23 22:07:41 +0000,natevillegas,RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
-194547993607806976,2011-04-23 22:07:10 +0000,TD,@kelseysilver how long will you be in town?
-194547987593183233,2011-04-23 22:07:09 +0000,rusashka,@maciej hahaha :) @gpena together we're going to cover all core 28 languages!
-194547824690597888,2011-04-23 22:06:30 +0000,fat,@stevej @xc i'm going to picket when i get back.
-194547658562605057,2011-04-23 22:05:51 +0000,wil,@0x9900 @paulnivin http://t.co/bwVdtAPe
-194547528430137344,2011-04-23 22:05:19 +0000,wangtian,"@tianhonghe @xiangxin72 oh, you can even order specific items?"
-194547402550689793,2011-04-23 22:04:49 +0000,shinypb,"@kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird"
-194547260233760768,2011-04-23 22:04:16 +0000,0x9900,@wil @paulnivin if you want to take you seriously don't say daemontools!
-194547084349804544,2011-04-23 22:03:34 +0000,kpk,@shinypb @skilldrick @hoverbird invented it
-194546876782092291,2011-04-23 22:02:44 +0000,skilldrick,@shinypb Well played :) @hoverbird
-194546811480969217,2011-04-23 22:02:29 +0000,sam,"Can someone project the date that I'll get a 27"" retina display?"
-194546738810458112,2011-04-23 22:02:11 +0000,shinypb,"@skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain."
-194546727670390784,2011-04-23 22:02:09 +0000,bartt,"@noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come."
-194546649203347456,2011-04-23 22:01:50 +0000,skilldrick,"@hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all."
-194546583608639488,2011-04-23 22:01:34 +0000,sean,@mep Thanks for coming by. Was great to have you.
-194546388707717120,2011-04-23 22:00:48 +0000,hoverbird,"@shinypb @trammell it's all suck a ""duck blur"" sometimes."
-194546264212385793,2011-04-23 22:00:18 +0000,kelseysilver,San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+244111183165157376,2012-09-07 16:33:36 +0000,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)"
+244110336414859264,2012-09-07 16:30:14 +0000,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"
+244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107890632294400,2012-09-07 16:20:31 +0000,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)"
+244107823733174272,2012-09-07 16:20:15 +0000,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"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244106476048764928,2012-09-07 16:14:53 +0000,mbostock,If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+244105599351148544,2012-09-07 16:11:24 +0000,FakeDorsey,“Write drunk. Edit sober.”—Ernest Hemingway
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244104146997870594,2012-09-07 16:05:38 +0000,calebelston,"We just announced Mosaic, what we've been working on since the Yobongo acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic"
+244103057175113729,2012-09-07 16:01:18 +0000,BarackObama,Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 #Obama2012
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102741125890048,2012-09-07 16:00:03 +0000,eveningedition,LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+244102729860009984,2012-09-07 16:00:00 +0000,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
+244102490646278146,2012-09-07 15:59:03 +0000,jasonfried,"The story of Mars Curiosity's gears, made by a factory in Rockford, IL: http://t.co/MwCRsHQg"
+244102209942458368,2012-09-07 15:57:56 +0000,sferik,"@episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem to be missing ""1.1"" from the URL."
+244100411563339777,2012-09-07 15:50:47 +0000,sferik,@episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+244099460672679938,2012-09-07 15:47:01 +0000,dwiskus,"Gentlemen, you can't fight in here! This is the war room! http://t.co/kMxMYyqF"
         eos
       end
     end
@@ -3156,27 +2995,27 @@ ID,Posted at,Screen name,Text
       it "should output in long format" do
         @cli.timeline
         $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
+ID                  Posted at     Screen name       Text
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
         eos
       end
       context "--reverse" do
@@ -3186,133 +3025,133 @@ ID                  Posted at     Screen name    Text
         it "should reverse the order of the sort" do
           @cli.timeline
           $stdout.string.should == <<-eos
-ID                  Posted at     Screen name    Text
-194546264212385793  Apr 23  2011  @kelseysilver  San Francisco here I come! (...
-194546388707717120  Apr 23  2011  @hoverbird     @shinypb @trammell it's all ...
-194546583608639488  Apr 23  2011  @sean          @mep Thanks for coming by. W...
-194546649203347456  Apr 23  2011  @skilldrick    @hoverbird @shinypb You guys...
-194546727670390784  Apr 23  2011  @bartt         @noahlt @gaarf Yup, now owni...
-194546738810458112  Apr 23  2011  @shinypb       @skilldrick @hoverbird Wow, ...
-194546811480969217  Apr 23  2011  @sam           Can someone project the date...
-194546876782092291  Apr 23  2011  @skilldrick    @shinypb Well played :) @hov...
-194547084349804544  Apr 23  2011  @kpk           @shinypb @skilldrick @hoverb...
-194547260233760768  Apr 23  2011  @0x9900        @wil @paulnivin if you want ...
-194547402550689793  Apr 23  2011  @shinypb       @kpk Pfft, I think you're fo...
-194547528430137344  Apr 23  2011  @wangtian      @tianhonghe @xiangxin72 oh, ...
-194547658562605057  Apr 23  2011  @wil           @0x9900 @paulnivin http://t....
-194547824690597888  Apr 23  2011  @fat           @stevej @xc i'm going to pic...
-194547987593183233  Apr 23  2011  @rusashka      @maciej hahaha :) @gpena tog...
-194547993607806976  Apr 23  2011  @TD            @kelseysilver how long will ...
-194548121416630272  Apr 23  2011  @natevillegas  RT @gelobautista #riordan RT...
-194548120271416632  Apr 23  2011  @levie         I know you're as rare as lep...
-194563027248121416  Apr 23  2011  @sfbike        Bike to Work Counts in: 73% ...
-194548141663027221  Apr 23  2011  @ryanbigg      Things that have made my lif...
+ID                  Posted at     Screen name       Text
+244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
+244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
+244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
+244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
+244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
+244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
+244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
+244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
+244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
+244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
+244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
+244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
+244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
+244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
+244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
+244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
+244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
+244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
+244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
           eos
         end
       end
     end
     context "--number" do
       before do
-        stub_get("/1/statuses/home_timeline.json").
+        stub_get("/1.1/statuses/home_timeline.json").
           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").
+        stub_get("/1.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 => "200", :max_id => "194546264212385792"}).
+        stub_get("/1.1/statuses/home_timeline.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1/statuses/home_timeline.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          stub_get("/1.1/statuses/home_timeline.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
       end
       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").
+        a_get("/1.1/statuses/home_timeline.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.timeline
-        a_get("/1/statuses/home_timeline.json").
+        a_get("/1.1/statuses/home_timeline.json").
           with(:query => {:count => "200"}).
           should have_been_made
-        a_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+        a_get("/1.1/statuses/home_timeline.json").
+          with(:query => {:count => "200", :max_id => "244099460672679937"}).
           should have_been_made.times(7)
         (5..185).step(20).to_a.reverse.each do |count|
-          a_get("/1/statuses/home_timeline.json").
-            with(:query => {:count => count, :max_id => "194546264212385792"}).
+          a_get("/1.1/statuses/home_timeline.json").
+            with(:query => {:count => count, :max_id => "244099460672679937"}).
             should have_been_made
         end
       end
     end
     context "with a user passed" do
       before do
-        stub_get("/1/statuses/user_timeline.json").
+        stub_get("/1.1/statuses/user_timeline.json").
           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").
+        a_get("/1.1/statuses/user_timeline.json").
           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").
+          stub_get("/1.1/statuses/user_timeline.json").
             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").
+          a_get("/1.1/statuses/user_timeline.json").
             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").
+          stub_get("/1.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").
+          stub_get("/1.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 => "200", :screen_name => "sferik", :max_id => "194546264212385792"}).
+          stub_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :screen_name => "sferik", :max_id => "244099460672679937"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           (5..185).step(20).to_a.reverse.each do |count|
-            stub_get("/1/statuses/user_timeline.json").
-              with(:query => {:count => count, :screen_name => "sferik", :max_id => "194546264212385792"}).
+            stub_get("/1.1/statuses/user_timeline.json").
+              with(:query => {:count => count, :screen_name => "sferik", :max_id => "244099460672679937"}).
               to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           end
         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").
+          a_get("/1.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").
+          a_get("/1.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 => "200", :screen_name => "sferik", :max_id => "194546264212385792"}).
+          a_get("/1.1/statuses/user_timeline.json").
+            with(:query => {:count => "200", :screen_name => "sferik", :max_id => "244099460672679937"}).
             should have_been_made.times(7)
           (5..185).step(20).to_a.reverse.each do |count|
-            a_get("/1/statuses/user_timeline.json").
-              with(:query => {:count => count, :screen_name => "sferik", :max_id => "194546264212385792"}).
+            a_get("/1.1/statuses/user_timeline.json").
+              with(:query => {:count => count, :screen_name => "sferik", :max_id => "244099460672679937"}).
               should have_been_made
           end
         end
@@ -3322,12 +3161,14 @@ ID                  Posted at     Screen name    Text
 
   describe "#trends" do
     before do
-      stub_get("/1/trends/1.json").
+      stub_get("/1.1/trends/place.json").
+        with(:query => {:id => "1"}).
         to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.trends
-      a_get("/1/trends/1.json").
+      a_get("/1.1/trends/place.json").
+        with(:query => {:id => "1"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -3337,14 +3178,14 @@ ID                  Posted at     Screen name    Text
     context "--exclude-hashtags" do
       before do
         @cli.options = @cli.options.merge("exclude-hashtags" => true)
-        stub_get("/1/trends/1.json").
-          with(:query => {:exclude => "hashtags"}).
+        stub_get("/1.1/trends/place.json").
+          with(:query => {:id => "1", :exclude => "hashtags"}).
           to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.trends
-        a_get("/1/trends/1.json").
-          with(:query => {:exclude => "hashtags"}).
+        a_get("/1.1/trends/place.json").
+          with(:query => {:id => "1", :exclude => "hashtags"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -3354,12 +3195,14 @@ ID                  Posted at     Screen name    Text
     end
     context "with a WOEID passed" do
       before do
-        stub_get("/1/trends/2487956.json").
+        stub_get("/1.1/trends/place.json").
+          with(:query => {:id => "2487956"}).
           to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.trends("2487956")
-        a_get("/1/trends/2487956.json").
+        a_get("/1.1/trends/place.json").
+          with(:query => {:id => "2487956"}).
           should have_been_made
       end
       it "should have the correct output" do
@@ -3371,12 +3214,12 @@ ID                  Posted at     Screen name    Text
 
   describe "#trend_locations" do
     before do
-      stub_get("/1/trends/available.json").
+      stub_get("/1.1/trends/available.json").
         to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.trend_locations
-      a_get("/1/trends/available.json").
+      a_get("/1.1/trends/available.json").
         should have_been_made
     end
     it "should have the correct output" do
@@ -3424,6 +3267,42 @@ WOEID     Parent ID  Type       Name           Country
         $stdout.string.chomp.should == "Worldwide      United States  San Francisco  New York       Boston"
       end
     end
+    context "--sort=country" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "country")
+      end
+      it "should sort by number of favorites" do
+        @cli.trend_locations
+        $stdout.string.chomp.should == "Worldwide      New York       Boston         United States  San Francisco"
+      end
+    end
+    context "--sort=parent" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "parent")
+      end
+      it "should sort by number of favorites" do
+        @cli.trend_locations
+        $stdout.string.chomp.should == "Boston         Worldwide      New York       United States  San Francisco"
+      end
+    end
+    context "--sort=type" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "type")
+      end
+      it "should sort by number of favorites" do
+        @cli.trend_locations
+        $stdout.string.chomp.should == "United States  Worldwide      New York       Boston         San Francisco"
+      end
+    end
+    context "--sort=woeid" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "woeid")
+      end
+      it "should sort by number of favorites" do
+        @cli.trend_locations
+        $stdout.string.chomp.should == "Worldwide      Boston         New York       San Francisco  United States"
+      end
+    end
     context "--unsorted" do
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
@@ -3441,17 +3320,17 @@ WOEID     Parent ID  Type       Name           Country
     end
     context "one user" do
       it "should request the correct resource" do
-        stub_delete("/1/friendships/destroy.json").
-          with(:query => {:screen_name => "sferik"}).
+        stub_post("/1.1/friendships/destroy.json").
+          with(:body => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
-        a_delete("/1/friendships/destroy.json").
-          with(:query => {:screen_name => "sferik"}).
+        a_post("/1.1/friendships/destroy.json").
+          with(:body => {: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"}).
+        stub_post("/1.1/friendships/destroy.json").
+          with(:body => {:screen_name => "sferik"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
         $stdout.string.should =~ /^@testcli is no longer following 1 user\.$/
@@ -3459,27 +3338,27 @@ WOEID     Parent ID  Type       Name           Country
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
-          stub_delete("/1/friendships/destroy.json").
-            with(:query => {:user_id => "7505382"}).
+          stub_post("/1.1/friendships/destroy.json").
+            with(:body => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.unfollow("7505382")
-          a_delete("/1/friendships/destroy.json").
-            with(:query => {:user_id => "7505382"}).
+          a_post("/1.1/friendships/destroy.json").
+            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_delete("/1/friendships/destroy.json").
-            with(:query => {:screen_name => "sferik"}).
+          stub_post("/1.1/friendships/destroy.json").
+            with(:body => {: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"}).
+          a_post("/1.1/friendships/destroy.json").
+            with(:body => {:screen_name => "sferik"}).
             should have_been_made.times(3)
         end
       end
@@ -3489,7 +3368,7 @@ WOEID     Parent ID  Type       Name           Country
   describe "#update" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
-      stub_post("/1/statuses/update.json").
+      stub_post("/1.1/statuses/update.json").
         with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_request(:get, "http://checkip.dyndns.org/").
@@ -3499,7 +3378,7 @@ WOEID     Parent ID  Type       Name           Country
     end
     it "should request the correct resource" do
       @cli.update("Testing")
-      a_post("/1/statuses/update.json").
+      a_post("/1.1/statuses/update.json").
         with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).
         should have_been_made
       a_request(:get, "http://checkip.dyndns.org/").
@@ -3514,12 +3393,12 @@ WOEID     Parent ID  Type       Name           Country
     context "with file" do
       before do
         @cli.options = @cli.options.merge("file" => fixture_path + "/long.png")
-        stub_post("/1/statuses/update_with_media.json", "https://upload.twitter.com").
+        stub_post("/1.1/statuses/update_with_media.json").
           to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.update("Testing")
-        a_post("/1/statuses/update_with_media.json", "https://upload.twitter.com").
+        a_post("/1.1/statuses/update_with_media.json").
           should have_been_made
       end
       it "should have the correct output" do
@@ -3531,14 +3410,14 @@ WOEID     Parent ID  Type       Name           Country
 
   describe "#users" do
     before do
-      stub_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik,pengwynn"}).
+      stub_post("/1.1/users/lookup.json").
+        with(:body => {:screen_name => "sferik,pengwynn"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @cli.users("sferik", "pengwynn")
-      a_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik,pengwynn"}).
+      a_post("/1.1/users/lookup.json").
+        with(:body => {:screen_name => "sferik,pengwynn"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -3610,14 +3489,14 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
+        stub_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382,14100886"}).
           to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.users("7505382", "14100886")
-        a_get("/1/users/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
+        a_post("/1.1/users/lookup.json").
+          with(:body => {:user_id => "7505382,14100886"}).
           should have_been_made
       end
     end
@@ -3677,13 +3556,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe "#whois" do
     before do
-      stub_get("/1/users/show.json").
+      stub_get("/1.1/users/show.json").
         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").
+      a_get("/1.1/users/show.json").
         with(:query => {:screen_name => "sferik"}).
         should have_been_made
     end
@@ -3720,13 +3599,13 @@ ID,Verified,Name,Screen name,Bio,Location,Following,Last update,Lasted updated a
     context "--id" do
       before do
         @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1/users/show.json").
+        stub_get("/1.1/users/show.json").
           with(:query => {:user_id => "7505382"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
         @cli.whois("7505382")
-        a_get("/1/users/show.json").
+        a_get("/1.1/users/show.json").
           with(:query => {:user_id => "7505382"}).
           should have_been_made
       end