t 1.7.2 → 2.0.0

data/lib/t/utils.rb

@@ -50,7 +50,7 @@ module T
     def fetch_users(users, options, &block)
       format_users!(users, options)
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         yield users
       end
       [users, users.length]
@@ -95,26 +95,26 @@ module T
       "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || "#{singular}s"))
     end
 
-    def decode_full_text(tweet, decode_full_urls = false)
+    def decode_full_text(tweet, decode_full_uris = false)
       require 'htmlentities'
       text = HTMLEntities.new.decode(tweet.full_text)
-      text = decode_urls(text, tweet.urls) if decode_full_urls
+      text = decode_uris(text, tweet.uris) if decode_full_uris
       text
     end
 
-    def decode_urls(full_text, url_entities)
-      return full_text if url_entities.nil?
+    def decode_uris(full_text, uri_entities)
+      return full_text if uri_entities.nil?
 
-      url_entities.each do |url_hash|
-        full_text = full_text.gsub(url_hash.url, url_hash.expanded_url)
+      uri_entities.each do |uri_entity|
+        full_text = full_text.gsub(uri_entity.uri.to_s, uri_entity.expanded_uri.to_s)
       end
 
       full_text
     end
 
-    def open_or_print( url, options )
-      Launchy.open( url, options ) do |e|
-        say "Open: #{url}"
+    def open_or_print(uri, options)
+      Launchy.open(uri, options) do
+        say "Open: #{uri}"
       end
     end
   end

data/lib/t/version.rb

@@ -4,17 +4,17 @@ module T
 
       # @return [Integer]
       def major
-        1
+        2
       end
 
       # @return [Integer]
       def minor
-        7
+        0
       end
 
       # @return [Integer]
       def patch
-        2
+        0
       end
 
       # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -44,22 +44,22 @@ testcli
 
   describe "#authorize" do
     before do
-      @cli.options = @cli.options.merge("profile" => project_path + "/tmp/authorize", "display-url" => true)
+      @cli.options = @cli.options.merge("profile" => project_path + "/tmp/authorize", "display-uri" => true)
       stub_post("/oauth/request_token").to_return(:body => fixture("request_token"))
       stub_post("/oauth/access_token").to_return(:body => fixture("access_token"))
       stub_get("/1.1/account/verify_credentials.json").with(:query => {:include_entities => "false", :skip_status => "true"}).to_return(:body => fixture("sferik.json"))
     end
     it "requests the correct resource" do
-      $stdout.should_receive(:print)
-      $stdin.should_receive(:gets).and_return("\n")
-      $stdout.should_receive(:print).with("Enter your consumer key: ")
-      $stdin.should_receive(:gets).and_return("abc123")
-      $stdout.should_receive(:print).with("Enter your consumer secret: ")
-      $stdin.should_receive(:gets).and_return("asdfasd223sd2")
-      $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
-      $stdin.should_receive(:gets).and_return("\n")
-      $stdout.should_receive(:print).with("Enter the supplied PIN: ")
-      $stdin.should_receive(:gets).and_return("1234567890")
+      expect($stdout).to receive(:print)
+      expect($stdin).to receive(:gets).and_return("\n")
+      expect($stdout).to receive(:print).with("Enter your consumer key: ")
+      expect($stdin).to receive(:gets).and_return("abc123")
+      expect($stdout).to receive(:print).with("Enter your consumer secret: ")
+      expect($stdin).to receive(:gets).and_return("asdfasd223sd2")
+      expect($stdout).to receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+      expect($stdin).to receive(:gets).and_return("\n")
+      expect($stdout).to receive(:print).with("Enter the supplied PIN: ")
+      expect($stdin).to receive(:gets).and_return("1234567890")
       @cli.authorize
       expect(a_post("/oauth/request_token")).to have_been_made
       expect(a_post("/oauth/access_token")).to have_been_made
@@ -67,37 +67,37 @@ testcli
     end
     it "does not raise error" do
       expect do
