colorb 0.0.6.1 → 0.0.7

data/lib/colorb.rb

@@ -40,72 +40,80 @@ class String
     :standout  => 7
   }
 
-  (Colors.keys + Extra.keys).each {|name|
-    remove_method name rescue nil
-  }
-
   attr_accessor :foreground, :background, :flags
 
-  alias __old_method_missing method_missing
-
-  def method_missing (id, *args, &block)
-    name = id.to_s.match(/^(.+?)[!?]?$/)[1].to_sym
-
-    result = (self.frozen? || !id.to_s.end_with?('!')) ? self.dup : self
-
-    return __old_method_missing(id, *args, &block) unless Colors[name] || Extra[name]
+  Colors.keys.each {|name|
+    define_method name do
+      color(name)
+    end
 
-    if Colors[name]
-      if id.to_s.end_with?('?')
-        result.foreground == name
-      else
-        if !result.foreground
-          result.foreground = name
-        else
-          result.background = name
-        end
-      end
-    elsif Extra[name]
-      result.flags ||= []
+    define_method "#{name}!" do
+      color!(name)
+    end
+  }
 
-      if id.to_s.end_with?('?')
-        result.flags.member?(name)
-      else
-        result.flags << name
-      end
+  Extra.keys.each {|name|
+    define_method name do
+      extra(name)
     end
 
-    result.lazy? ? result : result.colorify!
-  end
+    define_method "#{name}!" do
+      extra!(name)
+    end
+  }
 
   def color (code, second=nil)
-    return method_missing(code.to_sym) if code.is_a?(Symbol) || code.is_a?(String)
-
-    self.dup.color!(code, seond)
+    self.dup.color!(code, second)
   end
 
   def color! (code, second=nil)
-    if code < 16
-      if code > 7
-        (self.flags ||= []) << (!self.foreground ? :bold : :blink)
-      end
+    string = (self.frozen?) ? self.dup : self
 
-      if !self.foreground
-        self.foreground = code - (code > 7 ? 7 : 0)
+    if code.is_a?(Symbol) || code.is_a?(String)
+      name = code.to_sym
+
+      if !string.foreground
+        string.foreground = name
       else
-        self.background = code - (code > 7 ? 7 : 0)
+        string.background = name
       end
+
+      string.lazy? ? string : string.colorify!
     else
-      if !self.foreground
-        self.foreground = code
+      if code < 16
+        if code > 7
+          (string.flags ||= []) << (!string.foreground ? :bold : :blink)
+        end
+
+        if !string.foreground
+          string.foreground = code - (code > 7 ? 7 : 0)
+        else
+          string.background = code - (code > 7 ? 7 : 0)
+        end
       else
-        self.background = code
+        if !string.foreground
+          string.foreground = code
+        else
+          string.background = code
+        end
       end
     end
 
-    self.color(second) if second
+    string.color!(second) if second
+
+    string.lazy? ? string : string.colorify!
+  end
+
+  def extra (name)
+    self.dup.extra!(name)
+  end
+
+  def extra! (name)
+    string = (self.frozen?) ? self.dup : self
+
+    (string.flags ||= []) << name
 
-    self.lazy? ? self : self.colorify!
+    string.lazy? ? string : string.colorify!
   end
 
   def lazy;  @lazy = true; self end
@@ -118,9 +126,9 @@ class String
   def self.colorify (string, foreground, background, flags)
     return string if ENV['NO_COLORS'] && !ENV['NO_COLORS'].empty?
 
-    result = string.dup
+    string = string.dup
 
-    result.sub!(/^/, [
+    string.sub!(/^/, [
       String.color!(foreground),
       String.color!(background, true),
       [flags].flatten.compact.uniq.map {|f|
@@ -128,9 +136,9 @@ class String
       }
     ].flatten.compact.join(''))
 
-    result.sub!(/$/, String.extra!(:clean))
+    string.sub!(/$/, String.extra!(:clean))
 
-    result
+    string
   end
 
   def self.color! (what, bg=false)

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  - 1
-  version: 0.0.6.1
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - meh.
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +01:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: []