tuomas-tweetwine 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+=== 0.2.2 released 2009-09-03
+
+* Highlight hashtags in statuses.
+* URL shortening step shortens only unique URLs.
+* URL shortening step is skipped if
+  - there is a connection error to the URL shortening service, or
+  - required libraries are not installed (nokogiri).
+* Fixed a colorization bug for duplicate URLs.
+* Removed dependencies to Rubygems.
+
 === 0.2.1 released 2009-08-17
 
 * Command line option "-v" show version information.

data/MIT-LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Tuomas Kareinen.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.rdoc

@@ -84,24 +84,4 @@ com >.
 
 == Legal notes
 
-This software is licensed under the terms of the "MIT license":
-
-Copyright (c) 2009 Tuomas Kareinen.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+Copyright (c) 2009 Tuomas Kareinen. See MIT-LICENSE.txt in this directory.

data/Rakefile

@@ -1,15 +1,16 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+
 require "rubygems"
 
-package_name = "tweetwine"
-require "lib/#{package_name}"
-full_name = Tweetwine::Meta::NAME
-version = Tweetwine::Meta::VERSION
+name = "tweetwine"
+require "#{name}"
+version = Tweetwine::VERSION
 
 require "rake/clean"
 
 require "rake/gempackagetask"
 spec = Gem::Specification.new do |s|
-  s.name = package_name
+  s.name = name
   s.version = version
   s.homepage = "http://github.com/tuomas/tweetwine"
   s.summary = "A simple Twitter agent for command line use"
@@ -19,14 +20,14 @@ spec = Gem::Specification.new do |s|
   s.email = "tkareine@gmail.com"
 
   s.platform = Gem::Platform::RUBY
-  s.files = FileList["Rakefile", "*.rdoc", "bin/**/*", "lib/**/*", "test/**/*"].to_a
+  s.files = FileList["Rakefile", "MIT-LICENSE.txt", "*.rdoc", "bin/**/*", "lib/**/*", "test/**/*"].to_a
   s.executables = ["tweetwine"]
 
   s.add_dependency("rest-client", ">= 1.0.0")
 
   s.has_rdoc = true
-  s.extra_rdoc_files = FileList["*.rdoc"].to_a
-  s.rdoc_options << "--title"   << "#{full_name} #{version}" \
+  s.extra_rdoc_files = FileList["MIT-LICENSE.txt", "*.rdoc"].to_a
+  s.rdoc_options << "--title"   << "#{name} #{version}" \
                  << "--main"    << "README.rdoc" \
                  << "--exclude" << "test" \
                  << "--line-numbers"
@@ -45,29 +46,30 @@ task :gemspec do
 end
 
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{package_name}-#{version}.gem}
+  sh %{sudo gem install pkg/#{name}-#{version}.gem}
 end
 
 task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{package_name}}
