whirled_peas 0.6.0 → 0.7.0

data/Rakefile

@@ -5,37 +5,27 @@ RSpec::Core::RakeTask.new(:spec)
 
 def screen_test(file, method)
   raise ArgumentError, 'Missing argument: file' unless file
-
-  require 'bundler/setup'
-  require 'whirled_peas'
-  require_relative 'screen_test/screen_tester'
-
-  WhirledPeas::ScreenTester.new(file).send(method)
+  require_relative 'tools/whirled_peas/tools/screen_tester'
+  WhirledPeas::Tools::ScreenTester.new(file).send(method)
 end
 
 namespace :screen_test do
-  %i[template view run save debug].each do |t|
+  %i[template view run save update debug].each do |t|
     task t, [:file] do |_, args|
       screen_test(args[:file], t)
     end
   end
 
   task :update_all do
-    require 'bundler/setup'
-    require 'whirled_peas'
-    require_relative 'screen_test/screen_tester'
-
-    WhirledPeas::ScreenTester.update_all
+    require_relative 'tools/whirled_peas/tools/screen_tester'
+    WhirledPeas::Tools::ScreenTester.update_all
   end
 end
 
 task :screen_test do
-  require 'bundler/setup'
-  require 'whirled_peas'
-  require_relative 'screen_test/screen_tester'
-
-  WhirledPeas::ScreenTester.run_all
+  require_relative 'tools/whirled_peas/tools/screen_tester'
+  WhirledPeas::Tools::ScreenTester.run_all
 end
 
 task default: :ci
-task ci: [:screen_test, :spec]
+task ci: %i[spec screen_test]

data/lib/whirled_peas/graphics.rb

@@ -1,5 +1,19 @@
 module WhirledPeas
   module Graphics
+    class << self
+      attr_accessor :debug
+
+      def debugger(string_or_proc)
+        return unless @debug
+        @debugger ||= Logger.new(STDOUT, level: Logger::DEBUG)
+        if string_or_proc.is_a?(Proc)
+          string = string_or_proc.call
+        else
+          string = string_or_proc
+        end
+        @debugger.debug(string)
+      end
+    end
   end
   private_constant :Graphics
 end

data/lib/whirled_peas/graphics/box_painter.rb

@@ -4,13 +4,20 @@ require_relative 'container_dimensions'
 module WhirledPeas
   module Graphics
     class BoxPainter < ContainerPainter
-      def paint(canvas, &block)
+      def paint(canvas, left, top, &block)
         super
-        return unless canvas.writable?
+        canvas_coords = coords(left, top)
+        content_canvas = canvas.child(
+          canvas_coords.content_left,
+          canvas_coords.content_top,
+          dimensions.content_width,
+          dimensions.content_height
+        )
+        return unless content_canvas.writable?
         if settings.horizontal_flow?
-          paint_horizontally(canvas, &block)
+          paint_horizontally(content_canvas, canvas_coords, &block)
         else
-          paint_vertically(canvas, &block)
+          paint_vertically(content_canvas, canvas_coords, &block)
         end
       end
 
@@ -47,59 +54,45 @@ module WhirledPeas
 
       private
 
-      def paint_horizontally(canvas, &block)
-        stroke_top = coords(canvas).content_top
-        stroke_left = coords(canvas).content_left
-        total_child_width = 0
-        each_child { |c| total_child_width += c.dimensions.outer_width }
-        if settings.align_center?
-          stroke_left += (dimensions.content_width - total_child_width) / 2
-        elsif settings.align_right?
-          stroke_left += dimensions.content_width - total_child_width
-        end
-        given_width = 0
+      def paint_horizontally(canvas, canvas_coords, &block)
+        stroke_left = canvas_coords.content_left
+        stroke_top = canvas_coords.content_top
+        children_width = 0
+        each_child { |c| children_width += c.dimensions.outer_width }
+        left_offset, spacing_offset = horiz_justify_offset(children_width)
+        stroke_left += left_offset
         each_child do |child|
