whirled_peas 0.5.0 → 0.6.0

data/lib/whirled_peas/graphics/box_painter.rb

@@ -7,7 +7,7 @@ module WhirledPeas
       def paint(canvas, &block)
         super
         return unless canvas.writable?
-        if element.settings.horizontal_flow?
+        if settings.horizontal_flow?
           paint_horizontally(canvas, &block)
         else
           paint_vertically(canvas, &block)
@@ -37,6 +37,14 @@ module WhirledPeas
         end
       end
 
+      def each_child(&block)
+        if settings.reverse_flow?
+          children.reverse.each(&block)
+        else
+          super
+        end
+      end
+
       private
 
       def paint_horizontally(canvas, &block)

data/lib/whirled_peas/graphics/composer.rb

@@ -0,0 +1,80 @@
+require 'whirled_peas/settings/box_settings'
+require 'whirled_peas/settings/grid_settings'
+require 'whirled_peas/settings/text_settings'
+
+require_relative 'box_painter'
+require_relative 'grid_painter'
+require_relative 'text_painter'
+
+module WhirledPeas
+  module Graphics
+    class Composer
+      # List of classes that convert nicely to a string
+      STRINGALBE_CLASSES = [FalseClass, Float, Integer, NilClass, String, Symbol, TrueClass]
+      private_constant :STRINGALBE_CLASSES
+
+      def self.stringable?(value)
+        STRINGALBE_CLASSES.include?(value.class)
+      end
+
+      def self.next_name
+        @counter ||= 0
+        @counter += 1
+        "Element-#{@counter}"
+      end
+
+      def self.build
+        settings = Settings::BoxSettings.new
+        template = BoxPainter.new('TEMPLATE', settings)
+        composer = Composer.new(template)
+        value = yield composer, settings
+        if !template.children? && stringable?(value)
+          composer.add_text { value.to_s }
+        end
+        template
+      end
+
+      attr_reader :painter
+
+      def initialize(painter)
+        @painter = painter
+      end
+
+      def add_text(name=self.class.next_name, &block)
+        child_settings = Settings::TextSettings.inherit(painter.settings)
+        child = TextPainter.new(name, child_settings)
+        # TextPainters are not composable, so yield nil
+        content = yield nil, child_settings
+        unless self.class.stringable?(content)
+          raise ArgumentError, "Unsupported type for text: #{content.class}"
+        end
+        child.content = content.to_s
+        painter.add_child(child)
+      end
+
+      def add_box(name=self.class.next_name, &block)
+        child_settings = Settings::BoxSettings.inherit(painter.settings)
+        child = BoxPainter.new(name, child_settings)
+        composer = self.class.new(child)
+        value = yield composer, child.settings
+        painter.add_child(child)
+        if !child.children? && self.class.stringable?(value)
+          composer.add_text("#{name}-Text") { value.to_s }
+        end
+      end
+
+      def add_grid(name=self.class.next_name, &block)
+        child_settings = Settings::GridSettings.inherit(painter.settings)
+        child = GridPainter.new(name, child_settings)
+        composer = self.class.new(child)
+        values = yield composer, child.settings
+        painter.add_child(child)
+        if !child.children? && values.is_a?(Array)
+          values.each.with_index do |value, index|
+            composer.add_text("#{name}-Text-#{index}") { value.to_s }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/whirled_peas/graphics/container_coords.rb

@@ -32,27 +32,37 @@ module WhirledPeas
       end
 
       def content_left(col_index=0)
-        padding_left + settings.padding.left + col_index * grid_width(true)
+        padding_left + settings.padding.left + col_index * grid_width
       end
 
       def content_top(row_index=0)
-        padding_top + settings.padding.top + row_index * grid_height(true)
+        padding_top + settings.padding.top + row_index * grid_height
       end
 
