tweetwine 0.2.7 → 0.2.8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.2.8 released 2010-01-17
+
+* Unescape basic HTML encoding when displaying statuses
+* Retry connection on timeout
+
 === 0.2.7 released 2009-12-22
 
 * Formatted help texts so that they do not exceed 80 chars in width.

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tuomas Kareinen.
+Copyright (c) 2009-2010 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

data/README.rdoc

@@ -83,4 +83,5 @@ com >.
 
 == Legal notes
 
-Copyright (c) 2009 Tuomas Kareinen. See MIT-LICENSE.txt in this directory.
+Copyright (c) 2009-2010 Tuomas Kareinen. See MIT-LICENSE.txt in this
+directory.

data/lib/tweetwine/io.rb

@@ -90,6 +90,7 @@ module Tweetwine
     end
 
     def format_status(status)
+      status = Util.unescape_html(status)
       if @colors
         status = colorize_all_by_group(:yellow, status, USERNAME_REGEX)
         status = colorize_all_by_group(:magenta, status, HASHTAG_REGEX)

data/lib/tweetwine/meta.rb

@@ -1,3 +1,3 @@
 module Tweetwine
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/tweetwine/retrying_http.rb

@@ -27,7 +27,7 @@ module Tweetwine
         begin
           tries += 1
           yield
-        rescue Errno::ECONNRESET => e
+        rescue Errno::ECONNRESET, RestClient::RequestTimeout => e
           if tries < MAX_RETRIES
             timeout = RETRY_BASE_WAIT_TIMEOUT**tries
             @io.warn("Could not connect -- retrying in #{timeout} seconds") if @io

data/lib/tweetwine/util.rb

@@ -1,3 +1,4 @@
+require "cgi"
 require "time"
 require "uri"
 
