natty-ui 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23eed1ba95aaecb2555dfeed5a6fedbcd827299d1e4a64c91952953b3d36d787
-  data.tar.gz: 53380e5ebe647a96abbc24baecd1f24a7a3290544ac10e34e3aa8b1e8dba1e17
+  metadata.gz: 43f1afe6be5864d4895c974783fbfcff1f4b5a23f963eb24f6a964fe09b1174c
+  data.tar.gz: e3a4c8e1981f0299f9927c4a3f53fa0c4eca95f792f9590c9ea191e7018adcb5
 SHA512:
-  metadata.gz: 56c829ee249c7cecce24bb9b88c131e8fdaaec20aff2f0340b16d701c77907805f7595d38cfe0e122d4f7365d6ae6babfccdd680b9754de283c7e63c944e78ea
-  data.tar.gz: 9964afa255fe3a76d59727f13edcafa31429768729e3b14408f6142f6af17236c7831836857897a0e860044732ad5a347c6bc4efb06ef277412d73d67167519d
+  metadata.gz: d9c75d24c0363076c3e0d41ac458d4f13a6552811d166028d5d758ba408d20aa63907a471ee56c4fe4b0638db1cb03e915d0b6c606e8770a9753d59eafb7c951
+  data.tar.gz: 77a95400ba528d57f3e1b559ac1ffa584c68a60bcc45d212341bc803031f204abac44e269db1d81903a4629b7c9c466c27acae66d84c2f802a3486bab37a929b

data/examples/24bit-colors.rb

@@ -3,12 +3,12 @@
 require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]24-bit Color Support[/]' do
-  ui.space
   bar = '█' * ui.columns
   rainbow =
-    (7..17).map do |i|
-      NattyUI::Ansi.rainbow(bar, seed: 3, spread: 3.25, frequency: i / 100.0)
+    (7..21).map do |i|
+      NattyUI::Ansi.rainbow(bar, seed: 3, spread: 3.25, frequency: i / 200.0)
     end
 
+  ui.space
   ui.puts(*rainbow)
 end

data/examples/3bit-colors.rb

@@ -4,7 +4,7 @@ require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]3/4bit Color Support[/]' do
   ui.space
-  ui.puts <<~INFO, ignore_newline: true
+  ui.puts <<~INFO, eol: false
     Terminals may support colors. You can colorize foreground text and
     background. The very basic color palette consists of eight colors and may
     be extended with eight colors which are much brighter.

data/examples/attributes.rb

@@ -4,7 +4,7 @@ require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]ANSI Attributes[/]' do
   ui.space
-  ui.puts <<~INFO_1, <<~INFO_2, ignore_newline: true
+  ui.puts <<~INFO_1, <<~INFO_2, eol: false
     NattyUI supports all well known attributes like
     [b]bold[/b],
     [i]italic[/i],

data/examples/examples.rb

@@ -3,6 +3,7 @@
 require_relative '../lib/natty-ui'
 
 EXAMPLES = {
+  'info' => 'Terminal Information',
   'attributes' => 'ANSI Attributes',
   '3bit-colors' => '3/4bit Color Support',
   '8bit-colors' => '8bit Color Support',

data/examples/info.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Terminal Information[/]' do
+  ui.space
+  ui.table do |table|
+    table.add('Identifier', Terminal.application || 'unidentified')
+    table.add('ANSI support', Terminal.ansi? ? 'yes' : 'no')
+    table.add('Input mode', Terminal.input_mode)
+    table.add(
+      'Colors',
+      "#{Terminal.true_color? ? 'true color' : Terminal.colors}
+      [black]██[red]██[green]██[yellow]██[blue]██[magenta]██[cyan]██[white]██" \
+        '[bright_black]██[bright_red]██[bright_green]██[bright_yellow]██' \
+        '[bright_blue]██[bright_magenta]██[bright_cyan]██[bright_white]██[/]' \
+        "#{
+          if Terminal.true_color?
+            Terminal::Ansi.rainbow("\n████████████████████████████████")
+          end
+        }"
+    )
+    table.add('Screen size', Terminal.size.join(' x '))
+    fc = table.columns[0]
+    fc.width = 13
+    fc.padding_right = 1
+    fc.align = :right
+    table.columns[1].style = :bold
+  end
+end

data/examples/key-codes.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+raw = name = :start
+while name != 'Esc'
+  ui.temporary do
+    ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Keyboard Key Codes[/]' do
+      ui.puts(
+        "\n#{
+          case name
+          when :start
+            "Your terminal uses [i]#{
+              Terminal.input_mode
+            }[/i] mode. Press a key!"
+          when nil
+            "[green]#{raw.inspect}[/fg] → [bold bright_green][\\#{raw}]"
+          else
+            "[green]#{raw.inspect}[/fg] → [bold bright_green]#{
+              name.split('+').map! { "[\\#{_1}]" }.join(' ')
+            }"
+          end
+        }\n\n[bright_black](Exit with ESC)"
+      )
+    end
+    raw, name = Terminal.read_key(mode: :both)
+  end
+end