-        $stdout.should_receive(:print)
-        $stdin.should_receive(:gets).and_return("\n")
-        $stdout.should_receive(:print).with("Enter your consumer key: ")
-        $stdin.should_receive(:gets).and_return("abc123")
-        $stdout.should_receive(:print).with("Enter your consumer secret: ")
-        $stdin.should_receive(:gets).and_return("asdfasd223sd2")
-        $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
-        $stdin.should_receive(:gets).and_return("\n")
-        $stdout.should_receive(:print).with("Enter the supplied PIN: ")
-        $stdin.should_receive(:gets).and_return("1234567890")
+        expect($stdout).to receive(:print)
+        expect($stdin).to receive(:gets).and_return("\n")
+        expect($stdout).to receive(:print).with("Enter your consumer key: ")
+        expect($stdin).to receive(:gets).and_return("abc123")
+        expect($stdout).to receive(:print).with("Enter your consumer secret: ")
+        expect($stdin).to receive(:gets).and_return("asdfasd223sd2")
+        expect($stdout).to receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+        expect($stdin).to receive(:gets).and_return("\n")
+        expect($stdout).to receive(:print).with("Enter the supplied PIN: ")
+        expect($stdin).to receive(:gets).and_return("1234567890")
         @cli.authorize
       end.not_to raise_error
     end
     context "empty RC file" do
       before do
-        @cli.options = @cli.options.merge("profile" => project_path + "/tmp/empty", "display-url" => true)
+        @cli.options = @cli.options.merge("profile" => project_path + "/tmp/empty", "display-uri" => true)
       end
       after do
         File.delete(project_path + "/tmp/empty")
       end
       it "requests the correct resource" do
-        $stdout.should_receive(:print)
-        $stdin.should_receive(:gets).and_return("\n")
-        $stdout.should_receive(:print).with("Enter your consumer key: ")
-        $stdin.should_receive(:gets).and_return("abc123")
-        $stdout.should_receive(:print).with("Enter your consumer secret: ")
-        $stdin.should_receive(:gets).and_return("asdfasd223sd2")
-        $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
-        $stdin.should_receive(:gets).and_return("\n")
-        $stdout.should_receive(:print).with("Enter the supplied PIN: ")
-        $stdin.should_receive(:gets).and_return("1234567890")
+        expect($stdout).to receive(:print)
+        expect($stdin).to receive(:gets).and_return("\n")
+        expect($stdout).to receive(:print).with("Enter your consumer key: ")
+        expect($stdin).to receive(:gets).and_return("abc123")
+        expect($stdout).to receive(:print).with("Enter your consumer secret: ")
+        expect($stdin).to receive(:gets).and_return("asdfasd223sd2")
+        expect($stdout).to receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+        expect($stdin).to receive(:gets).and_return("\n")
+        expect($stdout).to receive(:print).with("Enter the supplied PIN: ")
+        expect($stdin).to receive(:gets).and_return("1234567890")
         @cli.authorize
         expect(a_post("/oauth/request_token")).to have_been_made
         expect(a_post("/oauth/access_token")).to have_been_made
@@ -105,16 +105,16 @@ testcli
       end
       it "does not raise error" do
         expect do
-          $stdout.should_receive(:print)
-          $stdin.should_receive(:gets).and_return("\n")
-          $stdout.should_receive(:print).with("Enter your consumer key: ")
-          $stdin.should_receive(:gets).and_return("abc123")
-          $stdout.should_receive(:print).with("Enter your consumer secret: ")
-          $stdin.should_receive(:gets).and_return("asdfasd223sd2")
-          $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
-          $stdin.should_receive(:gets).and_return("\n")
-          $stdout.should_receive(:print).with("Enter the supplied PIN: ")
-          $stdin.should_receive(:gets).and_return("1234567890")
+          expect($stdout).to receive(:print)
+          expect($stdin).to receive(:gets).and_return("\n")
+          expect($stdout).to receive(:print).with("Enter your consumer key: ")
+          expect($stdin).to receive(:gets).and_return("abc123")
+          expect($stdout).to receive(:print).with("Enter your consumer secret: ")
+          expect($stdin).to receive(:gets).and_return("asdfasd223sd2")
+          expect($stdout).to receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+          expect($stdin).to receive(:gets).and_return("\n")
+          expect($stdout).to receive(:print).with("Enter the supplied PIN: ")
+          expect($stdin).to receive(:gets).and_return("1234567890")
           @cli.authorize
         end.not_to raise_error
       end
