natty-ui 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93595f761b9be11457f8c8eac967c87f6c91f55d1145aca2f9aa3f35c81a442c
-  data.tar.gz: fe3fa5b6844e6513ed9e03cbfdb5338bebf9a1f955f61611053b0b3807771aab
+  metadata.gz: db28cf57db8670d12ed258d70765447c08bd51462acc7907ea9072b64117f965
+  data.tar.gz: 36e9c43bf76fcb1e68b450a1289bcffa8b4cfb33fa2d575ed9b1b92dc6ecce69
 SHA512:
-  metadata.gz: f19f64cc3898a51bffe330505ddf015790c456dfc765f078b4798fe06584ae803e20fade81f3981d07a25342598ecfbc4ce1ee525866cbc865a7ab5a21706c96
-  data.tar.gz: 96ff67e741b3caf88472547c0c205d403fdaa2bb9f21f01d4d8c0eff5c984cb0c1e6c0a12fc70c17bbf7a5fda5cc764693e15de07093c617e889517c0f57a368
+  metadata.gz: e19e8e97300a844d294f61e9d4e6c43f5db5fe5a7122ff7c07c7bdd460e229ffffb0b6c943fe1e9f015bf91008824312746290098e10c7851ece75b7bfcb21bf
+  data.tar.gz: c6caff65104a42913c3f38ad53b0d628b11aff7517f6450d562c7f41e3b99234caaa48d8e266dd7abb6ca3a83546cd27a019612d0ee6f9e40e249717d26ecfd1

data/examples/24bit-colors.rb

@@ -5,8 +5,8 @@ require_relative '../lib/natty-ui'
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]24-bit Color Support[/]' do
   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

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/8bit-colors.rb

@@ -6,13 +6,13 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]8bit Color Support[/]' do
   color = ->(i) { "[bg#{i = i.to_s(16).rjust(2, '0')}] #{i} " }
 
   ui.space
-  ui.message('System Colors', <<~COLORS.chomp)
+  ui.message 'System Colors', <<~COLORS.chomp
     [#ff]#{0.upto(7).map(&color).join}
     [#00]#{8.upto(15).map(&color).join}
   COLORS
 
   ui.space
-  ui.message('Grayscale', <<~GRAYSCALE.chomp)
+  ui.message 'Grayscale', <<~GRAYSCALE.chomp
     [#ff]#{0xe8.upto(0xf3).map(&color).join}
     [#ff]#{0xf4.upto(0xff).map(&color).join}
   GRAYSCALE

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/elements.rb

@@ -4,16 +4,16 @@ require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Simple Elements[/]' do
   ui.space
-  ui.h1('This is a [b]H1[/b] heading element')
+  ui.h1 'This is a [b]H1[/b] heading element'
 
   ui.space
-  ui.h2('This is a [b]H2[/b] heading element')
+  ui.h2 'This is a [b]H2[/b] heading element'
 
   ui.space
   ui.quote "This is a\nmulti-line quotation"
 
   ui.space
-  ui.h3('This is a [b]H3[/b] heading element')
+  ui.h3 'This is a [b]H3[/b] heading element'
   ui.mark(
     'This is a multi-line message',
     'with a leading checkmark.',
@@ -21,11 +21,11 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Simple Elements[/]' do
   )
 
   ui.space
-  ui.h4('This is a [b]H4[/b] heading element')
+  ui.h4 'This is a [b]H4[/b] heading element'
 
   ui.space
-  ui.h5('This is a [b]H5[/b] heading element')
+  ui.h5 'This is a [b]H5[/b] heading element'
 
   ui.space
-  ui.h6('This is a [b]H6[/b] heading element')
+  ui.h6 'This is a [b]H6[/b] heading element'
 end

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',
@@ -12,6 +13,8 @@ EXAMPLES = {
   'ls' => 'Print Lists',
   'tables' => 'Print Tables',
   'cols' => 'Print Columns',
+  'vbars' => 'Print Vertical Bars',
+  'hbars' => 'Print Horizontal Bars',
   'sections' => 'Sections',
   'tasks' => 'Tasks'
 }.freeze
@@ -22,7 +25,7 @@ ui.space
 
 while true
   selected =
-    ui.choice(**EXAMPLES, abortable: true) do
+    ui.choice(**EXAMPLES, abortable: true, selected: selected) do
       ui.cols(
         "[red] /\\_/\\\n( o.o )\n > ^ <",
         '[bright_green b]Select a natty example:',

data/examples/hbars.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Horizontal Bars[/]' do
+  values = [11.97, 14.35, 15.51, 12.39, 14.3, 10.6, 17.7].freeze
+
+  ui.space
+  ui.hbars values, style: :blue
+  ui.puts 'NattyUI can quick dump values as horizontal bars.'
+
+  ui.space
+  ui.hbars values, style: :green, normalize: true, width: 0.5
+  ui.puts(
+    'These are the same values but [i]normalized[/i] ' \
+      'and printed in half width.'
+  )
+end

data/examples/illustration.rb

@@ -39,7 +39,7 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b]' do
     table.add do |row|
       row.add 'Layout'
       row.add <<~TEXT.chomp
-        🎩 heading elements     📝 messages
+        🎩 heading elements     📝 messages    📊 bar graphs
         📏 horizontal rulers    [blue]┼┼[/] tables
         📋 lists                [b green]✓✓[/] tasks
       TEXT

data/examples/info.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+def colors
+  return Terminal.colors.to_s if Terminal.colors < 8
+  colors = [
+    Terminal.true_color? ? 'true color' : Terminal.colors,
+    "#{(0..15).map { "[#{_1.to_s(16).rjust(2, '0')}]██" }.join}[/]"
+  ]
+  if Terminal.true_color?
+    colors << Terminal::Ansi.rainbow('████████████████████████████████')
+  end
+  colors.join("\n")
+end
+
+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', colors
+    table.add 'Screen size', Terminal.size.join(' x ')
+    fc = table.columns[0]
+    fc.width = 14
+    fc.padding_right = 2
+    fc.align = :right
+    table.columns[1].style = %i[bold bright_yellow]
+  end
+end

data/examples/key-codes.rb

@@ -2,27 +2,29 @@
 
 require_relative '../lib/natty-ui'
 
-raw = name = :start
-while name != 'Esc'
+event = nil
+while true
   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}]"
+        "
+        #{
+          if event
+            "#{event.to_a.size < 2 ? ' Key' : 'Keys'}: [bold bright_green]#{
+              event.to_a.map { "[\\#{_1}]" }.join(' ')
+            }[/]
+            Code: [bright_blue]#{event.raw.inspect}[/]"
           else
-            "[green]#{raw.inspect}[/fg] → [bold bright_green]#{
-              name.split('+').map! { "[\\#{_1}]" }.join(' ')
-            }"
+            "Your terminal uses [bright_blue]#{
+              Terminal.input_mode
+            }[/] mode. Press a key!"
           end
