whirled_peas 0.8.0 → 0.11.1

data/lib/whirled_peas/settings/container_settings.rb

@@ -12,8 +12,6 @@ require_relative 'vert_alignment'
 module WhirledPeas
   module Settings
     class ContainerSettings < ElementSettings
-      attr_accessor :width, :height
-
       def align
         @_align || Alignment::DEFAULT
       end
@@ -98,7 +96,7 @@ module WhirledPeas
       end
 
       def border
-        @_border ||= Border.new
+        @_border ||= Border.new(theme)
       end
 
       def flow=(flow)
@@ -177,13 +175,20 @@ module WhirledPeas
         @_padding ||= Padding.new
       end
 
-      def set_position(left: nil, top: nil)
-        position.left = left if left
-        position.top = top if top
+      def set_content_start(left: nil, top: nil, right: nil, bottom: nil)
+        if left && right
+          raise ArgumentError, 'Setting left and right content_start is not supported'
+        elsif top && bottom
+          raise ArgumentError, 'Setting top and bottom content_start is not supported'
+        end
+        content_start.left = left if left
+        content_start.top = top if top
+        content_start.right = right if right
+        content_start.bottom = bottom if bottom
       end
 
-      def position
-        @_position ||= Position.new
+      def content_start
+        @_content_start ||= Position.new
       end
 
       def set_scrollbar(horiz: nil, vert: nil)
@@ -214,7 +219,7 @@ module WhirledPeas
       def inherit(parent)
         super
         return unless parent.is_a?(ContainerSettings)
-        set_border(color: parent.border.color, style: parent.border.style)
+        @_border = Border.inherit(parent.border)
       end
 
       protected

data/lib/whirled_peas/settings/debugger.rb

@@ -34,6 +34,8 @@ module WhirledPeas
       def debug_value(value)
         return if value.nil?
         case value
+        when Theme
+          nil
         when Position
           position_value(value)
         when Margin
@@ -73,7 +75,7 @@ module WhirledPeas
       def border_value(border)
         values = non_defaults(
           border,
-          Border.new,
+          Border.new(settings.theme),
           %i[left? top? right? bottom? inner_horiz? inner_vert? style color]
         )
         return if values == ''

data/lib/whirled_peas/settings/element_settings.rb

@@ -8,17 +8,30 @@ module WhirledPeas
   module Settings
     class ElementSettings
       def self.inherit(parent)
-        child = self.new
+        child = self.new(parent.theme)
         child.inherit(parent)
         child
       end
 
+      attr_accessor :theme, :width, :height
+
+      def initialize(theme)
+        @theme = theme
+      end
+
+      def validate!
+      end
+
       def bg_color
-        @_bg_color || BgColor::DEFAULT
+        @_bg_color || theme.bg_color
       end
 
       def bg_color=(color)
-        @_bg_color = BgColor.validate!(color)
+        if color == :highlight
+          @_bg_color = theme.highlight_bg_color
+        else
+          @_bg_color = BgColor.validate!(color)
+        end
       end
 
       def bold?
@@ -30,11 +43,15 @@ module WhirledPeas
       end
 
       def color
-        @_color || TextColor::DEFAULT
+        @_color || theme.color
       end
 
       def color=(color)
-        @_color = TextColor.validate!(color)
+        if color == :highlight
+          @_color = theme.highlight_color
+        else
+          @_color = TextColor.validate!(color)
+        end
       end
 
       def underline?

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 || theme.axis_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

@@ -7,6 +7,13 @@ module WhirledPeas
     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

data/lib/whirled_peas/settings/position.rb

@@ -1,14 +1,26 @@
 module WhirledPeas
   module Settings
     class Position
-      attr_writer :left, :top
+      attr_reader :left, :top, :right, :bottom
 
-      def left
-        @left || 0
+      def left=(value)
+        @right = nil
+        @left = value
       end
 
-      def top
-        @top || 0
+      def top=(value)
+        @bottom = nil
+        @top = value
+      end
+
+      def right=(value)
+        @left = nil
+        @right = value
+      end
+
+      def bottom=(value)
+        @top = nil
+        @bottom = value
       end
     end
   end

data/lib/whirled_peas/settings/text_color.rb

@@ -1,5 +1,6 @@
 require 'whirled_peas/utils/ansi'
 
+require_relative 'bg_color'
 require_relative 'color'
 
 module WhirledPeas
@@ -16,6 +17,10 @@ module WhirledPeas
       GRAY = BLACK.bright
 
       DEFAULT = nil  # Use system defined default
+
+      def as_bg_color
+        BgColor.new(code + BgColor::BG_OFFSET, bright?)
+      end
     end
   end
 end

data/lib/whirled_peas/settings/text_settings.rb

@@ -8,6 +8,7 @@ module WhirledPeas
       attr_reader :title_font
 
       def title_font=(font)
