whirled_peas 0.4.1 → 0.5.0

data/lib/whirled_peas/template/element.rb

@@ -1,13 +1,6 @@
-require_relative '../utils/title_font'
-
-require_relative 'settings'
-
 module WhirledPeas
-  module UI
-    STRINGALBE_CLASSES = [FalseClass, Float, Integer, NilClass, String, Symbol, TrueClass]
-
+  module Template
     class Element
-      attr_accessor :preferred_width, :preferred_height
       attr_reader :name, :settings
 
       def initialize(name, settings)
@@ -16,215 +9,5 @@ module WhirledPeas
       end
     end
     private_constant :Element
-
-    class TextElement < Element
-      attr_reader :lines
-
-      def initialize(name, settings)
-        super(name, TextSettings.merge(settings))
-      end
-
-      def lines=(val)
-        unless STRINGALBE_CLASSES.include?(val.class)
-          raise ArgmentError, "Unsupported type for TextElement: #{val.class}"
-        end
-        if settings.title_font
-          @lines = Utils::TitleFont.to_s(val.to_s, settings.title_font).split("\n")
-        else
-          @lines = [val.to_s]
-        end
-        @preferred_width = settings.width || @lines.first.length
-        @preferred_height = @lines.length
-      end
-
-      def inspect(indent='')
-        dims = unless preferred_width.nil?
-          "#{indent + '  '}- Dimensions: #{preferred_width}x#{preferred_height}"
-        end
-        [
-          "#{indent}+ #{name} [#{self.class.name}]",
-          dims,
-          "#{indent + '  '}- Settings",
-          settings.inspect(indent + '    ')
-        ].compact.join("\n")
-      end
-    end
-
-    class ComposableElement < Element
-      class << self
-        def next_name
-          @counter ||= 0
-          @counter += 1
-          "Element-#{@counter}"
-        end
-      end
-
-      def initialize(name, settings)
-        super
-      end
-
-      def children
-        @children ||= []
-      end
-
-      def add_text(name=self.class.next_name, &block)
-        element = TextElement.new(name, settings)
-        element.lines = yield nil, element.settings
-        children << element
-      end
-
-      def add_box(name=self.class.next_name, &block)
-        element = BoxElement.new(name, settings)
-        value = yield element, element.settings
-        children << element
-        if element.children.empty? && STRINGALBE_CLASSES.include?(value.class)
-          element.add_text { value.to_s }
-        end
-      end
-
-      def add_grid(name=self.class.next_name, &block)
-        element = GridElement.new(name, settings)
-        values = yield element, element.settings
-        children << element
-        if element.children.empty? && values.is_a?(Array)
-          values.each { |v| element.add_text { v.to_s } }
-        end
-      end
-
-      def inspect(indent='')
-        kids = children.map { |c| c.inspect(indent + '    ') }.join("\n")
-        dims = unless preferred_width.nil?
-          "#{indent + '  '}- Dimensions: #{preferred_width}x#{preferred_height}"
-        end
-        [
-          "#{indent}+ #{name} [#{self.class.name}]",
-          dims,
-          "#{indent + '  '}- Settings",
-          settings.inspect(indent + '    '),
-          "#{indent + '  '}- Children",
-          kids
-        ].compact.join("\n")
-      end
-
-      private
-
-      def margin_width
-        settings.margin.left + settings.margin.right
-      end
-
-      def margin_height
-        settings.margin.top + settings.margin.bottom
-      end
-
-      def outer_border_width
-        (settings.border.left? ? 1 : 0) + (settings.border.right? ? 1 : 0)
-      end
-
-      def outer_border_height
-        (settings.border.top? ? 1 : 0) + (settings.border.bottom? ? 1 : 0)
-      end
-
-      def inner_border_width
-        settings.border.inner_vert? ? 1 : 0
-      end
-
-      def inner_border_height
-        settings.border.inner_horiz? ? 1 : 0
-      end
-
-      def padding_width
-        settings.padding.left + settings.padding.right
-      end
-
-      def padding_height
-        settings.padding.top + settings.padding.bottom
-      end
-    end
-
-    class Template < ComposableElement
-      def initialize(settings=TemplateSettings.new)
-        super('TEMPLATE', settings)
-      end
-    end
-
-    class BoxElement < ComposableElement
-      attr_writer :content_width, :content_height
-
-      def initialize(name, settings)
-        super(name, BoxSettings.merge(settings))
-      end
-
-      def self.from_template(template, width, height)
-        box = new(template.name, template.settings)
-        template.children.each { |c| box.children << c }
-        box.content_width = box.preferred_width = width
-        box.content_height = box.preferred_height = height
-        box
-      end
-
-      def content_width
-        @content_width ||= begin
-          child_widths = children.map(&:preferred_width)
-          width = settings.horizontal_flow? ? child_widths.sum : (child_widths.max || 0)
-          [width, *settings.width].max
-        end
-      end
-
-      def preferred_width
-        @preferred_width ||=
-          margin_width + outer_border_width + padding_width + content_width
-      end
-
-      def content_height
-        @content_height ||= begin
-          child_heights = children.map(&:preferred_height)
-          settings.vertical_flow? ? child_heights.sum : (child_heights.max || 0)
-        end
-      end
-
-      def preferred_height
-        @preferred_height ||=
-          margin_height + outer_border_height + padding_height + content_height
-      end
-    end
-
-    class GridElement < ComposableElement
-      def initialize(name, settings)
-        super(name, GridSettings.merge(settings))
-      end
-
-      def col_width
-        return @col_width if @col_width
-        @col_width = 0
-        children.each do |child|
-          @col_width = child.preferred_width if child.preferred_width > @col_width
-        end
-        @col_width
-      end
-
-      def row_height
-        return @row_height if @row_height
-        @row_height = 0
-        children.each do |child|
-          @row_height = child.preferred_height if child.preferred_height > @row_height
-        end
-        @row_height
-      end
-
-      def preferred_width
-        margin_width +
-          outer_border_width +
-          settings.num_cols * (padding_width + col_width) +
-          (settings.num_cols - 1) * inner_border_width
-      end
-
-      def preferred_height
-        num_rows = (children.length / settings.num_cols).ceil
-        margin_height +
-          outer_border_height +
-          num_rows * (padding_height + row_height) +
-          (num_rows - 1) * inner_border_height
-      end
-    end
   end
 end

