whirled_peas 0.6.0 → 0.7.0

data/lib/whirled_peas/graphics/painter.rb

@@ -8,11 +8,15 @@ module WhirledPeas
         @name = name
       end
 
-      def paint(canvas, &block)
+      def paint(canvas, left, top, &block)
       end
 
       def dimensions
       end
+
+      def inspect
+        "#{self.class.name.split('::').last}(name=#{name.inspect})"
+      end
     end
     private_constant :Painter
   end

data/lib/whirled_peas/graphics/renderer.rb

@@ -10,7 +10,12 @@ module WhirledPeas
       end
 
       def paint(&block)
-        template.paint(Canvas.new(0, 0, width, height, 0, 0), &block)
+        # Modify the template's settings so that it fills the entire screen
+        template.settings.width = width
+        template.settings.height = height
+        template.settings.sizing = :border
+        template.settings.set_margin(left: 0, top: 0, right: 0, bottom: 0)
+        template.paint(Canvas.new(0, 0, width, height), 0, 0, &block)
       end
 
       private

data/lib/whirled_peas/graphics/text_painter.rb

@@ -9,7 +9,7 @@ module WhirledPeas
     class TextPainter < Painter
       attr_reader :content
 
-      def paint(canvas, &block)
+      def paint(canvas, left, top, &block)
         return unless canvas.writable?
         formatting = [*settings.color, *settings.bg_color]
         formatting << Utils::Ansi::BOLD if settings.bold?
@@ -17,7 +17,7 @@ module WhirledPeas
           formatting << Utils::Ansi::UNDERLINE
         end
         content.each.with_index do |line, index|
-          canvas.stroke(canvas.start_left, canvas.start_top + index, line, formatting, &block)
+          canvas.stroke(left, top + index, line, formatting, &block)
         end
       end
 

data/lib/whirled_peas/settings/alignment.rb

@@ -0,0 +1,24 @@
+module WhirledPeas
+  module Settings
+    module Alignment
+      LEFT = :left
+      CENTER = :center
+      RIGHT = :right
+      BETWEEN = :between
+      AROUND = :around
+      EVENLY = :evenly
+
+      DEFAULT = LEFT
+
+      VALID = [LEFT, CENTER, RIGHT, BETWEEN, AROUND, EVENLY]
+      private_constant :VALID
+
+      def self.validate!(align)
+        return if align.nil?
+        return align if VALID.include?(align)
+        raise ArgumentError, "Unsupported alignment: #{align.inspect}"
+      end
+    end
+    private_constant :Alignment
+  end
+end

data/lib/whirled_peas/settings/bg_color.rb

@@ -17,6 +17,8 @@ module WhirledPeas
       CYAN = new(Utils::Ansi::CYAN + BG_OFFSET)
       WHITE = new(Utils::Ansi::WHITE + BG_OFFSET)
       GRAY = BLACK.bright
+
+      DEFAULT = nil  # Use system defined default
     end
   end
 end

data/lib/whirled_peas/settings/border.rb

@@ -34,20 +34,20 @@ module WhirledPeas
           '╚', '═', '╩', '╝'
         )
 
+        DEFAULT = BOLD
+
         def self.validate!(style)
-          return unless style
+          return if style.nil?
+          return style if style.is_a?(Border::Style)
           if style.is_a?(Symbol)
-            error_message = "Unsupported border style: #{style}"
-            begin
-              style = self.const_get(style.upcase)
-              raise ArgumentError, error_message unless style.is_a?(Style)
-              style
-            rescue NameError
-              raise ArgumentError, error_message
-            end
-          else
-            style
+            style_class = self.const_get(style.upcase)
+            return style_class if style_class.is_a?(Border::Style)
           end
+          error_message = "Unsupported border style: #{style.inspect}"
+          raise ArgumentError, error_message
+        rescue NameError
+          error_message = "Unsupported border style: #{style.inspect}"
+          raise ArgumentError, error_message
         end
       end
 
@@ -82,20 +82,20 @@ module WhirledPeas
       end
 
       def style
-        @style || Styles::BOLD
+        @style || Styles::DEFAULT
       end
 
       def style=(val)
         @style = Styles.validate!(val)
       end
 
-      def color
-        @color || TextColor::WHITE
-      end
-
       def color=(val)
         @color = TextColor.validate!(val)
       end
+
+      def color
+        @color || TextColor::DEFAULT
+      end
     end
   end
 end

data/lib/whirled_peas/settings/color.rb

@@ -13,25 +13,24 @@ module WhirledPeas
       # @return [Color|Symbol] the value passed in if valid, otherwise an ArgumentError
       #   is raised.
       def self.validate!(color)
-        return unless color
+        return if color.nil?
+        return color if color.is_a?(self)
         if color.is_a?(Symbol)
