ansiterm 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38217a9590237a3e098e5cf097fc03bc055dbab158c7eaab8b730a9c51e28d8
-  data.tar.gz: fa2661f67e062ad9e8a12f930bb80e93aff47d41641da140ec8bc51a293b98ba
+  metadata.gz: 594990b07d22ef5777b36348387c47a3061c4772f5e830a2240294c77574b3ea
+  data.tar.gz: 772aa91059ffa9d4e59bd06b33fd607726befacd0ecfafa61db3a5df862897a9
 SHA512:
-  metadata.gz: 84474fe763a85f88560157e7bf70d047e1bbf1efb72407b64b6f4cd9cac57be295f99d9720c5a28d7531873c8ac192c1c3ab63b37fa6d44d877729f96442d1bc
-  data.tar.gz: 809ec57358492a2b71a9ae095907248b1ff2e681f679ab3139d5cd7bede8198cb42408ece26e109859f3a0862702a37be9bb75de0b04ca1d9227abc1644a450d
+  metadata.gz: d3e0fba3540ea67e4126c9ccc6918b778d7fffd971f407c3d4045148dda5b5edf2ef00761ec2465eea55e1e930da15e8a111e62a214753cbfd8a2c6d77fd753b
+  data.tar.gz: 59a9fa226a211ce692a446c7e895631bc19c30e729d3597a7f5f6f97e1de267ac16e4593fe363f460d4a37e3c02bbfb01112772d1cd7489e05cc6ae0406d471c

data/lib/ansiterm/attr.rb

@@ -12,7 +12,7 @@ module AnsiTerm
   # whether to e.g. encode a string as spans with one Attr,
   # or characters with one Attr per character.
   #
-  # Use Attr#transition(other_attr) to retrieve an ANSI
+  # Use `Attr#transition(other_attr)` to retrieve an ANSI
   # sequence that represents the changes from self to
   # other_attr.
   #
@@ -32,7 +32,15 @@ module AnsiTerm
       freeze
     end
 
+    def ==(other)
+      return false if !other.kind_of?(self.class)
+      return fgcol == other.fgcol &&
+             bgcol == other.bgcol &&
+             flags == other.flags
+    end
+
     def merge(attrs)
+      return self if self == attrs
       if attrs.kind_of?(self.class)
         old = attrs
         attrs = {}
@@ -64,8 +72,8 @@ module AnsiTerm
 
     def transition_to(other)
       t = []
-      t << [other.fgcol] if other.fgcol && other.fgcol != self.fgcol
-      t << [other.bgcol] if other.bgcol && other.bgcol != self.bgcol
+      t << [other.fgcol] if other.fgcol != self.fgcol && other.fgcol
+      t << [other.bgcol] if other.bgcol != self.fgcol && other.bgcol
 
       if other.bold? != self.bold?
         t << [other.bold? ? 1 : 22]
@@ -89,4 +97,7 @@ module AnsiTerm
     end
   end
 
+  def self.attr(*args)
+    Attr.new(*args)
+  end
 end

data/lib/ansiterm/string.rb

@@ -1,16 +1,20 @@
- 
-# This is a test
+# coding: utf-8
 module AnsiTerm
 
   class String
-    def initialize(str="")
-      parse(str)
+    def initialize(str=nil)
+      if str
+        parse(str)
+      else
+        @str = ""
+        @attrs = []
+      end
     end
 
     def to_plain_str
       @str.dup
     end
-    
+
     def to_str
       out = ""
       a = Attr.new
@@ -45,15 +49,39 @@ module AnsiTerm
       @str, @attrs = str,Array(attrs)
     end
 
+    def raw
+      return @str, Array(@attrs)
+    end
+
     def set_attr(range, attr)
-      min = range.first - 1
+      min   = [range.first - 1,0].max
+      fattr = @attrs[min]
+      attr  = fattr.merge(attr)
+      r = Array(@attrs[range]).count # Inefficient, but saves dealing with negative offsets etc. "manually"
+      last = nil
+      @attrs[range] = @attrs[range].map do |a|
+        n = a.merge(attr)
+        last == n ? last : n
+      end
+      rm = range.last
+      if a = @attrs[rm]
+        @attrs[rm] = Attr.new(bgcol:40).merge(fattr).merge(a)
+      end
+    end
+
+    def merge_attr_below(range, attr)
+      min = [0,range.first - 1].max
       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)
+      @attrs[range] = @attrs[range].map do |a|
+        if a.bgcol == 49
+          a.merge(attr)
+        else
+          attr.merge(a)
+        end
       end
+      #fattr #@attrs[min+r].merge(fattr)
     end
 
     def[]= range, str
@@ -75,12 +103,25 @@ module AnsiTerm
       end
     end
 
+    def char_at(index)
+      @str[index]
+    end
+    
     def attr_at(index)
       @attrs[index]
     end
 
     def << str
-      parse(self.to_str + "\e[0m" + str.to_str)
+      return self if str.nil?
+      if !str.kind_of?(self.class)
+        parse(self.to_str + "\e[0m" + str.to_str)
+        return self
+      end
+
+      s,a = str.raw
+      @str.concat(s)
+      @attrs.concat(a)
+      self
     end
 
     private
@@ -162,4 +203,8 @@ module AnsiTerm
       self
     end
   end
+
+  def self.str(*args)
+    AnsiTerm::String.new(*args)
+  end
 end

data/lib/ansiterm/version.rb

@@ -1,3 +1,3 @@
 module AnsiTerm
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansiterm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ANSI/VT102 terminal output with windowing