data/examples/ls.rb

@@ -31,4 +31,20 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Lists[/]' do
   ui.space
   ui.h2 'Compact Display'
   ui.ls lorem, glyph: 1
+
+  ui.space
+  ui.h2 'Latin Char Glyph'
+  ui.ls lorem.take(5), glyph: :a
+
+  ui.space
+  ui.h2 'Hex Numbers'
+  ui.ls lorem.take(5), glyph: '0x08'
+
+  ui.space
+  ui.h2 'Chapter Numbering'
+  ui.ls lorem.take(5), glyph: :'1.8'
+
+  ui.space
+  ui.h2 'Custom Glyph'
+  ui.ls lorem.take(5), glyph: '[b bright_yellow]→[/]'
 end

data/examples/named-colors.rb

@@ -18,6 +18,6 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Named Colors Support[/]' do
     NattyUI::Ansi
       .named_colors
       .delete_if { /\d/.match?(_1) }
-      .map! { "[bg_#{_1}] [/bg] [#{_1}]#{_1.to_s.ljust(22)}[/fg]" }
+      .map! { "[bg_#{_1}] [/bg] [#{_1}]#{_1}[/fg]" }
   )
 end

data/examples/sections.rb

@@ -5,7 +5,7 @@ require_relative '../lib/natty-ui'
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Sections[/]' do
   ui.space
   ui.information 'Informative Message' do
-    ui.puts <<~TEXT, ignore_newline: true
+    ui.puts <<~TEXT, eol: false
       Sections and messages are elements which support any other feature. This
       means they may contain text, other sections, titles, horizontal rules,
       lists, progress bars and much more!
@@ -13,7 +13,7 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Sections[/]' do
   end
 
   ui.space
-  ui.warning 'Warning', 'This is a warning message example.'
+  ui.warning "Warning\nThis is a warning message example."
 
   ui.space
   ui.error 'Error Message' do
@@ -23,7 +23,4 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Sections[/]' do
       cc.add 'You can add all other elements to a section.', vertical: :middle
     end
   end
-
-  ui.space
-  ui.failed "Fail Message\nA sad failure message."
 end

data/examples/tables.rb

@@ -46,10 +46,9 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Tables[/]' do
   ui.space
   ui.table do |table|
     table.add do |row|
-      row.add 'green', style: :on_green
-      row.add 'blue', style: :on_blue
-      row.add 'red', style: :on_red
-      row.width = 15
+      row.add 'green', style: :on_green, max_width: 0.1
+      row.add 'blue', style: :on_blue, max_width: 0.25
+      row.add 'red', style: :on_red, max_width: 0.1
       row.align = :centered
     end
     table.add do |row|

data/examples/tasks.rb

@@ -4,7 +4,7 @@ require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Tasks[/]' do
   ui.space
-  ui.puts <<~TEXT, ignore_newline: true
+  ui.puts <<~TEXT, eol: false
     Tasks are sections that are closed either successfully or with an error message.
     If successful, their content is only displayed temporarily and can consist of all
     other features, in particular further (sub)tasks. As an exception to this, some

data/lib/natty-ui/attributes.rb

@@ -11,19 +11,13 @@ module NattyUI
       end
 
       # @return [Attributes] itself
-      def merge!(**attributes)
-        attributes.empty? ? self : _assign(attributes)
-      end
+      def merge!(**attributes) = attributes.empty? ? self : _assign(attributes)
 
       # @!visibility private
-      def to_hash
-        _store({})
-      end
+      def to_hash = _store({})
 
       # @!visibility private
-      def to_h(&block)
-        block ? _store({}).to_h(&block) : _store({})
-      end
+      def to_h(&block) = block ? _store({}).to_h(&block) : _store({})
 
       private
 
@@ -41,17 +35,22 @@ module NattyUI
 
       def as_wh(value)
         return unless value
-        return (value = value.to_i) > 0 ? value : nil if value.is_a?(Numeric)
-        value.is_a?(Range) ? wh_from(value.begin.to_i, value.end.to_i) : nil
+        return value > 0 ? value : nil if value.is_a?(Numeric)
+        value.is_a?(Range) ? wh_from(value.begin, value.end) : nil
       end
 
       def wh_from(min, max)
-        min = nil if min < 1
-        max = nil if max < 1
+        min = normalized(min)
+        max = normalized(max)
         return max ? (..max) : nil unless min
-        return(min..) unless max
+        return Range.new(min, nil) unless max
         min == max ? min : Range.new(*[min, max].minmax)
       end
+
+      def normalized(value)
+        return value < 0 ? nil : value if value.is_a?(Float) && value < 1
+        (value = value.to_i) < 1 ? nil : value
+      end
     end
 
     module Align
@@ -83,6 +82,30 @@ module NattyUI
       end
     end
 