-          error_message = "Unsupported #{self.name.split('::').last}: #{color.inspect}"
           match = color.to_s.match(/^(bright_)?(\w+)$/)
-          begin
-            color = self.const_get(match[2].upcase)
-            raise ArgumentError, error_message unless color.is_a?(Color)
-            if match[1]
-              raise ArgumentError, error_message if color.bright?
-              color.bright
-            else
-              color
+          color_class = self.const_get(match[2].upcase)
+          if color_class.is_a?(self)
+            if !match[1]
+              return color_class
+            elsif !color_class.bright?
+              return color_class.bright
             end
-          rescue NameError
-            raise ArgumentError, error_message
           end
-        else
-          color
         end
+        error_message = "Unsupported #{self.name.split('::').last}: #{color.inspect}"
+        raise ArgumentError, error_message
+      rescue NameError
+        error_message = "Unsupported #{self.name.split('::').last}: #{color.inspect}"
+        raise ArgumentError, error_message
       end
 
       def initialize(code, bright=false)

data/lib/whirled_peas/settings/container_settings.rb

@@ -1,3 +1,4 @@
+require_relative 'alignment'
 require_relative 'border'
 require_relative 'display_flow'
 require_relative 'element_settings'
@@ -5,6 +6,8 @@ require_relative 'margin'
 require_relative 'padding'
 require_relative 'position'
 require_relative 'scrollbar'
+require_relative 'sizing'
+require_relative 'vert_alignment'
 
 module WhirledPeas
   module Settings
@@ -12,37 +15,80 @@ module WhirledPeas
       attr_accessor :width, :height
 
       def align
-        @_align || TextAlign::LEFT
+        @_align || Alignment::DEFAULT
       end
 
       def align_left?
-        align == TextAlign::LEFT
+        align == Alignment::LEFT
       end
 
       def align_center?
-        align == TextAlign::CENTER
+        align == Alignment::CENTER
       end
 
       def align_right?
-        align == TextAlign::RIGHT
+        align == Alignment::RIGHT
+      end
+
+      def align_between?
+        align == Alignment::BETWEEN
+      end
+
+      def align_around?
+        align == Alignment::AROUND
+      end
+
+      def align_evenly?
+        align == Alignment::EVENLY
       end
 
       def align=(align)
-        @_align = TextAlign.validate!(align)
+        @_align = Alignment.validate!(align)
+      end
+
+      def valign
+        @_valign || VertAlignment::DEFAULT
+      end
+
+      def valign_top?
+        valign == VertAlignment::TOP
+      end
+
+      def valign_middle?
+        valign == VertAlignment::MIDDLE
+      end
+
+      def valign_bottom?
+        valign == VertAlignment::BOTTOM
+      end
+
+      def valign_between?
+        valign == VertAlignment::BETWEEN
+      end
+
+      def valign_around?
+        valign == VertAlignment::AROUND
+      end
+
+      def valign_evenly?
+        valign == VertAlignment::EVENLY
+      end
+
+      def valign=(valign)
+        @_valign = VertAlignment.validate!(valign)
       end
 
       def set_border(
         left: nil, top: nil, right: nil, bottom: nil, inner_horiz: nil, inner_vert: nil, style: nil, color: nil
       )
-        @_border = Border.new unless @_border
-        @_border.left = left unless left.nil?
-        @_border.top = top unless top.nil?
-        @_border.right = right unless right.nil?
-        @_border.bottom = bottom unless bottom.nil?
-        @_border.inner_horiz = inner_horiz unless inner_horiz.nil?
-        @_border.inner_vert = inner_vert unless inner_vert.nil?
-        @_border.style = style unless style.nil?
-        @_border.color = color unless color.nil?
+        border.left = left unless left.nil?
+        border.top = top unless top.nil?
+        border.right = right unless right.nil?
+        border.bottom = bottom unless bottom.nil?
+        border.inner_horiz = inner_horiz unless inner_horiz.nil?
+        border.inner_vert = inner_vert unless inner_vert.nil?
+        border.style = style unless style.nil?
+        border.color = color unless color.nil?
       end
 
       def full_border(style: nil, color: nil)
@@ -52,7 +98,7 @@ module WhirledPeas
       end
 
       def border
-        @_border || Border.new
+        @_border ||= Border.new
       end
 
       def flow=(flow)
@@ -60,7 +106,7 @@ module WhirledPeas
       end
 
       def flow
-        @_flow || DisplayFlow::LEFT_TO_RIGHT
+        @_flow || DisplayFlow::DEFAULT
       end
 
       def horizontal_flow?
@@ -79,61 +125,99 @@ module WhirledPeas
         !forward_flow?
       end
 