-      def grid_width(include_border)
-        (include_border && settings.border.inner_vert? ? 1 : 0) +
-          settings.padding.left +
+      def inner_grid_width
+        settings.padding.left +
           dimensions.content_width +
           settings.padding.right
       end
 
-      def grid_height(include_border)
-        (include_border && settings.border.inner_horiz? ? 1 : 0) +
-          settings.padding.top +
+      def grid_width
+        (settings.border.inner_vert? ? 1 : 0) +
+          inner_grid_width +
+          (settings.scrollbar.vert? ? 1 : 0)
+      end
+
+      def inner_grid_height
+        settings.padding.top +
           dimensions.content_height +
           settings.padding.bottom
       end
 
+      def grid_height
+        (settings.border.inner_horiz? ? 1 : 0) +
+          inner_grid_height +
+          (settings.scrollbar.horiz? ? 1 : 0)
+      end
+
       private
 
       attr_reader :canvas, :settings, :dimensions

data/lib/whirled_peas/graphics/container_dimensions.rb

@@ -1,11 +1,13 @@
 module WhirledPeas
   module Graphics
     class ContainerDimensions
-      attr_reader :content_width, :content_height, :num_cols, :num_rows
+      attr_reader :content_width, :content_height, :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
+        @children_width = content_width
+        @children_height = content_height
         @num_cols = num_cols
         @num_rows = num_rows
         @settings = settings
@@ -14,21 +16,17 @@ module WhirledPeas
       def outer_width
         @outer_width ||= margin_width +
           outer_border_width +
-          num_cols * (padding_width + content_width) +
+          num_cols * (padding_width + content_width + vert_scroll_width) +
           (num_cols - 1) * inner_border_width
       end
 
       def outer_height
         @outer_height ||= margin_height +
           outer_border_height +
-          num_rows * (padding_height + content_height) +
+          num_rows * (padding_height + content_height + horiz_scroll_height) +
           (num_rows - 1) * inner_border_height
       end
 
-      private
-
-      attr_reader :settings
-
       def margin_width
         settings.margin.left + settings.margin.right
       end
@@ -60,6 +58,18 @@ module WhirledPeas
       def padding_height
         settings.padding.top + settings.padding.bottom
       end
+
+      def vert_scroll_width
+        settings.scrollbar.vert? ? 1 : 0
+      end
+
+      def horiz_scroll_height
+        settings.scrollbar.horiz? ? 1 : 0
+      end
+
+      private
+
+      attr_reader :settings
     end
   end
 end

data/lib/whirled_peas/graphics/container_painter.rb

@@ -8,38 +8,39 @@ module WhirledPeas
     class ContainerPainter < Painter
       PADDING = ' '
 
-      def initialize(element, settings, name)
+      def initialize(name, settings)
         super
         @children = []
       end
 
       def paint(canvas, &block)
         return unless canvas.writable?
-        has_inner_vert = dimensions.num_cols > 1 && settings.border.inner_vert?
-        has_inner_horiz = dimensions.num_rows > 1 && settings.border.inner_horiz?
-        has_border = settings.border.outer? || has_inner_vert || has_inner_horiz
-        return unless settings.bg_color || has_border
-        stroke_left = coords(canvas).border_left
-        stroke_top = coords(canvas).border_top
+        return unless needs_printing?
+        canvas_coords = coords(canvas)
+        stroke_left = canvas_coords.border_left
+        stroke_top = canvas_coords.border_top
         formatting = [*settings.border.color, *settings.bg_color]
         if settings.border.top?
-          canvas.stroke(stroke_left, stroke_top, top_border_stroke, formatting, &block)
+          canvas.stroke(stroke_left, stroke_top, top_border_stroke(canvas_coords), formatting, &block)
           stroke_top += 1
         end
