lib/ansiterm/string.rb in ansiterm-0.3.1 vs lib/ansiterm/string.rb in ansiterm-0.3.2

@@ -1,13 +1,18 @@
-
+ 
+# This is a test
 module AnsiTerm
 
   class String
     def initialize(str="")
       parse(str)
     end
 
+    def to_plain_str
+      @str.dup
+    end
+    
     def to_str
       out = ""
       a = Attr.new
       @str.length.times.each do |i|
         if a != @attrs[i]
@@ -38,10 +43,29 @@
 
     def set(str,attrs)
       @str, @attrs = str,Array(attrs)
     end
 
+    def set_attr(range, attr)
+      min = range.first - 1
+      fattr = @attrs[min]
+      attr = fattr.merge(attr) if fattr
+      r = Array(@attrs[range]).count # Inefficient, but saves dealing with negative offsets etc. "manually"
+      last = nil
+      @attrs[range] = @attrs[range].map do |a| 
+        a == last ? a : last = attr.merge(a)
+      end
+    end
+
+    def[]= range, str
+      s = @str
+      a = @attrs
+      parse(str)
+      @str   = s[0..(range.min-1)].to_s + @str   + s[(range.max)..-1].to_s
+      @attrs = a[0..(range.min-1)].to_a + @attrs + a[(range.max)..-1].to_a
+    end
+    
     def[] i
       str = @str[i]
       if str
         a = self.class.new
         a.set(str,@attrs[i])
@@ -49,10 +73,14 @@
       else
         nil
       end
     end
 
+    def attr_at(index)
+      @attrs[index]
+    end
+
     def << str
       parse(self.to_str + "\e[0m" + str.to_str)
     end
 
     private
@@ -62,11 +90,12 @@
       if col == 38 || col == 48
         par = params.shift
         if par == "5"
           col = [col,5,params.shift].join(";")
         elsif par == "2"
-          col = [col,5,params.shift,params.shift, params.shift].join(";")
+          col = ([col,2] << params.slice!(0..2)).join(";")
+#          ,params.shift,params.shift, params.shift].join(";")
         end
       end
       a.merge(attr_name => col)
     end
     
@@ -79,20 +108,26 @@
       i   = 0
       
       while i < max
         c = str[i]
         if c == "\e" && str[i+1] == "[" # CSI
-          params = ""
+          params = []
           i += 2
+          par = ""
           while i < max && str[i].ord < 0x40
-            params << str[i]
+            if str[i] == ";"
+              params << par
+              par = ""
+            else
+              par << str[i]
+            end
             i+=1
           end
+          params << par if !par.empty?
           final = str[i]
 
           if final == "m"
-            params = params.split(";")
             while par = params.shift
               par = par.to_i
               case par
               when 0
                 a = a.reset
@@ -103,15 +138,16 @@
               when 9
                 a = a.crossed_out
               when 22
                 a = a.normal
               when 24
+                old = a
                 a = a.clear_flag(Attr::UNDERLINE)
               when 29
                 a = a.clear_flag(Attr::CROSSED_OUT)
-              when 30..39
+              when 30..39, 90..98
                 a = parse_color(par, params, a, :fgcol)
-              when 40..49
+              when 40..49, 100..107
                 a = parse_color(par, params, a, :bgcol)
               else
                 @str << "[unknown escape: #{par}]"
               end
             end