whirled_peas 0.4.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740b5ae88bfdd0f6dfbf4b1ef9e220a4298ddd8f4d8b01d62e904e3bfb4e109b
-  data.tar.gz: 1e78f0bf1664187825441258909a750c74455017266d01b4b64d5cdd7c609572
+  metadata.gz: 55ddf23151c866304cbe5213073c9ac9bd3c7b17139737acf1fe2f6678e6248f
+  data.tar.gz: 31d26322b45af3d06c2f64c019fde32cebfe87638852c87857fa0113dc3bdc11
 SHA512:
-  metadata.gz: '0960008e3b09aae39cf0655ff57d6dde8859bd3437844b68b37fd72b49bc04199dae2fa5544ba219f795d87f5b5ada80d56f0e96f005eaffddbd74de67d4037c'
-  data.tar.gz: ce998b69ac1db491577cdfaaaa4b35fb79a0bd07d24c622f426e38b1ff3eb0851ff10c90d24b8b7f48dc1b97dd01c11f93960a011c2611df201f3d86c45ce65a
+  metadata.gz: 7be414e153881ff228f8780e11887be61844d1f719c1b19d50888cf7c2caf3d2171dd992c6694604672209f5e7457b35eebba7498dd60bb1d21e717c467f0a6c
+  data.tar.gz: d27958378cfd0fe6728ef547559f07258ecafb2481df0d1994d3cf13802ae14ad414c212d2186f8e36ecb00be608d8abc3c6ccb918109a0114cc9585ed431735

data/.travis.yml

@@ -6,3 +6,4 @@ rvm:
   - 2.7.2
   - 3.0.0
 before_install: gem install bundler -v 2.1.4
