tuomas-tweetwine 0.1.9 → 0.1.10

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.10 released 2009-08-09
+
+* Improved URL highlight support.
+
 === 0.1.9 released 2009-07-15
 
 * Added commands "friends" and "followers"

data/Rakefile

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

data/lib/tweetwine/io.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 module Tweetwine
   class IO
     COLOR_CODES = {
@@ -8,7 +10,6 @@ module Tweetwine
     }
 
     NICK_REGEX = /@\w+/
-    URL_REGEX = /(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(:[0-9]{2,5})?(((\/[a-z0-9_\-]+)+\/?)|(\/))?/i
 
     def initialize(options)
       @input = options[:input] || $stdin
@@ -46,18 +47,18 @@ module Tweetwine
     def show_as_status(record)
       time_diff_value, time_diff_unit = Util.humanize_time_diff(record[:status][:created_at], Time.now)
       from_user = record[:user]
-      from_user = colorize(:green, from_user) if @colorize
+      colorize!(:green, from_user) if @colorize
       in_reply_to = record[:status][:in_reply_to]
       in_reply_to = if in_reply_to && !in_reply_to.empty?
-        in_reply_to = colorize(:green, in_reply_to) if @colorize
+        colorize!(:green, in_reply_to) if @colorize
         "in reply to #{in_reply_to}, "
       else
         ""
       end
       status = record[:status][:text]
       if @colorize
-        status = colorize(:yellow, status, NICK_REGEX)
-        status = colorize(:cyan, status, URL_REGEX)
+        colorize!(:yellow, status, [NICK_REGEX])
+        colorize!(:cyan, status, URI.extract(status, ["http", "https"]))
       end
       @output.puts <<-END
 #{from_user}, #{in_reply_to}#{time_diff_value} #{time_diff_unit} ago:
@@ -68,7 +69,7 @@ module Tweetwine
 
     def show_as_user(record)
       user = record[:user]
-      user = colorize(:green, user) if @colorize
+      colorize!(:green, user) if @colorize
       @output.puts <<-END
 #{user}
 
@@ -77,13 +78,15 @@ module Tweetwine
 
     private
 
-    def colorize(color, str, matcher = nil)
+    def colorize!(color, str, patterns = nil)
       color_code = COLOR_CODES[color.to_sym]
 
-      unless matcher
-        colorize_str(color_code, str)
+      if patterns
+        patterns.each do |pattern|
+          str.sub!(pattern) { |s| colorize_str(color_code, s) }
+        end
       else
-        str.gsub(matcher) { |s| colorize_str(color_code, s) }
+        str.replace colorize_str(color_code, str)
       end
     end
 

data/test/client_test.rb

@@ -156,7 +156,7 @@ class ClientTest < Test::Unit::TestCase
             :text         => "wondering around",
             :in_reply_to  => nil
           }
-        },
+        }
       )
       RestClient.expects(:post) \
                 .with("https://foo:bar@twitter.com/statuses/update.json", {:status => "wondering about"}) \
@@ -175,7 +175,7 @@ class ClientTest < Test::Unit::TestCase
             :text         => "wondering around",
             :in_reply_to  => nil
           }
-        },
+        }
       )
       RestClient.expects(:post) \
                 .with("https://foo:bar@twitter.com/statuses/update.json", {:status => "wondering about"}) \
@@ -231,7 +231,7 @@ class ClientTest < Test::Unit::TestCase
             :text         => truncated_status_update,
             :in_reply_to  => nil
           }
-        },
+        }
       )
       RestClient.expects(:post) \
                 .with("https://foo:bar@twitter.com/statuses/update.json", {:status => truncated_status_update}) \

data/test/io_test.rb

@@ -85,14 +85,14 @@ Hi, @barman! Lulz woo!
         :user   => "barman",
         :status => {
           :created_at   => Time.at(1),
-          :text         => "Hi, @fooman! Check this: http://www.foo.com. Nice, isn't it?",
+          :text         => "Hi, @fooman! How are you doing?",
           :in_reply_to  => "fooman"
         }
       }
       Util.expects(:humanize_time_diff).returns([2, "secs"])
       @output.expects(:puts).with(<<-END
 barman, in reply to fooman, 2 secs ago:
-Hi, @fooman! Check this: http://www.foo.com. Nice, isn't it?
+Hi, @fooman! How are you doing?
 
       END
       )