+  sh %{sudo gem uninstall #{name}}
 end
 
 require "rake/rdoctask"
 desc "Create documentation"
 Rake::RDocTask.new(:rdoc) do |rd|
   rd.rdoc_dir = "rdoc"
-  rd.title = "#{full_name} #{version}"
+  rd.title = "#{name} #{version}"
   rd.main = "README.rdoc"
-  rd.rdoc_files.include("*.rdoc", "lib/**/*.rb")
+  rd.rdoc_files.include("MIT-LICENSE.txt", "*.rdoc", "lib/**/*.rb")
   rd.options << "--line-numbers"
 end
 
 require "rake/testtask"
 desc "Run tests"
-Rake::TestTask.new do |t|
-  t.test_files = FileList["test/*_test.rb"]
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
   t.warning = true
+  t.libs << "test"
 end
 
 desc "Find code smells"
@@ -77,7 +79,7 @@ end
 
 desc "Search unfinished parts of source code"
 task :todo do
-  FileList["**/*.rb"].egrep /#.*(TODO|FIXME)/
+  FileList["**/*.rb", "**/*.rdoc", "**/*.txt"].egrep /(TODO|FIXME)/
 end
 
 task :default => :test

data/bin/tweetwine

@@ -10,10 +10,8 @@ trap("INT") do
   exit(EXIT_SIGINT)
 end
 
-require "rubygems"
 require "optparse"
-
-require File.dirname(__FILE__) << "/../lib/tweetwine"
+require "tweetwine"
 
 include Tweetwine
 
@@ -47,7 +45,7 @@ Usage: tweetwine [options...] [command]
           options[:page_num] = arg
         end
         opt.on("-v", "--version", "Show version information and exit") do
-          puts Meta
+          puts "#{File.basename($0)} #{VERSION}"
           exit(EXIT_VERSION)
         end
         opt.on_tail("-h", "--help", "Show this help message and exit") do

data/lib/tweetwine/client.rb

@@ -159,12 +159,14 @@ module Tweetwine
       end
 
       def shorten_urls!(status)
-        url_pairs = URI.extract(status, ["http", "https"]).map do |url_to_be_shortened|
+        url_pairs = URI.extract(status, ["http", "https"]).uniq.map do |url_to_be_shortened|
           [url_to_be_shortened, @url_shortener.shorten(url_to_be_shortened)]
         end
         url_pairs.reject { |pair| pair.last.nil? || pair.last.empty? }.each do |url_pair|
-          status.sub!(url_pair.first, url_pair.last)
+          status.gsub!(url_pair.first, url_pair.last)
         end
+      rescue ClientError, LoadError => e
+        @io.warn "#{e}. Skipping URL shortening..."
       end
     end
   end

data/lib/tweetwine/io.rb

@@ -9,7 +9,8 @@ module Tweetwine
       :yellow   => 33
     }
 
-    NICK_REGEX = /@\w+/
+    HASHTAG_REGEX = /#[\w-]+/
+    USERNAME_REGEX = /@\w+/
 
     def initialize(options)
       @input = options[:input] || $stdin
@@ -78,9 +79,10 @@ module Tweetwine
     def format_status(status)
       status = status.dup
       if @colorize
-        colorize_all!(:yellow, status, NICK_REGEX)
-        URI.extract(status, ["http", "https"]).each do |url|
-          colorize_first!(:cyan, status, url)
+        colorize_all!(:yellow, status, USERNAME_REGEX)
+        colorize_all!(:magenta, status, HASHTAG_REGEX)
+        URI.extract(status, ["http", "https"]).uniq.each do |url|
+          colorize_all!(:cyan, status, url)
         end
       end
       status
@@ -104,10 +106,6 @@ module Tweetwine
       str.gsub!(pattern) { |s| colorize_str(COLOR_CODES[color.to_sym], s) }
     end
 
-    def colorize_first!(color, str, pattern)
-      str.sub!(pattern) { |s| colorize_str(COLOR_CODES[color.to_sym], s) }
-    end
-
     def colorize!(color, str)
       str.replace colorize_str(COLOR_CODES[color.to_sym], str)
     end

data/lib/tweetwine/meta.rb

@@ -1,10 +1,3 @@
 module Tweetwine
-  module Meta #:nodoc:
-    NAME = "Tweetwine"
-    VERSION = "0.2.1"
-
-    def self.to_s
-      "#{NAME} #{VERSION}"
-    end
-  end
+  VERSION = "0.2.2"
 end

data/lib/tweetwine/options.rb

@@ -1,7 +1,8 @@
 module Tweetwine
   class Options
-    def initialize(options)
+    def initialize(options, source = nil)
       @hash = options.to_hash
+      @source = source
     end
 
     def [](key)
@@ -10,7 +11,11 @@ module Tweetwine
 
     def require(key)
       value = @hash[key]
-      raise RuntimeError, "Option #{key} is required" if value.nil?
+      if value.nil?
+        msg = "Option #{key} is required"
+        msg << " for #{@source}" if @source
+        raise ArgumentError, msg
+      end
       value
     end
   end

data/lib/tweetwine/rest_client_wrapper.rb

@@ -10,7 +10,7 @@ module Tweetwine
 
     def self.method_missing(name, *args, &block)
       RestClient.send(name, *args, &block)
-    rescue RestClient::Exception, SystemCallError => e
+    rescue RestClient::Exception, SocketError, SystemCallError => e
       raise ClientError, e.message
     end
   end

