tuomas-tweetwine 0.1.5 → 0.1.6

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.6 released 2009-06-07
+
+* Improved URL highlighting.
+
 === 0.1.5 released 2009-06-06
 
 * URLs of http(s) scheme are highlighted. Changed colors.

data/Rakefile

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

data/lib/tweetwine/io.rb

@@ -1,5 +1,15 @@
 module Tweetwine
   class IO
+    COLOR_CODES = {
+      :cyan     => 36,
+      :green    => 32,
+      :magenta  => 35,
+      :yellow   => 33
+    }
+
+    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
       @output = options[:output] || $stdout
@@ -26,44 +36,33 @@ module Tweetwine
     end
 
     def show_statuses(statuses)
-      statuses.each do |status|
-        time_diff_value, time_diff_unit = Util.humanize_time_diff(status["created_at"], Time.now)
-        from_user = status["user"]["screen_name"]
-        from_user = colorize(:green, from_user) if @colorize
-        in_reply_to = status["in_reply_to_screen_name"]
-        in_reply_to = if in_reply_to && !in_reply_to.empty?
-          in_reply_to = colorize(:green, in_reply_to) if @colorize
-          "in reply to #{in_reply_to}, "
-        else
-          ""
-        end
-        text = status["text"]
-        if @colorize
-          text = colorize(:yellow, text, NICK_REGEX)
-          text = colorize(:cyan, text, URL_REGEX)
-        end
-        @output.puts <<-END
-#{from_user}, #{in_reply_to}#{time_diff_value} #{time_diff_unit} ago:
-#{text}
-
-        END
-      end
+      statuses.each { |status| show_status(status) }
     end
 
     private
 
-    COLOR_CODES = {
-      :cyan     => 36,
-      :green    => 32,
-      :magenta  => 35,
-      :yellow   => 33
-    }.inject({}) do |result, pair|
-      result[pair.first.to_sym] = "\033[#{pair.last}m"
-      result
-    end
+    def show_status(status)
+      time_diff_value, time_diff_unit = Util.humanize_time_diff(status["created_at"], Time.now)
+      from_user = status["user"]["screen_name"]
+      from_user = colorize(:green, from_user) if @colorize
+      in_reply_to = status["in_reply_to_screen_name"]
+      in_reply_to = if in_reply_to && !in_reply_to.empty?
+        in_reply_to = colorize(:green, in_reply_to) if @colorize
+        "in reply to #{in_reply_to}, "
+      else
+        ""
+      end
+      text = status["text"]
+      if @colorize
+        text = colorize(:yellow, text, NICK_REGEX)
+        text = colorize(:cyan, text, URL_REGEX)
+      end
+      @output.puts <<-END
+#{from_user}, #{in_reply_to}#{time_diff_value} #{time_diff_unit} ago:
+#{text}
 
-    NICK_REGEX = /@\w+/
-    URL_REGEX = /(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/\S*)?/i
+      END
+    end
 
     def colorize(color, str, matcher = nil)
       color_code = COLOR_CODES[color.to_sym]
@@ -76,7 +75,7 @@ module Tweetwine
     end
 
     def colorize_str(color_code, str)
-      "#{color_code}#{str}\033[0m"
+      "\033[#{color_code}m#{str}\033[0m"
     end
   end
 end

data/test/io_test.rb

@@ -134,6 +134,56 @@ Hi, \033[33m@barman\033[0m! Check this: \033[36mhttp://www.foo.com\033[0m. Nice,
       @io.show_statuses(statuses)
     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"
+    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"
+    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

data/test/test_helper.rb

@@ -5,3 +5,19 @@ require "shoulda"
 require "mocha"
 
 Mocha::Configuration.prevent(:stubbing_non_existent_method)
+
+module Test
+  module Unit
+    class TestCase
+      def assert_full_match(regex, str, msg = "")
+        match_data = regex.match(str)
+        assert(str == match_data.to_s, msg)
+      end
+
+      def assert_no_full_match(regex, str, msg = "")
+        match_data = regex.match(str)
+        assert(str != match_data.to_s, msg)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ homepage: http://github.com/tuomas/tweetwine
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.5
+- Tweetwine 0.1.6
 - --main
 - README.rdoc
 - --exclude