data/lib/whirled_peas/template/grid_element.rb

@@ -0,0 +1,8 @@
+require_relative 'container'
+
+module WhirledPeas
+  module Template
+    class GridElement < Container
+    end
+  end
+end

data/lib/whirled_peas/template/text_element.rb

@@ -0,0 +1,24 @@
+require_relative 'element'
+
+module WhirledPeas
+  module Template
+    class TextElement < Element
+      # 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
+
+      attr_reader :content
+
+      def content=(val)
+        unless self.class.stringable?(val)
+          raise ArgumentError, "Unsupported type for TextElement: #{val.class}"
+        end
+        @content = val.to_s
+      end
+    end
+  end
+end

data/lib/whirled_peas/utils/ansi.rb

@@ -1,5 +1,5 @@
 module WhirledPeas
-  module UI
+  module Utils
     # Helper module for working with ANSI escape codes. The most useful ANSI escape codes
     # relate to text formatting.
     #
@@ -7,6 +7,9 @@ module WhirledPeas
     module Ansi
       ESC = "\033"
 
+      END_FORMATTING = 0
+      private_constant :END_FORMATTING
+
       # Text formatting constants
       BOLD = 1
       UNDERLINE = 4
@@ -21,8 +24,8 @@ module WhirledPeas
       CYAN = 36
       WHITE = 37
 
-      END_FORMATTING = 0
-      private_constant :END_FORMATTING
+      # Bright colors are offset by this much from their standard versions
+      BRIGHT_OFFSET = 60
 
       class << self
         def cursor_pos(top: 0, left: 0)
@@ -37,63 +40,10 @@ module WhirledPeas
           "#{ESC}[J"
         end
 
