t 0.9.7 → 0.9.8

data/lib/t/rcfile.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'yaml'
 
 class RCFile
   FILE_NAME = '.trc'
@@ -60,6 +59,7 @@ class RCFile
   end
 
   def load
+    require 'yaml'
     YAML.load_file(@path)
   rescue Errno::ENOENT
     default_structure
@@ -86,6 +86,7 @@ private
   end
 
   def write
+    require 'yaml'
     File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |rcfile|
       rcfile.write @data.to_yaml
     end

data/lib/t/requestable.rb

@@ -5,31 +5,31 @@ module T
     DEFAULT_HOST = 'api.twitter.com'
     DEFAULT_PROTOCOL = 'https'
 
-    private
+  private
 
-      def base_url
-        "#{protocol}://#{host}"
-      end
+    def base_url
+      "#{protocol}://#{host}"
+    end
 
-      def client
-        return @client if @client
-        @rcfile.path = options['profile'] if options['profile']
-        @client = Twitter::Client.new(
-          :endpoint => base_url,
-          :consumer_key => @rcfile.active_consumer_key,
-          :consumer_secret => @rcfile.active_consumer_secret,
-          :oauth_token => @rcfile.active_token,
-          :oauth_token_secret  => @rcfile.active_secret
-        )
-      end
+    def client
+      return @client if @client
+      @rcfile.path = options['profile'] if options['profile']
+      @client = Twitter::Client.new(
+        :endpoint => base_url,
+        :consumer_key => @rcfile.active_consumer_key,
+        :consumer_secret => @rcfile.active_consumer_secret,
+        :oauth_token => @rcfile.active_token,
+        :oauth_token_secret  => @rcfile.active_secret
+      )
+    end
 
-      def host
-        options['host'] || DEFAULT_HOST
-      end
+    def host
+      options['host'] || DEFAULT_HOST
+    end
 
-      def protocol
-        options['no-ssl'] ? 'http' : DEFAULT_PROTOCOL
-      end
+    def protocol
+      options['no-ssl'] ? 'http' : DEFAULT_PROTOCOL
+    end
 
   end
 end

data/lib/t/search.rb

@@ -1,14 +1,10 @@
-require 'csv'
-# 'fastercsv' required on Ruby versions < 1.9
-require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-require 'htmlentities'
-require 't/collectable'
-require 't/printable'
-require 't/rcfile'
-require 't/requestable'
 require 'thor'
 
 module T
+  autoload :Collectable, 't/collectable'
+  autoload :Printable, 't/printable'
+  autoload :RCFile, 't/rcfile'
+  autoload :Requestable, 't/requestable'
   class Search < Thor
     include T::Collectable
     include T::Printable
@@ -35,7 +31,10 @@ module T
       statuses = collect_with_rpp(rpp) do |opts|
         client.search(query, opts)
       end
+      require 'htmlentities'
       if options['csv']
+        require 'csv'
+        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
         say STATUS_HEADINGS.to_csv unless statuses.empty?
         statuses.each do |status|
           say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
@@ -80,6 +79,7 @@ module T
         list = owner
         owner = @rcfile.active_profile[0]
       else
+        require 't/core_ext/string'
         owner = if options['id']
           owner.to_i
         else
@@ -138,6 +138,7 @@ module T
       query = args.pop
       user = args.pop
       if user
+        require 't/core_ext/string'
         user = if options['id']
           user.to_i
         else
@@ -172,6 +173,9 @@ module T
     method_option "tweets", :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
     def users(query)
+      require 't/core_ext/enumerable'
+      require 'retryable'
+      require 'twitter'
       users = 1.upto(50).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.user_search(query, :page => page, :per_page => MAX_USERS_PER_REQUEST)

data/lib/t/set.rb

@@ -1,9 +1,8 @@
-require 't/core_ext/string'
-require 't/rcfile'
-require 't/requestable'
 require 'thor'
 
 module T
+  autoload :RCFile, 't/rcfile'
+  autoload :Requestable, 't/requestable'
   class Set < Thor
     include T::Requestable
 
@@ -16,6 +15,7 @@ module T
 
     desc "active SCREEN_NAME [CONSUMER_KEY]", "Set your active account."
     def active(screen_name, consumer_key=nil)
