natty-ui 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f26cebef7a281c4b11df8e8accf096706d4308aa22d716bb516f9c85b51be6
-  data.tar.gz: 62fc6e920615b9f4536da8a9db33cc9e4261352d36a3423cdd11c64ab7b2e93c
+  metadata.gz: 53cd6e051da19fb57efdfe448cfdb6ede5e7bdae3c8d59db5690ea32bb9bcd39
+  data.tar.gz: 39a38e0d1c1314e881b72aa7a6d74fdba47225ffadb110a47fd0db305095a564
 SHA512:
-  metadata.gz: 231f29c1bca8face152dbb63ed1c6137866a97941e092ed3db3f30ee2c372d71bbb10b1885100fd28691fb6093d2d4deab14fcf8d95fe05106cfc0c2d44d3b66
-  data.tar.gz: e39a9f14e9adfb4bfc1360cc9ee3dda19f96b3cce23afbf97da2315b184bf5b0b62f62c0f4e6fb283f22029d2902bc14623beec8cb42c45d528ea5168a5bb274
+  metadata.gz: cb080dd1ea872a74f1ad1db42be94020cea77892c1fcab5a4b7850f78c2624d9a5bb9576442b352975644f66de3bc9e2d446e2a73c5dad9390b85b0c187da1ee
+  data.tar.gz: c2c5ee5cfbfcc1481ab842470f654176836b962d0ffc6cc3019c5e2e45b3c50cfd0613b9c7c6a82d9800e2b84e3cc26f538a959095101a512d33947be8d8d684

data/examples/illustration.rb

@@ -7,10 +7,9 @@ ui.framed do
     This is the [[c4]]beautiful[[/]], [[c5]]nice[[/]], [[c6]]nifty[[/]],
     [[c7]]fancy[[/]], [[c8]]neat[[/]], [[c9]]pretty[[/]],  [[ca]]cool[[/]],
     [[cb]]lovely[[/]], [[cc]]natty[[/]] [[bold]]user interface[[/]] you like to
-    have for your command line applications. It contains
-    [[curly_underline ul_c4]]elegant[[/]], [[italic]]simple[[/]] and
-    [[double_underline ul_cc]]beautiful[[/]] tools that enhance your command
-    line interfaces functionally and aesthetically.
+    have for your command line applications. It contains [[italic]]elegant[[/]],
+    [[italic]]simple[[/]] and [[italic]]beautiful[[/]] tools that enhance your
+    command line interfaces functionally and aesthetically.
   TEXT
 
   ui.msg('Features', glyph: '⭐️') { ui.ls(<<~FEATURES.lines(chomp: true)) }

data/lib/natty-ui/ansi.rb

@@ -209,9 +209,9 @@ module NattyUI
               when (0..255)
                 "38;5;#{arg}"
               when (256..511)
-                "48;5;#{arg}"
+                "48;5;#{arg - 256}"
               when (512..767)
-                "58;5;#{arg}"
+                "58;5;#{arg - 512}"
               else
                 invalid_argument(arg)
               end
@@ -331,7 +331,12 @@ module NattyUI
       end
     end
 
