Fix whitespace issues

Author: robotdana

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v2.0.2
+- Improve whitespace handling
+
 # v2.0.1
 - Fix warning
 

lib/tty_string/cell.rb

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

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

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,58 +16,67 @@ def initialize(initial_style:)
       @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
       @screen = []
     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 @@ def clear_forward
     end
 
     def ensure_row
-      screen[row] ||= []
+      screen[row] ||= Row.new(newline_style: current_style)
     end
 
     def write(string)

lib/tty_string/version.rb

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

spec/tty_string_spec.rb

@@ -397,7 +397,7 @@
 
         it 'removes unnecessary reset codes' do
           expect("\e[31mred\e[0m\e[32m green\e[0m \e[0m")
-            .to render_with_style_as "\e[31mred\e[32m green\e[0m"
+            .to render_with_style_as "\e[31mred\e[32m green\e[0m "
         end
 
         it 'removes unnecessary color code overriding previous ones' do
@@ -412,7 +412,7 @@
 
         it 'assumes the string begins reset' do
           expect("     \e[31mred \r\e[0mplain")
-            .to render_with_style_as "plain\e[31mred\e[0m"
+            .to render_with_style_as "plain\e[31mred \e[0m"
         end
 
         it 'renders 24bit color codes' do
@@ -472,6 +472,18 @@
                                   unknown: described_class::RAISE)
           end.to raise_error described_class::UnknownCodeError, 'Unknown style code "256" in "\e[38;5;256m"'
         end
+
+        it 'puts the newline in the right place' do
+          expect("dog \e[1;31mcat\e[0m\n").to render_with_style_as(
+            "dog \e[1;31mcat\e[0m\n"
+          )
+        end
+
+        it 'fills clears with styled spaces' do
+          expect("abcd\033[2D\033[41m\033[1K\033[0m").to render_with_style_as(
+            "\e[41m   \e[0md"
+          )
+        end
       end
 
       describe 'h' do