tuomas-tweetwine 0.1.10 → 0.1.11

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.11 released 2009-08-10
+
+* Fixed highlighting multiple nicks in statuses.
+
 === 0.1.10 released 2009-08-09
 
 * Improved URL highlight support.

data/Rakefile

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

data/lib/tweetwine/io.rb

@@ -57,8 +57,10 @@ module Tweetwine
       end
       status = record[:status][:text]
       if @colorize
-        colorize!(:yellow, status, [NICK_REGEX])
-        colorize!(:cyan, status, URI.extract(status, ["http", "https"]))
+        colorize_all!(:yellow, status, NICK_REGEX)
+        URI.extract(status, ["http", "https"]).each do |url|
+          colorize_first!(:cyan, status, url)
+        end
       end
       @output.puts <<-END
 #{from_user}, #{in_reply_to}#{time_diff_value} #{time_diff_unit} ago:
@@ -78,16 +80,16 @@ module Tweetwine
 
     private
 
-    def colorize!(color, str, patterns = nil)
-      color_code = COLOR_CODES[color.to_sym]
+    def colorize_all!(color, str, pattern)
+      str.gsub!(pattern) { |s| colorize_str(COLOR_CODES[color.to_sym], s) }
+    end
 
-      if patterns
-        patterns.each do |pattern|
-          str.sub!(pattern) { |s| colorize_str(color_code, s) }
-        end
-      else
-        str.replace colorize_str(color_code, str)
-      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
 
     def colorize_str(color_code, str)

data/test/io_test.rb

@@ -122,13 +122,13 @@ Hi, @fooman! How are you doing?
         :user   => "fooman",
         :status => {
           :created_at => Time.at(1),
-          :text       => "Hi, @barman! Lulz woo!"
+          :text       => "Wondering the meaning of life."
         }
       }
       Util.expects(:humanize_time_diff).returns([2, "secs"])
       @output.expects(:puts).with(<<-END
 \033[32mfooman\033[0m, 2 secs ago:
-Hi, \033[33m@barman\033[0m! Lulz woo!
+Wondering the meaning of life.
 
       END
       )
@@ -171,6 +171,24 @@ Three links: \033[36mhttp://bit.ly/18rU_Vx\033[0m \033[36mhttp://is.gd/1qLk3\033
       )
       @io.show(record)
     end
+
+    should "highlight nicks in a status" do
+      record = {
+        :user   => "barman",
+        :status => {
+          :created_at   => Time.at(1),
+          :text         => "I salute you @fooman, @barbaz, and @spoonman!",
+        }
+      }
+      Util.expects(:humanize_time_diff).returns([2, "secs"])
+      @output.expects(:puts).with(<<-END
+\033[32mbarman\033[0m, 2 secs ago:
+I salute you \033[33m@fooman\033[0m, \033[33m@barbaz\033[0m, and \033[33m@spoonman\033[0m!
+
+      END
+      )
+      @io.show(record)
+    end
   end
 
   context "Nick regex" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ licenses:
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.10
+- Tweetwine 0.1.11
 - --main
 - README.rdoc
 - --exclude