terminal_rb 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2f93f672f13936c9415cf3a474533df0f5785da3272f3482a02842a0607917
-  data.tar.gz: 52a1498c80085ea7667b7641416f406ae8694e02505a0c3201efd5f150f8d986
+  metadata.gz: 91c150887b2ab21e509a1d8da160bc89879d9750de3246a2f84ee0c87c5a3992
+  data.tar.gz: 640cc99db38489ca6ccb57f3d7605fdc199a581ff674f20cda145b189a62747c
 SHA512:
-  metadata.gz: 41cfbe3e34fa3db0af51674dc0f70f32dd08fb20d2b3a1040eff2834c65440f917f2ecea021500037658fbcf613373148c8399fdb29b7ea987916e71c570a65d
-  data.tar.gz: b6485ac5e2a9ba17ec72ffadc94cad6f5348ab846f885d12e9a68a338c15baeaa0d564ce1e1a4d2f946505887782e02dfd7221fc03e60bd3e7bb40afb88b47a1
+  metadata.gz: 9a2f57d900145e027ea44bad3bea885a46c37c451e31cd9c0623c0d4935022ab3eb3479a76095a094d0ed3acb91d4248c2052d7b635538cf95d540af3a2b8512
+  data.tar.gz: 17b15d64bb67d748202fe7db329565d9bce197c50c00bb6005e15483acea2461d59b11f16d9910c4092532299c49047817d9e4934d54b8e8d59f1580040d4314

data/README.md