+    module Position
+      # Horizontal element position.
+      #
+      # @return [nil, :right, :centered]
+      attr_reader :position
+
+      # @attribute [w] position
+      def position=(value)
+        @position = Utils.position(value)
+      end
+
+      protected
+
+      def _assign(opt)
+        self.position = opt[:position] if opt.key?(:position)
+        super
+      end
+
+      def _store(opt)
+        opt[:position] = @position if @position
+        super
+      end
+    end
+
     module Vertical
       # Vertical element alignment.
       #
@@ -129,26 +152,22 @@ module NattyUI
       #
       # @attribute [r] min_width
       # @return [Integer, nil]
-      def min_width
-        width.is_a?(Range) ? @width.begin : @width
-      end
+      def min_width = width.is_a?(Range) ? @width.begin : @width
 
       # @attribute [w] min_width
       def min_width=(value)
-        @width = wh_from(value.to_i, max_width.to_i)
+        @width = wh_from(value, max_width)
       end
 
       # Maximum element width.
       #
       # @attribute [r] max_width
       # @return [Integer, nil]
-      def max_width
-        width.is_a?(Range) ? @width.end : @width
-      end
+      def max_width = width.is_a?(Range) ? @width.end : @width
 
       # @attribute [w] max_width
       def max_width=(value)
-        @width = wh_from(min_width.to_i, value.to_i)
+        @width = wh_from(min_width, value)
       end
 
       protected
@@ -183,9 +202,7 @@ module NattyUI
       #
       # @attribute [r] min_height
       # @return [Integer, nil]
-      def min_height
-        @height.is_a?(Range) ? @height.begin : @height
-      end
+      def min_height = @height.is_a?(Range) ? @height.begin : @height
 
       # @attribute [w] min_height
       def min_height=(value)
@@ -196,9 +213,7 @@ module NattyUI
       #
       # @attribute [r] max_height
       # @return [Integer, nil]
-      def max_height
-        @height.is_a?(Range) ? @height.begin : @height
-      end
+      def max_height = @height.is_a?(Range) ? @height.begin : @height
 
       # @attribute [w] max_height
       def max_height=(value)
@@ -464,30 +479,6 @@ module NattyUI
       end
     end
 
-    module BorderAround
-      # Whether the border is around an element.
-      #
-      # @return [true, false]
-      attr_reader :border_around
-
-      # @attribute [w]  border_around
-      def border_around=(value)
-        @border_around = value ? true : false
-      end
-
-      protected
-
-      def _assign(opt)
-        @border_around = opt[:border_around]
-        super
-      end
-
-      def _store(opt)
-        opt[:border_around] = true if @border_around
-        super
-      end
-    end
-
     module Border
       # Border type.
       #
@@ -568,10 +559,8 @@ module NattyUI
     attr_reader :text
 
     def empty? = @text.empty?
-
     alias _to_s to_s
     private :_to_s
-
     def to_str = @text.join("\n")
     alias to_s to_str
 

data/lib/natty-ui/element.rb

@@ -33,10 +33,10 @@ module NattyUI
     end
 
     alias _to_s to_s
+    private :_to_s
 
     # @!visibility private
     alias to_s inspect
-    private :_to_s
 
     private
 
@@ -46,33 +46,30 @@ module NattyUI
     end
   end
 
-  module StateMixin
-    attr_reader :state
+  module WithStatus
+    attr_reader :status
 
-    def closed? = @state ? true : false
+    def active? = @status.nil?
+    def closed? = !active?
     def ok? = @state == :ok
     def failed? = @state == :failed
 
-    # @return [Element] itself
-    def done(*text) = @state ? self : finish_ok(text)
-    alias ok done
-
-    # @!visibility private
-    def failed(title, *msg)
-      return if @state
-      super
-      finish_failed
+    def ok(*text)
+      return self if @state
+      text = [@title] if text.empty? && @title
+      _done(text)
+      @state = :ok
+      self
     end
+    alias done ok
 
-    # @!visibility private
-    def inspect = "#{_to_s.chop} state=#{@state.inspect}>"
-
-    protected
-
-    def finish_failed
+    def failed(*text, &block)
+      return self if @state
+      _failed
       @state = :failed
+      text = [@title] if text.empty? && @title
+      @parent.failed(*text, &block)
       self
     end
   end
-  private_constant :StateMixin
 end

data/lib/natty-ui/features.rb

@@ -31,8 +31,8 @@ module NattyUI
     # @param options [{Symbol => Object}]
     # @option options [:left, :right, :centered] :align (:left)
     #   text alignment
-    # @option options [true, false] :ignore_newline (false)
-    #   whether to igniore newline characters
+    # @option options [true, false] :eol (true)
+    #   whether to respect newline characters
     #
     # @return [Features]
     #   itself
@@ -84,7 +84,7 @@ module NattyUI
           limit: max_width,
           bbcode: bbcode,
           ansi: Terminal.ansi?,
-          ignore_newline: options[:ignore_newline]
+          ignore_newline: options[:eol] == false || options[:ignore_newline]
         )
 
       if (align = options[:align]).nil?
@@ -292,7 +292,7 @@ module NattyUI
     #
     # @return (see puts)
     def space(count = 1)