data/lib/tweetwine/url_shortener.rb

@@ -1,9 +1,8 @@
 module Tweetwine
   class UrlShortener
     def initialize(options)
-      require "nokogiri"
-      options = Options.new(options)
-      @method = options[:method].to_sym || :get
+      options = Options.new(options, "URL shortening")
+      @method = (options[:method] || :get).to_sym
       @service_url = options.require :service_url
       @url_param_name = options.require :url_param_name
       @extra_params = options[:extra_params] || {}
@@ -16,6 +15,7 @@ module Tweetwine
     end
 
     def shorten(url)
+      require "nokogiri"
       rest = case @method
       when :get
         tmp = @extra_params.dup

data/lib/tweetwine.rb

@@ -8,5 +8,5 @@
   url_shortener
   client
 }.each do |f|
-  require File.dirname(__FILE__) << "/tweetwine/#{f}"
+  require "tweetwine/#{f}"
 end

data/test/client_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 require "json"
 
 Mocha::Configuration.allow(:stubbing_non_existent_method)
@@ -12,9 +12,9 @@ class ClientTest < Test::Unit::TestCase
     end
 
     should "raise exception when no authentication data is given" do
-      assert_raises(ArgumentError) { Client.new(@io, {}) }
-      assert_raises(ArgumentError) { Client.new(@io, { :password => "bar" }) }
-      assert_raises(ArgumentError) { Client.new(@io, { :username => "", :password => "bar" }) }
+      assert_raise(ArgumentError) { Client.new(@io, {}) }
+      assert_raise(ArgumentError) { Client.new(@io, { :password => "bar" }) }
+      assert_raise(ArgumentError) { Client.new(@io, { :username => "", :password => "bar" }) }
       assert_nothing_raised { Client.new(@io, { :username => "foo", :password => "bar" }) }
     end
 
@@ -29,7 +29,7 @@ class ClientTest < Test::Unit::TestCase
     end
 
     should "raise an exception for configured number of statuses if not in allowed range" do
-      assert_raises(ArgumentError) { Client.new(@io, { :username => "foo", :password => "bar", :num_statuses => 0 }) }
+      assert_raise(ArgumentError) { Client.new(@io, { :username => "foo", :password => "bar", :num_statuses => 0 }) }
     end
 
     should "use default page number if not configured otherwise" do
@@ -43,7 +43,7 @@ class ClientTest < Test::Unit::TestCase
     end
 
     should "raise an exception for configured page number if not in allowed range" do
-      assert_raises(ArgumentError) { Client.new(@io, { :username => "foo", :password => "bar", :page_num => 0 }) }
+      assert_raise(ArgumentError) { Client.new(@io, { :username => "foo", :password => "bar", :page_num => 0 }) }
     end
   end
 
@@ -343,6 +343,73 @@ class ClientTest < Test::Unit::TestCase
           @io.expects(:show_record).with(gen_records[0])
           @client.update(status)
         end