-        }\n\n[bright_black](Exit with ESC)"
+        }
+
+        [faint](Exit with ESC)"
       )
     end
-    raw, name = Terminal.read_key(mode: :both)
+    event = Terminal.read_key_event
+    exit if event.nil? || event.name == 'Esc'
   end
 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!

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
@@ -21,7 +21,7 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Tasks[/]' do
 
     ui.task('Connect to Library') do
       foo
-      ui.mark('Server Found', mark: :checkmark)
+      ui.mark 'Server Found', mark: :checkmark
       ui.task('Login...') { some }
     end
 

data/examples/vbars.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Vertical Bars[/]' do
+  values = [
+    11.97,
+    14.35,
+    15.51,
+    12.39,
+    14.3,
+    10.6,
+    17.7,
+    14.47,
+    14.56,
+    17.31,
+    12.98,
+    16.21,
+    14.9,
+    17.23,
+    13.35,
+    11.62,
+    14.81,
+    19.7,
+    13.42,
+    14.18
+  ].freeze
+
+  ui.space
+  ui.vbars values, style: :blue
+  ui.puts 'NattyUI can quick dump values as vertical bars.'
+
+  ui.space
+  ui.vbars values, style: :green, normalize: true, bar_width: 2
+  ui.puts(
+    'These are the same values but [i]normalized[/i] and printed with ' \
+      'a fixed bar width.'
+  )
+end

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/choice.rb

@@ -7,22 +7,24 @@ module NattyUI
     def select
       yield(self) if block_given?
       pin_line = NattyUI.lines_written
-      draw(current = 0)
-      while (key = Terminal.read_key)
-        case key
+      draw(current = @ret.index(@selected) || 0)
+      while (event = Terminal.read_key_event)
+        case event.name
         when 'Esc', 'Ctrl+c'
           break nil if @abortable
         when 'Enter', ' '
           break @ret[current]
-        when 'Up', 'Left', 'Back', 'Shift+Tab'
+        when 'Home'
+          current = 0
+        when 'End'
+          current = @texts.size - 1
+        when 'Up', 'Back', 'Shift+Tab', 'i'
           current = @texts.size - 1 if (current -= 1) < 0
-          pin_line = NattyUI.back_to_line(pin_line, erase: false)
-          draw(current)
-        when 'Down', 'Right', 'Tab'
+        when 'Down', 'Tab', 'k'
           current = 0 if (current += 1) == @texts.size
-          pin_line = NattyUI.back_to_line(pin_line, erase: false)
-          draw(current)
         end
+        pin_line = NattyUI.back_to_line(pin_line, erase: false)
+        draw(current)
       end
     ensure
       NattyUI.back_to_line(@start_line)
@@ -30,12 +32,13 @@ module NattyUI
 
     private
 
-    def initialize(parent, args, kwargs, abortable)
+    def initialize(parent, args, kwargs, abortable, selected)
       super(parent)
       @start_line = NattyUI.lines_written
       @texts = args + kwargs.values
       @ret = Array.new(args.size, &:itself) + kwargs.keys
       @abortable = abortable
+      @selected = selected
       theme = Theme.current
       @mark = [theme.mark(:choice), theme.choice_style]
       @mark_current = [theme.mark(:current_choice), theme.choice_current_style]

data/lib/natty-ui/dumb_choice.rb

@@ -7,10 +7,10 @@ module NattyUI
     def select
       yield(self) if block_given?
       draw
-      while (code = Terminal.read_key)
-        return if @abortable && (code == 'Esc' || code == 'Ctrl+c')
-        next if code.size > 1
-        code = code[0].upcase
+      while (event = Terminal.read_key_event)
+        return if @abortable && %w[Esc Ctrl+c].include?(event.name)
+        next unless event.simple?
+        code = event.raw.upcase
         if @ret.size <= 9 && ('1'..'9').include?(code)
           code = @ret[code.ord - 49] and break code
         elsif ('A'..'Z').include?(code)