-        content_line = content_line_stroke
-        middle_border = dimensions.num_rows > 1 ? middle_border_stroke : ''
+        middle_border = dimensions.num_rows > 1 ? middle_border_stroke(canvas_coords) : ''
         dimensions.num_rows.times do |row_num|
           if row_num > 0 && settings.border.inner_horiz?
             canvas.stroke(stroke_left, stroke_top, middle_border, formatting, &block)
             stroke_top += 1
           end
-          coords(canvas).grid_height(false).times do
-            canvas.stroke(stroke_left, stroke_top, content_line, formatting, &block)
+          canvas_coords.inner_grid_height.times do |row_within_cell|
+            canvas.stroke(stroke_left, stroke_top, content_line_stroke(canvas_coords, row_within_cell), formatting, &block)
+            stroke_top += 1
+          end
+          if settings.scrollbar.horiz?
+            canvas.stroke(stroke_left, stroke_top, bottom_scroll_stroke(canvas_coords), formatting, &block)
             stroke_top += 1
           end
         end
         if settings.border.bottom?
-          canvas.stroke(stroke_left, stroke_top, bottom_border_stroke, formatting, &block)
+          canvas.stroke(stroke_left, stroke_top, bottom_border_stroke(canvas_coords), formatting, &block)
           stroke_top += 1
         end
       end
@@ -52,6 +53,10 @@ module WhirledPeas
         children.length
       end
 
+      def children?
+        num_children > 0
+      end
+
       def each_child(&block)
         children.each(&block)
       end
@@ -60,55 +65,168 @@ module WhirledPeas
 
       attr_reader :children
 
+      def needs_printing?
+        return true if settings.bg_color
+        return true if settings.border.outer?
+        return true if dimensions.num_cols > 1 && settings.border.inner_vert?
+        return true if dimensions.num_rows > 1 && settings.border.inner_horiz?
+        settings.scrollbar.horiz? || settings.scrollbar.vert?
+      end
+
       def coords(canvas)
         ContainerCoords.new(canvas, dimensions, settings)
       end
 
-      def line_stroke(left_border, horiz_border, junc_border, right_border)
+      def line_stroke(left_border, junc_border, right_border, &block)
         stroke = ''
         stroke += left_border if settings.border.left?
         dimensions.num_cols.times do |col_num|
           stroke += junc_border if col_num > 0 && settings.border.inner_vert?
-          stroke += horiz_border * (dimensions.content_width + settings.padding.left + settings.padding.right)
+          stroke += yield
         end
         stroke += right_border if settings.border.right?
         stroke
       end
 
-      def top_border_stroke
+      def top_border_stroke(canvas_coords)
         line_stroke(
           settings.border.style.top_left,
-          settings.border.style.top_horiz,
           settings.border.style.top_junc,
           settings.border.style.top_right
-        )
-      end
-
-      def content_line_stroke
-        line_stroke(
-          settings.border.style.left_vert,
-          PADDING,
-          settings.border.style.middle_vert,
-          settings.border.style.right_vert
-        )
+        ) do
+          settings.border.style.top_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+        end
       end
 
-      def middle_border_stroke
+      def middle_border_stroke(canvas_coords)
         line_stroke(
           settings.border.style.left_junc,
-          settings.border.style.middle_horiz,
           settings.border.style.cross_junc,
           settings.border.style.right_junc
-        )
+        ) do
+          settings.border.style.middle_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+        end
       end
 
