tuomas-tweetwine 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.4 released 2009-05-12
+
+* Command line option "--page N" fetches a specific status page
+
 === 0.1.3 released 2009-05-05
 
 * Empty status update indicates cancellation of the command

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 
 full_name = "Tweetwine"
 package_name = "tweetwine"
-version = "0.1.3"
+version = "0.1.4"
 
 require "lib/#{package_name}"
 

data/bin/tweetwine

@@ -30,6 +30,9 @@ Usage: tweetwine [options...] [command]
         opt.on("-n", "--num N", Integer, "The number of statuses to fetch, defaults to #{Client::DEFAULT_NUM_STATUSES}") do |arg|
           options[:num_statuses] = arg
         end
+        opt.on("-p", "--page N", Integer, "The page number of the statuses to fetch, defaults to #{Client::DEFAULT_PAGE_NUM}") do |arg|
+          options[:page_num] = arg
+        end
         opt.on_tail("-h", "--help", "Show this help message") do
           puts opt
           exit(1)

data/lib/tweetwine/client.rb

@@ -5,12 +5,12 @@ module Tweetwine
   class ClientError < RuntimeError; end
 
   class Client
-    attr_reader :num_statuses
+    attr_reader :num_statuses, :page_num
 
     COMMANDS = [:home, :mentions, :user, :update]
 
     DEFAULT_NUM_STATUSES = 20
-    MAX_NUM_STATUSES = 200
+    DEFAULT_PAGE_NUM = 1
     MAX_STATUS_LENGTH = 140
 
     def initialize(options)
@@ -18,28 +18,21 @@ module Tweetwine
       raise ArgumentError, "No authentication data given" if @username.empty?
       @base_url = "https://#{@username}:#{options[:password]}@twitter.com/"
       @colorize = options[:colorize] || false
-      @num_statuses = if options[:num_statuses]
-        if (1..MAX_NUM_STATUSES).include? options[:num_statuses]
-          options[:num_statuses]
-        else
-          raise ArgumentError, "Invalid number of statuses to show -- must be between 1..#{MAX_NUM_STATUSES}"
-        end
-      else
-        DEFAULT_NUM_STATUSES
-      end
+      @num_statuses = parse_positive_int_option(options[:num_statuses], DEFAULT_NUM_STATUSES, 1, "number of statuses_to_show")
+      @page_num = parse_positive_int_option(options[:page_num], DEFAULT_PAGE_NUM, 1, "page number")
       @io = IO.new(options)
     end
 
     def home
-      get_and_show "statuses/friends_timeline.json?count=#{@num_statuses}"
+      get_result_as_json_and_show "statuses/friends_timeline"
     end
 
     def mentions
-      get_and_show "statuses/mentions.json?count=#{@num_statuses}"
+      get_result_as_json_and_show "statuses/mentions"
     end
 
     def user(user = @username)
-      get_and_show "statuses/user_timeline/#{user}.json?count=#{@num_statuses}"
+      get_result_as_json_and_show "statuses/user_timeline/#{user}"
     end
 
     def update(new_status = nil)
@@ -59,16 +52,29 @@ module Tweetwine
 
     private
 
-    def get_and_show(rest_url)
-      @io.show_statuses JSON.parse(get(rest_url))
+    def parse_positive_int_option(value, default, min, name_for_error)
+      if value
+        value = value.to_i
+        if value >= min
+          value
+        else
+          raise ArgumentError, "Invalid #{name_for_error} -- must be greater than or equal to #{min}"
+        end
+      else
+        default
+      end
+    end
+
+    def get_result_as_json_and_show(url_body)
+      @io.show_statuses JSON.parse(get(url_body + ".json?count=#{@num_statuses}&page=#{@page_num}"))
     end
 
-    def get(rest_url)
-      rest_client_action(:get, @base_url + rest_url)
+    def get(body_url)
+      rest_client_action(:get, @base_url + body_url)
     end
 
-    def post(rest_url, body)
-      rest_client_action(:post, @base_url + rest_url, body)
+    def post(body_url, body)
+      rest_client_action(:post, @base_url + body_url, body)
     end
 
     def rest_client_action(action, *args)

data/test/client_test.rb

@@ -12,18 +12,32 @@ class ClientTest < Test::Unit::TestCase
       assert_nothing_raised { Client.new({ :username => "foo", :password => "bar" }) }
     end
 
