natty-ui 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a38cff2c6416d6d7832c3c053d63ebf23977a67abf485e555c35e206fe768b
-  data.tar.gz: 14363fcea12c6dbb45ce7e7b8dec8d68668f5faa4a8f20793b212e9bb9bd5905
+  metadata.gz: 53cd6e051da19fb57efdfe448cfdb6ede5e7bdae3c8d59db5690ea32bb9bcd39
+  data.tar.gz: 39a38e0d1c1314e881b72aa7a6d74fdba47225ffadb110a47fd0db305095a564
 SHA512:
-  metadata.gz: 5e5031c308e7f63c4f99ba4d6558cf3a3effab04f475f568054c079b6da3908c47df2581259a6c93f661c51e623baafeed61c91e6fe0c025f55bc0adf2b18d17
-  data.tar.gz: 6275cb88ce6f4822b57debd98a9b8c560198fb3c48028768fd39401320339561b777512d3e0ddbc15a14dd250ef60b592777453f7733156925f525755e4e1678
+  metadata.gz: cb080dd1ea872a74f1ad1db42be94020cea77892c1fcab5a4b7850f78c2624d9a5bb9576442b352975644f66de3bc9e2d446e2a73c5dad9390b85b0c187da1ee
+  data.tar.gz: c2c5ee5cfbfcc1481ab842470f654176836b962d0ffc6cc3019c5e2e45b3c50cfd0613b9c7c6a82d9800e2b84e3cc26f538a959095101a512d33947be8d8d684

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
@@ -239,7 +239,7 @@ module NattyUI
       #
       # @param str [#to_s] string to be modified
       # @return [String] string without ANSI attributes
-      def blemish(str) = str.to_s.gsub(/(\e\[(?~[a-zA-Z])[a-zA-Z])/, '')
+      def blemish(str) = str.to_s.gsub(ESC, '')
 
       # Try to combine given ANSI attributes and colors.
       # The attributes and colors have to be seperated by space char (" ").
@@ -331,6 +331,13 @@ module NattyUI
       end
     end
 
+    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',
       'bg' => '48',
@@ -338,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
@@ -347,6 +354,7 @@ module NattyUI
           def self.to_hash
             map = {
               # alternative names
+              reset: '',
               slow_blink: 5,
               conceal: 8,
               default_font: 10,
@@ -368,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
@@ -477,8 +484,18 @@ module NattyUI
     ATTR = SATTR.transform_keys(&:to_s).freeze
     SCLR = CLR.transform_keys(&:to_sym).compare_by_identity.freeze
 
-    private_constant :CLR_PREFIX, :PI2_THIRD, :PI4_THIRD
-    private_constant :SATTR, :SCLR, :ATTR, :CLR
+    private_constant(
+      :CSI,
+      :OSC,
+      :ESC,
+      :CLR_PREFIX,
+      :PI2_THIRD,
+      :PI4_THIRD,
+      :SATTR,
+      :CLR,
+      :ATTR,
+      :SCLR
+    )
   end
 end
 

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.0'
+  VERSION = '0.9.2'
 end

data/lib/natty-ui.rb

@@ -83,18 +83,19 @@ module NattyUI
     def embellish(str)
       return +'' if (str = str.to_s).empty?
       reset = false
-      ret =
+      str =
         str.gsub(/(\[\[((?~\]\]))\]\])/) do
           match = Regexp.last_match[2]
-          unless match.delete_prefix!('/')
+          if match[0] == '/'
+            next "[[#{match[1..]}]]" if match.size > 1
+            reset = false
+            Ansi::RESET
+          else
             ansi = Ansi.try_convert(match)
-            next ansi ? reset = ansi : "[[#{match}]]"
+            ansi ? reset = ansi : "[[#{match}]]"
           end
-          match.empty? or next "[[#{match}]]"
-          reset = false
-          Ansi::RESET
         end
-      reset ? "#{ret}#{Ansi::RESET}" : ret
+      reset ? "#{str}#{Ansi::RESET}" : str
     end
 
     # Remove embedded attribute descriptions from given string.
@@ -103,16 +104,13 @@ module NattyUI
     # @param [:keep,:remove] ansi keep or remove ANSI codes too
     # @return [String] edited string
     def plain(str, ansi: :keep)
+      return +'' if (str = str.to_s).empty?
       str =
-        str
-          .to_s
-          .gsub(/(\[\[((?~\]\]))\]\])/) do
-            match = Regexp.last_match[2]
-            if match.delete_prefix!('/')
-              next match.empty? ? nil : "[[#{match}]]"
-            end
-            Ansi.try_convert(match) ? nil : "[[#{match}]]"
-          end
+        str.gsub(/(\[\[((?~\]\]))\]\])/) do
+          match = Regexp.last_match[2]
+          next match.size == 1 ? nil : "[[#{match[1..]}]]" if match[0] == '/'
+          Ansi.try_convert(match) ? nil : "[[#{match}]]"
+        end
       ansi == :keep ? str : Ansi.blemish(str)
     end
 
@@ -122,8 +120,19 @@ module NattyUI
     # @param [#to_s] str string to calculate
     # @return [Integer] the display size
     def display_width(str)
-      return 0 if (str = str.to_s).empty?
-      Reline::Unicode.calculate_width(plain(str), true)
+      str = plain(str).encode(Encoding::UTF_8)
+      return 0 if str.empty?
+      width = 0
+      in_zero_width = false
+      str.scan(Ansi::WIDTH_SCANNER) do |np_start, np_end, _csi, _osc, gc|
+        if in_zero_width
+          in_zero_width = false if np_end
+          next
+        end
+        next in_zero_width = true if np_start
+        width += Reline::Unicode.get_mbchar_width(gc) if gc
+      end
+      width
     end
 
     # Convert given arguments into strings and yield each line.
@@ -190,10 +199,10 @@ module NattyUI
     private
 
     def wrapper_class(stream, ansi)
-      return AnsiWrapper if ansi == true || ENV['ANSI'] == '1'
-      if ansi == false || ENV.key?('NO_COLOR') || ENV['TERM'] == 'dumb'
-        return Wrapper
-      end
+      return AnsiWrapper if ansi == true
+      return Wrapper if ansi == false || ENV.key?('NO_COLOR')
+      return AnsiWrapper if ENV['ANSI'] == '1'
+      return Wrapper if ENV['TERM'] == 'dumb'
       stream.tty? ? AnsiWrapper : Wrapper
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 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,
@@ -31,7 +31,6 @@ files:
 - examples/animate.rb
 - examples/attributes.rb
 - examples/demo.rb
-- examples/illustration.png
 - examples/illustration.rb
 - examples/ls.rb
 - examples/message.rb