-      (count = count.to_i).positive? ? puts(*Array.new(count, "\n")) : self
+      puts("\n" * count) if (count = count.to_i).positive?
     end
 
     # Print given items as list (like 'ls' command).
@@ -327,7 +327,7 @@ module NattyUI
     # Generate and print a table.
     # See {Table} for much more details about table generation.
     #
-    # @example Draw a very simple table with three rows, four columns, complete borders
+    # @example Draw a very simple 3x4 table with complete borders
     #   ui.table(border: :default, border_around: true, padding: [0, 1]) do |table|
     #     table.add 1, 2, 3, 4
     #     table.add 5, 6, 7, 8
@@ -338,13 +338,16 @@ module NattyUI
     #   attributes for the table and default attributes for table cells
     # @option attributes [Symbol] :border (nil)
     #   kind of border,
-    #   see {Attributes::Border}
-    # @option attributes [true, false] :border_around (false)
-    #   whether the table should have a border around,
-    #   see {Attributes::BorderAround}
+    #   see {Table::Attributes}
     # @option attributes [Enumerable<Symbol>] :border_style (nil)
     #   style of border,
-    #   see {Attributes::BorderStyle}
+    #   see {Table::Attributes}
+    # @option attributes [true, false] :border_around (false)
+    #   whether the table should have a border around,
+    #   see {Table::Attributes}
+    # @option attributes [:left, :right, :centered] :position (false)
+    #   where to align the table,
+    #   see {Table::Attributes}
     #
     # @yieldparam table [Table]
     #   helper to define the table layout
@@ -353,7 +356,11 @@ module NattyUI
     def table(**attributes)
       return self unless block_given?
       yield(table = Table.new(**attributes))
-      puts(*TableRenderer[table, columns])
+      puts(
+        *TableRenderer[table, columns],
+        align: table.attributes.position,
+        expand: true
+      )
     end
 
     # Print text in columns.
@@ -372,9 +379,10 @@ module NattyUI
     #
     # @return (see puts)
     def cols(*columns, **attributes)
-      table(**attributes) do |table|
+      tab_att, att = Utils.split_table_attr(attributes)
+      table(**tab_att) do |table|
         table.add do |row|
-          columns.each { row.add(_1, **attributes) }
+          columns.each { row.add(_1, **att) }
           yield(row) if block_given?
         end
       end
@@ -403,9 +411,9 @@ module NattyUI
     # @return (see puts)
     def div(*text, **attributes)
       return self if text.empty?
-      table(border_around: true, **attributes) do |table|
-        table.add { _1.add(*text, **attributes) }
-      end
+      tab_att, att = Utils.split_table_attr(attributes)
+      tab_att[:border_around] = true
+      table(**tab_att) { |table| table.add { _1.add(*text, **att) } }
     end
 
     # Dynamically display a task progress.
@@ -444,7 +452,7 @@ module NattyUI
     #   @param pin [true, false]
     #     whether the final progress state should be "pinned" to parent element
     #
-    #   @return [Progress]
+    #   @return [ProgressHelper]
     #     itself
     #
     # @overload progress(title, max: nil, pin: false, &block)
@@ -455,7 +463,7 @@ module NattyUI
     #   @param pin [true, false]
     #     whether the final progress state should be "pinned" to parent element
     #
-    #   @yieldparam progress [Progress]
+    #   @yieldparam progress [ProgressHelper]
     #     itself
     #
     #   @return [Object]
@@ -555,7 +563,7 @@ module NattyUI
     # @param align [:left, :right, :centered]
     #   text alignment,
     #   see {Attributes::Align}
-    # @param border: [Symbol]
+    # @param border [Symbol]
     #   kind of border,
     #   see {Attributes::Border}
     # @param border_style [Enumerable<Symbol>]

data/lib/natty-ui/ls_renderer.rb

@@ -19,7 +19,7 @@ module NattyUI
       def as_items(items, glyph)
         items.flatten!
         glyph = as_glyph(glyph, items.size)
-        items.map! { |item| Item.new(item = glyph[item], Text.width(item)) }
+        items.map! { Item.new(glyph[_1]) }
       end
 
       def as_glyph(glyph, size)
@@ -27,30 +27,34 @@ module NattyUI
         when nil, false
           lambda(&:itself)
         when :hex
-          pad = size.to_s(16).size
+          pad = [2, size.to_s(16).size].max
           glyph = 0
           ->(s) { "#{(glyph += 1).to_s(16).rjust(pad, '0')} #{s}" }
+        when /\A0x(\h+)\z/
+          glyph = Regexp.last_match(1).hex - 1
+          pad = [2, (glyph + size).to_s(16).size].max
+          ->(s) { "0x#{(glyph += 1).to_s(16).rjust(pad, '0')} #{s}" }
         when Integer
           pad = (glyph + size).to_s.size
           glyph -= 1
-          ->(s) { "#{(glyph += 1).to_s.rjust(pad)} #{s}" }
+          ->(s) { "#{(glyph += 1).to_s.rjust(pad, ' ')} #{s}" }
         when Symbol
