whirled_peas 0.5.0 → 0.9.0

data/lib/whirled_peas/settings/container_settings.rb

@@ -1,47 +1,92 @@
+require_relative 'alignment'
 require_relative 'border'
 require_relative 'display_flow'
 require_relative 'element_settings'
 require_relative 'margin'
 require_relative 'padding'
 require_relative 'position'
+require_relative 'scrollbar'
+require_relative 'sizing'
+require_relative 'vert_alignment'
 
 module WhirledPeas
   module Settings
     class ContainerSettings < ElementSettings
-      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)
@@ -51,7 +96,7 @@ module WhirledPeas
       end
 
       def border
-        @_border || Border.new
+        @_border ||= Border.new
       end
 
       def flow=(flow)
@@ -59,7 +104,7 @@ module WhirledPeas
       end
 
       def flow
-        @_flow || DisplayFlow::LEFT_TO_RIGHT
+        @_flow || DisplayFlow::DEFAULT
       end
 
       def horizontal_flow?
@@ -78,51 +123,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.horiz = horiz unless horiz.nil?
+        scrollbar.vert = vert unless vert.nil?
+      end
+
+      def scrollbar
+        @_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/debugger.rb

@@ -3,6 +3,7 @@ require_relative 'container_settings'
 require_relative 'margin'
 require_relative 'padding'
 require_relative 'position'
+require_relative 'scrollbar'
 
 module WhirledPeas
   module Settings
@@ -41,6 +42,8 @@ module WhirledPeas
           border_value(value)
         when Padding
           padding_value(value)
+        when Scrollbar
+          scrollbar_value(value)
         else
           value.inspect
         end
@@ -82,6 +85,12 @@ module WhirledPeas
         return if values == ''
         "Padding(#{values})"
       end
+
+      def scrollbar_value(scrollbar)
+        values = non_defaults(scrollbar, Scrollbar.new, %i[horiz? vert?])
+        return if values == ''
+        "Scrollbar(#{values})"
+      end
     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

data/lib/whirled_peas/settings/element_settings.rb

@@ -1,7 +1,7 @@
 require 'json'
 
+require_relative 'alignment'
 require_relative 'bg_color'
-require_relative 'text_align'
 require_relative 'text_color'
 
 module WhirledPeas
@@ -13,8 +13,13 @@ module WhirledPeas
         child
       end
 
+      attr_accessor :width, :height
+
+      def validate!
+      end
+
       def bg_color
-        @_bg_color
+        @_bg_color || BgColor::DEFAULT
       end
 
       def bg_color=(color)
@@ -30,7 +35,7 @@ module WhirledPeas
       end
 
       def color
-        @_color
+        @_color || TextColor::DEFAULT
       end
 
       def color=(color)

data/lib/whirled_peas/settings/graph_settings.rb

@@ -0,0 +1,21 @@
+require_relative 'text_color'
+require_relative 'element_settings'
+
+module WhirledPeas
+  module Settings
+    class GraphSettings < ElementSettings
+      def axis_color
+        @_axis_color || color
+      end
+
+      def axis_color=(color)
+        @_axis_color = TextColor.validate!(color)
+      end
+
+      def validate!
+        super
+        raise SettingsError, "`height` must be set for GraphSettings" if height.nil?
+      end
+    end
+  end
+end

data/lib/whirled_peas/settings/grid_settings.rb

@@ -6,6 +6,21 @@ module WhirledPeas
   module Settings
     class GridSettings < ContainerSettings
       attr_accessor :num_cols
+
+      def validate!
+        super
+        if num_cols.nil? || num_cols <= 0
+          raise SettingsError, "`num_cols` must be set to a positive number for GridSettings"
+        end
+      end
+
+      def set_scrollbar(*)
+        raise NotImplementedError, 'Grids do not support scrollbars'
+      end
+
+      def sizing=(*)
+        raise NotImplementedError, 'Grids only support the default sizing model'
+      end
     end
   end
 end

data/lib/whirled_peas/settings/scrollbar.rb

@@ -0,0 +1,15 @@
+module WhirledPeas
+  module Settings
+    class Scrollbar
+      attr_writer :horiz, :vert
+
+      def horiz?
+        @horiz == true
+      end
+
+      def vert?
+        @vert == true
+      end
+    end
+  end
+end

data/lib/whirled_peas/settings/sizing.rb

@@ -0,0 +1,19 @@
+module WhirledPeas
+  module Settings
+    class Sizing
+      CONTENT = :content
+      BORDER = :border
+
+      DEFAULT = CONTENT
+
+      VALID = [CONTENT, BORDER]
+      private_constant :VALID
+
+      def self.validate!(sizing)
+        return if sizing.nil?
+        return sizing if VALID.include?(sizing)
+        raise ArgumentError, "Unsupported sizing model: #{sizing.inspect}"
+      end
+    end
+  end
+end

data/lib/whirled_peas/settings/spacing.rb

@@ -3,21 +3,55 @@ module WhirledPeas
     class Spacing
       attr_writer :left, :top, :right, :bottom
 
+      def left=(value)
+        @left = validate!(value)
+      end
+
       def left
         @left || 0
       end
 
+      def top=(value)
+        @top = validate!(value)
+      end
+
       def top
         @top || 0
       end
 
+      def right=(value)
+        @right = validate!(value)
+      end
+
       def right
         @right || 0
       end
 
+      def bottom=(value)
+        @bottom = validate!(value)
+      end
+
       def bottom
         @bottom || 0
       end
+
+      def horiz=(value)
+        self.left = self.right = value
+      end
+
+      def vert=(value)
+        self.top = self.bottom = value
+      end
+
+      private
+
+      def validate!(value)
+        if value && value < 0
+          raise ArgumentError, "Negative values for #{self.class.name.split('::').last.downcase} are not allowed"
+        else
+          value
+        end
+      end
     end
     private_constant :Spacing
   end