-        # Format the string with the ANSI escapes codes for the given integer codes
-        #
-        # @param str [String] the string to format
-        # @param codes [Array<Integer>] the integer part of the ANSI escape code (see
-        #   constants in this module for codes and meanings)
-        def format(str, codes)
-          if str.empty? || codes.length == 0
-            str
-          else
-            start_formatting = codes.map(&method(:esc_seq)).join
-            "#{start_formatting}#{str}#{esc_seq(END_FORMATTING)}"
-          end
-        end
-
         def clear
           esc_seq(END_FORMATTING)
         end
 
-        # If the string has unclosed formatting, add the end formatting characters to
-        # the end of the string
-        def close_formatting(str)
-          codes = str.scan(/#{ESC}\[(\d+)m/)
-          if codes.length > 0 && codes.last[0] != END_FORMATTING.to_s
-            "#{str}#{esc_seq(END_FORMATTING)}"
-          else
-            str
-          end
-        end
-
-        # Return a substring of the input string that preservse the formatting
-        #
-        # @param str [String] the (possibly formatted) string
-        # @param first_visible_character [Integer] the index of the first character to
-        #   include in the substring (ignoring all hidden formatting characters)
-        # @param num_visible_chars [Integer] the maximum number of visible characters to
-        #   include in the substring (ignoring all hidden formatting characters)
-        def substring(str, first_visible_character, num_visible_chars)
-          substr = ''
-          is_visible = true
-          visible_index = 0
-          substr_visible_len = 0
-          str.chars.each do |char|
-            in_substring = (visible_index >= first_visible_character)
-            is_visible = false if is_visible && char == ESC
-            visible_index += 1 if is_visible
-            if !is_visible || in_substring
-              substr += char
-              substr_visible_len += 1 if is_visible
-            end
-            is_visible = true if !is_visible && char == 'm'
-            break if substr_visible_len == num_visible_chars
-          end
-          close_formatting(substr)
-        end
-
-        private
-
         def esc_seq(code)
           "#{ESC}[#{code}m"
         end

data/lib/whirled_peas/utils/formatted_string.rb

@@ -0,0 +1,64 @@
+require_relative 'ansi'
+
+module WhirledPeas
+  module Utils
+    class FormattedString
+      def self.blank
+        new('')
+      end
+
+      def initialize(raw, formatting=nil)
+        @raw = raw
+        @formatting = [*formatting]
+      end
+
+      def length
+        raw.length
+      end
+
+      def [](index_or_range)
+        self.class.new(raw[index_or_range], foramtting)
+      end
+
+      def blank?
+        raw.empty?
+      end
+
+      def hash
+        [raw, formatting].hash
+      end
+
+      def ==(other)
+        case other
+        when self.class
+          hash == other.hash
+        when String
+          formatting.empty? && raw == other
+        else
+          false
+        end
+      end
+
+      def to_s
+        if raw.empty? || formatting.length == 0
+          raw
+        else
+          start_formatting = formatting.map { |code| Ansi.esc_seq(code) }.join
+          "#{start_formatting}#{raw}#{Ansi.clear}"
+        end
+      end
+
+      def inspect
+        if raw.empty? || formatting.length == 0
+          raw.inspect
+        else
+          "<#{formatting.join(', ')}>#{raw}<0>".inspect
+        end
+      end
+
+      private
+
+      attr_reader :raw, :formatting
+    end
+  end
+end

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/screen_test/rendered/elements/box.frame

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

data/screen_test/rendered/elements/box.rb

@@ -0,0 +1,20 @@
+require 'whirled_peas'
+
+class TemplateFactory
+  def build(*)
+    WhirledPeas.template do |composer|
+      composer.add_box('Container') do |composer, settings|
+        composer.add_box do |composer, settings|
+          settings.flow = :t2b
+          composer.add_box('TopLeft') { "TOP LEFT" }
+          composer.add_box('BottomLeft') { "BOTTOM LEFT" }
+        end
+        composer.add_box do |composer, settings|
+          settings.flow = :t2b
+          composer.add_box('TopRight') { " TOP RIGHT   " }
+          composer.add_box('BottomRight') { " BOTTOM RIGHT" }
+        end
+      end
+    end
+  end
+end