-          lambda do |s|
-            "#{
-              t = glyph
-              glyph = glyph.succ
-              t
-            } #{s}[/]"
-          end
+          ->(s) { "#{[glyph, glyph = glyph.succ][0]} #{s}" }
         else
           ->(s) { "#{glyph} #{s}" }
         end
       end
 
-      Item =
-        Struct.new(:str, :width) do
-          def to_s(in_width) = "#{str}#{' ' * (in_width - width)}"
+      class Item
+        attr_reader :width
+
+        def to_s(in_width) = "#{@str}#{' ' * (in_width - @width)}"
+
+        def initialize(str)
+          @str = str
+          @width = Text.width(str)
         end
+      end
       private_constant :Item
     end
   end

data/lib/natty-ui/progress.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'element'
+
 module NattyUI
   # @todo This chapter needs more documentation.
   #
   # Progress indictaor helper used by {Features.progress}.
   #
   module ProgressHelper
+    include WithStatus
+
     # @return [String]
     attr_reader :title
 
@@ -40,21 +44,12 @@ module NattyUI
       redraw
     end
 
-    def active? = @status.nil?
-    def ok? = @status == :ok
-    def failed? = @status == :failed
-
     def step(count: 1, title: nil)
       @title = title if title
       self.value += count
       self
     end
 
-    def done(title = nil) = finish(:ok, title)
-    alias ok done
-
-    def failed(title = nil) = finish(:failed, title)
-
     alias _to_s to_s
     private :_to_s
 
@@ -80,31 +75,33 @@ module NattyUI
 
     private
 
-    def finish(status, title)
-      return if @status
-      @status = status
+    def _done(text)
       NattyUI.back_to_line(@pin_line)
-      if status == :failed
-        @parent.failed(title || @title)
-      else
-        cm = Theme.current.mark(:checkmark)
-        @parent.puts(
-          title || @title,
-          pin: @pin,
-          first_line_prefix: cm,
-          first_line_prefix_width: cm.width
-        )
-      end
-      self
+      @pin_line = nil
+      cm = Theme.current.mark(:checkmark)
+      @parent.puts(
+        *text,
+        pin: @pin,
+        first_line_prefix: cm,
+        first_line_prefix_width: cm.width
+      )
+    end
+
+    def _failed
+      NattyUI.back_to_line(NattyUI.lines_written - 1) if @last&.size == 2
+      @pin_line = nil
     end
 
     def initialize(parent, title, max, pin)
       @parent = parent
-      @value = 0.0
+      @value = 0
       @title = title
       @pin = pin
       @pin_line = NattyUI.lines_written
       @style = Theme.current.task_style
+      cm = Theme.current.mark(:current)
+      @flp = "#{cm} #{@style}"
+      @flpw = cm.width + 1
       max ? self.max = max : redraw
     end
 
@@ -116,14 +113,14 @@ module NattyUI
       @pin_line = NattyUI.back_to_line(@pin_line) if @last
       @parent.puts(
         *curr,
-        first_line_prefix: "#{@style}➔ ",
-        first_line_prefix_width: 2
+        first_line_prefix: @flp,
+        first_line_prefix_width: @flpw
       )
       @last = curr
     end
 
     def moving_bar
-      "#{@style}#{'·' * @value}" if @value >= 1
+      "#{@style}#{'•' * @value}" if @value >= 1
     end
 
     def bar(diff)
@@ -143,20 +140,18 @@ module NattyUI
 
     private
 
-    def finish(status, title)
-      return if @status
-      @status = status
-      if status == :failed
-        @parent.failed(title || @title)
-      else
-        cm = Theme.current.mark(:checkmark)
-        @parent.puts(
-          title || @title,
-          first_line_prefix: cm,
-          first_line_prefix_width: cm.width
-        )
-      end
-      self
+    def _done(text)
+      cm = Theme.current.mark(:checkmark)
+      @parent.puts(
+        *text,
+        pin: @pin,
+        first_line_prefix: cm,
+        first_line_prefix_width: cm.width
+      )
+    end
+
+    def _failed
+      # nop
     end
 
     def initialize(parent, title, max)

data/lib/natty-ui/section.rb

@@ -3,7 +3,7 @@
 require_relative 'element'
 
 module NattyUI
-  # {Element} implemting a display section used by
+  # Display section used by
   #
   # - {Features.section}
   # - {Features.message}
@@ -13,23 +13,20 @@ module NattyUI
   # - {Features.failed}
   #
   class Section < Element
-    include StateMixin
+    include WithStatus
 
     # @!visibility private
     def puts(*objects, **options) = @state ? self : super
 
     private
 
-    def finish_ok(text)
+    def _done(text)
       puts(*text) unless text.empty?
-      @state = :ok
       @parent.puts(@border.bottom)
-      self
     end
 
-    def finish_failed
+    def _failed
       @parent.puts(@border.bottom)
-      super
     end
 
     def show_title(title)
@@ -51,7 +48,7 @@ module NattyUI
       @border = Theme.current.section_border(kind)
       show_title(title)
       @prefix = @border.prefix
