natty-ui 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad3de350d186095b5c1d0c55e94171367fc2efefbfbe78a17c31aa10a7a94e6
-  data.tar.gz: e7bdd00a40c25dec0fe0526cf09e2bc7ad967f7772f4de9dc321218d96114448
+  metadata.gz: 0aa357f7937c367ecc77396e7241f33a774973d773b99c6923cc975199755a14
+  data.tar.gz: '060778aaca552a23c57e39e4efd8adf3eff07658e6a712708b6c8e46c5077bc1'
 SHA512:
-  metadata.gz: e7fa944d6f43866e23745edd5859d0428c3372821056a4cfb43af243b1dc358516be76f221e529c8efb89dfc3e0100296b1b7b28cc379017f2744bd46ee66070
-  data.tar.gz: '09dbb59441a7a07dc3d8550f33e7d64f11ec657d6ae8b708064ee597cb99b90a3738f87861141f23df64160c6a71a3b86d4b6aa7bf4d173997d4970df5923a7d'
+  metadata.gz: c79a14e0f8b02181a19268958c8784e306f66853e0e09f40ae630043a3f89b699aaaaee72622d06fff43df0eab9814908b5d692f748df0c7ff5f67d4cac1b460
+  data.tar.gz: 7b27b83b5592b3ec556e640d7d583983ec42615ac036c40a0f5b2a305616e3df846f292aae191952e312aeaf6d9e4be99ab84ed123c1853acbf055c515b9335f

data/examples/8bit-colors.rb

@@ -7,7 +7,7 @@ ui.h1 'NattyUI: 8-bit Color Support'
 ui.space
 
 color = ->(i) { "[bg#{i = i.to_s(16).rjust(2, '0')}] #{i} " }