@@ -140,14 +140,32 @@ Hi, \033[33m@barman\033[0m! Lulz woo!
         :user   => "barman",
         :status => {
           :created_at   => Time.at(1),
-          :text         => "Hi, @fooman! Check this: http://www.foo.com. Nice, isn't it?",
+          :text         => "Hi, @fooman! How are you doing?",
           :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! Check this: \033[36mhttp://www.foo.com\033[0m. Nice, isn't it?
+Hi, \033[33m@fooman\033[0m! How are you doing?
+
+      END
+      )
+      @io.show(record)
+    end
+
+    should "highlight HTTP and HTTPS URIs in a status" do
+      record = {
+        :user   => "barman",
+        :status => {
+          :created_at   => Time.at(1),
+          :text         => "Three links: http://bit.ly/18rU_Vx http://is.gd/1qLk3 and https://is.gd/2rLk4",
+        }
+      }
+      Util.expects(:humanize_time_diff).returns([2, "secs"])
+      @output.expects(:puts).with(<<-END
+\033[32mbarman\033[0m, 2 secs ago:
+Three links: \033[36mhttp://bit.ly/18rU_Vx\033[0m \033[36mhttp://is.gd/1qLk3\033[0m and \033[36mhttps://is.gd/2rLk4\033[0m
 
       END
       )
@@ -167,43 +185,6 @@ Hi, \033[33m@fooman\033[0m! Check this: \033[36mhttp://www.foo.com\033[0m. Nice,
       assert_no_full_match IO::NICK_REGEX, "@nick-man"
     end
   end
-
-  context "URL regex" do
-    should "match an IP" do
-      assert_full_match IO::URL_REGEX, "http://127.0.0.1"
-      assert_full_match IO::URL_REGEX, "http://127.0.0.1/"
-      assert_full_match IO::URL_REGEX, "https://127.0.0.1"
-      assert_full_match IO::URL_REGEX, "https://127.0.0.1/"
-    end
-
-    should "match a FQDN" do
-      assert_full_match IO::URL_REGEX, "https://fo.com"
-      assert_full_match IO::URL_REGEX, "https://fo.com/"
-      assert_full_match IO::URL_REGEX, "http://www.foo.com"
-      assert_full_match IO::URL_REGEX, "http://www.foo.com/"
-      assert_full_match IO::URL_REGEX, "https://www.foo.com"
-      assert_full_match IO::URL_REGEX, "https://www.foo.com/"
-    end
-
-    should "respect whitespace, parentheses, periods, etc. at the end" do
-      assert_full_match IO::URL_REGEX, "http://tr.im/WGAP"
-      assert_no_full_match IO::URL_REGEX, "http://tr.im/WGAP "
-      assert_no_full_match IO::URL_REGEX, "http://tr.im/WGAP)"
-      assert_no_full_match IO::URL_REGEX, "http://tr.im/WGAP."
-      assert_no_full_match IO::URL_REGEX, "http://tr.im/WGAP,"
-    end
-
-    should "match multipart URLs" do
-      assert_full_match IO::URL_REGEX, "http://technomancy.us/126"
-      assert_full_match IO::URL_REGEX, "http://technomancy.us/126/"
-      assert_full_match IO::URL_REGEX, "http://bit.ly/18rUVx"
-      assert_full_match IO::URL_REGEX, "http://bit.ly/18rUVx/"
-      assert_full_match IO::URL_REGEX, "http://bit.ly/18rU_Vx"
-      assert_full_match IO::URL_REGEX, "http://bit.ly/18rU_Vx/"
-      assert_full_match IO::URL_REGEX, "http://www.ireport.com/docs/DOC-266869"
-      assert_full_match IO::URL_REGEX, "http://www.ireport.com/docs/DOC-266869/"
-    end
-  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-08-09 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,10 +50,11 @@ files:
 - test/util_test.rb
 has_rdoc: false
 homepage: http://github.com/tuomas/tweetwine
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.9
+- Tweetwine 0.1.10
 - --main
 - README.rdoc
 - --exclude
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple Twitter agent for command line use