whirled_peas 0.6.0 → 0.7.0

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
@@ -14,7 +14,7 @@ module WhirledPeas
       end
 
       def bg_color
-        @_bg_color
+        @_bg_color || BgColor::DEFAULT
       end
 
       def bg_color=(color)
@@ -30,7 +30,7 @@ module WhirledPeas
       end
 
       def color
-        @_color
+        @_color || TextColor::DEFAULT
       end
 
       def color=(color)

data/lib/whirled_peas/settings/grid_settings.rb

@@ -8,7 +8,11 @@ module WhirledPeas
       attr_accessor :num_cols
 
       def set_scrollbar(*)
-        raise NotImplemented, 'Grids do not currently support scrollbars'
+        raise NotImplementedError, 'Grids do not support scrollbars'
+      end
+
+      def sizing=(*)
+        raise NotImplementedError, 'Grids only support the default sizing model'
       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

data/lib/whirled_peas/settings/text_color.rb

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

data/lib/whirled_peas/settings/vert_alignment.rb

@@ -0,0 +1,24 @@
+module WhirledPeas
+  module Settings
+    module VertAlignment
+      TOP = :top
+      MIDDLE = :middle
+      BOTTOM = :bottom
+      BETWEEN = :between
+      AROUND = :around
+      EVENLY = :evenly
+
+      DEFAULT = TOP
+
+      VALID = [TOP, MIDDLE, BOTTOM, BETWEEN, AROUND, EVENLY]
+      private_constant :VALID
+
+      def self.validate!(valign)
+        return if valign.nil?
+        return valign if VALID.include?(valign)
+        raise ArgumentError, "Unsupported vertical alignment: #{valign.inspect}"
+      end
+    end
+    private_constant :VertAlignment
+  end
+end

data/lib/whirled_peas/utils/title_font.rb

@@ -6,7 +6,7 @@ module WhirledPeas
 
       class << self
         def validate!(font_key)
-          return unless font_key
+          return if font_key.nil?
           return font_key if fonts.key?(font_key)
           allowed = fonts.keys.map(&:inspect).sort
           message = "Unrecognized font: '#{font_key.inspect}', expecting one of #{allowed.join(', ')}"

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/screen_test/{rendered/elements → elements}/box.frame