@@ -1,10 +1,10 @@
-# Terminal.rb v1.0.6
+# Terminal.rb v1.0.8
 
 Terminal.rb supports you with input and output on your terminal. Simple [BBCode](https://en.wikipedia.org/wiki/BBCode)-like markup for attributes and coloring, word-wise line breaks, correct special key recognition and mouse event reporting enable you to implement your CLI app quickly and easily.
 
 - Gem: [rubygems.org](https://rubygems.org/gems/terminal_rb)
 - Source: [codeberg.org](https://codeberg.org/mblumtritt/Terminal.rb)
-- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/1.0.6/Terminal)
+- Help: [rubydoc.info](https://rubydoc.info/gems/terminal_rb/1.0.8/Terminal)
 
 ## Features
 

data/examples/key-codes.rb

@@ -6,7 +6,7 @@ Terminal.puts <<~TEXT
 
   ✅ [b bright_green]Terminal.rb[/b] — Key Codes:[/fg]
      Press any key to display it's control code and name.
-     [bright_black]([b]#{Terminal.input_mode}[/b] mode  - exit with ESC)[/fg]
+     [bright_black]([b]#{Terminal.input_mode}[/b] mode – exit with ESC)[/fg]
 
 TEXT
 

data/lib/terminal/ansi.rb

@@ -69,9 +69,9 @@ module Terminal
             .map! do |arg|
               case arg
               when String
-                @attr_map[arg] || _invalid(arg)
+                @attr_str_map[arg] || _invalid(arg)
               when Symbol
-                @attrs_map[arg] || _invalid(arg)
+                @attr_sym_map[arg] || _invalid(arg)
               when (0..255)
                 "38;5;#{arg}"
               when (256..511)
@@ -130,9 +130,14 @@ module Terminal
       #   attribute is invalid
       def try_convert(attributes, separator: ' ')
         return unless attributes
-        return if (attributes = attributes.to_s.split(separator)).empty?
-        attributes.uniq!
-        "\e[#{attributes.map! { @attr_map[it] || return }.join(';')}m"
+        cache = @convert_cache[separator]
+        hit = cache[key = attributes.to_s] and return hit
+        cache.clear if cache.size > 1024 # cache limit
+        cache[key] = unless (attributes = key.split(separator)).empty?
+          # attributes.uniq!
+          codes = attributes.map { @attr_str_map[it] || break }
+          "\e[#{codes.join(';')}m" if codes
+        end
       end
 
       # Generate rainbow-colored text using true color (24-bit) ANSI
@@ -213,7 +218,7 @@ module Terminal
             next "[#{match}]"
           end
           next match_str if (match = match.split).empty?
-          next if match.all? { @attr_map[it] }
+          next if match.all? { @attr_str_map[it] }
           match_str
         end
       end
@@ -237,7 +242,7 @@ module Terminal
           next match_str if fc == '\\' || fc == ']'
           match = Regexp.last_match(1) or next match_str
           next match_str if (parts = match.split).empty?
-          next "[\\#{match}]" if parts.all? { @attr_map[it] }
+          next "[\\#{match}]" if parts.all? { @attr_str_map[it] }
           match_str
         end
       end
@@ -271,9 +276,9 @@ module Terminal
         attributes.all? do |arg|
           case arg
           when String
-            @attr_map[arg]
+            @attr_str_map[arg]
           when Symbol
-            @attrs_map[arg]
+            @attr_sym_map[arg]
           when (0..767)
             true
           end
@@ -625,7 +630,7 @@ module Terminal
 
     @re_bbcode = /(?:\[((?~[\[\]]))\])/
 
-    clr_map = {
+    color_map = {
       # foreground
       'black' => '30',
       'red' => '31',
@@ -684,9 +689,9 @@ module Terminal
       'on_bright_white' => '107'
     }
 
-    @colors = clr_map.keys.map!(&:to_sym).sort!.freeze
+    @colors = color_map.keys.map!(&:to_sym).sort!.freeze
 
-    attr_map = {
+    @attr_base_map = {
       'reset' => '',
       'bold' => '1',
       'faint' => '2',
@@ -743,7 +748,7 @@ module Terminal
       'dashed_underline_off' => '4:0'
     }
 
-    attr_alias = ->(t, s) { attr_map[t] = attr_map[s] }
+    attr_alias = ->(t, s) { @attr_base_map[t] = @attr_base_map[s] }
 
     # aliases:
     attr_alias['off', 'reset']
@@ -768,18 +773,18 @@ module Terminal
     attr_alias['sup', 'superscript']
     attr_alias['sub', 'subscript']
 
-    @attributes = attr_map.keys.map!(&:to_sym).sort!.freeze
+    @attributes = @attr_base_map.keys.map!(&:to_sym).sort!.freeze
 
     # shortcuts disable:
-    attr_map.keys.each do |n|
+    @attr_base_map.keys.each do |n|
       attr_alias["/#{n.delete_suffix('_off')}", n] if n.end_with?('_off')
     end
 
     # additional shortcuts disable:
     attr_alias['/', 'reset']
-    attr_map['/bg'] = clr_map['on_default']
-    attr_map['/fg'] = clr_map['default']
-    attr_map['/ul'] = clr_map['ul_default']
+    @attr_base_map['/bg'] = color_map['on_default']
+    @attr_base_map['/fg'] = color_map['default']
+    @attr_base_map['/ul'] = color_map['ul_default']
 
     attr_alias['/b', 'bold_off']
     attr_alias['/d', 'dim_off']
@@ -800,15 +805,20 @@ module Terminal
     @cbase.default = '38'
     @cbase.freeze
 
-    @attr_map =
-      Hash.new do |_, str|
-        b, v = /\A(on|ul)?_?#?([[:xdigit:]]{1,6})\z/.match(str)&.captures
+    @attr_base_map.merge!(color_map).freeze
+
+    @attr_str_map = @attr_base_map.dup
+    @attr_str_map.default_proc =
+      proc do |h, s|
+        if h.size > 1024 # cache limit
+          h.keep_if { |key, _| @attr_base_map.key?(key) }
+        end
+        b, v = /\A(on|ul)?_?#?([[:xdigit:]]{1,6})\z/.match(s)&.captures
         unless v
-          b = /\A(on|ul)?_?([a-z]{3,}[0-9]{0,3})\z/.match(str) or next
-          v = NAMED_COLORS[b[2]] or next
-          next "#{@cbase[b[1]]};#{v}"
+          b = /\A(on|ul)?_?([a-z]{3,}[0-9]{0,3})\z/.match(s) or next h[s] = nil
+          next h[s] = (v = NAMED_COLORS[b[2]]) ? "#{@cbase[b[1]]};#{v}" : nil
         end
-        case v.size
+        h[s] = case v.size
         when 1, 2
           "#{@cbase[b]};5;#{v.hex}"
         when 3
@@ -817,12 +827,12 @@ module Terminal
           "#{@cbase[b]};2;#{v[0, 2].hex};#{v[2, 2].hex};#{v[4, 2].hex}"
         end
       end
-    attr_map.merge!(clr_map).keys.sort!.each { @attr_map[it] = attr_map[it] }
-    @attr_map.freeze
 
-    @attrs_map = @attr_map.transform_keys(&:to_sym)
-    @attrs_map.default_proc = @attr_map.default_proc
-    @attrs_map.compare_by_identity.freeze
+    @attr_sym_map = @attr_base_map.transform_keys(&:to_sym)
+    @attr_sym_map.compare_by_identity
+    @attr_sym_map.default_proc = proc { |h, s| h[s] = @attr_str_map[s.to_s] }
+
+    @convert_cache = Hash.new { |h, k| h[k] = {} }
 
     @screen_erase = { below: nil, above: '1', scrollback: '3' }
     @screen_erase.default = '2'

data/lib/terminal/output/ansi.rb

@@ -43,6 +43,8 @@ module Terminal
 
     def raw_write(object)
       @out.syswrite(object)
+    rescue Errno::EINTR
+      retry # fixes rare condition found on MacOS Terminal.app
     rescue IOError, SystemCallError
       __output_error(nil)
     end