+      require 't/core_ext/string'
       screen_name = screen_name.strip_ats
       @rcfile.path = options['profile'] if options['profile']
       consumer_key = @rcfile[screen_name].keys.last if consumer_key.nil?

data/lib/t/stream.rb

@@ -1,11 +1,10 @@
-require 't/cli'
-require 't/printable'
-require 't/rcfile'
-require 't/search'
 require 'thor'
-require 'tweetstream'
 
 module T
+  autoload :CLI, 't/cli'
+  autoload :Printable, 't/printable'
+  autoload :RCFile, 't/rcfile'
+  autoload :Search, 't/search'
   class Stream < Thor
     include T::Printable
 
@@ -25,8 +24,11 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def all
+      require 'tweetstream'
       client.on_inited do
         if options['csv']
+          require 'csv'
+          require 'fastercsv' unless Array.new.respond_to?(:to_csv)
           say STATUS_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
           headings = STATUS_HEADINGS.size.times.map do |index|
@@ -52,6 +54,7 @@ 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])
       end
@@ -63,6 +66,7 @@ module T
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def search(keyword, *keywords)
       keywords.unshift(keyword)
+      require 'tweetstream'
       client.on_inited do
         search = T::Search.new
         search.options = search.options.merge(options)
@@ -89,6 +93,7 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def timeline
+      require 'tweetstream'
       client.on_inited do
         cli = T::CLI.new
         cli.options = cli.options.merge(options)
@@ -117,8 +122,11 @@ module T
     def users(user_id, *user_ids)
       user_ids.unshift(user_id)
       user_ids.map!(&:to_i)
+      require 'tweetstream'
       client.on_inited do
         if options['csv']
+          require 'csv'
+          require 'fastercsv' unless Array.new.respond_to?(:to_csv)
           say STATUS_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
           headings = STATUS_HEADINGS.size.times.map do |index|

data/lib/t/version.rb

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

data/spec/cli_spec.rb

@@ -113,6 +113,9 @@ testcli
       stub_get("/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").
+        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
@@ -123,16 +126,16 @@ testcli
     it "should have the correct output" do
       @cli.direct_messages
       $stdout.string.should == <<-eos
-              sferik: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
-              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
-              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
-              sferik: Just checking in. How's everything going? (about 1 year ago)
-              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-              sferik: How are the graph enhancements coming? (about 1 year ago)
-              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
+              sferik: Sounds good. Meeting Tuesday is fine. (a year ago)
+              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
+              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
+              sferik: Just checking in. How's everything going? (a year ago)
+              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (a year ago)
+              sferik: How are the graph enhancements coming? (a year ago)
+              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
+              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
+              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (a year ago)
+              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (a year ago)
       eos
     end
     context "--csv" do