@@ -64,6 +65,10 @@ module Tweetwine
       URI.escape(str.to_s, /[^#{URI::PATTERN::UNRESERVED}]/)
     end
 
+    def self.unescape_html(str)
+      CGI.unescapeHTML(str.gsub(' ', ' '))
+    end
+
     def self.find_hash_path(hash, path)
       return nil if hash.nil?
       path = [path] if !path.is_a? Array

data/test/io_test.rb

@@ -99,6 +99,27 @@ class IOTest < Test::Unit::TestCase
         @io.show_record(record)
       end
 
+
+      should "unescape HTML in a status" do
+        from_user = "fooman"
+        escaped_status = "apple &gt; orange &amp; grapefruit &lt; banana"
+        unescaped_status = "apple > orange & grapefruit < banana"
+        record = {
+          :from_user  => from_user,
+          :status     => escaped_status,
+          :created_at => Time.at(1),
+          :to_user    => nil
+        }
+        Util.expects(:humanize_time_diff).returns([2, "secs"])
+        @output.expects(:puts).with(<<-END
+#{from_user}, 2 secs ago:
+#{unescaped_status}
+
+        END
+        )
+        @io.show_record(record)
+      end
+
       should "output a preview of a status" do
         status = "@nick, check http://bit.ly/18rU_Vx"
         @output.expects(:puts).with(<<-END

data/test/retrying_http_test.rb

@@ -40,24 +40,26 @@ class ClientTest < Test::Unit::TestCase
       assert_raise(HttpError) { @client.get("https://unresolved.org") }
     end
 
-    should "retry connection upon connection reset" do
-      retrying_calls = sequence("Retrying Client calls")
-      RestClient.expects(:get).with("https://moderate.traffic.org").in_sequence(retrying_calls).raises(Errno::ECONNRESET)
-      RestClient.expects(:get).with("https://moderate.traffic.org").in_sequence(retrying_calls)
-      @io.expects(:warn).with("Could not connect -- retrying in 4 seconds")
-      @client.get("https://moderate.traffic.org")
-    end
-
-    should "retry connection a maximum of certain number of times" do
-      retrying_calls = sequence("Retrying Client calls")
-      io_calls = sequence("IO")
-      Client::MAX_RETRIES.times do
-        RestClient.expects(:get).with("https://unresponsive.org").in_sequence(retrying_calls).raises(Errno::ECONNRESET)
+    [Errno::ECONNRESET, RestClient::RequestTimeout].each do |error_class|
+      should "retry connection upon connection reset, case #{error_class}" do
+        retrying_calls = sequence("Retrying Client calls")
+        RestClient.expects(:get).with("https://moderate.traffic.org").in_sequence(retrying_calls).raises(error_class)
+        RestClient.expects(:get).with("https://moderate.traffic.org").in_sequence(retrying_calls)
+        @io.expects(:warn).with("Could not connect -- retrying in 4 seconds")
+        @client.get("https://moderate.traffic.org")
       end
-      (Client::MAX_RETRIES - 1).times do
-        @io.expects(:warn).in_sequence(io_calls)
+
+      should "retry connection a maximum of certain number of times, case #{error_class}" do
+        retrying_calls = sequence("Retrying Client calls")
+        io_calls = sequence("IO")
+        Client::MAX_RETRIES.times do
+          RestClient.expects(:get).with("https://unresponsive.org").in_sequence(retrying_calls).raises(error_class)
+        end
+        (Client::MAX_RETRIES - 1).times do
+          @io.expects(:warn).in_sequence(io_calls)
+        end
+        assert_raise(HttpError) { @client.get("https://unresponsive.org") }
       end
-      assert_raise(HttpError) { @client.get("https://unresponsive.org") }
     end
 
     should "return a resource with IO inherited from the client" do
@@ -101,24 +103,26 @@ class ResourceTest < Test::Unit::TestCase
       assert_raise(HttpError) { @resource.get }
     end
 
-    should "retry connection upon connection reset" do
-      retrying_calls = sequence("Retrying Resource calls")
-      @wrapped.expects(:get).in_sequence(retrying_calls).raises(Errno::ECONNRESET)
-      @wrapped.expects(:get).in_sequence(retrying_calls)
-      @io.expects(:warn).with("Could not connect -- retrying in 4 seconds")
-      @resource.get
-    end
-
-    should "retry connection a maximum of certain number of times" do
-      retrying_calls = sequence("Retrying Resource calls")
-      io_calls = sequence("IO")
-      Resource::MAX_RETRIES.times do
-        @wrapped.expects(:get).in_sequence(retrying_calls).raises(Errno::ECONNRESET)
+    [Errno::ECONNRESET, RestClient::RequestTimeout].each do |error_class|
+      should "retry connection upon connection reset, case #{error_class}" do
+        retrying_calls = sequence("Retrying Resource calls")
+        @wrapped.expects(:get).in_sequence(retrying_calls).raises(error_class)
+        @wrapped.expects(:get).in_sequence(retrying_calls)
+        @io.expects(:warn).with("Could not connect -- retrying in 4 seconds")
+        @resource.get
       end
-      (Resource::MAX_RETRIES - 1).times do
-        @io.expects(:warn).in_sequence(io_calls)
+
+      should "retry connection a maximum of certain number of times, case #{error_class}" do
+        retrying_calls = sequence("Retrying Resource calls")
+        io_calls = sequence("IO")
+        Resource::MAX_RETRIES.times do
+          @wrapped.expects(:get).in_sequence(retrying_calls).raises(error_class)
+        end
+        (Resource::MAX_RETRIES - 1).times do
+          @io.expects(:warn).in_sequence(io_calls)
+        end
+        assert_raise(HttpError) { @resource.get }
       end
-      assert_raise(HttpError) { @resource.get }
     end
   end
 end

data/test/util_test.rb

@@ -120,7 +120,7 @@ class UtilTest < Test::Unit::TestCase
       assert_equal "_", Util.percent_encode("_")
     end
 
-    should "encode space character with precent-encoding, not with '+' character" do
+    should "encode space character with percent-encoding, not with '+' character" do
       assert_equal "%20", Util.percent_encode(" ")
     end
 
@@ -138,6 +138,26 @@ class UtilTest < Test::Unit::TestCase
     end
   end
 
+  context "for unescaping HTML" do
+    should "not affect already unescaped characters" do
+      assert_equal "a", Util.unescape_html("a")
+      assert_equal "B", Util.unescape_html("B")
+      assert_equal "3", Util.unescape_html("3")
+      assert_equal ".", Util.unescape_html(".")
+      assert_equal "-", Util.unescape_html("-")
+      assert_equal "_", Util.unescape_html("_")
+      assert_equal "+", Util.unescape_html("+")
+    end
+
+    should "unescape HTML-escaped characters" do
+      assert_equal "<",  Util.unescape_html("&lt;")
+      assert_equal ">",  Util.unescape_html("&gt;")
+      assert_equal "&",  Util.unescape_html("&amp;")
+      assert_equal "\"", Util.unescape_html("&quot;")
+      assert_equal " ",  Util.unescape_html("&nbsp;")
+    end
+  end
+
   context "for traversing a hash with a path expression for finding a value" do
     setup do
       @inner_hash = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +02:00
+date: 2010-01-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- tweetwine 0.2.7
+- tweetwine 0.2.8
 - --main
 - README.rdoc
 - --exclude