-      def set_margin(left: nil, top: nil, right: nil, bottom: nil)
-        @_margin = Margin.new unless @_margin
-        @_margin.left = left if left
-        @_margin.top = top if top
-        @_margin.right = right if right
-        @_margin.bottom = bottom if bottom
+      def set_margin(left: nil, top: nil, right: nil, bottom: nil, horiz: nil, vert: nil)
+        if horiz && (left || right)
+          raise ArgumentError, 'Cannot set horizontal margin when setting left/right'
+        elsif vert && (top || bottom)
+          raise ArgumentError, 'Cannot set vertical margin when setting top/bottom'
+        end
+
+        if horiz
+          margin.horiz = horiz
+        else
+          margin.left = left if left
+          margin.right = right if right
+        end
+
+        if vert
+          margin.vert = vert
+        else
+          margin.top = top if top
+          margin.bottom = bottom if bottom
+        end
       end
 
       def margin
-        @_margin || Margin.new
+        @_margin ||= Margin.new
       end
 
-      def set_padding(left: nil, top: nil, right: nil, bottom: nil)
-        @_padding = Padding.new unless @_padding
-        @_padding.left = left if left
-        @_padding.top = top if top
-        @_padding.right = right if right
-        @_padding.bottom = bottom if bottom
+      def set_padding(left: nil, top: nil, right: nil, bottom: nil, horiz: nil, vert: nil)
+        if horiz && (left || right)
+          raise ArgumentError, 'Cannot set horizontal padding when setting left/right'
+        elsif vert && (top || bottom)
+          raise ArgumentError, 'Cannot set vertical padding when setting top/bottom'
+        end
+
+        if horiz
+          padding.horiz = horiz
+        else
+          padding.left = left if left
+          padding.right = right if right
+        end
+
+        if vert
+          padding.vert = vert
+        else
+          padding.top = top if top
+          padding.bottom = bottom if bottom
+        end
       end
 
       def padding
-        @_padding || Padding.new
+        @_padding ||= Padding.new
       end
 
       def set_position(left: nil, top: nil)
-        @_position = Position.new unless @_position
-        @_position.left = left if left
-        @_position.top = top if top
+        position.left = left if left
+        position.top = top if top
       end
 
       def position
-        @_position || Position.new
+        @_position ||= Position.new
       end
 
       def set_scrollbar(horiz: nil, vert: nil)
-        @_scrollbar = Scrollbar.new unless @_scrollbar
-        @_scrollbar.horiz = horiz unless horiz.nil?
-        @_scrollbar.vert = vert unless vert.nil?
+        scrollbar.horiz = horiz unless horiz.nil?
+        scrollbar.vert = vert unless vert.nil?
       end
 
       def scrollbar
-        @_scrollbar || Scrollbar.new
+        @_scrollbar ||= Scrollbar.new
+      end
+
+      def sizing
+        @_sizing || Sizing::DEFAULT
+      end
+
+      def border_sizing?
+        @_sizing == Sizing::BORDER
+      end
+
+      def content_sizing?
+        @_sizing == Sizing::CONTENT
+      end
+
+      def sizing=(sizing)
+        @_sizing = Sizing.validate!(sizing)
       end
 
       def inherit(parent)
         super
         return unless parent.is_a?(ContainerSettings)
-        @_align = parent._align
-        @_flow = parent._flow
         set_border(color: parent.border.color, style: parent.border.style)
       end
 
       protected
-
-      attr_accessor :_align, :_flow
     end
   end
 end

data/lib/whirled_peas/settings/display_flow.rb

@@ -6,18 +6,20 @@ module WhirledPeas
       TOP_TO_BOTTOM = :t2b
       BOTTOM_TO_TOP = :b2t
 
+      DEFAULT = LEFT_TO_RIGHT
+
+      VALID = [
+        DisplayFlow::LEFT_TO_RIGHT,
+        DisplayFlow::RIGHT_TO_LEFT,
+        DisplayFlow::TOP_TO_BOTTOM,
+        DisplayFlow::BOTTOM_TO_TOP
+      ]
+      private_constant :VALID
+
       def self.validate!(flow)
-        return unless flow
-        if [
-          DisplayFlow::LEFT_TO_RIGHT,
-          DisplayFlow::RIGHT_TO_LEFT,
-          DisplayFlow::TOP_TO_BOTTOM,
-          DisplayFlow::BOTTOM_TO_TOP
-        ].include?(flow)
-          flow
-        else
-          raise ArgumentError, "Unsupported display flow: #{flow}"
-        end
+        return if flow.nil?
+        return flow if VALID.include?(flow)
+        raise ArgumentError, "Unsupported display flow: #{flow.inspect}"
       end
     end
     private_constant :DisplayFlow