@@ -186,8 +189,13 @@ ID          Posted at     Screen name  Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/direct_messages.json").
-          with(:query => {:count => "145", :max_id => "1624782205"}).
-          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          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").
+            with(:query => {:count => count, :max_id => "1624782205"}).
+            to_return(:body => fixture("direct_messages.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)
@@ -203,8 +211,13 @@ ID          Posted at     Screen name  Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/direct_messages.json").
-          with(:query => {:count => "145", :max_id => "1624782205"}).
-          should have_been_made
+          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").
+            with(:query => {:count => count, :max_id => "1624782205"}).
+            should have_been_made
+        end
       end
     end
     context "--reverse" do
@@ -214,16 +227,16 @@ ID          Posted at     Screen name  Text
       it "should reverse the order of the sort" do
         @cli.direct_messages
         $stdout.string.should == <<-eos
-              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
-              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-              sferik: How are the graph enhancements coming? (about 1 year ago)
-              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-              sferik: Just checking in. How's everything going? (about 1 year ago)
-              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
-              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
-              sferik: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (a year ago)
+              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (a year ago)
+              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
+              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
+              sferik: How are the graph enhancements coming? (a year ago)
+              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (a year ago)
+              sferik: Just checking in. How's everything going? (a year ago)
+              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
+              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
+              sferik: Sounds good. Meeting Tuesday is fine. (a year ago)
         eos
       end
     end
@@ -234,6 +247,9 @@ ID          Posted at     Screen name  Text
       stub_get("/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").
+        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
@@ -244,16 +260,16 @@ ID          Posted at     Screen name  Text
     it "should have the correct output" do
       @cli.direct_messages_sent
       $stdout.string.should == <<-eos
-           hurrycane: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
-           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
-           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
-           hurrycane: Just checking in. How's everything going? (about 1 year ago)
-           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-           hurrycane: How are the graph enhancements coming? (about 1 year ago)
-           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
+           hurrycane: Sounds good. Meeting Tuesday is fine. (a year ago)
+           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
+           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
+           hurrycane: Just checking in. How's everything going? (a year ago)
+           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (a year ago)
+           hurrycane: How are the graph enhancements coming? (a year ago)
+           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
+           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
+           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (a year ago)
+           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (a year ago)
       eos
     end
     context "--csv" do
@@ -307,8 +323,13 @@ ID          Posted at     Screen name  Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/direct_messages/sent.json").
-          with(:query => {:count => "145", :max_id => "1624782205"}).
+          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").
+            with(:query => {:count => count, :max_id => "1624782205"}).
+            to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        end
       end
       it "should limit the number of results 1" do
         @cli.options = @cli.options.merge("number" => 1)
@@ -324,8 +345,13 @@ ID          Posted at     Screen name  Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/direct_messages/sent.json").
-          with(:query => {:count => "145", :max_id => "1624782205"}).
-          should have_been_made
+          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").
+            with(:query => {:count => count, :max_id => "1624782205"}).
+            should have_been_made
+        end
       end
     end
     context "--reverse" do
@@ -335,16 +361,16 @@ ID          Posted at     Screen name  Text
       it "should reverse the order of the sort" do
         @cli.direct_messages_sent
         $stdout.string.should == <<-eos
-           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
-           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-           hurrycane: How are the graph enhancements coming? (about 1 year ago)
-           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-           hurrycane: Just checking in. How's everything going? (about 1 year ago)
-           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
-           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
-           hurrycane: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (a year ago)
+           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (a year ago)
+           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
+           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
+           hurrycane: How are the graph enhancements coming? (a year ago)
+           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (a year ago)
+           hurrycane: Just checking in. How's everything going? (a year ago)
+           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
+           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
+           hurrycane: Sounds good. Meeting Tuesday is fine. (a year ago)
         eos
       end
     end
@@ -538,7 +564,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
-      $stdout.string.chomp.should == "Direct Message sent from @testcli to @pengwynn (about 1 year ago)."
+      $stdout.string.chomp.should == "Direct Message sent from @testcli to @pengwynn (a year ago)."
     end
     context "--id" do
       before do
@@ -646,13 +672,13 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/friendships/exists.json").
-        with(:query => {:user_a => "ev", :user_b => "testcli"}).
+        with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
         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("ev")
       a_get("/1/friendships/exists.json").
-        with(:query => {:user_a => "ev", :user_b => "testcli"}).
+        with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
         should have_been_made
     end
     it "should have the correct output" do
@@ -666,7 +692,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:user_id => "20"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/friendships/exists.json").
-          with(:query => {:user_a => "sferik", :user_b => "testcli"}).
+          with(:query => {:screen_name_a => "sferik", :screen_name_b => "testcli"}).
           to_return(:body => fixture("true.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
@@ -675,7 +701,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           with(:query => {:user_id => "20"}).
           should have_been_made
         a_get("/1/friendships/exists.json").
-          with(:query => {:user_a => "sferik", :user_b => "testcli"}).
+          with(:query => {:screen_name_a => "sferik", :screen_name_b => "testcli"}).
           should have_been_made
       end
     end
@@ -694,7 +720,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:user_id => "428004849"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/friendships/exists.json").
-            with(:query => {:user_a => "sferik", :user_b => "sferik"}).
+            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
@@ -706,7 +732,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:user_id => "428004849"}).
             should have_been_made
           a_get("/1/friendships/exists.json").
-            with(:query => {:user_a => "sferik", :user_b => "sferik"}).
+            with(:query => {:screen_name_a => "sferik", :screen_name_b => "sferik"}).
             should have_been_made
         end
       end
@@ -714,7 +740,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     context "false" do
       before do
         stub_get("/1/friendships/exists.json").
-          with(:query => {:user_a => "ev", :user_b => "testcli"}).
+          with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
           to_return(:body => fixture("false.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should exit" do
@@ -722,7 +748,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
           @cli.does_follow("ev")
         end.should raise_error(SystemExit)
         a_get("/1/friendships/exists.json").
-          with(:query => {:user_a => "ev", :user_b => "testcli"}).
+          with(:query => {:screen_name_a => "ev", :screen_name_b => "testcli"}).
           should have_been_made
       end
     end
@@ -771,6 +797,9 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         @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!
@@ -799,6 +828,9 @@ ID,Posted at,Screen name,Text
         @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...
@@ -843,6 +875,9 @@ ID                  Posted at     Screen name    Text
 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...
           eos
         end
       end
@@ -856,8 +891,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/favorites.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+          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"}).
+            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)
@@ -873,8 +913,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/favorites.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          should have_been_made
+          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/favorites.json").
+            with(:query => {:count => count, :max_id => "194546264212385792"}).
+            should have_been_made
+        end
       end
     end
     context "with a user passed" do
@@ -1767,6 +1812,9 @@ 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!
@@ -1795,6 +1843,9 @@ ID,Posted at,Screen name,Text
         @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...
@@ -1839,6 +1890,9 @@ ID                  Posted at     Screen name    Text
 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...
           eos
         end
       end
@@ -1852,8 +1906,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/statuses/mentions.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+          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"}).
+            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)
@@ -1869,8 +1928,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/statuses/mentions.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          should have_been_made
+          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/mentions.json").
+            with(:query => {:count => count, :max_id => "194546264212385792"}).
+            should have_been_made
+        end
       end
     end
   end
@@ -1934,7 +1998,7 @@ ID                  Posted at     Screen name    Text
       $stdout.string.should == <<-eos
 Hourly limit    20,000
 Remaining hits  19,993
-Reset time      Oct 26  2010 (about 1 year from now)
+Reset time      Oct 26  2010 (a year from now)
       eos
     end
     context "--csv" do
@@ -2084,6 +2148,9 @@ 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!
@@ -2112,6 +2179,9 @@ ID,Posted at,Screen name,Text
         @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...
@@ -2156,6 +2226,9 @@ ID                  Posted at     Screen name    Text
 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...
           eos
         end
       end
@@ -2169,8 +2242,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+          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)
@@ -2186,8 +2264,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          should have_been_made
+          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
@@ -2560,6 +2643,9 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
         @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!
@@ -2588,6 +2674,9 @@ ID,Posted at,Screen name,Text
         @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...
@@ -2632,6 +2721,9 @@ ID                  Posted at     Screen name    Text
 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...
           eos
         end
       end
@@ -2645,8 +2737,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          with(:query => {:count => "200", :max_id => "194546264212385792"}).
+          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"}).
+            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)
@@ -2662,8 +2759,13 @@ ID                  Posted at     Screen name    Text
           with(:query => {:count => "200"}).
           should have_been_made
         a_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "145", :max_id => "194546264212385792"}).