-      @prefix_width = @prefix.size
+      @prefix_width = @prefix.width
       puts(*rest) if rest && !rest.empty?
       puts(*msg) unless msg.empty?
     end

data/lib/natty-ui/table.rb

@@ -33,7 +33,7 @@ module NattyUI
           m = cell.attributes.max_width
           max = m if m && (max.nil? || max < m)
         end
-        wh_from(min.to_i, max.to_i)
+        wh_from(min, max)
       end
 
       def respond_to_missing?(name, _)
@@ -181,7 +181,46 @@ module NattyUI
     class Attributes < NattyUI::Attributes::Base
       prepend NattyUI::Attributes::Border
       prepend NattyUI::Attributes::BorderStyle
-      prepend NattyUI::Attributes::BorderAround
+      prepend NattyUI::Attributes::Position
+
+      # Whether the table has a border around.
+      #
+      # @return [true, false]
+      attr_reader :border_around
+
+      # @attribute [w]  border_around
+      def border_around=(value)
+        @border_around = value ? true : false
+      end
+
+      # Maximum table width.
+      #
+      # @return [Integer, nil]
+      attr_reader :max_width
+
+      # @attribute [w] max_width
+      def max_width=(value)
+        if value.is_a?(Float)
+          return @max_width = nil if value < 0
+          return @max_width = value if value < 1
+        end
+        value = value.to_i
+        @max_width = value <= 0 ? nil : value
+      end
+
+      protected
+
+      def _assign(opt)
+        @border_around = opt[:border_around]
+        self.max_width = opt[:max_width]
+        super
+      end
+
+      def _store(opt)
+        opt[:border_around] = true if @border_around
+        opt[:max_width] = @max_width if @max_width
+        super
+      end
     end
 
     include Enumerable
@@ -207,10 +246,20 @@ module NattyUI
 
     # @return [Row] created row
     def add(*text, **attributes)
-      nr = Row.new
-      @rows << nr
-      text.each { nr.add(_1, **attributes) }
-      block_given? ? yield(nr) : nr
+      unless text[0].is_a?(Hash)
+        @rows << (nr = Row.new)
+        text.each { nr.add(_1, **attributes) }
+        return block_given? ? yield(nr) : nr
+      end
+      new_rows = []
+      text[0].each_pair do |key, value|
+        new_rows << (nr = Row.new)
+        @rows << nr
+        nr.add(key, **attributes)
+        nr.add(value, **attributes)
+        yield(nr) if block_given?
+      end
+      new_rows
     end
 
     def delete(row)

data/lib/natty-ui/table_renderer.rb

@@ -8,29 +8,42 @@ module NattyUI
     def self.[](table, max_width)
       columns = table.columns.map(&:width)
       return [] if columns.empty?
-      attributes = table.attributes
-      unless attributes.border_chars.nil?
+      att = table.attributes
+      case att.max_width
+      when Float
+        max_width *= att.max_width
+      when Integer
+        max_width = [max_width, att.max_width].min
+      end
+      unless att.border_chars.nil?
         max_width -= (columns.size - 1)
-        max_width -= 2 if attributes.border_around
+        max_width -= 2 if att.border_around
       end
       return [] if max_width < columns.size
-      new(columns, table.each.to_a, attributes, max_width).lines
+      new(columns, table.each.to_a, att, max_width).lines
     end
 
     attr_reader :lines
 
     private
 
-    def initialize(columns, rows, attributes, max_width)
+    def initialize(columns, rows, att, max_width)
       @max_width, @columns = WidthFinder.find(columns, max_width)
-      init_borders(attributes)
+      init_borders(att)
       @columns = @columns.each.with_index
+
       @lines = render(rows.shift)
       @lines.unshift(@b_top) if @b_top
-      rows.each do |row|
-        @lines << @b_between if @b_between
-        @lines += render(row)
+
+      if @b_between
+        rows.each do |row|
+          @lines << @b_between
+          @lines += render(row)
+        end
+      else
+        rows.each { |row| @lines += render(row) }
       end
+
       @lines << @b_bottom if @b_bottom
     end
 
@@ -43,11 +56,12 @@ module NattyUI
       end
     end
 
-    def init_borders(attributes)
-      chars = attributes.border_chars or return
-      style = border_style(attributes)
+    def init_borders(att)
+      chars = att.border_chars or return
+      style = border_style(att)
       @b_inner = style[chars[9]]
-      return init_borders_around(chars, style) if attributes.border_around
+      return if chars[10] == ' '
+      return init_borders_around(chars, style) if att.border_around
       @b_between = chars[10] * (@max_width + @columns.size - 1)
       i = -1
       @columns[0..-2].each { |w| @b_between[i += w + 1] = chars[4] }
@@ -71,8 +85,8 @@ module NattyUI
       @b_outer = @b_inner
     end
 
-    def border_style(attributes)
-      style = attributes.border_style_bbcode
+    def border_style(att)
+      style = att.border_style_bbcode
       style ? ->(line) { "#{style}#{line}[/]" } : lambda(&:itself)
     end
 