+
+        should "reuse a shortened URL for duplicate long URLs" do
+          long_urls = ["http://www.w3.org/TR/1999/REC-xpath-19991116"] * 2
+          long_status = long_urls.join(" and ")
+          short_url = "http://shorten.it/2k7mk"
+          short_status = ([short_url] * 2).join(" and ")
+          status_records, gen_records = create_test_statuses(
+            { :user => @username,
+              :status => {
+                :created_at   => Time.at(1).to_s,
+                :text         => short_status,
+                :in_reply_to  => nil
+              }
+            }
+          )
+          RestClientWrapper.expects(:post) \
+              .with("#{@base_url}/statuses/update.json", {:status => short_status}) \
+              .returns(status_records[0].to_json)
+          @url_shortener.expects(:shorten).with(long_urls.first).returns(short_url)
+          @io.expects(:show_status_preview).with(short_status)
+          @io.expects(:confirm).with("Really send?").returns(true)
+          @io.expects(:info).with("Sent status update.\n\n")
+          @io.expects(:show_record).with(gen_records[0])
+          @client.update(long_status)
+        end
+
+        context "in erroneous situations" do
+          setup do
+            @url = "http://www.w3.org/TR/1999/REC-xpath-19991116"
+            @status = "skimming through #{@url}"
+            @status_records, @gen_records = create_test_statuses(
+              { :user => @username,
+                :status => {
+                  :created_at   => Time.at(1).to_s,
+                  :text         => @status,
+                  :in_reply_to  => nil
+                }
+              }
+            )
+          end
+
+          should "skip shortening URLs if required libraries are not found" do
+            RestClientWrapper.expects(:post) \
+                .with("#{@base_url}/statuses/update.json", {:status => @status}) \
+                .returns(@status_records[0].to_json)
+            @url_shortener.expects(:shorten).with(@url).raises(LoadError, "gem not found")
+            @io.expects(:warn)
+            @io.expects(:show_status_preview).with(@status)
+            @io.expects(:confirm).with("Really send?").returns(true)
+            @io.expects(:info).with("Sent status update.\n\n")
+            @io.expects(:show_record).with(@gen_records[0])
+            @client.update(@status)
+          end
+
+          should "skip shortening URLs upon connection error to the URL shortening service" do
+            RestClientWrapper.expects(:post) \
+                .with("#{@base_url}/statuses/update.json", {:status => @status}) \
+                .returns(@status_records[0].to_json)
+            @url_shortener.expects(:shorten).with(@url).raises(ClientError, "connection error")
+            @io.expects(:warn)
+            @io.expects(:show_status_preview).with(@status)
+            @io.expects(:confirm).with("Really send?").returns(true)
+            @io.expects(:info).with("Sent status update.\n\n")
+            @io.expects(:show_record).with(@gen_records[0])
+            @client.update(@status)
+          end
+        end
       end
     end
 

data/test/io_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 
 module Tweetwine
 
@@ -9,7 +9,6 @@ class IOTest < Test::Unit::TestCase
       @output = mock()
       @io = IO.new({ :input => @input, :output => @output })
     end
-
     should "output prompt and return input as trimmed" do
       @output.expects(:print).with("The answer: ")
       @input.expects(:gets).returns("  42 ")
@@ -63,7 +62,7 @@ fooman
     end
 
     should "output a record as status info when status is given, without in-reply info" do