@@ -1 +1 @@
-[?25lTOP LEFTBOTTOM LEFT TOP RIGHT    BOTTOM RIGHT[?25h
+[?25lTOP LEFTBOTTOM LEFT TOP RIGHT    BOTTOM RIGHT[?25h

data/screen_test/elements/grid.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━┳━━━━━━┳━━━━━━┓┃      ┃      ┃      ┃┣━━━━━━╋━━━━━━╋━━━━━━┫┃      ┃      ┃      ┃┣━━━━━━╋━━━━━━╋━━━━━━┫┃      ┃      ┃      ┃┗━━━━━━┻━━━━━━┻━━━━━━┛Item 0Item 1Item 2Item 3Item 4Item 5Item 6[?25h

data/screen_test/elements/screen_overflow_x.frame

@@ -0,0 +1 @@
+[?25l--------------------------------[?25h

data/screen_test/elements/screen_overflow_y.frame

@@ -0,0 +1 @@
+[?25l||||||||||||||||||||||||[?25h

data/screen_test/elements/screen_overflow_y.rb

@@ -0,0 +1,9 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do
+      "|\n" * 1000
+    end
+  end
+end

data/screen_test/elements/text.frame

@@ -0,0 +1 @@
+[?25lHello, World![?25h

data/screen_test/elements/text_multiline.frame

@@ -0,0 +1 @@
+[?25lLine 1Line 2Line 3[?25h

data/screen_test/settings/align/box_around.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━┓┃               ┃┗━━━━━━━━━━━━━━━┛ABC[?25h

data/screen_test/settings/align/box_around.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.full_border
+        settings.align = :around
+        settings.width = 15
+        composer.add_text { 'A' }
+        composer.add_text { 'B' }
+        composer.add_text { 'C' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/box_between.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━┓┃               ┃┗━━━━━━━━━━━━━━━┛ABC[?25h

data/screen_test/settings/align/box_between.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.full_border
+        settings.align = :between
+        settings.width = 15
+        composer.add_text { 'A' }
+        composer.add_text { 'B' }
+        composer.add_text { 'C' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/box_center.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━┓┃                      ┃┃                      ┃┗━━━━━━━━━━━━━━━━━━━━━━┛This is an aligned boxCenter[?25h

data/screen_test/{rendered/settings/align/grid.rb → settings/align/box_center.rb}

@@ -3,16 +3,17 @@ require 'whirled_peas'
 class TemplateFactory
   def build(*)
     WhirledPeas.template do |composer|
-      [nil, :left, :center, :right].each do |align|
-        composer.add_grid("Alignment-#{align || :default}") do |composer, settings|
-          settings.num_cols = 1
+      composer.add_grid do |composer, settings|
+        settings.num_cols = 2
+        composer.add_box('Alignment') do |composer, settings|
+          settings.flow = :t2b
           settings.full_border
-          settings.align = align
+          settings.align = :center
           # Keep the title long so grids below will be wide enough to use the
           # alignment attribute. Don't rely on the `width` attribute to keep
           # `align` isolated in this test.
-          composer.add_text('Title') { 'This is an aligned grid' }
-          composer.add_text('Content') { align || :default }
+          composer.add_text('Title') { 'This is an aligned box' }
+          composer.add_text('Content') { 'Center' }
         end
       end
     end

data/screen_test/settings/align/box_default.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━┓┃                      ┃┃                      ┃┗━━━━━━━━━━━━━━━━━━━━━━┛This is an aligned boxDefault[?25h

data/screen_test/settings/align/box_default.rb

@@ -0,0 +1,20 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_grid do |composer, settings|
+        settings.num_cols = 2
+        composer.add_box('Alignment') do |composer, settings|
+          settings.flow = :t2b
+          settings.full_border
+          # Keep the title long so grids below will be wide enough to use the
+          # alignment attribute. Don't rely on the `width` attribute to keep
+          # `align` isolated in this test.
+          composer.add_text('Title') { 'This is an aligned box' }
+          composer.add_text('Content') { 'Default' }
+        end
+      end
+    end
+  end
+end

data/screen_test/settings/align/box_evenly.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━┓┃               ┃┗━━━━━━━━━━━━━━━┛ABC[?25h

data/screen_test/settings/align/box_evenly.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.full_border
+        settings.align = :evenly
+        settings.width = 15
+        composer.add_text { 'A' }
+        composer.add_text { 'B' }
+        composer.add_text { 'C' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/box_left.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━┓┃                      ┃┃                      ┃┗━━━━━━━━━━━━━━━━━━━━━━┛This is an aligned boxLeft[?25h

data/screen_test/settings/align/box_left.rb

@@ -0,0 +1,21 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_grid do |composer, settings|
+        settings.num_cols = 2
+        composer.add_box('Alignment') do |composer, settings|
+          settings.flow = :t2b
+          settings.full_border
+          settings.align = :left
+          # Keep the title long so grids below will be wide enough to use the
+          # alignment attribute. Don't rely on the `width` attribute to keep
+          # `align` isolated in this test.
+          composer.add_text('Title') { 'This is an aligned box' }
+          composer.add_text('Content') { 'Left' }
+        end
+      end
+    end
+  end
+end

data/screen_test/settings/align/box_right.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━┓┃                      ┃┃                      ┃┗━━━━━━━━━━━━━━━━━━━━━━┛This is an aligned boxRight[?25h

data/screen_test/settings/align/box_right.rb

@@ -0,0 +1,21 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_grid do |composer, settings|
+        settings.num_cols = 2
+        composer.add_box('Alignment') do |composer, settings|
+          settings.flow = :t2b
+          settings.full_border
+          settings.align = :right
+          # Keep the title long so grids below will be wide enough to use the
+          # alignment attribute. Don't rely on the `width` attribute to keep
+          # `align` isolated in this test.
+          composer.add_text('Title') { 'This is an aligned box' }
+          composer.add_text('Content') { 'Right' }
+        end
+      end
+    end
+  end
+end

data/screen_test/settings/align/children_center.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓┃                            ┃┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛Thing 1Thing 2[?25h

data/screen_test/settings/align/children_center.rb

@@ -0,0 +1,15 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.align = :center
+        settings.width = 28
+        settings.full_border
+        composer.add_text('Text1') { 'Thing 1' }
+        composer.add_text('Text2') { 'Thing 2' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/children_left.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓┃                            ┃┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛Thing 1Thing 2[?25h

data/screen_test/settings/align/children_left.rb

@@ -0,0 +1,15 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.align = :left
+        settings.width = 28
+        settings.full_border
+        composer.add_text('Text1') { 'Thing 1' }
+        composer.add_text('Text2') { 'Thing 2' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/children_right.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓┃                            ┃┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛Thing 1Thing 2[?25h

data/screen_test/settings/align/children_right.rb

@@ -0,0 +1,15 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box do |composer, settings|
+        settings.align = :right
+        settings.width = 28
+        settings.full_border
+        composer.add_text('Text1') { 'Thing 1' }
+        composer.add_text('Text2') { 'Thing 2' }
+      end
+    end
+  end
+end

data/screen_test/settings/align/grid_center.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━━━━━━━━━━━━━━┓┃                       ┃┣━━━━━━━━━━━━━━━━━━━━━━━┫┃                       ┃┗━━━━━━━━━━━━━━━━━━━━━━━┛This is an aligned gridCenter[?25h

data/screen_test/settings/align/grid_center.rb

@@ -0,0 +1,18 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_grid('Alignment') do |composer, settings|
+        settings.num_cols = 1
+        settings.full_border
+        settings.align = :center
+        # Keep the title long so grids below will be wide enough to use the
+        # alignment attribute. Don't rely on the `width` attribute to keep
+        # `align` isolated in this test.
+        composer.add_text('Title') { 'This is an aligned grid' }
+        composer.add_text('Content') { 'Center' }
+      end
+    end
+  end
+end