+        font = theme.title_font if font == :theme
         @title_font = Utils::TitleFont.validate!(font)
       end
     end

data/lib/whirled_peas/settings/theme.rb

@@ -0,0 +1,61 @@
+require 'whirled_peas/utils/title_font'
+
+require_relative 'bg_color'
+require_relative 'border'
+require_relative 'text_color'
+
+module WhirledPeas
+  module Settings
+    class Theme
+      attr_reader :bg_color, :border_style, :color, :title_font
+
+      def axis_color=(value)
+        @axis_color = TextColor.validate!(value)
+      end
+
+      def axis_color
+        @axis_color || border_color
+      end
+
+      def bg_color=(value)
+        @bg_color = BgColor.validate!(value)
+      end
+
+      def border_color=(value)
+        @border_color = TextColor.validate!(value)
+      end
+
+      def border_color
+        @border_color || color
+      end
+
+      def border_style=(value)
+        @border_style = Border::Styles.validate!(value)
+      end
+
+      def color=(value)
+        @color = TextColor.validate!(value)
+      end
+
+      def highlight_bg_color=(value)
+        @highlight_bg_color = BgColor.validate!(value)
+      end
+
+      def highlight_bg_color
+        @highlight_bg_color || color.as_bg_color
+      end
+
+      def highlight_color=(value)
+        @highlight_color = TextColor.validate!(value)
+      end
+
+      def highlight_color
+        @highlight_color || bg_color.as_text_color
+      end
+
+      def title_font=(value)
+        @title_font = Utils::TitleFont.validate!(value)
+      end
+    end
+  end
+end

data/lib/whirled_peas/settings/theme_library.rb

@@ -0,0 +1,69 @@
+require 'yaml'
+
+require_relative 'theme'
+
+module WhirledPeas
+  module Settings
+    module ThemeLibrary
+      CONFIG_FILE = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'data', 'themes.yaml')
+
+      class << self
+        def theme_names
+          themes.keys
+        end
+
+        def add(name, theme)
+          themes[name] = theme
+        end
+
+        def get(name)
+          unless themes.key?(name)
+            expected = themes.keys.map(&:inspect).join(', ')
+            raise ArgumentError, "Unknown theme: #{name.inspect}, expecting one of #{expected}"
+          end
+          themes[name]
+        end
+
+        def default_name
+          themes.keys.first
+        end
+
+        private
+
+        def themes
+          return @themes if @themes
+          @themes = {}
+          config = YAML.load_file(CONFIG_FILE)
+          config.each do |name, settings|
+            name = name.to_sym
+            theme = Theme.new
+            settings.each do |key, value|
+              case key
+              when 'axis_color'
+                theme.axis_color = value
+              when 'bg_color'
+                theme.bg_color = value
+              when 'border_color'
+                theme.border_color = value
+              when 'border_style'
+                theme.border_style = value
+              when 'color'
+                theme.color = value
+              when 'highlight_bg_color'
+                theme.highlight_bg_color = value
+              when 'highlight_color'
+                theme.highlight_color = value
+              when 'title_font'
+                theme.title_font = value
+              else
+                raise ArgumentError, "Unexpected theme setting: #{key} in #{CONFIG_FILE}"
+              end
+            end
+            @themes[name] = theme
+          end
+          @themes
+        end
+      end
+    end
+  end
+end

data/lib/whirled_peas/utils/ansi.rb

@@ -28,7 +28,7 @@ module WhirledPeas
       BRIGHT_OFFSET = 60
 
       class << self
-        def with_screen(output, width: nil, height: nil, &block)
+        def with_screen(output=STDOUT, width: nil, height: nil, &block)
           require 'highline'
           unless width && height
             width, height = HighLine.new.terminal.terminal_size

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.8.0'
+  VERSION = '0.11.1'
 end

data/screen_test/components/list_with_active/l2r_active_color.frame

@@ -0,0 +1 @@
+[?25l                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ┏━━━━━━━━━━┓┃          ┃┃  ▗▄▄▄▖   ┃┗━━━━━━━━━━┛HIJKLMNOPQ[?25h

data/screen_test/components/list_with_active/l2r_active_color.rb

@@ -0,0 +1,18 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.length / 2
+        component.viewport_size = 10
+        component.active_color = :gray
+        component.active_bg_color = :bright_white
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_position_end.frame

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

data/screen_test/components/list_with_active/l2r_position_end.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.size - 1
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_position_middle.frame

@@ -0,0 +1 @@
+[?25l                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ┏━━━━━━━━━━┓┃          ┃┃  ▗▄▄▄▖   ┃┗━━━━━━━━━━┛HIJKLMNOPQ[?25h

data/screen_test/components/list_with_active/l2r_position_middle.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.length / 2
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_position_start.frame

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

data/screen_test/components/list_with_active/l2r_position_start.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = 0
+        component.viewport_size = 10
+      end
+    end
+  end
+end