-          child_width = [
-            child.dimensions.outer_width,
-            dimensions.content_width - given_width
-          ].min
+          top_offset, _ = vert_justify_offset(child.dimensions.outer_height)
+          child_width = child.dimensions.outer_width
           child_canvas = canvas.child(
-            stroke_left + given_width,
-            stroke_top,
+            stroke_left,
+            stroke_top + top_offset,
             child_width,
-            [dimensions.content_height, child.dimensions.outer_height].min
+            child.dimensions.outer_height
           )
-          child.paint(child_canvas, &block)
-          given_width += child_width
-          break if given_width == dimensions.content_width
+          child.paint(child_canvas, stroke_left, stroke_top + top_offset, &block)
+          stroke_left += child_width + spacing_offset
         end
       end
 
-      def paint_vertically(canvas, &block)
-        stroke_top = coords(canvas).content_top
-        stroke_left = coords(canvas).content_left
-        given_height = 0
+      def paint_vertically(canvas, canvas_coords, &block)
+        stroke_left = canvas_coords.content_left
+        stroke_top = canvas_coords.content_top
+        children_height = 0
+        each_child { |c| children_height += c.dimensions.outer_height }
+        top_offset, spacing_offset = vert_justify_offset(children_height)
+        stroke_top += top_offset
         each_child do |child|
-          if settings.align_center?
-            justify_offset = (dimensions.content_width - child.dimensions.outer_width) / 2
-          elsif settings.align_right?
-            justify_offset = dimensions.content_width - child.dimensions.outer_width
-          else
-            justify_offset = 0
-          end
-          child_height = [
-            child.dimensions.outer_height,
-            dimensions.content_height - given_height
-          ].min
+          left_offset, _ = horiz_justify_offset(child.dimensions.outer_width)
+          child_height = child.dimensions.outer_height
           child_canvas = canvas.child(
-            stroke_left + justify_offset,
-            stroke_top + given_height,
-            [dimensions.content_width, child.dimensions.outer_width].min,
+            stroke_left + left_offset,
+            stroke_top ,
+            child.dimensions.outer_width,
             child_height
           )
-          child.paint(child_canvas, &block)
-          given_height += child_height
-          break if given_height == dimensions.content_height
+          child.paint(child_canvas, stroke_left + left_offset, stroke_top, &block)
+          stroke_top += child_height + spacing_offset
         end
       end
     end

data/lib/whirled_peas/graphics/canvas.rb

@@ -4,28 +4,29 @@ module WhirledPeas
   module Graphics
     # Canvas represent the area of the screen a painter can paint on.
     class Canvas
-      attr_reader :left, :top, :width, :height, :start_left, :start_top
+      attr_reader :left, :top, :width, :height
 
       def self.unwritable
-        new(-1, -1, 0, 0, -1, -1)
+        new(-1, -1, 0, 0)
       end
 
-      def initialize(left, top, width, height, start_left, start_top)
+      def initialize(left, top, width, height)
         @left = left
         @top = top
         @width = width
         @height = height
-        @start_left = start_left
-        @start_top = start_top
       end
 
       def writable?
         width > 0 || height > 0
       end
 
-      def child(start_left, start_top, child_width, child_height)
-        child_left = start_left
-        child_top = start_top
+      def child(child_left, child_top, child_width, child_height)
+        Graphics.debugger(
+          proc do
+            "Create child: #{self.inspect}.child(left=#{child_left}, top=#{child_top}, width=#{child_width}, height=#{child_height})"
+          end
+        )
         if child_left >= left + width
           self.class.unwritable
         elsif child_left + child_width <= left
@@ -45,20 +46,25 @@ module WhirledPeas
             child_top = top
           end
           child_height = [height - (child_top - top), child_height].min
