epitron-colorize 0.6.2 → 0.6.3

data/lib/colorize.rb

@@ -213,6 +213,10 @@ class String
     15  => :light_white,
   }
 
+  #        
+  def valid_color?(string)
+    COLORS.include?(string.to_sym) or (string =~ /^\d+$/ and BBS_COLOR_TABLE.include?(string.to_i))
+  end
   
   #
   # Colorize a string that has "color tags".
@@ -228,19 +232,23 @@ class String
   def tagged_colors
     stack = []
 
+    # matchers for just the color part of the tag
     open_tag_re     = /<([\w\d_]+)>/
     close_tag_re    = /<\/([\w\d_]+)>/
-    tokens          = self.scan(/(<\/?[\w\d_]+>|[^<>]+)/).flatten
 
+    # split the string into tags and texts
+    tokens          = self.split(/(<\/?[\w\d_]+>)/)
+    tokens.delete_if { |token| token.size == 0 }
+    
     result        = ""
 
     tokens.each do |token|
       
-      if open_tag_re =~ token
+      if open_tag_re =~ token and valid_color?($1)
 
         stack.push $1
 
-      elsif close_tag_re =~ token
+      elsif close_tag_re =~ token and valid_color?($1)
 
 	# if this color is on the stack somwehere...
         if pos = stack.rindex($1)

data/test/tagged_colors.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class TaggedColors < Test::Unit::TestCase
+
+  def test_display_tagged_colors
+    ## Visual inspection seemed the easiest way to test this. :)
+    puts
+    puts "##########################################################################"
+    puts "## VISUAL TEST. Make sure these all look okay!"
+    puts "##########################################################################"
+    puts
+    puts "* Testing various features of the tagged colorizer..."
+    puts
+    puts "  <light_blue>I am light blue.".colorize
+    puts "  <yellow>Yellow <green>Green <light_blue>Light blue".colorize
+    puts "  <8>grey <13>light magenta <4>red".colorize
+    puts "  <1>w<9>o<3>o<11>o<15>ooohoo<11>o<3>o<9>o<1>o".colorize
+    puts "  <yellow>yellow <light_yellow>light_yellow</light_yellow> yellow</yellow> default.".colorize
+    puts "  <yellow>yellow <light_yellow>light_yellow</yellow> light_yellow</light_yellow> default.".colorize
+    puts
+    puts "* Broken tags (shouldn't change colors, or raise errors):"
+    puts
+    puts "  <light_green>Light green!</light_green> < > <Fsdfa> <69></69> <<light_red>Light Red!</light_red>>".colorize
+  end
+  
+  def test_bad_tags
+    assert_raise RuntimeError do
+      puts "Closing unopened tag: </blue>".colorize
+    end
+  end
+    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: epitron-colorize
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - fazibear
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,5 +54,5 @@ signing_key:
 specification_version: 3
 summary: Colorize your console output (via extensions to the String class).
 test_files: 
-- test/test_colorize.rb
+- test/tagged_colors.rb
 - test/test_helper.rb

data/test/test_colorize.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestColorize < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end