-ui.msg 'System Colors', glyph: :point do
+ui.msg 'System Colors' do
   ui.puts <<~COLORS
     [#ff]#{0.upto(7).map(&color).join}
     [#00]#{8.upto(15).map(&color).join}
@@ -15,7 +15,7 @@ ui.msg 'System Colors', glyph: :point do
   COLORS
 end
 
-ui.msg '6x6x6 Color Cube', glyph: :point do
+ui.msg '6x6x6 Color Cube' do
   [16, 22, 28].each do |b|
     b.step(b + 185, by: 36) do |i|
       left = i.upto(i + 5).map(&color).join
@@ -26,7 +26,7 @@ ui.msg '6x6x6 Color Cube', glyph: :point do
   end
 end
 
-ui.msg 'Grayscale', glyph: :point do
+ui.msg 'Grayscale' do
   ui.puts <<~GRAYSCALE
     [#ff]#{232.upto(243).map(&color).join}
     [#ff]#{244.upto(255).map(&color).join}

data/examples/animate.rb

@@ -13,32 +13,32 @@ TEXT = <<~TEXT.tr("\n", ' ')
   aliquip ex ea commodo [bold]consequat[/].
 TEXT
 
-ui.message 'Default Animation', glyph: :point do
+ui.message 'Default Animation' do
   ui.animate TEXT, animation: :default
 end
 ui.space
 
-ui.message 'Shiny Rainbow', glyph: :point do
+ui.message 'Shiny Rainbow' do
   ui.animate TEXT, animation: :rainbow
 end
 ui.space
 
-ui.message 'Binary Encoded', glyph: :point do
+ui.message 'Binary Encoded' do
   ui.animate TEXT, animation: :binary, style: 'green', alt_style: :bright_green
 end
 ui.space
 
-ui.message 'Matrix Style', glyph: :point do
+ui.message 'Matrix Style' do
   ui.animate TEXT, animation: :matrix
 end
 ui.space
 
-ui.message 'Typewriter Like', glyph: :point do
+ui.message 'Typewriter Like' do
   ui.animate TEXT, animation: :type_writer
 end
 ui.space
 
-ui.message 'Default Styled', glyph: :point do
+ui.message 'Default Styled' do
   ui.animate TEXT, style: 'bold bright_white on_red'
 end
 ui.space

data/examples/progress.rb

@@ -7,8 +7,13 @@ ui.h1 'NattyUI: Progress Indication'
 ui.space
 
 # just simulate some work
-def something = sleep(0.5)
-def some = sleep(0.15)
+if ENV.key?('NO_WAIT')
+  def something = nil
+  def some = nil
+else
+  def something = sleep(0.5)
+  def some = sleep(0.15)
+end
 
 ui.info 'Tasks are sections to visualize step by step processing.' do
   ui.task 'Assemble assets' do
@@ -25,7 +30,7 @@ ui.info 'Tasks are sections to visualize step by step processing.' do
 
     ui.task 'Compile files...' do
       %w[readme.txt main.css main.html sub.html].each do |name|
-        ui.msg "Compile file [bright_yellow]./source/#{name}[/]..."
+        ui.msg "Compile file [bright_yellow]./source/#{name}[/]...", glyph: :dot
         something
       end
       ui.done 'Files compiled.'

data/lib/natty-ui/animation/binary.rb

@@ -12,9 +12,8 @@ module NattyUI
         35.times do |i|
           binary.each do |chars|
             rc = rand_char
-            rc = @style + rc if rc.size == 1
             chars.pop
-            chars.unshift(rc)
+            chars.unshift(rc.size == 1 ? @style + rc : rc)
             puts(stream, chars.join)
           end
           (stream << @top).flush

data/lib/natty-ui/animation/default.rb

@@ -11,23 +11,19 @@ module NattyUI
         @lines.each do |line, size|
           time = 0.25 / size
           stream << style
+          line = Text.plain(line)
           if (num += 1).odd?
             stream << @pos1
-            Text
-              .plain(line)
-              .each_char do |char|
-                (stream << char).flush
-                sleep(time)
-              end
+            line.each_char do |char|
+              (stream << char).flush
+              sleep(time)
+            end
           else
             stream << Ansi.cursor_column(@prefix_width + size - 1)
-            Text
-              .plain(line)
-              .reverse
-              .each_char do |char|
-                (stream << char << CURSOR_LEFT).flush
-                sleep(time)
-              end
+            line.reverse.each_char do |char|
+              (stream << char << CURSOR_LEFT).flush
+              sleep(time)
+            end
           end
           stream << Ansi::RESET << @pos1 << line << Ansi::LINE_NEXT
         end

data/lib/natty-ui/animation/matrix.rb

@@ -22,10 +22,6 @@ module NattyUI
               pos.pop(count).each { enc[_1] = line[_1] }
               pos.sample(pos.size / 3).each { enc[_1] = CHARS.sample }
             end
-
-            # next stream << Ansi::LINE_NEXT if pos.size < 4
-            # pos.shift(pos.size / 8).each { enc[_1] = line[_1] }
-            # pos.sample(pos.size / 2).each { enc[_1] = CHARS.sample }
             puts(stream, enc)
           end
           (stream << @top).flush

data/lib/natty-ui/animation/type_writer.rb

@@ -10,15 +10,15 @@ module NattyUI
         @style = attribute(:style, :default)
         @cursor_style = attribute(:cursor_style, 0x2e)
         @lines.each do |line, size|
+          line = Text.plain(line)
           if (num += 1).odd?
             stream << @pos1
-            Text.plain(line).each_char { cursor(stream, _1).flush }
+            line.each_char { cursor(stream, _1).flush }
           else
             stream << Ansi.cursor_column(@prefix_width + size - 1)
-            Text
-              .plain(line)
-              .reverse
-              .each_char { (cursor(stream, _1) << CURSOR_2LEFT).flush }
+            line.reverse.each_char do |char|
+              (cursor(stream, char) << CURSOR_2LEFT).flush
+            end
           end
           stream << Ansi::RESET << @pos1 << line << Ansi::LINE_NEXT
         end

data/lib/natty-ui/animation.rb

@@ -2,19 +2,19 @@
 
 module NattyUI
   module Animation
-    def self.defined = @defined.keys
-    def self.defined?(name) = @defined.key?(name)
-    def self.define(**kwargs) = @defined.merge!(kwargs)
+    def self.names = @all.keys
 
     def self.[](name)
       return if name.nil?
-      klass = @defined[name] || @defined[:default]
+      klass = @all[name] || @all[:default]
       return klass unless klass.is_a?(String)
       require(klass)
-      klass = @defined[name] and return klass
+      klass = @all[name] and return klass
       raise(LoadError, "unknown animation - #{name}")
     end
 
+    def self.define(**kwargs) = @all.merge!(kwargs)
+
     class Base
       attr_reader :lines_written
 
@@ -58,7 +58,7 @@ module NattyUI
     private_constant :Base
 
     dir = __dir__
-    @defined = {
+    @all = {
       binary: "#{dir}/animation/binary",
       default: "#{dir}/animation/default",
       matrix: "#{dir}/animation/matrix",

data/lib/natty-ui/ansi/constants.rb

@@ -59,17 +59,17 @@ module NattyUI::Ansi
   REVEAL = self[:reveal].freeze
 
   # @!visibility private
-  CLS = (CURSOR_HOME + SCREEN_ERASE).freeze
+  CLS = "#{CURSOR_HOME}#{SCREEN_ERASE}".freeze
 
   # @!visibility private
-  CLL = (CURSOR_FIRST_COLUMN + LINE_ERASE).freeze
+  CLL = "#{CURSOR_FIRST_COLUMN}#{LINE_ERASE}".freeze
 
   # @!visibility private
   SCREEN_BLANK =
-    (
-      CURSOR_SAFE_POS + SCREEN_ALTERNATE + CURSOR_HOME + SCREEN_ERASE + RESET
-    ).freeze
+    "#{CURSOR_SAFE_POS}#{
+      SCREEN_ALTERNATE
+    }#{CURSOR_HOME}#{SCREEN_ERASE}#{RESET}".freeze
 
   # @!visibility private
-  SCREEN_UNBLANK = (RESET + SCREEN_ALTERNATE_OFF + CURSOR_RESTORE_POS).freeze
+  SCREEN_UNBLANK = "#{RESET}#{SCREEN_ALTERNATE_OFF}#{CURSOR_RESTORE_POS}".freeze
 end

data/lib/natty-ui/ansi_wrapper.rb

@@ -85,11 +85,7 @@ module NattyUI
         (wrapper.stream << @msg << Ansi::CURSOR_HIDE).flush
         @msg = "#{Ansi::CLL}#{@msg}"
         return @msg << BAR_COLOR if @max_value
-        spinner_color = Ansi[:bold, 220]
-        @spinner =
-          Enumerator.new do |y|
-            spinner.each_char { y << "#{spinner_color}#{_1}" } while true
-          end
+        @spinner = NattyUI::Spinner[spinner]
       end
 
       def redraw
@@ -162,7 +158,7 @@ module NattyUI
 
       def initialize(parent, title:, glyph:, **opts)
         color = COLORS[glyph] || COLORS[:default]
-        glyph = NattyUI.glyph(glyph) || glyph
+        glyph = NattyUI::Glyph[glyph]
         prefix_width = Text.width(glyph) + 1
         parent.puts(
           title,

data/lib/natty-ui/frame.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module NattyUI
+  # Helper class to select frame types.
+  # @see Features#framed
+  # @see Features#table
+  module Frame
+    # Define frame type used by default.
+    #
+    # @attribute [w] self.default
+    # @param value [Symbol] type name
+    # @return [Symbol] type name
+    def self.default=(value)
+      @default = self[value.nil? || value == :default ? :rounded : value]
+    end
+
+    # Defined frame type names.
+    # @see []
+    #
+    # @attribute [r] self.names
+    # @return [Array<Symbol>] supported attribute names
+    def self.names = @all.keys
+
+    # @param name [Symbol, String]
+    #   defined type name (see {.names})
+    #   or frame elements
+    # @return [String] frame definition
+    def self.[](name)
+      return @default if name == :default
+      if name.is_a?(Symbol)
+        ret = @all[name] and return ret
+      elsif name.is_a?(String)
+        return name if name.size == 11
+        return name * 11 if name.size == 1
+      end
+      raise(ArgumentError, "invalid frame type - #{name}")
+    end
+
+    @all = {
+      cols: '    │ │    ',
+      double: '╔╗╚╝║═╬╦╩╠╣',
+      heavy: '┏┓┗┛┃━╋┳┻┣┫',
+      rounded: '╭╮╰╯│─┼┬┴├┤',
+      rows: '     ──    ',
+      semi: '╒╕╘╛│═╪╤╧╞╡',
+      semi2: '╓╖╙╜│─╫╥╨╟╢',
+      simple: '┌┐└┘│─┼┬┴├┤',
+      undecorated: '           '
+    }.compare_by_identity
+
+    self.default = nil
+  end
+end

data/lib/natty-ui/glyph.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative 'text'
+
+module NattyUI
+  # Helper class to select glyph types.
+  # @see Features#message
+  module Glyph
+    # Define glyph type used by default.
+    # @attribute [w] self.default
+    # @param value [Symbol] type name
+    # @return [Symbol] type name
+    def self.default=(value)
+      @default = self[value.nil? || value == :default ? :point : value]
+    end
+
+    # Defined glyph type names.
+    # @see []
+    #
+    # @attribute [r] self.names
+    # @return [Array<Symbol>] supported attribute names
+    def self.names = @all.keys
+
+    # @param name [Symbol, #to_s]
+    #   defined type name (see {.names})
+    #   or glyph
+    # @return [String] glyph definition
+    def self.[](name)
+      return @default if name == :default
+      Text.embellish(
+        if name.is_a?(Symbol)
+          @all[name] or raise(ArgumentError, "invalid glyph type - #{name}")
+        else
+          name.to_s
+        end
+      )
+    end
+
+    @all = {
+      completed: '[b 52]✓',
+      dot: '[27]•',
+      error: '[b d0]𝙓',
+      failed: '[b c4]𝑭',
+      information: '[b 77]𝒊',
+      point: '[27]◉',
+      query: '[b 27]▸',
+      task: '[b 27]➔',
+      warning: '[b dd]!'
+    }.compare_by_identity
+
+    # GLYPH = {
+    #   default: '●',
+    #   information: '🅸 ',
+    #   warning: '🆆 ',
+    #   error: '🅴 ',
+    #   completed: '✓',
+    #   failed: '🅵 ',
+    #   task: '➔',
+    #   query: '🆀 '
+    # }.compare_by_identity.freeze
+
+    self.default = nil
+  end
+end

data/lib/natty-ui/preload.rb

@@ -3,7 +3,10 @@
 require_relative '../natty-ui'
 
 module NattyUI
-  Animation.defined?(:matrix)
-  Text::EastAsianWidth[0]
+  Animation[nil]
+  Frame[:default]
+  Glyph[:default]
   KEY_MAP[0]
+  Spinner[:default]
+  Text.width("\u1100")
 end

data/lib/natty-ui/spinner.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require_relative 'ansi'
+
+module NattyUI
+  # Helper class to select spinner types.
+  # @see Features#progress
+  module Spinner
+    class << self
+      # Define spinner type used by default.
+      # @attribute [w] self.default
+      # @param value [Symbol] type name
+      # @return [Symbol] type name
+      def default=(value)
+        @default = self[value.nil? || value == :default ? :pulse : value]
+      end
+
+      # Defined spinner type names.
+      # @see []
+      #
+      # @attribute [r] self.names
+      # @return [Array<Symbol>] supported attribute names
+      def names = @all.keys
+
+      # @param name [Symbol, #to_a, #to_s]
+      #   defined type name (see {.names})
+      #   or spinner elements
+      # @return [Enumerator] spinner definition
+      def [](name)
+        return @default if name == :default
+        parts =
+          if name.is_a?(Symbol)
+            @all[name] or raise(ArgumentError, "invalid spinner type - #{name}")
+          else
+            name
+          end
+        parts =
+          (parts.respond_to?(:map) ? parts : parts.to_s.chars).map do |part|
+            "#{@style}#{part}"
+          end
+        raise(ArgumentError, "invalid spinner type - #{name}") if parts.empty?
+        parts = parts.zip(parts).flatten(1) while parts.size < 6
+        Enumerator.new { |y| parts.each { y << _1 } while true }
+      end
+
+      private
+
+      def slide(a, b, size, prefix = nil, suffix = prefix)
+        Enumerator.new do |y|
+          fn =
+            lambda do |i|
+              y << "#{prefix}#{a * (i += 1)}#{b * (size - i)}#{suffix}"
+            end
+          size.times(&fn)
+          a, b = b, a
+          size.times(&fn)
+        end
+      end
+
+      def bounce(a, b, size, prefix = nil, suffix = prefix)
+        Enumerator.new do |y|
+          fn =
+            lambda do |i|
+              y << "#{prefix}#{a * (i += 1)}#{b * (size - i)}#{suffix}"
+            end
+          size.times(&fn)
+          a, b = b, a
+          (size - 1).times(&fn)
+          fn = ->(i) { y << "#{prefix}#{a * i}#{b * (size - i)}#{suffix}" }
+          (size - 2).downto(0, &fn)
+          a, b = b, a
+          (size - 1).downto(0, &fn)
+        end
+      end
+
+      def move(a, b, size, prefix = nil, suffix = prefix)
+        Enumerator.new do |y|
+          size.times do |i|
+            y << "#{prefix}#{b * i}#{a}#{b * (size - i - 1)}#{suffix}"
+          end
+          y << "#{prefix}#{b * size}#{suffix}"
+        end
+      end
+    end
+
+    @style = Ansi[:bold, 220]
+    @all = {
+      bar: '▁▂▃▄▅▆▇█▇▆▅▄▃▂',
+      blink: '■□▪▫',
+      blocks: '▖▘▝▗',
+      bounce: bounce('◼︎', '◻︎', 7),
+      bounce2: bounce('▰', '▱', 7),
+      bounce3: bounce('● ', '◌ ', 7),
+      bounce4: bounce('=', ' ', 5, '[', ']'),
+      circle: '◐◓◑◒',
+      colors: '🟨🟨🟧🟧🟥🟥🟦🟦🟪🟪🟩🟩',
+      dots: '⣷⣯⣟⡿⢿⣻⣽⣾',
+      dots2: '⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏',
+      dots3: '⠋⠙⠚⠞⠖⠦⠴⠲⠳⠓',
+      dots4: '⠄⠆⠇⠋⠙⠸⠰⠠⠰⠸⠙⠋⠇⠆',
+      dots5: '⠋⠙⠚⠒⠂⠂⠒⠲⠴⠦⠖⠒⠐⠐⠒⠓⠋',
+      move: move('◼︎', '◻︎', 7),
+      move2: move('▰', '▱', 7),
+      move3: move('● ', '◌ ', 7),
+      move4: move('=', ' ', 5, '[', ']'),
+      pulse: '•✺◉●◉✺',
+      slide: slide('◼︎', '◻︎', 7),
+      slide2: slide('▰', '▱', 7),
+      slide3: slide('● ', '◌ ', 7),
+      slide4: slide('=', ' ', 5, '[', ']'),
+      slide5: slide('.', ' ', 3),
+      snake: '⠁⠉⠙⠸⢰⣠⣄⡆⠇⠃',
+      stod: '⡿⣟⣯⣷⣾⣽⣻⢿',
+      swap: '㊂㊀㊁',
+      vintage: '-\\|/'
+    }.compare_by_identity
+
+    self.default = nil
+  end
+end

data/lib/natty-ui/version.rb

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

data/lib/natty-ui/wrapper/ask.rb

@@ -56,7 +56,7 @@ module NattyUI
       end
 
       def draw(question)
-        glyph = NattyUI.glyph(:query)
+        glyph = NattyUI::Glyph[:query]
         @parent.print(
           question,
           prefix: "#{glyph} #{Ansi[255]}",

data/lib/natty-ui/wrapper/framed.rb

@@ -11,12 +11,12 @@ module NattyUI
     # {Wrapper::Element#close}.
     #
     # @param [Array<#to_s>] args more objects to print
-    # @param [:double, :heavy, :rounded, :semi, :simple] type frame type
+    # @param [Symbol, String] type frame type; see {NattyUI::Frame}
     # @yieldparam [Wrapper::Framed] framed the created section
     # @return [Object] the result of the code block
     # @return [Wrapper::Framed] itself, when no code block is given
-    def framed(*args, type: :rounded, &block)
-      _section(:Framed, args, type: NattyUI.frame(type), &block)
+    def framed(*args, type: :default, &block)
+      _section(:Framed, args, type: NattyUI::Frame[type], &block)
     end
   end
 

data/lib/natty-ui/wrapper/list_in_columns.rb

@@ -89,7 +89,7 @@ module NattyUI
             } #{Text.embellish(s)}"
           end
         else
-          ->(s) { "#{glyph} #{Text.embellish(s)}" }
+          ->(s) { "#{Text.embellish(glyph)} #{Text.embellish(s)}" }
         end
       end
 

data/lib/natty-ui/wrapper/message.rb

@@ -9,7 +9,7 @@ module NattyUI
     #
     # @param [#to_s] title object to print as section title
     # @param [Array<#to_s>] args more objects to print
-    # @param [#to_s] glyph glyph/prefix used for the title
+    # @param [Symbol, #to_s] glyph used for the title; see {NattyUI::Glyph}
     # @yieldparam [Wrapper::Message] message the created section
     # @return [Object] the result of the code block
     # @return [Wrapper::Message] itself, when no code block is given
@@ -94,7 +94,7 @@ module NattyUI
       protected
 
       def initialize(parent, title:, glyph:)
-        glyph = NattyUI.glyph(glyph) || glyph
+        glyph = NattyUI::Glyph[glyph]
         prefix_width = Text.width(glyph) + 1
         super(
           parent,

data/lib/natty-ui/wrapper/progress.rb

@@ -18,11 +18,9 @@ module NattyUI
     #
     # @param [#to_s] title object to print as progress title
     # @param [#to_f] max_value maximum value of the progress
-    # @param [:bar, :blink, :blocks, :braile, :circle, :colors, :pulse,
-    #   :snake, :swap, :triangles, :vintage, #to_s] spinner type of spinner or
-    #   spinner elements
+    # @param [Symbol, #to_a, #to_s] spinner spinner type; see {NattyUI::Spinner}
     # @return [Wrapper::Progress] the created progress element
-    def progress(title, max_value: nil, spinner: :pulse)
+    def progress(title, max_value: nil, spinner: :default)
       _element(:Progress, title, max_value, spinner)
     end
   end
@@ -42,26 +40,10 @@ module NattyUI
         @final_text = [title]
         @max_value = [0, max_value.to_f].max if max_value
         @value = @progress = 0
-        draw(title, SPINNER[spinner] || spinner.to_s)
+        draw(title, spinner)
         self
       end
 
-      SPINNER = {
-        bar: '▁▂▃▄▅▆▇█▇▆▅▄▃▂',
-        blink: '■□▪▫',
-        blocks: '▖▘▝▗',
-        braile: '⣷⣯⣟⡿⢿⣻⣽⣾',
-        braile_reverse: '⡿⣟⣯⣷⣾⣽⣻⢿',
-        circle: '◐◓◑◒',
-        colors: '🟨🟧🟥🟦🟪🟩',
-        pulse: '•✺◉●◉✺',
-        snake: '⠁⠉⠙⠸⢰⣠⣄⡆⠇⠃',
-        swap: '㊂㊀㊁',
-        triangles: '◢◣◤◥',
-        vintage: '-\\|/'
-      }.compare_by_identity.freeze
-      private_constant :SPINNER
-
       def draw(title, _spinner)
         (wrapper.stream << @parent.prefix << "➔ #{title} ").flush
       end

data/lib/natty-ui/wrapper/request.rb

@@ -36,7 +36,7 @@ module NattyUI
 
       def draw(question)
         wrapper = @parent.wrapper
-        glyph = NattyUI.glyph(:query)
+        glyph = NattyUI :Glyph[:query]
         @parent.print(
           question,
           prefix: "#{glyph} #{Ansi[255]}",

data/lib/natty-ui/wrapper/table.rb

@@ -7,14 +7,11 @@ module NattyUI
     #
     # Table view of data.
     #
-    # Defined values for `type` are
-    # :double, :heavy, :semi, :simple
-    #
-    # @overload table(*args, type: simple, expand: false)
+    # @overload table(*args, type: :default, expand: false)
     #   Display the given arrays as rows of a table.
     #
     #   @param [#map<#map<#to_s>>] args one or more arrays representing rows of the table
-    #   @param [Symbol] type frame type
+    #   @param [Symbol, String] type frame type; see {NattyUI::Frame}
     #   @param [false, true. :equal] expand
     #
     #   @example
@@ -33,10 +30,10 @@ module NattyUI
     #     # ───────┼───────┼───────────
     #     # kiwi   │ 1.5$  │ Newzeeland
     #
-    # @overload table(type: simple, expand: false)
+    # @overload table(type: :default, expand: false)
     #   Construct and display a table.
     #
-    #   @param [Symbol] type frame type
+    #   @param [Symbol, String] type frame type; see {NattyUI::Frame}
     #   @param [false, true. :equal] expand
     #
     #   @example
@@ -58,8 +55,8 @@ module NattyUI
     #
     # @yield [Table] table construction helper
     # @return [Wrapper::Section, Wrapper] it's parent object
-    def table(*table, type: :simple, expand: false)
-      type = NattyUI.frame(type)
+    def table(*table, type: :default, expand: false)
+      type = NattyUI::Frame[type]
       table = Table.create(*table)
       yield(table) if block_given?
       _element(:Table, table, type, expand)

data/lib/natty-ui.rb

@@ -135,34 +135,6 @@ module NattyUI
       nil
     end
 
-    # @return [Array<Symbol>] available glyph names
-    def glyph_names = GLYPH.keys
-
-    # Get a pre-defined glyph.
-    #
-    # @param [Symbol] name glyph name
-    # @return [String] the glyph
-    # @return [nil] when glyph is not defined
-    def glyph(name) = GLYPH[name]
-
-    # @return [Array<Symbol>] available frame names
-    def frame_names = FRAME.keys
-
-    # Get a frame definition.
-    #
-    # @param [Symbol] name frame type name
-    # @return [String] the frame definition
-    # @raise [ArgumentError] when an invalid name is specified
-    def frame(name)
-      if name.is_a?(Symbol)
-        ret = FRAME[name] and return ret
-      elsif name.is_a?(String)
-        return name if name.size == 11
-        return name * 11 if name.size == 1
-      end
-      raise(ArgumentError, "invalid frame type - #{name.inspect}")
-    end
-
     private
 
     def wrapper_class(stream, ansi)
@@ -188,44 +160,12 @@ module NattyUI
 
   dir = __dir__
   autoload(:Animation, File.join(dir, 'natty-ui', 'animation'))
+  autoload(:Frame, File.join(dir, 'natty-ui', 'frame'))
+  autoload(:Glyph, File.join(dir, 'natty-ui', 'glyph'))
   autoload(:KEY_MAP, File.join(dir, 'natty-ui', 'key_map'))
+  autoload(:Spinner, File.join(dir, 'natty-ui', 'spinner'))
 
-  GLYPH = {
-    default: "#{Ansi[:bold, 255]}•#{Ansi::RESET}",
-    point: "#{Ansi[0x27]}◉#{Ansi::RESET}",
-    information: "#{Ansi[:bold, 119]}𝒊#{Ansi::RESET}",
-    warning: "#{Ansi[:bold, 221]}!#{Ansi::RESET}",
-    error: "#{Ansi[:bold, 208]}𝙓#{Ansi::RESET}",
-    completed: "#{Ansi[:bold, 82]}✓#{Ansi::RESET}",
-    failed: "#{Ansi[:bold, 196]}𝑭#{Ansi::RESET}",
-    task: "#{Ansi[:bold, 39]}➔#{Ansi::RESET}",
-    query: "#{Ansi[:bold, 39]}▸#{Ansi::RESET}"
-  }.compare_by_identity.freeze
-
-  # GLYPH = {
-  #   default: '●',
-  #   information: '🅸 ',
-  #   warning: '🆆 ',
-  #   error: '🅴 ',
-  #   completed: '✓',
-  #   failed: '🅵 ',
-  #   task: '➔',
-  #   query: '🆀 '
-  # }.compare_by_identity.freeze
-
-  FRAME = {
-    rounded: '╭╮╰╯│─┼┬┴├┤',
-    simple: '┌┐└┘│─┼┬┴├┤',
-    heavy: '┏┓┗┛┃━╋┳┻┣┫',
-    double: '╔╗╚╝║═╬╦╩╠╣',
-    semi: '╒╕╘╛│═╪╤╧╞╡',
-    semi2: '╓╖╙╜│─╫╥╨╟╢',
-    rows: '     ──    ',
-    cols: '    │ │    ',
-    undecorated: '           '
-  }.compare_by_identity.freeze
-
-  private_constant :Animation, :KEY_MAP, :GLYPH, :FRAME
+  private_constant :Animation, :KEY_MAP
 
   @element = StdOut
   self.in_stream = STDIN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   This is the beautiful, nice, nifty, fancy, neat, pretty, cool, lovely,
@@ -49,8 +49,11 @@ files:
 - lib/natty-ui/ansi.rb
 - lib/natty-ui/ansi/constants.rb
 - lib/natty-ui/ansi_wrapper.rb
+- lib/natty-ui/frame.rb
+- lib/natty-ui/glyph.rb
 - lib/natty-ui/key_map.rb
 - lib/natty-ui/preload.rb
+- lib/natty-ui/spinner.rb
 - lib/natty-ui/text.rb
 - lib/natty-ui/text/east_asian_width.rb
 - lib/natty-ui/version.rb