+script: bundle exec rake ci

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## v0.7.1 - 2021-01-27
+
+- [b98781d](https://github.com/tcollier/whirled_peas/tree/b98781de23a24b596955f25cfc48936c0cc1efac): Fix num_cols bug for vertical grid flow
+
+## v0.7.0 - 2021-01-27
+
+BREAKING: the settings for the template now fills the full screen and disallows margin.
+
+- [b7c12c2](https://github.com/tcollier/whirled_peas/tree/b7c12c2c34d7077b9c2496d05ddd0c6d1eb90699): Update template to fill full screen with border sizing
+- [963b819](https://github.com/tcollier/whirled_peas/tree/963b8196f0d046ba03c893f07e5578bf8c88b7a3): Implement vertical alignment
+- [4bddd54](https://github.com/tcollier/whirled_peas/tree/4bddd54bec5c8f93d145c285379c1816f313f35e): Add `between`, `around`, and `evenly` alignments
+
+## v0.6.0 - 2021-01-25
+
+- [73df2af](https://github.com/tcollier/whirled_peas/tree/73df2af1f1eac37fe94f720dce16da1ed568dade): Add support for scroll bars along both axes
+- [f4f44e1](https://github.com/tcollier/whirled_peas/tree/f4f44e1ff6c75ed03cd682e3fa9921401dcd2d00): Implement remaining 3 flow directions for grids
+- [c01d083](https://github.com/tcollier/whirled_peas/tree/c01d083e10bf70983109a8def836bb181099f59c): Implement reverse flow directions for grids
+
+## v0.5.0 - 2021-01-25
+
+BREAKING: there was a significant amount of structural refactoring in this release. While that aspect did not add or remove any features, it fixed several layout bugs (some known and some unknown), so most template with moderate complexity will now be laid out slightly differently.
+
+- [3ddfede](https://github.com/tcollier/whirled_peas/tree/3ddfedee4ab2fadeecbe82c7c9caf25c2988f095): Allow relative positioning of containers
+- [507e77c](https://github.com/tcollier/whirled_peas/tree/507e77c551bcb9cc832d5c24e2f24eb1afe4eddc): Add height attribute for container settings
+- [af8ef19](https://github.com/tcollier/whirled_peas/tree/af8ef1950edebcd23a57a04982b22a56296ee09b): Add automated screen testing
+
+## v0.4.1 - 2021-01-22
+
+- [0f7aa6c](https://github.com/tcollier/whirled_peas/tree/0f7aa6ccc07323230dd602cb43e0341de5a69ad8): Allow relative path for config files
+
+## v0.4.0 - 2021-01-22
+
+- [7fd6712](https://github.com/tcollier/whirled_peas/tree/7fd6712818c94cdbfd81828277ca67c705e01793): BREAKING: replace `WhirledPeas.start` with command line executable
+- [2535342](https://github.com/tcollier/whirled_peas/tree/25353424f1ab4af4880f44eb7ddd28afefbbb9b2): Add support for loading screen
+- [7388fc2](https://github.com/tcollier/whirled_peas/tree/7388fc2eacdc8045b725311c11d650d6b8654be8): Add support for title fonts
+- [b345155](https://github.com/tcollier/whirled_peas/tree/b345155b1c212cabe73f9a2562ac8dbbedbbb6df): Add command to list title fonts to executable
+- [d3a8324](https://github.com/tcollier/whirled_peas/tree/d3a832496c36985993217ff11b6d83dd4697c4ed): Add commands for debugging application to executable
+
 ## v0.3.0 - 2021-01-21
 
 - [617f802](https://github.com/tcollier/whirled_peas/tree/617f8027d6688a2ec81a3e594e529c94485cee85): BREAKING: send frames directly to EventLoop (`Producer#send` renamed to `Producer#send_frame`)

data/README.md

@@ -1,8 +1,24 @@
 [![Build Status](https://travis-ci.com/tcollier/whirled_peas.svg?branch=main)](https://travis-ci.com/tcollier/whirled_peas)
 
-# WhirledPeas
+```
+                ██╗   ██╗██╗███████╗██╗   ██╗ █████╗ ██╗     ██╗███████╗███████╗
+                ██║   ██║██║██╔════╝██║   ██║██╔══██╗██║     ██║╚══███╔╝██╔════╝
+                ██║   ██║██║███████╗██║   ██║███████║██║     ██║  ███╔╝ █████╗
+                ╚██╗ ██╔╝██║╚════██║██║   ██║██╔══██║██║     ██║ ███╔╝  ██╔══╝
+                 ╚████╔╝ ██║███████║╚██████╔╝██║  ██║███████╗██║███████╗███████╗
+                  ╚═══╝  ╚═╝╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚══════╝╚═╝╚══════╝╚══════╝
+
+                                   your code's execution with
+
+    ██╗    ██╗██╗  ██╗██╗██████╗ ██╗     ███████╗██████╗    ██████╗ ███████╗ █████╗ ███████╗
+    ██║    ██║██║  ██║██║██╔══██╗██║     ██╔════╝██╔══██╗   ██╔══██╗██╔════╝██╔══██╗██╔════╝
+    ██║ █╗ ██║███████║██║██████╔╝██║     █████╗  ██║  ██║   ██████╔╝█████╗  ███████║███████╗
+    ██║███╗██║██╔══██║██║██╔══██╗██║     ██╔══╝  ██║  ██║   ██╔═══╝ ██╔══╝  ██╔══██║╚════██║
+    ╚███╔███╔╝██║  ██║██║██║  ██║███████╗███████╗██████╔╝   ██║     ███████╗██║  ██║███████║
+     ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝╚═╝  ╚═╝╚══════╝╚══════╝╚═════╝    ╚═╝     ╚══════╝╚═╝  ╚═╝╚══════╝
+```
 
-Visualize your code's execution with Whirled Peas!
+Easily create terminal-based graphics to visual the execution of your code. Whirled Peas offers templating inspired by HTML and CSS and provides a lightweight tie-in for your code to produce visual animations with these templates.
 
 ## Installation
 
@@ -24,9 +40,9 @@ Or install it yourself as:
 
 A Whirled Peas application consists of the following pieces
 
-1. [REQUIRED] The driver, which emits lightweight frame events
-1. [REQUIRED] The main template factory, which builds templates to convert frame events from the driver into terminal graphics
-1. [OPTIONAL] A loading screen template factory, which is used while content is loading
+- The driver (required) - the code that is to be visualized, it emits lightweight frame events through a producer
+- The main template factory (required) - builds templates to convert frame events from the driver into terminal graphics
+- A loading screen template factory (optional) - builds templates to display while content is loading
 
 These pieces are configured as following
 
@@ -36,10 +52,10 @@ require 'whirled_peas'
 
 class TemplateFactory
   def build(frame, args)
-    WhirledPeas.template do |body|
-      body.add_box('Title') do |_, settings|
+    WhirledPeas.template do |composer|
+      composer.add_box('Title') do |_, settings|
         settings.underline = true
-        "Hello #{args['name']}"
+        "Hello #{args[:name]}"
       end
       # ...
     end
@@ -48,7 +64,7 @@ end
 
 class Driver
   def start(producer)
-    producer.send_frame('starting', args: { 'name' => 'World' })
+    producer.send_frame('starting', args: { name: 'World' })
     # ...
   end
 end
@@ -67,13 +83,13 @@ $ whirled_peas start visualize.rb
 
 The optional loading screen can be configured like
 
-````ruby
+```ruby
 class LoadingTemplateFactory
   def build
-    WhirledPeas.template do |t|
-      t.add_box('Loading') do |box, settings|
+    WhirledPeas.template do |composer|
+      composer.add_box('Loading') do |_, settings|
         settings.set_margin(top: 15)
-        settings.auto_margin = true
+        settings.align = :center
         settings.full_border(color: :blue, style: :double)
         "Loading..."
       end
@@ -98,7 +114,7 @@ The driver is the application code to be visualized. This is typically a lightwe
 def start(producer)
   # application code here
 end
-````
+```
 
 The producer provides a single method
 
@@ -107,12 +123,14 @@ The producer provides a single method
 #
 # @param name [String] application defined name for the frame. The template factory will be provided this name
 # @param duration [Number] time in seconds this frame should be displayed for (defaults to 1 frame)
-# @param args [Hash] key value pairs to send as arguments to the template factory
+# @param args [Hash<Symbol, Object>] key value pairs to send as arguments to the template factory
 def send_frame(name, duration:, args:)
   # implementation
 end
 ```
 
+**IMPORTANT**: the keys in the `args` hash must be symbols!
+
 #### Example
 
 Simple application that loads a set of numbers and looks for a pair that adds up to 1,000
@@ -146,31 +164,36 @@ end
 
 ### Template Factory
 
-To render the frame events sent by the driver, the application requires a template factory. This factory will be called for each frame event, with the frame name and the arguments supplied by the driver. A template factory can be a simple ruby class and thus can maintain state. Whirled Peas provides a few basic building blocks to make simple, yet elegant terminal-based UIs.
+To render the frame events sent by the driver, the application requires a template factory. This factory will be called for each frame event, with the frame name and the arguments supplied by the driver. A template factory can be an instance of ruby class and thus can maintain state. Whirled Peas provides a few basic building blocks to make simple, yet elegant terminal-based UIs.
 
 #### Loading Template Factory
 
-`WhirledPeas.start` takes an optional template facotry to build a loading screen. This instance must implement `#build` (taking no arguments). The template returned by that method will be painted while the event loop is waiting for frames. The factory method will be called once per refresh cycle, so it's possible to implement animation.
+`WhirledPeas.configure` takes an optional template factory to build a loading screen. This instance must implement `#build` (taking no arguments). The template returned by that method will be painted while the event loop is waiting for frames. The factory method will be called once per refresh cycle, so it's possible to implement animation.
 
 #### Building Blocks
 
-A template is created with `WhirledPeas.template`, which yields a `Template` object and `TemplateSettings`. This template object is a `ComposableElement`, which allows for attaching child elements and setting layout options. `GridElement` and `BoxElement` are two other composable elements and `TextElement` is a simple element that can hold a text/number value and has layout options, but cannot have any child elements.
+A template is created with `WhirledPeas.template`, which yields a `Composer` object for a `Box` and `BoxSettings`. The composer allows for attaching child elements and the settings for setting layout options. The following attributes of the template's settings will be overridden before it is rendered to ensure that it fills the screen exactly
+
+- `margin` - all margin will be set to 0
+- `width` - will be set to the screen's width
+- `height` - will be set to the screen's height
+- `sizing` - will be set `:border` to ensure the entire box fits on the screen and fills it entirely.
 
-A `ComposableElement` provides the following methods to add child elements, each of these takes an optional string argument that is set as the name of the element (which can be useful when debugging).
+A `Composer` provides the following methods to add child elements, each of these takes an optional string argument that is set as the name of the element (which can be useful when debugging).
 
-- `add_box` - yields a `ComposableElement` and a `BoxSettings`, which will be added to the parent's children
-- `add_grid` - yields a `ComposableElement` and a `GridSettings`, which will be added to the parent's children
+- `add_box` - yields a `Composer` for a `Box` and a `BoxSettings`, which will be added to the parent's children
+- `add_grid` - yields a `Composer` for a `Grid` and a `GridSettings`, which will be added to the parent's children
 - `add_text` - yields `nil` and a `TextSettings`, which will be added to the parent's children
 
 E.g.
 
 ```ruby
-WhirledPeas.template do |template, template_settings|
-  template_settings.bg_color = :blue
-  template.add_grid do |grid, grid_settings|
-    grid_settings.num_cols = 10
+WhirledPeas.template do |composer, settings|
+  settings.bg_color = :blue
+  composer.add_grid do |composer, settings|
+    settings.num_cols = 10
     100.times do |i|
-      grid.add_text { i }
+      composer.add_text { i }
     end
   end
 end
@@ -179,81 +202,351 @@ end
 The above template can also be broken down into more manageable methods, e.g.
 
 ```ruby
-def number_grid(grid, settings)
+def number_grid(_composer, settings)
   settings.num_cols = 10
-  100.times do |i|
-    grid.add_text { i }
-  end
+  100.times.map(&:itself)
 end
 
-WhirledPeas.template do |template, settings|
+WhirledPeas.template do |composer, settings|
   settings.bg_color = :blue
-  template.add_grid(&method(:number_grid))
+  composer.add_grid(&method(:number_grid))
 end
 ```
 
-Additionally, if no child element is explicitly added to a `GridElement`, but the block returns an array of strings or numbers, those will be converted to `TextElements` and added as children to the `GridElement`. For example, these are identical ways to create a grid of strings
+Additionally, if no child element is explicitly added to a `Grid`, but the block returns an array of strings or numbers, those will be converted to `Text` elements and added as children to the `Grid`. For example, these are identical ways to create a grid of strings
 
 ```ruby
-template.add_grid do |g|
+template.add_grid do |composer|
   100.times do |i|
-    g.add_text { i }
+    composer.add_text { i }
   end
 end
 
-template.add_grid do |g|
+template.add_grid do
   100.times.map(&:itself)
 end
 ```
 
-Similarly, if no child element is explicilty added to a `BoxElement`, but the block returns a string or number, that value will be converted to a `TextElement` and added as a child. For example, these are identical ways to create a box with string content
+Similarly, if no child element is explicilty added to a `Box`, but the block returns a string or number, that value will be converted to a `Text` and added as a child. For example, these are identical ways to create a box with string content
 
 ```ruby
-template.add_box do |b|
-  b.add_text { "Hello!" }
+template.add_box do |composer|
+  composer.add_text { "Hello!" }
 end
 
-template.add_box do |b|
+template.add_box do
   "Hello!"
 end
 ```
 
 #### Settings
 
-Each element type has an associated settings type, which provide a custom set of options to format the output. Parent settings may be merged into child settings (assuming the child supports those settings)
+Each element type has an associated settings type, which provide a custom set of options to format the output. Child settings will inherit from the parent, where applicable
 The available settigs are
 
-| Setting       | Description                                                        | Default | Availability                      | Merged? |
-| ------------- | ------------------------------------------------------------------ | ------- | --------------------------------- | ------- |
-| `align`       | Justifies the text (allowed values: `:left`, `:center`, `:right`)  | `:left` | `Box`, `Grid`, `Text`             | Yes     |
-| `auto_margin` | Evenly distribute side margin (overrides left/right in `margin`)   | `false` | `Box`, `Grid`                     | Yes     |
-| `bg_color`    | Background color (see [Colors](#colors))                           |         | `Box`, `Grid`, `Template`, `Text` | Yes     |
-| `bold`        | `true` makes the font bold                                         | `false` | `Box`, `Grid`, `Template`, `Text` | Yes     |
-| `border`      | Set the border for the lements                                     | none    | `Box`, `Grid`,                    | Yes     |
-| `color`       | Foreground text color (see [Colors](#colors))                      |         | `Box`, `Grid`, `Template`, `Text` | Yes     |
-| `flow`        | Flow to display child elements (see [Display Flow](#display-flow)) | `:l2r`  | `Box`                             | Yes     |
-| `margin`      | Set the (left, top, right, bottom) margin of the element           | `0`     | `Box`, `Grid`                     | Yes     |
-| `padding`     | Set the (left, top, right, bottom) padding of the element          | `0`     | `Box`, `Grid`                     | Yes     |
-| `title_font`  | Font used to create "large" text (see [Large Text](#large-text))   |         | `Text`                            |
-| `transpose`   | Display grid elements top-to-bottom, then left-to-right            | `false` | `Grid`                            | No      |
-| `underline`   | `true` underlines the font                                         | `false` | `Box`, `Grid`, `Template`, `Text` | Yes     |
-| `width`       | Override the calculated with of an element                         |         | `Box`, `Grid`, `Text`             | No      |
-
-##### Margin and Padding
-
-Margin and padding settings allow for setting the spacing on each of the 4 sides of the element independently. The set these values, use
-
-- `clear_margin` - sets all margin values to 0
-- `set_margin(left:, top:, right:, bottom:)`
-- `clear_padding` - sets all margin values to 0
-- `set_padding(left:, top:, right:, bottom:)`
+| Setting      | Description                                                                      | Default    | Availability          | Inherited            |
+| ------------ | -------------------------------------------------------------------------------- | ---------- | --------------------- | -------------------- |
+| `align`      | Justifies the content in the horizontal direction                                | `:left`    | `Box`, `Grid`         | No                   |
+| `bg_color`   | Background color (see [Colors](#colors))                                         |            | `Box`, `Grid`, `Text` | Yes                  |
+| `bold`       | `true` makes the font bold                                                       | `false`    | `Box`, `Grid`, `Text` | Yes                  |
+| `border`     | Set the border for the lements                                                   | none       | `Box`, `Grid`,        | Only style and color |
+| `color`      | Foreground text color (see [Colors](#colors))                                    |            | `Box`, `Grid`, `Text` | Yes                  |
+| `flow`       | Flow to display child elements (see [Display Flow](#display-flow))               | `:l2r`     | `Box`, `Grid`         | No                   |
+| `height`     | Override the calculated height of an element's content area                      |            | `Box`, `Grid`         | No                   |
+| `margin`     | Set the (left, top, right, bottom) margin of the element                         | `0`        | `Box`, `Grid`         | No                   |
+| `num_cols`   | Number of columns in the grid (must be set!)                                     |            | `Grid`                | No                   |
+| `padding`    | Set the (left, top, right, bottom) padding of the element                        | `0`        | `Box`, `Grid`         | No                   |
+| `position`   | Set the (left, top) position of the element relative to parent content area      | `0`        | `Box`, `Grid`         | No                   |
+| `scrollbar`  | Display a scroll bar for vertical or horizontal scrolling                        |            | `Box`                 | No                   |
+| `sizing`     | Sizing model (`:content` or `:border`) used in conjunction with `width`/`hieght` | `:content` | `Box`                 | No                   |
+| `title_font` | Font used for "large" text (see [Large Text](#large-text), ignores `underline`)  |            | `Text`                | No                   |
+| `underline`  | `true` underlines the font                                                       | `false`    | `Box`, `Grid`, `Text` | Yes                  |
+| `width`      | Override the calculated width of an element's content area                       |            | `Box`, `Grid`         | No                   |
+| `valign`     | Justifies the content in the vertical direction                                  | `:top`     | `Box`, `Grid`         | No                   |
+
+##### Alignment
+
+The `align` setting takes one of several values
+
+- `:left` - align content starting at the leftmost edge of the container's content area
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃[child 1][child 2][child 3]            ┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+- `:right` - align content starting at the rightmost edge of the container's content area
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃            [child 1][child 2][child 3]┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+- `:center` - align content starting in the horizontal center of the container's content area
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃      [child 1][child 2][child 3]      ┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+- `:between` - distribute children so there is equal space between children no space outside of the children
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃[child 1]      [child 2]      [child 3]┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+- `:around` - distribute children so that they have equal spacing around them, space between two children is twice the space between an edge and a child.
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃  [child 1]    [child 2]    [child 3]  ┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+- `:evenly` - distribute children so there is even spacing between any two children (or space to the edge)
+
+```
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃   [child 1]   [child 2]   [child 3]   ┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+```
+
+The `valign` setting takes one of several values
+
+- `:top` - align content starting at the top of the container's content area
+
+```
+┏━━━━━━━━━┓
+┃[child 1]┃
+┃[child 2]┃
+┃[child 3]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┗━━━━━━━━━┛
+```
+
+- `:bottom` - align content starting at the bottom of the container's content area
+
+```
+┏━━━━━━━━━┓
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 1]┃
+┃[child 2]┃
+┃[child 3]┃
+┗━━━━━━━━━┛
+```
+
+- `:middle` - align content starting in the vertical middle of the container's content area
+
+```
+┏━━━━━━━━━┓
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 1]┃
+┃[child 2]┃
+┃[child 3]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┗━━━━━━━━━┛
+```
+
+- `:between` - distribute children so there is equal space between children no space outside of the children
+
+```
+┏━━━━━━━━━┓
+┃[child 1]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 2]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 3]┃
+┗━━━━━━━━━┛
+```
+
+- `:around` - distribute children so that they have equal spacing around them, space between two children is twice the space between an edge and a child.
+
+```
+┏━━━━━━━━━┓
+┃         ┃
+┃         ┃
+┃[child 1]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 2]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 3]┃
+┃         ┃
+┃         ┃
+┗━━━━━━━━━┛
+```
+
+- `:evenly` - distribute children so there is even spacing between any two children (or space to the edge)
+
+```
+┏━━━━━━━━━┓
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 1]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 2]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┃[child 3]┃
+┃         ┃
+┃         ┃
+┃         ┃
+┗━━━━━━━━━┛
+```
+
+##### Position
+
+Position settings dictate the relative position from where the painter would have preferred to place the container. Negative numbers move the container left/up and positive numbers move it right/down. To set these values, use
+
+- `set_position(left:, top:)`
+
+##### Sizing Model
+
+The sizing model determines how to interpret the `width` and `height` settings. The default sizing model is `:content`, which sets the width and height of the cotent area, whereas `:border` sets the width and height of the element inlcuding the padding and border and scroll bars.
+
+###### Examples
+
+In the examples below, the `~` character represents padding and would not be displayed in the acutal rendered screen.
+
+```ruby
+settings.width = 10
+settings.height = 3
+settings.set_padding(left: 3, top: 1, right: 3, bottom: 1)
+settings.full_border
+
+## Content sizing
+settings.sizing = :content
+
+# Results in the box
+#
+#   ┏━━━━━━━━━━━━━━━━┓
+#   ┃~~~~~~~~~~~~~~~~┃
+#   ┃~~~1234567890~~~┃
+#   ┃~~~1234567890~~~┃
+#   ┃~~~1234567890~~~┃
+#   ┃~~~~~~~~~~~~~~~~┃
+#   ┗━━━━━━━━━━━━━━━━┛
+
+## Border sizing
+settings.sizing = :border
+
+# Results in the box
+#
+#   ┏━━━━━━━━┓
+#   ┃~~~12~~~┃
+#   ┗━━━━━━━━┛
+```
+
+Notice that a box rendered with `:border` sizing would fit exactly in the content area of a box with the same `width` and `height` that is rendered with `:content` sizing. For containers with no padding and no border, the resulting size is the same for either sizing model.
+
+##### Margin
+
+Margin settings dictate the spacing on the outside (i.e. outside of the border) of each of the 4 sides of the container independently. To set these values, use
+
+- `set_margin(left:, top:, right:, bottom:, horiz:, vert:)` - set any combination of margin (note: setting `horiz` and `left`/`right` or setting `vert` and `top`/`bottom` is not allowed)
+- `margin.left=(value)` - set left margin
+- `margin.top=(value)` - set top margin
+- `margin.right=(value)` - set right margin
+- `margin.bottom=(value)` - set bottom margin
+- `margin.horiz=(value)` - set left and right margin to the same value
+- `margin.vert=(value)` - set top and bottom margin to the same value
+
+Note: values cannot be negative
+
+##### Padding
+
+Padding settings dictate the spacing on the inside (i.e. inside of the border) of each of the 4 sides of the container independently. To set these values, use
+
+- `set_padding(left:, top:, right:, bottom:, horiz:, vert:)` - set any combination of padding (note: setting `horiz` and `left`/`right` or setting `vert` and `top`/`bottom` is not allowed)
+- `padding.left=(value)` - set left padding
+- `padding.top=(value)` - set top padding
+- `padding.right=(value)` - set right padding
+- `padding.bottom=(value)` - set bottom padding
+- `padding.horiz=(value)` - set left and right padding to the same value
+- `padding.vert=(value)` - set top and bottom padding to the same value
+
+Note: values cannot be negative
+
+##### Scrollbar
+
+Scroll settings dictate whether the scrollbar will be shown when child content is larger the the container's viewport. A scrollbar adds a unit to the dimensions of a container (as opposed to overwriting the leftmost/bottommost padding)
+
+- `set_scrollbar(horiz:, vert:)` - set both scrollbar settings
+- `scrollbar.horiz=(flag)` - show/hide the horizontal scrollbar
+- `scrollbar.vert=(flag)` - show/hide the vertical scrollbar
+
+Note: there is a know bug with scrollbars and `center`/`right` alignments. Using `left` alignment is the supported workaround
 
 ##### Border
 
 The border settings consist of 6 boolean values (border are either width 1 or not shown), the 4 obvious values (`left`, `top`, `right`, and `bottom`) along with 2 other values for inner borders (`inner_horiz` and `inner_vert`) in a grid. A border also has a foreground color (defaults to `:white`) and a style. The background color is determined by the `bg_color` of the element. Border values can be set with
 
-- `clear_border` - sets all border positions to `false`
-- `set_border(left:, top:, right:, bottom:, inner_horiz:, inner_vert:, color:, style:)`
+- `set_border(left:, top:, right:, bottom:, inner_horiz:, inner_vert:, color:, style:)` - set any combination of border settings
+- `full_border(style:, color:)` - set all borders to true and optionally set the style or color
+- `border.left=(flag)` - show/hide left border
+- `border.top=(flag)` - show/hide top border
+- `border.right=(flag)` - show/hide right border
+- `border.bottom=(flag)` - show/hide bottom border
+- `border.inner_horiz=(flag)` - show/hide inner horizontal border (dividing grid rows)
+- `border.inner_vert=(flag)` - show/hide inner vertical border (dividing grid columns)
+- `border.color=(text_color)` - set the border color
+- `border.style=(style)` - set the border style
 
 Available border styles are
 
@@ -294,31 +587,71 @@ Child elements can flow in one of 4 directions
 - `:l2r` left-to-right
 
 ```
-[child 1] [child 2] ... [child N]
+# In a Box
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃[child 1] [child 2] ... [child N]┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+# In a Grid
+┏━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+┃[child 1]┃[child 2]┃[child 3]┃
+┣━━━━━━━━━╋━━━━━━━━━╋━━━━━━━━━┫
+┃[chiid 4]┃[child 5]┃         ┃
+┗━━━━━━━━━┻━━━━━━━━━┻━━━━━━━━━┛
 ```
 
 - `:r2l` right-to-left
 
 ```
-[child N] [child N - 1] ... [child 1]
+# In a Box
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+┃[child N] [child N - 1] ... [child 1]┃
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+# In a Grid
+┏━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+┃[child 3]┃[child 2]┃[child 1]┃
+┣━━━━━━━━━╋━━━━━━━━━╋━━━━━━━━━┫
+┃         ┃[chiid 5]┃[child 4]┃
+┗━━━━━━━━━┻━━━━━━━━━┻━━━━━━━━━┛
 ```
 
 - `:t2b` top-to-bottom
 
 ```
-[child 1]
-[child 2]
- ...
-[child N]
+# In a Box
+┏━━━━━━━━━┓
+┃[child 1]┃
+┃[child 2]┃
+┃ ...     ┃
+┃[child N]┃
+┗━━━━━━━━━┛
+
+# In a Grid
+┏━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+┃[child 1]┃[child 3]┃[child 5]┃
+┣━━━━━━━━━╋━━━━━━━━━╋━━━━━━━━━┫
+┃[child 2]┃[child 4]┃         ┃
+┗━━━━━━━━━┻━━━━━━━━━┻━━━━━━━━━┛
 ```
 
 - `:b2t` bottom-to-top
 
 ```
-[child N]
-[child N - 1]
- ...
-[child 1]
+# In a Box
+┏━━━━━━━━━━━━━┓
+┃[child N]    ┃
+┃[child N - 1]┃
+┃ ...         ┃
+┃[child 1]    ┃
+┗━━━━━━━━━━━━━┛
+
+# In a Grid
+┏━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+┃[child 2]┃[child 4]┃         ┃
+┣━━━━━━━━━╋━━━━━━━━━╋━━━━━━━━━┫
+┃[child 1]┃[child 3]┃[child 5]┃
+┗━━━━━━━━━┻━━━━━━━━━┻━━━━━━━━━┛
 ```
 
 ##### Colors
@@ -346,7 +679,7 @@ Many of these also have a "bright" option:
 
 ##### Large Text
 
-The `title_font` setting for `TextElement`s converts the standard terminal font into a large block font. The available fonts vary from system to system. Every system will have a `:default` font available, this font could look like
+The `title_font` setting for `Text`s converts the standard terminal font into a large block font. The available fonts vary from system to system. Every system will have a `:default` font available, this font could look like
 
 ```
 ██████╗ ███████╗███████╗ █████╗ ██╗   ██╗██╗     ████████╗
@@ -371,8 +704,13 @@ Note: when using a title font with WhirledPeas for the first time on a system, t
 class TemplateFactory
   def build(frame, args)
     set_state(frame, args)
-    WhirledPeas.template do |t|
-      t.add_box('Body', &method(:body))
+    WhirledPeas.template do |composer, settings|
+      settings.flow = :l2r
+      settings.align = :center
+
+      composer.add_box('Title', &method(:title))
+      composer.add_box('Sum', &method(:sum))
+      composer.add_grid('NumberGrid', &method(:number_grid))
     end
   end
 
@@ -386,34 +724,25 @@ class TemplateFactory
     @high = args[:high] if args.key?(:high)
   end
 
-  def title(_elem, settings)
+  def title(_composer, settings)
     settings.underline = true
     "Pair Finder"
   end
 
-  def sum(_elem, settings)
+  def sum(_composer, settings)
     settings.color = @frame == 'found-pair' ? :green : :red
     @sum ? "Sum: #{@sum}" : 'N/A'
   end
 
-  def number_grid(elem, settings)
+  def number_grid(composer, settings)
     settings.full_border
     @numbers.each.with_index do |num, index|
-      g.add_text do |_, settings|
+      composer.add_text do |_, settings|
         settings.bg_color = (@low == index || @high == index) ? :cyan : :white
         num
       end
     end
   end
-
-  def body(elem, settings)
-    settings.flow = :l2r
-    settings.auto_margin = true
-
-    elem.add_box('Title', &method(:title))
-    elem.add_box('Sum', &method(:sum))
-    elem.add_grid('NumberGrid', &method(:number_grid))
-  end
 end
 ```
 
@@ -441,19 +770,21 @@ Displays a single frame for several seconds
 $ whirled_peas <config file> play_frame move '{"direction":"N"}'
 ```
 
-Adding the `--debug` flag will result in just printing out the template's debug information, e.g.
+Adding the `--template` flag will result in printing out debug information for the template, e.g.
 
 ```
-$ whirled_peas <config file> play_frame move '{"direction":"N"}' --debug
-+ TEMPLATE [WhirledPeas::UI::Template]
+$ whirled_peas <config file> play_frame move '{"direction":"N"}' --template
++ TEMPLATE [WhirledPeas::Graphics::BoxPainter]
   - Settings
-    WhirledPeas::UI::TemplateSettings
+    WhirledPeas::Settings::BoxSettings
       <default>
   - Children
-    + TitleContainer [WhirledPeas::UI::BoxElement]
+    + TitleContainer [WhirledPeas::Graphics::BoxPainter]
 ...
 ```
 
+Note: the `list_frames` command will print out frame names and arguments formatted for this command
+
 #### loading
 
 Displays the configured loading screen for several seconds
@@ -462,16 +793,16 @@ Displays the configured loading screen for several seconds
 $ whirled_peas <config file> loading
 ```
 
-Adding the `--debug` flag will result in just printing out the loading template's debug information, e.g.
+Adding the `--template` flag will result in just printing out the loading template's debug information, e.g.
 
 ```
-$ whirled_peas <config file> loading --debug
-+ TEMPLATE [WhirledPeas::UI::Template]
+$ whirled_peas <config file> loading --template
++ TEMPLATE [WhirledPeas::Graphics::BoxPainter]
   - Settings
-    WhirledPeas::UI::TemplateSettings
+    WhirledPeas::Settings::BoxSettings
       <default>
   - Children
-    + TitleContainer [WhirledPeas::UI::BoxElement]
+    + TitleContainer [WhirledPeas::Graphics::BoxPainter]
 ...
 ```
 
@@ -481,6 +812,22 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Testing
+
+In addition to standard RSpec tests, WhirledPeas has custom tests for rendered templates. These files live in `screen_test/rendered`. Each ruby file is expected to define a class named `TemplateFactory` that responds to `#build(name, args)` returning a template (the standard template factory role). Each file should also be accompanied by a `.frame` file with the same base name. This file will contain the output of the rendered screen and is considered the correct output when running tests.
+
+Note: viewing `.frame` files with `cat` works better than most other text editors.
+
+The following rake tasks are provided to interact with the screen tests
+
+- `screen_test` runs all screen tests in the `screen_test/rendered` directory
+- `screen_test:debug[path/to/file.rb]` render the screen without printing it, this allows for debug print statments in the code to appear in the terminal
+- `screen_test:template[path/to/file.rb]` print the rendered template debug tree
+- `screen_test:run[path/to/file.rb]` runs a single screen test
+- `screen_test:save[path/to/file.rb]` saves the output generated by the template in the `.frame` file, overwriting any existing file
+- `screen_test:view[path/to/file.rb]` views the output generated by the template
+- `screen_test:update_all[path/to/file.rb]` interactively step through each pending or failed screen test to compare/set the expected output
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/whirled_peas. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/whirled_peas/blob/master/CODE_OF_CONDUCT.md).