-      def bottom_border_stroke
+      def bottom_border_stroke(canvas_coords)
         line_stroke(
           settings.border.style.bottom_left,
-          settings.border.style.bottom_horiz,
           settings.border.style.bottom_junc,
           settings.border.style.bottom_right
-        )
+        ) do
+          settings.border.style.bottom_horiz * (canvas_coords.inner_grid_width + (settings.scrollbar.vert? ? 1 : 0))
+        end
+      end
+
+      def content_line_stroke(canvas_coords, row_within_cell)
+        line_stroke(
+          settings.border.style.left_vert,
+          settings.border.style.middle_vert,
+          settings.border.style.right_vert,
+        ) do
+          if settings.scrollbar.vert?
+            if dimensions.children_height <= canvas_coords.grid_height || children.first.settings.position.top > 0
+              scrollbar_char = GUTTER
+            else
+              scrollbar_char = vert_scroll_char(
+                dimensions.children_height + dimensions.padding_height,
+                canvas_coords.inner_grid_height,
+                -children.first.settings.position.top,
+                row_within_cell
+              )
+            end
+            PADDING * canvas_coords.inner_grid_width + scrollbar_char
+          else
+            PADDING * canvas_coords.inner_grid_width
+          end
+        end
+      end
+
+      def bottom_scroll_stroke(canvas_coords)
+        line_stroke(
+          settings.border.style.left_vert,
+          settings.border.style.middle_vert,
+          settings.border.style.right_vert,
+        ) do
+          canvas_coords.inner_grid_width.times.map do |col_within_cell|
+            horiz_scroll_char(
+              dimensions.children_width + dimensions.padding_width,
+              canvas_coords.inner_grid_width,
+              -children.first.settings.position.left,
+              col_within_cell
+            )
+          end.join
+        end
+      end
+
+      GUTTER = ' '
+      HORIZONTAL = %w[▗ ▄ ▖]
+      VERTICAL = %w[
+        ▗
+        ▐
+        ▝
+      ]
+
+      def horiz_scroll_char(col_count, viewable_col_count, first_visible_col, curr_col)
+        scroll_char(col_count, viewable_col_count, first_visible_col, curr_col, HORIZONTAL)
+      end
+
+      def vert_scroll_char(row_count, viewable_row_count, first_visible_row, curr_row)
+        scroll_char(row_count, viewable_row_count, first_visible_row, curr_row, VERTICAL)
+      end
+
+      private
+
+      def scroll_char(total_count, viewable_count, first_visible, curr, chars)
+        return GUTTER unless total_count > 0 && viewable_count > 0
+        # The scroll handle has the exact same relative size and position in the scroll gutter
+        # that the viewable content has in the total content area. For example, a content area
+        # that is 50 columns wide with a view port that is 20 columns wide might look like
+        #
+        #    +---------1-----****2*********3******---4---------+
+        #    |               *                   *             |
+        #    |   hidden      *     viewable      *   hidden    |
+        #    |               *                   *             |
+        #    +---------1-----****2*********3******---4---------+
+        #
+        # The scoll gutter, would look like
+        #
+        #                    |......********.....|
+        #
+        # Scrolling all the way to the right results in
+        #
+        #    +---------1---------2---------3*********4*********+
+        #    |                             *                   *
+        #    |            hidden           *     viewable      *
+        #    |                             *                   *
+        #    +---------1---------2---------3*********4*********+
+        #                                  |...........********|
+
+        # The first task of determining how much of the handle is visible in a row/column is to
+        # calculate the range (as a precentage of the total) of viewable items
+        viewable_start = first_visible.to_f / total_count
+        viewable_end = (first_visible + viewable_count).to_f / total_count
+
+        # Always use the same length for the scroll bar so it does not give an inchworm effect
+        # as it scrolls along.
+        #
+        # Also, double the value now to get granularity for half width
+        # scrollbar characters.
+        scrollbar_length = ((2 * viewable_count ** 2).to_f / total_count).ceil
+        scrollbar_start = ((2 * first_visible * viewable_count).to_f / total_count).floor
+
+        first_half = (scrollbar_start...scrollbar_start + scrollbar_length).include?(2 * curr)
+        second_half = (scrollbar_start...scrollbar_start + scrollbar_length).include?(2 * curr + 1)
+
+        if first_half && second_half
+          chars[1]
+        elsif first_half
+          chars[2]
+        elsif second_half
+          chars[0]
+        else
+          GUTTER
+        end
       end
     end
     private_constant :ContainerPainter