natty-ui 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a38cff2c6416d6d7832c3c053d63ebf23977a67abf485e555c35e206fe768b
-  data.tar.gz: 14363fcea12c6dbb45ce7e7b8dec8d68668f5faa4a8f20793b212e9bb9bd5905
+  metadata.gz: 88f26cebef7a281c4b11df8e8accf096706d4308aa22d716bb516f9c85b51be6
+  data.tar.gz: 62fc6e920615b9f4536da8a9db33cc9e4261352d36a3423cdd11c64ab7b2e93c
 SHA512:
-  metadata.gz: 5e5031c308e7f63c4f99ba4d6558cf3a3effab04f475f568054c079b6da3908c47df2581259a6c93f661c51e623baafeed61c91e6fe0c025f55bc0adf2b18d17
-  data.tar.gz: 6275cb88ce6f4822b57debd98a9b8c560198fb3c48028768fd39401320339561b777512d3e0ddbc15a14dd250ef60b592777453f7733156925f525755e4e1678
+  metadata.gz: 231f29c1bca8face152dbb63ed1c6137866a97941e092ed3db3f30ee2c372d71bbb10b1885100fd28691fb6093d2d4deab14fcf8d95fe05106cfc0c2d44d3b66
+  data.tar.gz: e39a9f14e9adfb4bfc1360cc9ee3dda19f96b3cce23afbf97da2315b184bf5b0b62f62c0f4e6fb283f22029d2902bc14623beec8cb42c45d528ea5168a5bb274

data/examples/illustration.rb

@@ -7,9 +7,10 @@ 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 [[italic]]elegant[[/]],
-    [[italic]]simple[[/]] and [[italic]]beautiful[[/]] tools that enhance your
-    command line interfaces functionally and aesthetically.
+    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.
   TEXT
 
   ui.msg('Features', glyph: '⭐️') { ui.ls(<<~FEATURES.lines(chomp: true)) }

data/lib/natty-ui/ansi.rb

@@ -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,8 @@ module NattyUI
       end
     end
 
+    ESC = /(#{Reline::Unicode::CSI_REGEXP})|(#{Reline::Unicode::OSC_REGEXP})/
+
     CLR_PREFIX = {
       'fg' => '38',
       'bg' => '48',
@@ -477,8 +479,16 @@ 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(
+      :ESC,
+      :CLR_PREFIX,
+      :PI2_THIRD,
+      :PI4_THIRD,
+      :SATTR,
+      :CLR,
+      :ATTR,
+      :SCLR
+    )
   end
 end
 

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.1'
 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,21 @@ 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(
+        Reline::Unicode::WIDTH_SCANNER
+      ) do |non_printing_start, non_printing_end, _csi, _osc, gc|
+        if in_zero_width
+          in_zero_width = false if non_printing_end
+          next
+        end
+        next in_zero_width = true if non_printing_start
+        width += Reline::Unicode.get_mbchar_width(gc) if gc
+      end
+      width
     end
 
     # Convert given arguments into strings and yield each line.
@@ -190,10 +201,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.1
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-07-08 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