-          should have_been_made
+          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/home_timeline.json").
+            with(:query => {:count => count, :max_id => "194546264212385792"}).
+            should have_been_made
+        end
       end
     end
     context "with a user passed" do
@@ -2701,8 +2803,13 @@ ID                  Posted at     Screen name    Text
             with(:query => {:count => "200", :screen_name => "sferik"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/statuses/user_timeline.json").
-            with(:query => {:count => "145", :screen_name => "sferik", :max_id => "194546264212385792"}).
-            to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+            with(:query => {:count => "200", :screen_name => "sferik", :max_id => "194546264212385792"}).
+            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"}).
+              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)
@@ -2718,8 +2825,13 @@ ID                  Posted at     Screen name    Text
             with(:query => {:count => "200", :screen_name => "sferik"}).
             should have_been_made
           a_get("/1/statuses/user_timeline.json").
-            with(:query => {:count => "145", :screen_name => "sferik", :max_id => "194546264212385792"}).
-            should have_been_made
+            with(:query => {:count => "200", :screen_name => "sferik", :max_id => "194546264212385792"}).
+            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"}).
+              should have_been_made
+          end
         end
       end
     end
@@ -3076,7 +3188,7 @@ Bio          A mind forever voyaging through strange seas of thought, alone.
 Location     San Francisco
 Status       Not following
 Last update  RT @tenderlove: [ANN] sqlite3-ruby => sqlite3 (10 months ago)
-Since        Jul 16  2007 (over 4 years ago)
+Since        Jul 16  2007 (4 years ago)
 Tweets       3,479
 Favorites    1,040
 Listed       41