@@ -970,6 +970,16 @@ ID                   Posted at     Screen name       Text
         end
       end
     end
+    context "--max-id" do
+      before do
+        @cli.options = @cli.options.merge("max_id" => 244104558433951744)
+        stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+      end
+      it "requests the correct resource" do
+        @cli.favorites
+        expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20", :max_id => "244104558433951744"})).to have_been_made
+      end
+    end
     context "--number" do
       before do
         stub_get("/1.1/favorites/list.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"))
@@ -988,6 +998,16 @@ ID                   Posted at     Screen name       Text
         expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
       end
     end
+    context "--since-id" do
+      before do
+        @cli.options = @cli.options.merge("since_id" => 244104558433951744)
+        stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :since_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+      end
+      it "requests the correct resource" do
+        @cli.favorites
+        expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20", :since_id => "244104558433951744"})).to have_been_made
+      end
+    end
     context "with a user passed" do
       before do
         stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"))
@@ -1006,6 +1026,44 @@ ID                   Posted at     Screen name       Text
           expect(a_get("/1.1/favorites/list.json").with(:query => {:user_id => "7505382", :count => "20"})).to have_been_made
         end
       end
+      context "--max-id" do
+        before do
+          @cli.options = @cli.options.merge("max_id" => 244104558433951744)
+          stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "requests the correct resource" do
+          @cli.favorites("sferik")
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik", :max_id => "244104558433951744"})).to have_been_made
+        end
+      end
+      context "--number" do
+        before do
+          stub_get("/1.1/favorites/list.json").with(:query => {:count => "1", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"))
+          stub_get("/1.1/favorites/list.json").with(:query => {:count => "200", :screen_name => "sferik"}).to_return(:body => fixture("200_statuses.json"))
+          stub_get("/1.1/favorites/list.json").with(:query => {:count => "1", :screen_name => "sferik", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "limits the number of results to 1" do
+          @cli.options = @cli.options.merge("number" => 1)
+          @cli.favorites("sferik")
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "1", :screen_name => "sferik"})).to have_been_made
+        end
+        it "limits the number of results to 201" do
+          @cli.options = @cli.options.merge("number" => 201)
+          @cli.favorites("sferik")
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "200", :screen_name => "sferik"})).to have_been_made
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "1", :screen_name => "sferik", :max_id => "265500541700956160"})).to have_been_made
+        end
+      end
+      context "--since-id" do
+        before do
+          @cli.options = @cli.options.merge("since_id" => 244104558433951744)
+          stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik", :since_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "requests the correct resource" do
+          @cli.favorites("sferik")
+          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik", :since_id => "244104558433951744"})).to have_been_made
+        end
+      end
     end
   end
 
@@ -1052,7 +1110,7 @@ ID                   Posted at     Screen name       Text
           stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"}).to_return(:status => 502)
           expect do
             @cli.follow("sferik", "pengwynn")
-          end.to raise_error("Twitter is down or being upgraded.")
+          end.to raise_error(Twitter::Error::BadGateway)
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made.times(3)
           expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made.times(3)
           expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"})).to have_been_made.times(3)
@@ -1976,7 +2034,7 @@ ID                   Posted at     Screen name       Text
 
   describe "#open" do
     before do
-      @cli.options = @cli.options.merge("display-url" => true)
+      @cli.options = @cli.options.merge("display-uri" => true)
     end
     it "has the correct output" do
       expect do
@@ -2012,18 +2070,18 @@ ID                   Posted at     Screen name       Text
 
   describe "#reply" do
     before do
-      @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
+      @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => nil)
       stub_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_with_mention.json"))