-    ESC = /(#{Reline::Unicode::CSI_REGEXP})|(#{Reline::Unicode::OSC_REGEXP})/
+    CSI = /\e\[[\d;:]*[ABCDEFGHJKSTfminsuhl]/
+    OSC = /\e\]\d+(?:;[^;\a\e]+)*(?:\a|\e\\)/
+    ESC = /(#{CSI})|(#{OSC})/
+
+    # @!visibility private
+    WIDTH_SCANNER = /\G(?:(\1)|(\2)|(#{CSI})|(#{OSC})|(\X))/
 
     CLR_PREFIX = {
       'fg' => '38',
@@ -340,8 +345,8 @@ module NattyUI
       'on' => '48'
     }.freeze
 
-    PI2_THIRD = 2 * Math::PI / 3.0
-    PI4_THIRD = 4 * Math::PI / 3.0
+    PI2_THIRD = 2 * Math::PI / 3
+    PI4_THIRD = 4 * Math::PI / 3
 
     SATTR =
       Module
@@ -349,6 +354,7 @@ module NattyUI
           def self.to_hash
             map = {
               # alternative names
+              reset: '',
               slow_blink: 5,
               conceal: 8,
               default_font: 10,
@@ -370,9 +376,8 @@ module NattyUI
             }
             add = ->(s, n) { n.each_with_index { |a, idx| map[a] = s + idx } }
             add[
-              0,
+              1,
               %i[
-                reset
                 bold
                 faint
                 italic
@@ -480,6 +485,8 @@ module NattyUI
     SCLR = CLR.transform_keys(&:to_sym).compare_by_identity.freeze
 
     private_constant(
+      :CSI,
+      :OSC,
       :ESC,
       :CLR_PREFIX,
       :PI2_THIRD,

data/lib/natty-ui/ansi_constants.rb

@@ -4,42 +4,31 @@ module NattyUI
   module Ansi
     CURSOR_SHOW = "\e[?25h"
     CURSOR_HIDE = "\e[?25l"
+
     CURSOR_HOME = cursor_pos(nil, nil)
     CURSOR_FIRST_ROW = cursor_pos(1).freeze
     CURSOR_FIRST_COLUMN = cursor_column(1).freeze
+
     CURSOR_SAFE_POS_SCO = "\e[s"
-    CURSOR_RESTORE_POS_SCO = "\e[u"
     CURSOR_SAFE_POS_DEC = "\e7"
-    CURSOR_RESTORE_POS_DEC = "\e8"
     CURSOR_SAFE_POS = CURSOR_SAFE_POS_DEC
-    CURSOR_RESTORE_POS = CURSOR_RESTORE_POS_DEC
 
-    CURSOR_ALIGN_RIGHT = "\e[9999G\e[1D\e[1C" # @!visibility private
+    CURSOR_RESTORE_POS_SCO = "\e[u"
+    CURSOR_RESTORE_POS_DEC = "\e8"
+    CURSOR_RESTORE_POS = CURSOR_RESTORE_POS_DEC
 
     SCREEN_ERASE = screen_erase(:entire)
+
     SCREEN_SAVE = "\e[?47h"
     SCREEN_RESTORE = "\e[?47l"
+
     SCREEN_ALTERNATE = "\e[?1049h"
     SCREEN_ALTERNATE_OFF = "\e[?1049l"
-    SCREEN_SAVE_ATTRIBUTES = '\e[#{'
-    SCREEN_RESTORE_ATTRIBUTES = '\e[#}'
-
-    SCREEN_BLANK = "\e[0m\e[s\e[?47h\e[H\e[2J" # @!visibility private
-    SCREEN_UNBLANK = "\e[?47l\e[u\e[0m" # @!visibility private
 
     LINE_PREVIOUS = cursor_previous_line(1).freeze
     LINE_NEXT = cursor_next_line(1).freeze
     LINE_ERASE = line_erase(:entire)
 
-    # ANSI control code sequence to erase the screen and set cursor position on
-    # upper left corner.
-    CLS = (CURSOR_HOME + SCREEN_ERASE).freeze
-
-    # ANSI control code sequence to erase current line and position to first
-    # column.
-    CLL = (LINE_ERASE + CURSOR_FIRST_COLUMN).freeze
-
-    # ANSI control code to reset all attributes.
     RESET = self[:reset].freeze
 
     BOLD = self[:bold].freeze
@@ -69,5 +58,20 @@ module NattyUI
 
     HIDE = self[:hide].freeze
     REVEAL = self[:reveal].freeze
+
+    # @!visibility private
+    CLS = (CURSOR_HOME + SCREEN_ERASE).freeze
+
+    # @!visibility private
+    CLL = (CURSOR_FIRST_COLUMN + LINE_ERASE).freeze
+
+    # @!visibility private
+    SCREEN_BLANK =
+      (
+        CURSOR_SAFE_POS + SCREEN_ALTERNATE + CURSOR_HOME + SCREEN_ERASE + RESET
+      ).freeze
+
+    # @!visibility private
+    SCREEN_UNBLANK = (RESET + SCREEN_ALTERNATE_OFF + CURSOR_RESTORE_POS).freeze
   end
 end

data/lib/natty-ui/ansi_wrapper.rb

@@ -80,7 +80,7 @@ module NattyUI
       lambda do
         count = @lines_written - count
         if count.nonzero?
-          @stream << Ansi.cursor_prev_line(count) << Ansi.display(:erase_below)
+          @stream << Ansi.cursor_prev_line(count) << Ansi.screen_erase(:below)
           @lines_written -= count
         end
         @stream.flush

data/lib/natty-ui/version.rb

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

data/lib/natty-ui.rb

@@ -124,14 +124,12 @@ module NattyUI
       return 0 if str.empty?
       width = 0
       in_zero_width = false
-      str.scan(
-        Reline::Unicode::WIDTH_SCANNER
-      ) do |non_printing_start, non_printing_end, _csi, _osc, gc|
+      str.scan(Ansi::WIDTH_SCANNER) do |np_start, np_end, _csi, _osc, gc|
         if in_zero_width
-          in_zero_width = false if non_printing_end
+          in_zero_width = false if np_end
           next
         end
-        next in_zero_width = true if non_printing_start
+        next in_zero_width = true if np_start
         width += Reline::Unicode.get_mbchar_width(gc) if gc
       end
       width

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies: []
 description: |
   This is the beautiful, nice, nifty, fancy, neat, pretty, cool, lovely,