natty-ui 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd6017665733941fd093cbedda29b355bc207fd0ed3cecfdc041fcbc4b015f1
-  data.tar.gz: 0c8bd80f79200f5a0736a3830724e3effba02e45e90a7700ff3282206e0892fa
+  metadata.gz: 1bec48a569ad9b951d916baaa9388d825f78fdb63552d932e767e9ce52a9506a
+  data.tar.gz: 1959dea526e29424bec91acd9df4200256f04b748bd4e2a6f5469e1cad28cb7b
 SHA512:
-  metadata.gz: fc669642409c79aab2bf8147e6a1a490b83920e2549d8bf869c11d21e914c21b2f3e8e17135ce281d619716bbfb35536213826494a7e83ac37d996365c4ef6e4
-  data.tar.gz: 28ebfab029b8e77b9179f5d9652031e997cadc57e8eaf600729ccda22e0eaeb5443839ea58b7e157d7e425c495adddd38bd725d6c5e58758c9dff61b86be2f82
+  metadata.gz: 904823039984b10ddf34348fb81c9931396d8fe7b6e4079531c177a18d7f891a02227d7e5b4e371878d7837d32fbe3bff8afce7c25ca047265406f3d2ec9cef3
+  data.tar.gz: a993fbec0c910161f00f20e6333c13027f1407eeb39a3e7407f6c106f47b1bdb3f0059330340643b7b1cd3733d4fa2052ebcef04a0ac6f268204b5cd47852fed

data/README.md