-      status = "Hi, @barman! Lulz woo!"
+      status = "Hi, @barman! Lulz woo! #hellos"
       record = {
         :user   => "fooman",
         :status => {
@@ -153,14 +152,14 @@ Wondering the meaning of life.
         :user   => "barman",
         :status => {
           :created_at   => Time.at(1),
-          :text         => "Hi, @fooman! How are you doing?",
+          :text         => "Hi, @fooman! How are you doing? #hellos",
           :in_reply_to  => "fooman"
         }
       }
       Util.expects(:humanize_time_diff).returns([2, "secs"])
       @output.expects(:puts).with(<<-END
 \033[32mbarman\033[0m, in reply to \033[32mfooman\033[0m, 2 secs ago:
-Hi, \033[33m@fooman\033[0m! How are you doing?
+Hi, \033[33m@fooman\033[0m! How are you doing? \033[35m#hellos\033[0m
 
       END
       )
@@ -178,7 +177,7 @@ Hi, \033[33m@fooman\033[0m! How are you doing?
       @io.show_status_preview(status)
     end
 
-    should "highlight HTTP and HTTPS URIs in a status" do
+    should "highlight HTTP and HTTPS URLs in a status" do
       record = {
         :user   => "barman",
         :status => {
@@ -196,7 +195,25 @@ Three links: \033[36mhttp://bit.ly/18rU_Vx\033[0m \033[36mhttp://is.gd/1qLk3\033
       @io.show_record(record)
     end
 
-    should "highlight nicks in a status" do
+    should "highlight HTTP and HTTPS URLs in a status, even if duplicates" do
+      record = {
+        :user   => "barman",
+        :status => {
+          :created_at   => Time.at(1),
+          :text         => "Duplicate links: http://is.gd/1qLk3 and http://is.gd/1qLk3",
+        }
+      }
+      Util.expects(:humanize_time_diff).returns([2, "secs"])
+      @output.expects(:puts).with(<<-END
+\033[32mbarman\033[0m, 2 secs ago:
+Duplicate links: \033[36mhttp://is.gd/1qLk3\033[0m and \033[36mhttp://is.gd/1qLk3\033[0m
+
+      END
+      )
+      @io.show_record(record)
+    end
+
+    should "highlight usernames in a status" do
       record = {
         :user   => "barman",
         :status => {
@@ -215,16 +232,35 @@ I salute you \033[33m@fooman\033[0m, \033[33m@barbaz\033[0m, and \033[33m@spoonm
     end
   end
 
-  context "Nick regex" do
-    should "match a proper nick reference" do
-      assert_full_match IO::NICK_REGEX, "@nick"
-      assert_full_match IO::NICK_REGEX, "@nick_man"
+  context "Username regex" do
+    should "match a proper username reference" do
+      assert_full_match IO::USERNAME_REGEX, "@nick"
+      assert_full_match IO::USERNAME_REGEX, "@nick_man"
+    end
+
+    should "not match an inproper username reference" do
+      assert_no_full_match IO::USERNAME_REGEX, "@"
+      assert_no_full_match IO::USERNAME_REGEX, "nick"
+      assert_no_full_match IO::USERNAME_REGEX, "@nick-man"
+      assert_no_full_match IO::USERNAME_REGEX, " @nick"
+      assert_no_full_match IO::USERNAME_REGEX, "@nick "
+      assert_no_full_match IO::USERNAME_REGEX, " @nick "
+    end
+  end
+
+  context "Hashtag regex" do
+    should "match a proper hashtag reference" do
+      assert_full_match IO::HASHTAG_REGEX, "#mayhem"
+      assert_full_match IO::HASHTAG_REGEX, "#friday_mayhem"
+      assert_full_match IO::HASHTAG_REGEX, "#friday-mayhem"
     end
 
-    should "not match an inproper nick reference" do
-      assert_no_full_match IO::NICK_REGEX, "@"
-      assert_no_full_match IO::NICK_REGEX, "nick"
-      assert_no_full_match IO::NICK_REGEX, "@nick-man"
+    should "not match an inproper hashtag reference" do
+      assert_no_full_match IO::USERNAME_REGEX, "#"
+      assert_no_full_match IO::USERNAME_REGEX, "mayhem"
+      assert_no_full_match IO::USERNAME_REGEX, " #mayhem"
+      assert_no_full_match IO::USERNAME_REGEX, "#mayhem "
+      assert_no_full_match IO::USERNAME_REGEX, " #mayhem "
     end
   end
 end

data/test/options_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 
 module Tweetwine
 
@@ -9,9 +9,33 @@ class OptionsTest < Test::Unit::TestCase
       assert_equal nil, Options.new({})[:a]
     end
 
-    should "require missing value (a value that is nil)" do
-      assert_equal "alpha", Options.new({:a => "alpha"}).require(:a)
-      assert_raises(RuntimeError) { Options.new({}).require(:a) }
+    context "for requiring options" do
+      should "raise ArgumentError if there's no value for the required option (a value that is nil)" do
+        assert_equal "alpha", Options.new({:a => "alpha"}).require(:a)
+        assert_raise(ArgumentError) { Options.new({}).require(:a) }
+      end
+
+      should "indicate the required option upon failure" do
+        error = nil
+        begin
+          Options.new({}).require(:a)
+          flunk "should have raised ArgumentError"
+        rescue ArgumentError => e
+          error = e
+        end
+        assert_equal("Option a is required", e.to_s)
+      end
+
+      should "indicate the required option upon failure, with optional error source" do
+        error = nil
+        begin
+          Options.new({}, "test options").require(:a)
+          flunk "should have raised ArgumentError"
+        rescue ArgumentError => e
+          error = e
+        end
+        assert_equal("Option a is required for test options", e.to_s)
+      end
     end
   end
 end

data/test/rest_client_wrapper_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 require "rest_client"
 
 module Tweetwine
@@ -9,14 +9,21 @@ class RestClientWrapperTest < Test::Unit::TestCase
       RestClient.expects(:get) \
                 .with("https://secret:agent@hushhush.net") \
                 .raises(RestClient::Unauthorized)
-      assert_raises(ClientError) { RestClientWrapper.get("https://secret:agent@hushhush.net") }
+      assert_raise(ClientError) { RestClientWrapper.get("https://secret:agent@hushhush.net") }
     end
 
     should "raise ClientError when connection cannot be established" do
       RestClient.expects(:get) \
                 .with("http://www.invalid.net") \
                 .raises(Errno::ECONNRESET)
-      assert_raises(ClientError) { RestClientWrapper.get("http://www.invalid.net") }
+      assert_raise(ClientError) { RestClientWrapper.get("http://www.invalid.net") }
+    end
+
+    should "raise ClientError when host cannot be resolved" do
+      RestClient.expects(:get) \
+                .with("http://unknown.net") \
+                .raises(SocketError)
+      assert_raise(ClientError) { RestClientWrapper.get("http://unknown.net") }
     end
   end
 end

data/test/startup_config_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 
 module Tweetwine
 

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require "rubygems"
-require File.dirname(__FILE__) << "/../lib/tweetwine"
+require "tweetwine"
 require "test/unit"
 require "shoulda"
 require "mocha"

data/test/url_shortener_test.rb

@@ -1,66 +1,126 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 
 module Tweetwine
 
 class UrlShortenerTest < Test::Unit::TestCase
-  context "An URL shortener configured for HTTP GET" do
-    should "use parameters as URL query parameters, with just the URL parameter" do
-      url_shortener = UrlShortener.new({
-        :method           => "get",
-        :service_url      => "http://shorten.it/create",
-        :url_param_name   => "url",
-        :xpath_selector   => "//input[@id='short_url']/@value"
-      })
-      RestClientWrapper.expects(:get) \
-          .with("http://shorten.it/create?url=http://www.ruby-doc.org/core/")
-      url_shortener.shorten("http://www.ruby-doc.org/core/")
+  context "Upon initialization, an URL shortener" do
+    should "raise exception if service URL is not given" do
+      assert_raise(ArgumentError) do
+        UrlShortener.new({
+          :service_url      => nil,
+          :url_param_name   => "url",
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+      end
+    end
+
+    should "raise exception if URL parameter name is not given" do
+      assert_raise(ArgumentError) do
+        UrlShortener.new({
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => nil,
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+      end
+    end
+
+    should "raise exception if XPath selector is not given" do
+      assert_raise(ArgumentError) do
+        UrlShortener.new({
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :xpath_selector   => nil
+        })
+      end
     end
 
-    should "use parameters as URL query parameters, with additional extra parameters" do
+    should "fallback to use GET method if not given explicitly" do
       url_shortener = UrlShortener.new({
-        :method           => "get",
         :service_url      => "http://shorten.it/create",
         :url_param_name   => "url",
-        :extra_params     => {
-          :token => "xyz"
-        },
         :xpath_selector   => "//input[@id='short_url']/@value"
       })
-      RestClientWrapper.expects(:get) \
-          .with("http://shorten.it/create?token=xyz&url=http://www.ruby-doc.org/core/")
-      url_shortener.shorten("http://www.ruby-doc.org/core/")
+      assert_equal(:get, url_shortener.instance_variable_get(:@method))
     end
   end
 
-  context "An URL shortener configured for HTTP POST" do
-    should "use parameters as payload, with just the URL parameter" do
-      url_shortener = UrlShortener.new({
-        :method           => "post",
-        :service_url      => "http://shorten.it/create",
-        :url_param_name   => "url",
-        :xpath_selector   => "//input[@id='short_url']/@value"
-      })
-      RestClientWrapper.expects(:post) \
-          .with("http://shorten.it/create", {:url => "http://www.ruby-doc.org/core/"})
-      url_shortener.shorten("http://www.ruby-doc.org/core/")
+  context "At runtime, an URL shortener" do
+    context "An URL shortener configured for HTTP GET" do
+      should "use parameters as URL query parameters, with just the URL parameter" do
+        url_shortener = UrlShortener.new({
+          :method           => "get",
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+        RestClientWrapper.expects(:get) \
+            .with("http://shorten.it/create?url=http://www.ruby-doc.org/core/")
+        url_shortener.shorten("http://www.ruby-doc.org/core/")
+      end
+
+      should "use parameters as URL query parameters, with additional extra parameters" do
+        url_shortener = UrlShortener.new({
+          :method           => "get",
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :extra_params     => {
+            :token => "xyz"
+          },
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+        RestClientWrapper.expects(:get) \
+            .with("http://shorten.it/create?token=xyz&url=http://www.ruby-doc.org/core/")
+        url_shortener.shorten("http://www.ruby-doc.org/core/")
+      end
     end
 
-    should "use parameters as payload, with just the URL parameter" do
-      url_shortener = UrlShortener.new({
-        :method           => "post",
-        :service_url      => "http://shorten.it/create",
-        :url_param_name   => "url",
-        :extra_params     => {
-          :token => "xyz"
-        },
-        :xpath_selector   => "//input[@id='short_url']/@value"
-      })
-      RestClientWrapper.expects(:post) \
-          .with("http://shorten.it/create", {
-            :token => "xyz",
-            :url   => "http://www.ruby-doc.org/core/"
-          })
-      url_shortener.shorten("http://www.ruby-doc.org/core/")
+    context "An URL shortener configured for HTTP POST" do
+      should "use parameters as payload, with just the URL parameter" do
+        url_shortener = UrlShortener.new({
+          :method           => "post",
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+        RestClientWrapper.expects(:post) \
+            .with("http://shorten.it/create", {:url => "http://www.ruby-doc.org/core/"})
+        url_shortener.shorten("http://www.ruby-doc.org/core/")
+      end
+
+      should "use parameters as payload, with additional extra parameters" do
+        url_shortener = UrlShortener.new({
+          :method           => "post",
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :extra_params     => {
+            :token => "xyz"
+          },
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+        RestClientWrapper.expects(:post) \
+            .with("http://shorten.it/create", {
+              :token => "xyz",
+              :url   => "http://www.ruby-doc.org/core/"
+            })
+        url_shortener.shorten("http://www.ruby-doc.org/core/")
+      end
+    end
+
+    context "An URL shortener in erroenous situations" do
+      should "raise ClientError upon connection error" do
+        url_shortener = UrlShortener.new({
+          :method           => "post",
+          :service_url      => "http://shorten.it/create",
+          :url_param_name   => "url",
+          :xpath_selector   => "//input[@id='short_url']/@value"
+        })
+        RestClientWrapper.expects(:post) \
+            .with("http://shorten.it/create", {
+              :url   => "http://www.ruby-doc.org/core/"
+            }) \
+            .raises(ClientError, "connection error")
+        assert_raise(ClientError) { url_shortener.shorten("http://www.ruby-doc.org/core/") }
+      end
     end
   end
 end

data/test/util_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) << "/test_helper"
+require "test_helper"
 require "time"
 
 module Tweetwine
@@ -50,7 +50,7 @@ class UtilTest < Test::Unit::TestCase
     assert_equal 6, Util.parse_int_gt("6", 8, 4, "ethical working hours per day")
     assert_equal 8, Util.parse_int_gt(nil, 8, 4, "ethical working hours per day")
     assert_equal 8, Util.parse_int_gt(false, 8, 4, "ethical working hours per day")
-    assert_raises(ArgumentError) { Util.parse_int_gt(3, 8, 4, "ethical working hours per day") }
+    assert_raise(ArgumentError) { Util.parse_int_gt(3, 8, 4, "ethical working hours per day") }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,10 +29,12 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- MIT-LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
 files: 
 - Rakefile
+- MIT-LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
 - bin/tweetwine
@@ -57,11 +59,10 @@ files:
 - test/util_test.rb
 has_rdoc: false
 homepage: http://github.com/tuomas/tweetwine
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.2.1
+- tweetwine 0.2.2
 - --main
 - README.rdoc
 - --exclude
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A simple Twitter agent for command line use