tty_string 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73cc746b842f0d06ee1999b3f489a6ff01dc369dab4541bc35b095fe48e040ca
-  data.tar.gz: 5e4ab9ee53fc27904a98e59c8f264fe14618ed324e9fc2097dd408da9614ff9d
+  metadata.gz: fed365cd62d837aec3621a4c1a1f9055871aaf7050d4c136206ca1b6ef6e6a5b
+  data.tar.gz: adfbc75cc2f3ec31be690d30a26848ba9ca6b43f83612f8a9ccf698bfc8a7d1e
 SHA512:
-  metadata.gz: df7fa737a041d1593609f342e060c5a92a78c17fb8b7df8658c72c803d9f8ca72a6c8137ccda4ecdfadd9f042a9652c6ec33c554ad090edc9d2aad7eef1deb03
-  data.tar.gz: bd1246abfe031c1206d932e30a724b64e14455c99e9d7298774dbf8c76157ec365de312f32173b0adcfed11f906100bee7ded4151c82699332255d4b0d4cdd54
+  metadata.gz: edf12a947a46e36cdb82ec8f2b8ba26c111b189a78d1f35e7136771499605d4bfba8c96b251595555c5b83bfaa0f3059aec868958590d3ae5d012c37772a3145
+  data.tar.gz: 3a4487855eecdb533dd8f3382752c3f7b35bcd119a2516c7a02dba077580dff64837f1374a86bb4aa88628dc93eb51a1b9296873df53c19022a8ab75ba8505f7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.0.2
+- Improve whitespace handling
+
+# v2.0.1
+- Fix warning
+
 # v2.0.0
 - TTYString is now a module not a class.
 - Address the issue where preserved styles and unknown codes would cause the cursor to be misaligned when moving, and potentially overwriting styles unexpectedly:

data/lib/tty_string/cell.rb

@@ -8,9 +8,5 @@ module TTYString
       @style = style
       @value = value
     end
-
-    def to_s(style_context: NullStyle)
-      "#{style.to_s(context: style_context)}#{value}"
-    end
   end
 end

data/lib/tty_string/csi_code.rb

@@ -27,11 +27,14 @@ module TTYString
         @re ||= /\e\[#{args_re}#{char}/
       end
 
-      def args_re
+      def args_re # rubocop:disable Metrics/MethodLength
         case max_args
-        when 0, 1 then /(?:[0-:<-?]*){0,#{max_args}}/
+          # :nocov:
+        when 0 then nil
+          # :nocov:
+        when 1 then /[0-:<-?]*/
         when -1 then %r{[0-?]*[ -/]*}
-        else /(?:(?:[0-:<-?]*)?(?:;(?:[0-:<-?]*)?){0,#{max_args - 1}})?/
+        else /(?:(?:[0-:<-?]*)(?:;(?:[0-:<-?]*)){0,#{max_args - 1}})?/
         end
       end
 

data/lib/tty_string/row.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module TTYString
+  class Row
+    include Enumerable
+
+    attr_accessor :newline_style
+
+    def initialize(newline_style: NullStyle)
+      @array = []
+      self.newline_style = newline_style
+    end
+
+    def each(&block)
+      @array.each(&block)
+    end
+
+    def []=(index, value)
+      @array[index] = value
+    end
+
+    def slice!(*args)
+      @array.slice!(*args)
+    end
+
+    def fill(*args)
+      @array.fill(*args)
+    end
+  end
+end

data/lib/tty_string/screen.rb

@@ -3,6 +3,7 @@
 require_relative 'cursor'
 require_relative 'cell'
 require_relative 'style'
+require_relative 'row'
 
 module TTYString
   # a grid to draw on
@@ -15,40 +16,49 @@ module TTYString
       @current_style = @initial_style = initial_style
     end
 
-    def to_s # rubocop:disable Metrics/MethodLength
+    def to_s # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       style_context = initial_style
-      screen.map do |row|
-        Array(row).map do |cell|
+      str = +''
+      screen.each_with_index do |row, index|
+        unless index.zero?
+          str << row.newline_style.to_s(context: style_context) if row
+          str << "\n"
+          style_context = row.newline_style if row
+        end
+
+        Array(row).each do |cell|
           if cell
-            value = cell.to_s(style_context: style_context)
+            str << cell.style.to_s(context: style_context)
+            str << cell.value
             style_context = cell.style
-            value
           else
-            ' '
+            str << ' '
           end
-        end.join.rstrip
-      end.join("\n") + current_style.to_s(context: style_context)
+        end
+      end
+      str << current_style.to_s(context: style_context)
+      str
     end
 
     def []=((row, col), value)
-      screen[row] ||= []
+      screen[row] ||= Row.new(newline_style: current_style)
       screen[row][col] = value
     end
 
     def clear_at_cursor
-      self[cursor] = nil
+      self[cursor] = Cell.new(' ', style: current_style)
     end
 
     def clear_line_forward
-      screen[row].fill(nil, col..-1)
+      screen[row].slice!(col..-1)
     end
 
     def clear_line_backward
-      screen[row].fill(nil, 0..col)
+      screen[row].fill(Cell.new(' ', style: current_style), 0..col)
     end
 
     def clear_line
-      screen[row] = []
+      screen[row] = Row.new(newline_style: current_style)
     end
 
     def clear
@@ -56,17 +66,17 @@ module TTYString
     end
 
     def scroll_up
-      screen.push([])
+      screen.push(Row.new(newline_style: current_style))
       screen.shift
     end
 
     def scroll_down
-      screen.unshift([])
+      screen.unshift(Row.new(newline_style: current_style))
       screen.pop
     end
 
     def clear_lines_before
-      screen.fill([], 0...row)
+      screen.fill(Row.new(newline_style: current_style), 0...row)
     end
 
     def clear_lines_after
@@ -84,7 +94,7 @@ module TTYString
     end
 
     def ensure_row
-      screen[row] ||= []
+      screen[row] ||= Row.new(newline_style: current_style)
     end
 
     def write(string)

data/lib/tty_string/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TTYString
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tty_string
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Dana Sherson
@@ -210,6 +210,7 @@ files:
 - lib/tty_string/cursor.rb
 - lib/tty_string/null_style.rb
 - lib/tty_string/parser.rb
+- lib/tty_string/row.rb
 - lib/tty_string/screen.rb
 - lib/tty_string/style.rb
 - lib/tty_string/version.rb