data/lib/natty-ui/task.rb

@@ -3,40 +3,44 @@
 require_relative 'element'
 
 module NattyUI
-  # {Element} implemting a task display section used by {Features.task}.
+  # Task display section used by {Features.task}.
   #
   class Task < Temporary
-    include StateMixin
+    include WithStatus
 
     private
 
-    def finish_ok(text)
-      NattyUI.back_to_line(@start_line)
+    def _done(text)
+      NattyUI.back_to_line(@start_line, erase: :all)
       @start_line = nil
       cm = Theme.current.mark(:checkmark)
-      text << @title if text.empty?
       @parent.puts(
         *text,
         first_line_prefix: cm,
         first_line_prefix_width: cm.width,
         pin: @pin
       )
-      super()
+      @pins&.each { |objects, options| puts(*objects, **options) }
+    end
+
+    def _failed
+      @start_line = nil
     end
 
     def initialize(parent, title, msg, pin)
       super(parent)
       @title = title
-      @prefix = '  '
-      @prefix_width = 2
       @pin = pin
       style = Theme.current.task_style
+      cm = Theme.current.mark(:current)
+      @prefix = ' ' * cm.width
+      @prefix_width = cm.width
       parent.puts(
         title,
-        first_line_prefix: "#{style}➔ ",
-        first_line_prefix_width: 2,
-        prefix: "#{style}  ",
-        prefix_width: 2
+        first_line_prefix: "#{cm}#{style}",
+        first_line_prefix_width: cm.width,
+        prefix: "#{@prefix}#{style}",
+        prefix_width: cm.width
       )
       puts(*msg) unless msg.empty?
     end

data/lib/natty-ui/temporary.rb

@@ -3,7 +3,7 @@
 require_relative 'element'
 
 module NattyUI
-  # {Element} implemting a temprary display section used by
+  # Temprary display section used by
   # {Features.temporary}.
   #
   class Temporary < Element
@@ -20,7 +20,7 @@ module NattyUI
     # @!visibility private
     def done
       return self if @state
-      NattyUI.back_to_line(@start_line) if @start_line
+      NattyUI.back_to_line(@start_line, erase: :all) if @start_line
       @pins&.each { |objects, options| puts(*objects, **options) }
       @state = :ok
       self
@@ -28,8 +28,6 @@ module NattyUI
 
     private
 
-    alias finish_ok done
-
     def initialize(parent)
       @start_line = NattyUI.lines_written
       super

data/lib/natty-ui/theme.rb

@@ -53,6 +53,7 @@ module NattyUI
             warning: '[bright_yellow]![/fg]',
             error: '[red]𝙓[/fg]',
             failed: '[bright_red]𝑭[/fg]',
+            current: '[bright_green]➔[/fg]',
             choice: '[bright_white]◦[/fg]',
             current_choice: '[bright_green]◉[/fg]'
           )
@@ -66,6 +67,35 @@ module NattyUI
           )
         end
       end
+
+      def emoji
+        create do |theme|
+          theme.heading_sytle = :bright_blue
+          theme.task_style = %i[bright_green b]
+          # theme.choice_style =
+          theme.choice_current_style = %i[bright_white on_blue b]
+          theme.define_marker(
+            bullet: '▫️',
+            checkmark: '✅',
+            quote: '[bright_blue]▍[/fg]',
+            information: '📌',
+            warning: '⚠️',
+            error: '❗️',
+            failed: '‼️',
+            current: '➡️',
+            choice: '[bright_white]•[/fg]',
+            current_choice: '[bright_green]●[/fg]'
+          )
+          theme.define_section(
+            default: :bright_blue,
+            message: :bright_blue,
+            information: :bright_blue,
+            warning: :bright_yellow,
+            error: :red,
+            failed: :bright_red
+          )
+        end
+      end
     end
 
     attr_accessor :section_border
@@ -206,7 +236,7 @@ module NattyUI
         return create_styled_heading(heading, style) if style
         heading.map do |left|
           right = " #{left.reverse}"
-          [left = Str.new("#{left} ", true), Str.new(right, left.size)]
+          [left = Str.new("#{left} ", true), Str.new(right, left.width)]
         end
       end
 
@@ -215,7 +245,7 @@ module NattyUI
           right = Ansi.decorate(left.reverse, *style)
           [
             left = Str.new("#{Ansi.decorate(left, *style)} ", true),
-            Str.new(" #{right}", left.size)
+            Str.new(" #{right}", left.width)
           ]
         end
       end
@@ -278,6 +308,7 @@ module NattyUI
         warning: '!',
         error: '𝙓',
         failed: '𝑭',
+        current: '➔',
         choice: '◦',
         current_choice: '◉'
       }

data/lib/natty-ui/utils.rb

@@ -24,12 +24,22 @@ module NattyUI
 
       # @!visibility private
       def align(value)
-        value == :right || value == :centered ? value : :left
+        POS_ALI.include?(value) ? value : :left
+      end
+
+      # @!visibility private
+      def position(value)
+        value if POS_ALI.include?(value)
       end
 
       # @!visibility private
       def vertical(value)