-          self.class.new(
+          child_canvas = self.class.new(
             child_left,
             child_top,
             child_width,
             child_height,
-            start_left,
-            start_top
           )
+          Graphics.debugger(proc { "  -> #{child_canvas.inspect}" })
+          child_canvas
         end
       end
 
       # Yields a single line of formatted characters positioned on the canvas,
       # verifying only characters within the canvas are included.
       def stroke(stroke_left, stroke_top, raw, formatting=[], &block)
+        Graphics.debugger(
+          proc do
+            "Stroke: #{self.inspect}.stroke(left=#{stroke_left}, top=#{stroke_top}, length=#{raw.length})"
+          end
+        )
         if stroke_left >= left + width
           # The stroke starts to the right of the canvas
           fstring = Utils::FormattedString.blank
@@ -88,6 +94,11 @@ module WhirledPeas
           end_index = start_index + visible_length - 1
           fstring = Utils::FormattedString.new(raw[start_index..end_index], formatting)
         end
+        Graphics.debugger(
+          proc do
+            "  -> Stroke(left=#{stroke_left}, top=#{stroke_top}, length=#{fstring.length})"
+          end
+        )
         yield stroke_left, stroke_top, fstring
       end
 

data/lib/whirled_peas/graphics/container_coords.rb

@@ -1,18 +1,19 @@
 module WhirledPeas
   module Graphics
     class ContainerCoords
-      def initialize(canvas, dimensions, settings)
-        @canvas = canvas
+      def initialize(dimensions, settings, start_left, start_top)
         @dimensions = dimensions
         @settings = settings
+        @start_left = start_left
+        @start_top = start_top
       end
 
       def left
-        canvas.start_left + settings.position.left
+        start_left + settings.position.left
       end
 
       def top
-        canvas.start_top + settings.position.top
+        start_top + settings.position.top
       end
 
       def border_left
@@ -65,7 +66,7 @@ module WhirledPeas
 
       private
 
-      attr_reader :canvas, :settings, :dimensions
+      attr_reader :settings, :dimensions, :start_left, :start_top
     end
   end
 end

data/lib/whirled_peas/graphics/container_dimensions.rb

@@ -1,11 +1,11 @@
 module WhirledPeas
   module Graphics
     class ContainerDimensions
-      attr_reader :content_width, :content_height, :children_width, :children_height, :num_cols, :num_rows
+      attr_reader :children_width, :children_height, :num_cols, :num_rows
 
       def initialize(settings, content_width, content_height, num_cols=1, num_rows=1)
-        @content_width = settings.width || content_width
-        @content_height = settings.height || content_height
+        @orig_content_width = content_width
+        @orig_content_height = content_height
         @children_width = content_width
         @children_height = content_height
         @num_cols = num_cols
@@ -13,17 +13,35 @@ module WhirledPeas
         @settings = settings
       end
 
+      def content_width
+        return orig_content_width unless settings.width
+        if settings.border_sizing?
+          settings.width - outer_border_width - scrollbar_width - padding_width
+        else
+          settings.width
+        end
+      end
+
+      def content_height
+        return orig_content_height unless settings.height
+        if settings.border_sizing?
+          settings.height - outer_border_height - scrollbar_height - padding_height
+        else
+          settings.height
+        end
+      end
+
       def outer_width
         @outer_width ||= margin_width +
           outer_border_width +
-          num_cols * (padding_width + content_width + vert_scroll_width) +
+          num_cols * (padding_width + content_width + scrollbar_width) +
           (num_cols - 1) * inner_border_width
       end
 
       def outer_height
         @outer_height ||= margin_height +
           outer_border_height +
-          num_rows * (padding_height + content_height + horiz_scroll_height) +
+          num_rows * (padding_height + content_height + scrollbar_height) +
           (num_rows - 1) * inner_border_height
       end
 
@@ -59,17 +77,17 @@ module WhirledPeas
         settings.padding.top + settings.padding.bottom
       end
 
-      def vert_scroll_width
+      def scrollbar_width
         settings.scrollbar.vert? ? 1 : 0
       end
 
-      def horiz_scroll_height
+      def scrollbar_height
         settings.scrollbar.horiz? ? 1 : 0
       end
 
       private
 
-      attr_reader :settings
+      attr_reader :settings, :orig_content_width, :orig_content_height
     end
   end
 end

data/lib/whirled_peas/graphics/container_painter.rb

@@ -13,10 +13,10 @@ module WhirledPeas
         @children = []
       end
 
-      def paint(canvas, &block)
+      def paint(canvas, left, top, &block)
         return unless canvas.writable?
         return unless needs_printing?
-        canvas_coords = coords(canvas)
+        canvas_coords = coords(left, top)
         stroke_left = canvas_coords.border_left
         stroke_top = canvas_coords.border_top
         formatting = [*settings.border.color, *settings.bg_color]
@@ -73,8 +73,46 @@ module WhirledPeas
         settings.scrollbar.horiz? || settings.scrollbar.vert?
       end
 
-      def coords(canvas)
-        ContainerCoords.new(canvas, dimensions, settings)
+      def coords(left, top)
+        ContainerCoords.new(dimensions, settings, left, top)
+      end
+
+      def horiz_justify_offset(containing_width)
+        if settings.align_center?
+          [(dimensions.content_width - containing_width) / 2, 0]
+        elsif settings.align_right?
+          [dimensions.content_width - containing_width, 0]
+        elsif settings.align_between?
+          return [0, 0] if num_children == 1
+          [0, (dimensions.content_width - containing_width) / (num_children - 1)]
+        elsif settings.align_around?
+          full_spacing = (dimensions.content_width - containing_width) / num_children
+          [full_spacing / 2, full_spacing]
+        elsif settings.align_evenly?
+          spacing = (dimensions.content_width - containing_width) / (num_children + 1)
+          [spacing, spacing]
+        else
+          [0, 0]
+        end
+      end
+
+      def vert_justify_offset(containing_height)
+        if settings.valign_middle?
+          [(dimensions.content_height - containing_height) / 2, 0]
+        elsif settings.valign_bottom?
+          [dimensions.content_height - containing_height, 0]
+        elsif settings.valign_between?
+          return [0, 0] if num_children == 1
+          [0, (dimensions.content_height - containing_height) / (num_children - 1)]
+        elsif settings.valign_around?
+          full_spacing = (dimensions.content_height - containing_height) / num_children
+          [full_spacing / 2, full_spacing]
+        elsif settings.valign_evenly?
+          spacing = (dimensions.content_height - containing_height) / (num_children + 1)
+          [spacing, spacing]
+        else
+          [0, 0]
+        end
       end
 
       def line_stroke(left_border, junc_border, right_border, &block)

data/lib/whirled_peas/graphics/grid_painter.rb

@@ -4,24 +4,25 @@ require_relative 'container_painter'
 module WhirledPeas
   module Graphics
     class GridPainter < ContainerPainter
-      def paint(canvas, &block)
+      def paint(canvas, left, top, &block)
         super
         return unless canvas.writable?
         each_child.with_index do |child, index|
           col_index, row_index = grid_cell(index)
-          content_left = coords(canvas).content_left(col_index)
-          if settings.align_center?
-            content_left += (dimensions.content_width - child.dimensions.outer_width) / 2
-          elsif settings.align_right?
-            content_left += dimensions.content_width - child.dimensions.outer_width
-          end
+          left_offset, _ = horiz_justify_offset(child.dimensions.outer_width)
+          top_offset, _ = vert_justify_offset(child.dimensions.outer_height)
           child_canvas = canvas.child(
-            content_left,
-            coords(canvas).content_top(row_index),
+            coords(left, top).content_left(col_index) + left_offset,
+            coords(left, top).content_top(row_index) + top_offset,
             [dimensions.content_width, child.dimensions.outer_width].min,
             [dimensions.content_height, child.dimensions.outer_height].min
           )
-          child.paint(child_canvas, &block)
+          child.paint(
+            child_canvas,
+            coords(left, top).content_left(col_index) + left_offset,
+            coords(left, top).content_top(row_index) + top_offset,
+            &block
+          )
         end
       end