-    should "use default num of statuses if not configured otherwise" do
+    should "use default number of statuses if not configured otherwise" do
       @client = Client.new({ :username => "foo", :password => "bar" })
       assert_equal Client::DEFAULT_NUM_STATUSES, @client.num_statuses
     end
 
-    should "use configured num of statuses if in allowed range" do
+    should "use configured number of statuses if in allowed range" do
       @client = Client.new({ :username => "foo", :password => "bar", :num_statuses => 12 })
       assert_equal 12, @client.num_statuses
     end
 
-    should "raise an exception for configured num of statuses if not in allowed range" do
-      assert_raises(ArgumentError) { Client.new({ :username => "foo", :password => "bar", :num_statuses => Client::MAX_NUM_STATUSES + 1 }) }
+    should "raise an exception for configured number of statuses if not in allowed range" do
+      assert_raises(ArgumentError) { Client.new({ :username => "foo", :password => "bar", :num_statuses => 0 }) }
+    end
+
+    should "use default page number if not configured otherwise" do
+      @client = Client.new({ :username => "foo", :password => "bar" })
+      assert_equal Client::DEFAULT_PAGE_NUM, @client.page_num
+    end
+
+    should "use configured page number if in allowed range" do
+      @client = Client.new({ :username => "foo", :password => "bar", :page_num => 12 })
+      assert_equal 12, @client.page_num
+    end
+
+    should "raise an exception for configured page number if not in allowed range" do
+      assert_raises(ArgumentError) { Client.new({ :username => "foo", :password => "bar", :page_num => 0 }) }
     end
   end
 
@@ -32,11 +46,12 @@ class ClientTest < Test::Unit::TestCase
       @client = Client.new({ :username => "foo", :password => "bar" })
       @io = mock()
       @client.instance_variable_set(:@io, @io)
+      @query_params = "count=#{Client::DEFAULT_NUM_STATUSES}&page=#{Client::DEFAULT_PAGE_NUM}"
     end
 
     should "raise ClientError for invalid request" do
       RestClient.expects(:get) \
-                .with("https://foo:bar@twitter.com/statuses/friends_timeline.json?count=20") \
+                .with("https://foo:bar@twitter.com/statuses/friends_timeline.json?#{@query_params}") \
                 .raises(RestClient::Unauthorized)
       assert_raises(ClientError) { @client.home }
     end
@@ -55,7 +70,7 @@ class ClientTest < Test::Unit::TestCase
         }
       ]
       RestClient.expects(:get) \
-                .with("https://foo:bar@twitter.com/statuses/friends_timeline.json?count=20") \
+                .with("https://foo:bar@twitter.com/statuses/friends_timeline.json?#{@query_params}") \
                 .returns(statuses.to_json)
       @io.expects(:show_statuses).with(statuses)
       @client.home
@@ -77,7 +92,7 @@ class ClientTest < Test::Unit::TestCase
         }
       ]
       RestClient.expects(:get) \
-                .with("https://foo:bar@twitter.com/statuses/mentions.json?count=20") \
+                .with("https://foo:bar@twitter.com/statuses/mentions.json?#{@query_params}") \
                 .returns(statuses.to_json)
       @io.expects(:show_statuses).with(statuses)
       @client.mentions
@@ -92,7 +107,7 @@ class ClientTest < Test::Unit::TestCase
         }
       ]
       RestClient.expects(:get) \
-                .with("https://foo:bar@twitter.com/statuses/user_timeline/zanzibar.json?count=20") \
+                .with("https://foo:bar@twitter.com/statuses/user_timeline/zanzibar.json?#{@query_params}") \
                 .returns(statuses.to_json)
       @io.expects(:show_statuses).with(statuses)
       @client.user("zanzibar")
@@ -107,7 +122,7 @@ class ClientTest < Test::Unit::TestCase
         }
       ]
       RestClient.expects(:get) \
-                .with("https://foo:bar@twitter.com/statuses/user_timeline/foo.json?count=20") \
+                .with("https://foo:bar@twitter.com/statuses/user_timeline/foo.json?#{@query_params}") \
                 .returns(statuses.to_json)
       @io.expects(:show_statuses).with(statuses)
       @client.user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ files:
 - test/test_config.yaml
 - test/test_helper.rb
 - test/util_test.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/tuomas/tweetwine
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.3
+- Tweetwine 0.1.4
 - --main
 - README.rdoc
 - --exclude