-        value == :bottom || value == :middle ? value : :top
+        VERT.include?(value) ? value : :top
+      end
+
+      # @!visibility private
+      def split_table_attr(values)
+        [values.slice(*TAB_ATTR), values.except(*TAB_ATTR)]
       end
 
       # @!visibility private
@@ -39,7 +49,7 @@ module NattyUI
         when 0
           [0, 0, 0, 0]
         when 1
-          [value[0], 0, 0, 0]
+          Array.new(4, value[0])
         when 2
           value * 2
         when 3
@@ -50,27 +60,29 @@ module NattyUI
       end
       alias margin padding
     end
+
+    POS_ALI = %i[right centered].freeze
+    VERT = %i[bottom middle].freeze
+    TAB_ATTR = %i[border_around border border_style position].freeze
   end
 
   class Str
     attr_reader :to_s
-
     alias to_str to_s
-    def inspect = to_s.inspect
-    def empty? = size == 0
+    def empty? = width == 0
+    def inspect = @to_s.inspect
 
-    def size
-      return @size if @size
-      @size = Text.width(self)
+    def width
+      return @width if @width
+      @width = Text.width(self)
       freeze
-      @size
+      @width
     end
-    alias width size
 
-    def initialize(str, size = nil)
+    def initialize(str, width = nil)
       @to_s = Ansi.bbcode(str).freeze
-      return unless size
-      @size = @size.is_a?(Integer) ? size : Text.width(self)
+      return unless width
+      @width = @width.is_a?(Integer) ? width : Text.width(self)
       freeze
     end
   end

data/lib/natty-ui/version.rb

@@ -2,5 +2,5 @@
 
 module NattyUI
   # The version number of the gem.
-  VERSION = '0.25.0'
+  VERSION = '0.27.0'
 end

data/lib/natty-ui/width_finder.rb

@@ -43,9 +43,9 @@ module NattyUI
 
     def fit_max_width(columns, max_width, saving_by_column)
       ret = max_width - columns.size + 1
+      columns = columns.map { normalized(_1, max_width) }
       return columns, ret if ret >= 1
       saving_by_column += 1
-      columns = columns.dup
       until ret >= 1
         columns.pop
         ret += saving_by_column
@@ -53,6 +53,16 @@ module NattyUI
       [columns, ret]
     end
 
+    def normalized(value, max_width)
+      return (max_width * value).to_i if value.is_a?(Float)
+      return value unless value.is_a?(Range)
+      min = value.begin
+      max = value.end
+      min = (max_width * min).to_i if min.is_a?(Float)
+      max = (max_width * max).to_i if max.is_a?(Float)
+      (min..max)
+    end
+
     def expand(sum)
       max_width = [@columns.sum(&:max_val), @max_width].min
       expandables = @columns.find_all(&:expandable?)

data/lib/natty-ui.rb

@@ -58,12 +58,12 @@ module NattyUI
     def title=(value)
       if value
         title = Ansi.plain(value).gsub(/\s+/, ' ')
-        _write(Ansi.tab_title(title)) if Terminal.ansi?
+        _write(Ansi.title(title)) if Terminal.ansi?
         @title_stack << title
       else
         @title_stack.pop
         last = @title_stack[-1]
-        _write(Ansi.tab_title(last)) if last && Terminal.ansi?
+        _write(Ansi.title(last)) if last && Terminal.ansi?
       end
     end
 
@@ -74,7 +74,13 @@ module NattyUI
     def back_to_line(number, erase: true)
       return @lines_written if (c = @lines_written - number) <= 0
       if Terminal.ansi?
-        _write(erase ? (Ansi::LINE_ERASE_PREV * c) : Ansi.cursor_prev_line(c))
+        _write(
+          if erase == :all
+            Ansi.cursor_prev_line(c) + Ansi::SCREEN_ERASE_BELOW
+          else
+            erase ? (Ansi::LINE_ERASE_PREV * c) : Ansi.cursor_prev_line(c)
+          end
+        )
       end
       @lines_written = number
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -13,16 +13,16 @@ dependencies:
   name: terminal_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.11.0
 description: |
   This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely,
   natty user interface tool you like to have for your command line applications.
@@ -45,6 +45,8 @@ files:
 - examples/elements.rb
 - examples/examples.rb
 - examples/illustration.rb
+- examples/info.rb
+- examples/key-codes.rb
 - examples/ls.rb
 - examples/named-colors.rb
 - examples/sections.rb
@@ -76,7 +78,7 @@ metadata:
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/mblumtritt/natty-ui
   bug_tracker_uri: https://github.com/mblumtritt/natty-ui/issues
-  documentation_uri: https://rubydoc.info/gems/natty-ui/0.25.0/NattyUI/
+  documentation_uri: https://rubydoc.info/gems/natty-ui/0.27.0/NattyUI
 rdoc_options: []
 require_paths:
 - lib
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely,
   natty user interface you like to have for your CLI.