-      stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :trim_user => "true"}).to_return(:body => fixture("status.json"))
       stub_request(:get, "http://checkip.dyndns.org/").to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
     it "requests the correct resource" do
       @cli.reply("263813522369159169", "Testing")
       expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
-      expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
-      expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
-      expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
+      expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :trim_user => "true"})).to have_been_made
+      expect(a_request(:get, "http://checkip.dyndns.org/")).not_to have_been_made
+      expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).not_to have_been_made
     end
     it "has the correct output" do
       @cli.reply("263813522369159169", "Testing")
@@ -2032,21 +2090,56 @@ ID                   Posted at     Screen name       Text
     context "--all" do
       before do
         @cli.options = @cli.options.merge("all" => true)
-        stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+        stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      end
+      it "requests the correct resource" do
+        @cli.reply("263813522369159169", "Testing")
+        expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :trim_user => "true"})).to have_been_made
+        expect(a_request(:get, "http://checkip.dyndns.org/")).not_to have_been_made
+        expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).not_to have_been_made
+      end
+      it "has the correct output" do
+        @cli.reply("263813522369159169", "Testing")
+        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench @sferik."
+      end
+    end
+    context "--location" do
+      before do
+        @cli.options = @cli.options.merge("location" => "location")
+        stub_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_with_mention.json"))
+        stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
       end
       it "requests the correct resource" do
         @cli.reply("263813522369159169", "Testing")
         expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
-        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
         expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
         expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
       end
       it "has the correct output" do
         @cli.reply("263813522369159169", "Testing")
-        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench @sferik."
+        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench."
       end
     end
-  end
+    context "--location 'latitude,longitude'" do
+      before do
+        @cli.options = @cli.options.merge("location" => "41.03132,28.9869")
+        stub_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_with_mention.json"))
+        stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "41.03132", :long => "28.9869", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      end
+      it "requests the correct resource" do
+        @cli.reply("263813522369159169", "Testing")
+        expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "41.03132", :long => "28.9869", :trim_user => "true"})).to have_been_made
+        expect(a_request(:get, "http://checkip.dyndns.org/")).not_to have_been_made
+        expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).not_to have_been_made
+      end
+      it "has the correct output" do
+        @cli.reply("263813522369159169", "Testing")
+        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench."
+      end
+    end  end
 
   describe "#report_spam" do
     before do
@@ -2341,12 +2434,10 @@ ID                  Posted at     Screen name      Text
   describe "#status" do
     before do
       stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"))
-      stub_get("/i/statuses/55709764298092545/activity/summary.json").to_return(:body => fixture("activity_summary.json"))
     end
     it "requests the correct resources" do
       @cli.status("55709764298092545")
       expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
-      expect(a_get("/i/statuses/55709764298092545/activity/summary.json")).to have_been_made
     end
     it "has the correct output" do
       @cli.status("55709764298092545")
@@ -2356,8 +2447,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States
       eos
@@ -2369,8 +2459,8 @@ Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, Californi
       it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
-ID,Posted at,Screen name,Text,Retweets,Favorites,Replies,Source,Location
-55709764298092545,2011-04-06 19:13:37 +0000,sferik,The problem with your code is that it's doing exactly what you told it to do.,320,2,1,Twitter for iPhone,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States"
+ID,Posted at,Screen name,Text,Retweets,Favorites,Source,Location
+55709764298092545,2011-04-06 19:13:37 +0000,sferik,The problem with your code is that it's doing exactly what you told it to do.,320,50,Twitter for iPhone,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States"
         eos
       end
     end
@@ -2386,8 +2476,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
         eos
@@ -2405,8 +2494,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
         eos
@@ -2424,8 +2512,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For, San Francisco, United States
         eos
@@ -2443,8 +2530,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For, San Francisco
         eos
@@ -2462,8 +2548,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     Blowfish Sushi To Die For
         eos
@@ -2482,8 +2567,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     San Francisco, CA, USA
         eos
@@ -2501,8 +2585,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     CA, USA
           eos