@@ -1,10 +1,10 @@
-# ᓚᕠᗢ NattyUI v1.0.2
+# ᓚᕠᗢ NattyUI v1.0.3
 
 This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely, natty user interface you like to have for your command line applications. It contains elegant, simple and beautiful tools that enhance your command line interfaces functionally and aesthetically.
 
 - Gem: [rubygems.org](https://rubygems.org/gems/natty-ui)
 - Source: [codeberg.org](https://codeberg.org/mblumtritt/natty-ui)
-- Help: [rubydoc.info](https://rubydoc.info/gems/natty-ui/1.0.2/NattyUI)
+- Help: [rubydoc.info](https://rubydoc.info/gems/natty-ui/1.0.3/NattyUI)
 
 ## Features
 

data/lib/natty-ui/element.rb

@@ -60,7 +60,7 @@ module NattyUI
         if (cpref = options[:cprefix]).nil? || cpref == true
           options[:prefix] = pref ? @prefix + pref : @prefix
         else
-          cpref = StrConst[cpref] unless StrConst === cpref
+          cpref = StrConst[cpref] unless cpref.is_a?(StrConst)
           options[:cprefix] = @prefix + cpref
           options[:prefix] = @prefix + (pref || StrConst.spacer(cpref.width))
         end
@@ -70,7 +70,7 @@ module NattyUI
         if (csuff = options[:csuffix]).nil? || csuff == true
           options[:suffix] = suff ? suff + @suffix : @suffix
         else
-          csuff = StrConst[csuff] unless StrConst === csuff
+          csuff = StrConst[csuff] unless csuff.is_a?(StrConst)
           options[:csuffix] = csuff + @suffix
           options[:suffix] = (suff || StrConst.spacer(csuff.width)) + @suffix
         end

data/lib/natty-ui/features.rb

@@ -65,7 +65,7 @@ module NattyUI
         return self if max_width < 1
 
         unless (prefix = popts.delete(:prefix)).nil?
-          prefix = StrConst[prefix] unless StrConst === prefix
+          prefix = StrConst[prefix] unless prefix.is_a?(StrConst)
           return self if (max_width -= prefix.width) < 1
         end
 
@@ -74,7 +74,7 @@ module NattyUI
         elsif cprefix == true
           prefix, cprefix = StrConst.spacer(prefix.width), prefix if prefix
         else
-          cprefix = StrConst[cprefix] unless StrConst === cprefix
+          cprefix = StrConst[cprefix] unless cprefix.is_a?(StrConst)
           unless prefix
             return self if (max_width -= cprefix.width) < 1
             prefix = StrConst.spacer(cprefix.width)
@@ -82,7 +82,7 @@ module NattyUI
         end
 
         unless (suffix = popts.delete(:suffix)).nil?
-          suffix = StrConst[suffix] unless StrConst === suffix
+          suffix = StrConst[suffix] unless suffix.is_a?(StrConst)
           return self if (max_width -= suffix.width) < 1
         end
 
@@ -91,7 +91,7 @@ module NattyUI
         elsif csuffix == true
           suffix, csuffix = StrConst.spacer(suffix.width), suffix if suffix
         else
-          csuffix = StrConst[csuffix] unless StrConst === csuffix
+          csuffix = StrConst[csuffix] unless csuffix.is_a?(StrConst)
           return self if (max_width -= csuffix.width) < 1
           suffix = StrConst.spacer(csuffix.width)
         end
@@ -101,6 +101,7 @@ module NattyUI
 
       popts[:ansi] = Terminal.ansi?
       lines = Text.format(*text, **popts)
+
       if cprefix || csuffix
         lines.map! do |line|
           line = "#{cprefix}#{line}#{csuffix}"
@@ -407,7 +408,11 @@ module NattyUI
       return self unless block_given?
       yield(table = Table.new)
       return self if table.empty?
-      puts(*TableRenderer.lines(columns, table, **options), bbcode: false)
+      puts(
+        *TableRenderer.lines(columns, table, **options),
+        bbcode: false,
+        eol: :no_paragraph
+      )
     end
 
     #
@@ -422,7 +427,7 @@ module NattyUI
     #
     # @example Manual close
     #   tmp = ui.temporary
-    #   ui.puts 'Loading…'
+    #   tmp.puts 'Loading…'
     #   sleep 1
     #   tmp.end   # erases "Loading…"
     #
@@ -484,7 +489,7 @@ module NattyUI
     #
     # @example Manual close
     #   sec = ui.section 'Results'
-    #   ui.ok 'All good'
+    #   sec.ok 'All good'
     #   sec.end
     #
     # @example Block form with title
@@ -570,7 +575,7 @@ module NattyUI
     #
     # @example Manual close
     #   frm = ui.frame 'Preview'
-    #   ui.puts 'Content inside the frame.'
+    #   frm.puts 'Content inside the frame.'
     #   frm.end
     #
     # @example Block form with title and custom border

data/lib/natty-ui/frame.rb

@@ -19,7 +19,7 @@ module NattyUI
   #
   # @example Manual close
   #   frm = ui.frame 'Preview'
-  #   ui.puts 'Content inside the frame.'
+  #   frm.puts 'Content inside the frame.'
   #   frm.end
   class Frame < Element
     # @private

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

@@ -171,13 +171,13 @@ module NattyUI
             b = value.begin
             e = value.end
 
-            if Integer === b || Float === b
+            if b.is_a?(Integer) || b.is_a?(Float)
               @min_width = [0, b].max
               return @max_width = @min_width if b == e
               return @max_width = e && @min_width < e ? e : nil
             end
 
-            if Integer === e || Float === e
+            if e.is_a?(Integer) || e.is_a?(Float)
               @max_width = [0, e].max
               return @min_width = nil
             end
@@ -271,13 +271,13 @@ module NattyUI
             b = value.begin
             e = value.end
 
-            if Integer === b || Float === b
+            if b.is_a?(Integer) || b.is_a?(Float)
               @min_height = [0, b.round].max
               return @max_height = @min_height if b == e
               return @max_height = e && @min_height < e ? e.round : nil
             end
 
-            if Integer === e || Float === e
+            if e.is_a?(Integer) || e.is_a?(Float)
               @max_height = [0, e.round].max
               return @min_height = nil
             end
@@ -315,7 +315,7 @@ module NattyUI
         # @raise [ArgumentError] if value has more than 4 elements or wrong type
         def padding=(value)
           return @padding = Array.new(4, 0) if value.nil?
-          return @padding = Array.new(4, value) if Integer === value
+          return @padding = Array.new(4, value) if value.is_a?(Integer)
           unless value.respond_to?(:map)
             raise(ArgumentError, 'value must be an Integer, Enumerable or nil')
           end
@@ -785,7 +785,7 @@ module NattyUI
       # @return [Boolean] `true` if a cell was removed, `false` otherwise
       def delete(index)
         cell =
-          if Cell === index
+          if index.is_a?(Cell)
             @cells.delete(index)
           else
             @cells.delete_at(index.to_int)
@@ -1107,7 +1107,7 @@ module NattyUI
       # @return [Boolean] `true` if a row was removed, `false` otherwise
       def delete(index)
         row =
-          if Row === index
+          if index.is_a?(Row)
             @rows.delete(index)
           else
             @rows.delete_at(index.to_int)

data/lib/natty-ui/margin.rb

@@ -16,7 +16,7 @@ module NattyUI
   #
   # @example Manual close with left spacing
   #   m = ui.margin left: 2
-  #   ui.puts 'Indented content.'
+  #   m.puts 'Indented content.'
   #   m.end
   class Margin < Element
     # @private
@@ -63,8 +63,8 @@ module NattyUI
           )
         end
 
-      top = [0, Float === top ? top.round : top.to_int].max
-      @bottom = [0, Float === @bottom ? @bottom.round : @bottom.to_int].max
+      top = [0, top.is_a?(Float) ? top.round : top.to_int].max
+      @bottom = [0, @bottom.is_a?(Float) ? @bottom.round : @bottom.to_int].max
 
       width = parent.columns
       if width < 2
@@ -72,8 +72,8 @@ module NattyUI
         return parent.space(top)
       end
 
-      right = (width * right).round if Float === right
-      left = (width * left).round if Float === left
+      right = (width * right).round if right.is_a?(Float)
+      left = (width * left).round if left.is_a?(Float)
 
       parent.space(top)
       @prefix = StrConst.spacer(left.to_int.clamp(0, width))

data/lib/natty-ui/progress.rb

@@ -126,7 +126,7 @@ module NattyUI
     end
 
     def simple
-      v = Float === @value ? @value.round(2) : @value
+      v = @value.is_a?(Float) ? @value.round(2) : @value
       "[bright_green]#{'•' * @value}▏[/fg]#{v}"
     end
 

data/lib/natty-ui/renderer/table_renderer.rb

@@ -59,13 +59,13 @@ module NattyUI
 
           value = [cells.map(&:natural_width).max, cmin].max
 
-          cmax = cells.map(&:content_max).compact.min
+          cmax = cells.filter_map(&:content_max).min
           if cmax
             value = [value, cmax].min
             max = cmax + pad
           end
 
-          ColWidth.new(cmin, pad, max, value, has_min)
+          ColWidth.new(value, pad, has_min, cmin, max)
         end
       adjust(cols, @content_width)
       @rows.each do |row|
@@ -77,33 +77,34 @@ module NattyUI
     end
 
     def adjust(cols, target)
-      delta = cols.sum(&:value) - target
+      delta = (cols.sum(&:value) - target).nonzero? or return
       # 1) wrap content by shrinking columns down to their content minimum.
       # Columns without a min_width are shrunk first; a column with a min_width
       # is only reduced once no unconstrained column can give up more room.
       while delta > 0
-        cand = cols.select(&:content_shrinkable?)
+        cand = []
+        free = []
+        cols.each do |c|
+          next unless c.shrinkable?
+          cand << c
+          free << c unless c.has_min
+        end
         break if cand.empty?
-        free = cand.reject(&:has_min)
-        (free.empty? ? cand : free).max_by(&:value).value -= 1
+        (free.empty? ? cand : free).max_by(&:value).shrink!
         delta -= 1
       end
       # 2) still too wide: trim padding, widest-padded column first
       while delta > 0
-        cand = cols.select(&:pad_reducible?)
-        break if cand.empty?
-        col = cand.max_by(&:pad)
-        col.pad -= 1
-        col.value -= 1
+        break if (cand = cols.select(&:pad_reducible?)).empty?
+        cand.max_by(&:pad).reduce_pad!
         delta -= 1
       end
       # 3) room to spare: grow columns to fill the width, but only on request
       # and never past a column's configured max_width
       return unless @expand
       while delta < 0
-        cand = cols.select(&:expandable?)
-        break if cand.empty?
-        cand.min_by(&:value).value += 1
+        break if (cand = cols.select(&:expandable?)).empty?
+        cand.min_by(&:value).expand!
         delta += 1
       end
     end
@@ -113,7 +114,7 @@ module NattyUI
         row.each(&:reflow!)
         cells = row.map(&:height)
         h = [cells.map(&:value).max, cells.map(&:min).max].max
-        mx = cells.map(&:max).compact.min
+        mx = cells.filter_map(&:max).min
         mx ? [h, mx].min : h
       end
     end
@@ -296,13 +297,29 @@ module NattyUI
     end
 
     # @private
-    ColWidth =
-      Struct.new(:content_min, :pad, :max, :value, :has_min) do
-        def content_shrinkable? = value > content_min + pad
-        def pad_reducible? = pad > 0
-        def expandable? = max.nil? || value < max
+    class ColWidth
+      attr_reader :value, :pad, :has_min
+
+      def shrinkable? = @value > @min
+      def expandable? = @max.nil? || @value < @max
+      def pad_reducible? = @pad > 0
+      def shrink! = (@value -= 1)
+      def expand! = (@value += 1)
+
+      def reduce_pad!
+        @value -= 1
+        @pad -= 1
       end
 
+      def initialize(value, pad, has_min, min, max)
+        @value = value
+        @pad = pad
+        @min = min + pad
+        @has_min = has_min
+        @max = max
+      end
+    end
+
     # @private
     class Size
       attr_reader :min, :max
@@ -311,8 +328,8 @@ module NattyUI
       def initialize(min, max, value)
         @min = min
         @max = max
-        value = [value, min].max
-        @value = max && value > max ? max : value
+        @value = [value, min].max
+        @value = max if max && @value > max
       end
     end
 
@@ -420,7 +437,7 @@ module NattyUI
 
       def dim(value, default, max)
         return default unless value
-        Float === value ? (value * max).round : value
+        value.is_a?(Float) ? (value * max).round : value
       end
     end
   end

data/lib/natty-ui/section.rb

@@ -20,7 +20,7 @@ module NattyUI
   #
   # @example Manual close
   #   sec = ui.warning 'Disk space low'
-  #   ui.puts 'Only 500 MB remaining.'
+  #   sec.puts 'Only 500 MB remaining.'
   #   sec.end
   class Section < Element
     # @private
@@ -148,7 +148,7 @@ module NattyUI
         information: [:bright_blue, '[bright_blue]𝒊[/fg] '],
         warning: [:yellow, '[bright_yellow]![/fg] '],
         error: [:red, '[bright_red]𝙓[/fg] '],
-        fatal: [:red, '[bright_red i]𝒊[/fg /i] ']
+        fatal: [:red, '[bright_red i]![/fg /i] ']
       }.compare_by_identity
       @kind.default = @kind[:default]
 

data/lib/natty-ui/temporary.rb

@@ -19,10 +19,10 @@ module NattyUI
   #   end  # "Thinking…" is erased here
   #
   # @example Manual close
-  #   ui.temporary
-  #   ui.puts 'Loading…'
+  #   temp = ui.temporary
+  #   temp.puts 'Loading…'
   #   do_work
-  #   ui.end   # erases "Loading…"
+  #   temp.end   # erases "Loading…"
   class Temporary < Element
     # @private
     def puts(*objects, **opts)

data/lib/natty-ui/utils/str_const.rb

@@ -12,12 +12,10 @@ module NattyUI
       end
       alias [] from_str
 
-      def spacer(size = 1)
-        size < 1 ? @empty : new((' ' * size).freeze, size)
-      end
+      def spacer(size = 1) = @spacer[size]
 
       def join(*other)
-        other.map! { ::StrConst === it ? it : from_str(it) }
+        other.map! { is.is_a?(::StrConst) ? it : from_str(it) }
         new(other.join.freeze, other.sum(&:width))
       end
     end
@@ -38,7 +36,7 @@ module NattyUI
     end
 
     def +(other)
-      other = StrConst[other] unless StrConst === other
+      other = StrConst[other] unless other.is_a?(StrConst)
       StrConst.new((@to_s + other.to_s).freeze, @width + other.width)
     end
 
@@ -47,15 +45,16 @@ module NattyUI
         if str.frozen?
           str.encoding == ENCODING ? str : str.encode(ENCODING).freeze
         else
-          str = str.dup
-          str.encode!(ENCODING) if str.encoding != ENCODING
-          str.freeze
+          (str.encoding == ENCODING ? str.dup : str.encode(ENCODING)).freeze
         end
       @width = width
     end
 
     ENCODING = Encoding::UTF_8
-    @empty = new('', 0)
+    @spacer =
+      Hash
+        .new { |h, size| h[size] = new((' ' * size).freeze, size) }
+        .compare_by_identity
   end
 
   private_constant :StrConst

data/lib/natty-ui/utils/utils.rb

@@ -14,7 +14,7 @@ module NattyUI
 
       def as_width(value, max)
         return max if value == :auto
-        (Float === value ? (max * value).round : value.to_int).clamp(0, max)
+        (value.is_a?(Float) ? (value * max).round : value.to_int).clamp(0, max)
       end
 
       def as_mark(mark)

data/lib/natty-ui/version.rb

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

data/lib/natty-ui.rb

@@ -118,6 +118,16 @@ module NattyUI
     # @private
     def end = self
 
+    # @private
+    def end!
+      return self if @element == self
+      @stack.shift
+      @stack.each { it.__send__(:done) }
+      @stack = [@element = self]
+      Terminal.show_cursor
+      self
+    end
+
     private
 
     def _begin(element)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 description: 'This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich,
   lovely, natty user interface tool you like to have for your command line applications.
   It contains elegant, simple and beautiful features that enhance your command line
@@ -91,7 +91,7 @@ metadata:
   yard.run: yard
   source_code_uri: https://codeberg.org/mblumtritt/natty-ui
   bug_tracker_uri: https://codeberg.org/mblumtritt/natty-ui/issues
-  documentation_uri: https://rubydoc.info/gems/natty-ui1.0.2
+  documentation_uri: https://rubydoc.info/gems/natty-ui/1.0.3
 rdoc_options: []
 require_paths:
 - lib
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely,
   natty user interface you like to have for your CLI.