@@ -2521,8 +2604,7 @@ Text         The problem with your code is that it's doing exactly what you told
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Retweets     320
-Favorites    2
-Replies      1
+Favorites    50
 Source       Twitter for iPhone
 Location     USA
           eos
@@ -2714,34 +2796,6 @@ ID                   Posted at     Screen name       Text
  244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
         eos
       end
-      context "--max-id" do
-        before do
-          @cli.options = @cli.options.merge("max_id" => 244104558433951744)
-          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
-        end
-        it "requests the correct resource" do
-          @cli.timeline
-          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"})).to have_been_made
-        end
-      end
-      context "--number" do
-        before do
-          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"))
-          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"))
-          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"))
-        end
-        it "limits the number of results to 1" do
-          @cli.options = @cli.options.merge("number" => 1)
-          @cli.timeline
-          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"})).to have_been_made
-        end
-        it "limits the number of results to 201" do
-          @cli.options = @cli.options.merge("number" => 201)
-          @cli.timeline
-          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"})).to have_been_made
-          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
-        end
-      end
       context "--reverse" do
         before do
           @cli.options = @cli.options.merge("reverse" => true)
@@ -2774,6 +2828,34 @@ ID                   Posted at     Screen name       Text
         end
       end
     end
+    context "--max-id" do
+      before do
+        @cli.options = @cli.options.merge("max_id" => 244104558433951744)
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+      end
+      it "requests the correct resource" do
+        @cli.timeline
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"})).to have_been_made
+      end
+    end
+    context "--number" do
+      before do
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"))
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"))
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"))
+      end
+      it "limits the number of results to 1" do
+        @cli.options = @cli.options.merge("number" => 1)
+        @cli.timeline
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"})).to have_been_made
+      end
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
+        @cli.timeline
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"})).to have_been_made
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
+      end
+    end
     context "--since-id" do
       before do
         @cli.options = @cli.options.merge("since_id" => 244104558433951744)
@@ -3014,7 +3096,7 @@ WOEID     Parent ID  Type       Name           Country
           stub_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:status => 502)
           expect do
             @cli.unfollow("sferik")
-          end.to raise_error("Twitter is down or being upgraded.")
+          end.to raise_error(Twitter::Error::BadGateway)
           expect(a_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"})).to have_been_made.times(3)
         end
       end
@@ -3023,16 +3105,16 @@ 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.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
+      stub_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :trim_user => "true"}).to_return(:body => fixture("status.json"))
       stub_request(:get, "http://checkip.dyndns.org/").to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
     it "requests the correct resource" do
       @cli.update("Testing")
-      expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
-      expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
-      expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
+      expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :trim_user => "true"})).to have_been_made
+      expect(a_request(:get, "http://checkip.dyndns.org/")).not_to have_been_made
+      expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).not_to have_been_made
     end
     it "has the correct output" do
       @cli.update("Testing")
@@ -3052,6 +3134,38 @@ WOEID     Parent ID  Type       Name           Country
         expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
       end
     end
+    context "--location" do
+      before do
+        @cli.options = @cli.options.merge("location" => "location")
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      end
+      it "requests the correct resource" do
+        @cli.update("Testing")
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
+        expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
+        expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
+      end
+      it "has the correct output" do
+        @cli.update("Testing")
+        expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
+      end
+    end
+    context "--location 'latitude,longitude'" do
+      before do
+        @cli.options = @cli.options.merge("location" => "41.03132,28.9869")
+        stub_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "41.03132", :long => "28.9869", :trim_user => "true"}).to_return(:body => fixture("status.json"))
+      end
+      it "requests the correct resource" do
+        @cli.update("Testing")
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "41.03132", :long => "28.9869", :trim_user => "true"})).to have_been_made
+        expect(a_request(:get, "http://checkip.dyndns.org/")).not_to have_been_made
+        expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).not_to have_been_made
+      end
+      it "has the correct output" do
+        @cli.update("Testing")
+        expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
+      end
+    end
   end
 
   describe "#users" do