natty-ui 0.26.0 → 0.28.0

data/lib/natty-ui/utils.rb

@@ -24,12 +24,22 @@ module NattyUI
 
       # @!visibility private
       def align(value)
-        value == :right || value == :centered ? value : :left
+        POS_ALI.include?(value) ? value : :left
+      end
+
+      # @!visibility private
+      def position(value)
+        value if POS_ALI.include?(value)
       end
 
       # @!visibility private
       def vertical(value)
-        value == :bottom || value == :middle ? value : :top
+        VERT.include?(value) ? value : :top
+      end
+
+      # @!visibility private
+      def split_table_attr(values)
+        [values.slice(*TAB_ATTR), values.except(*TAB_ATTR)]
       end
 
       # @!visibility private
@@ -39,7 +49,7 @@ module NattyUI
         when 0
           [0, 0, 0, 0]
         when 1
-          [value[0], 0, 0, 0]
+          Array.new(4, value[0])
         when 2
           value * 2
         when 3
@@ -49,29 +59,58 @@ module NattyUI
         end
       end
       alias margin padding
+
+      # @!visibility private
+      def as_size(range, value)
+        return range.begin if value == :min
+        return range.end if value.nil? || value.is_a?(Symbol)
+        (
+          if value.is_a?(Numeric)
+            (value > 0 && value < 1 ? (range.end * value) : value).round
+          else
+            value.to_i
+          end
+        ).clamp(range)
+      end
     end
+
+    POS_ALI = %i[right centered].freeze
+    VERT = %i[bottom middle].freeze
+    TAB_ATTR = %i[border_around border border_style position].freeze
   end
 
   class Str
     attr_reader :to_s
-
     alias to_str to_s
-    def inspect = to_s.inspect
-    def empty? = size == 0
+    def empty? = width == 0
+    def inspect = @to_s.inspect
 
-    def size
-      return @size if @size
-      @size = Text.width(self)
+    def width
+      return @width if @width
+      @width = Text.width(self)
       freeze
-      @size
+      @width
     end
-    alias width size
 
-    def initialize(str, size = nil)
-      @to_s = Ansi.bbcode(str).freeze
-      return unless size
-      @size = @size.is_a?(Integer) ? size : Text.width(self)
-      freeze
+    def +(other)
+      other = Str.new(other) unless other.is_a?(Str)
+      Str.new(@to_s + other.to_s, width + other.width)
+    end
+
+    if Terminal.ansi?
+      def initialize(str, width = nil)
+        @to_s = Ansi.bbcode(str).freeze
+        return unless width
+        @width = @width.is_a?(Integer) ? width : Text.width(self)
+        freeze
+      end
+    else
+      def initialize(str, width = nil)
+        @to_s = Ansi.plain(str).freeze
+        return unless width
+        @width = @width.is_a?(Integer) ? width : Text.width(self)
+        freeze
+      end
     end
   end
 

data/lib/natty-ui/vbars_renderer.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module NattyUI
+  module VBarsRenderer
+    class << self
+      def lines(vals, width, height, normalize, bar_width, style)
+        if style
+          bos = Ansi[*style]
+          eos = Ansi::RESET
+        end
+        if ((bar_width != :auto) && bar_width <= 1) || (vals.size * 2 > width)
+          db = '▉'
+          ds = ' '
+          el = "#{bos}#{'▔' * vals.size}#{eos}"
+          vals = vals.take(width) if vals.size > width
+        else
+          bw = (width - vals.size) / vals.size
+          bw = [bw, bar_width].min if bar_width != :auto
+          db = "#{'█' * bw} "
+          bw += 1
+          ds = ' ' * bw
+          el = "#{bos}#{'▔' * ((bw * vals.size) - 1)}#{eos}"
+        end
+        height -= 1
+        vals = normalize ? normalize!(vals, height) : adjust!(vals, height)
+        height
+          .downto(1)
+          .map { |i| "#{bos}#{vals.map { _1 < i ? ds : db }.join}#{eos}" } << el
+      end
+
+      private
+
+      def adjust!(vals, height)
+        max = vals.max.to_f
+        vals.map { ((_1 / max) * height).round }
+      end
+
+      def normalize!(vals, height)
+        min, max = vals.minmax
+        return Array.new(vals.size, height) if min == max
+        max = (max - min).to_f
+        vals.map { (((_1 - min) / max) * height).round }
+      end
+    end
+  end
+
+  private_constant :VBarsRenderer
+end

data/lib/natty-ui/version.rb

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

data/lib/natty-ui/width_finder.rb

@@ -43,9 +43,9 @@ module NattyUI
 
     def fit_max_width(columns, max_width, saving_by_column)
       ret = max_width - columns.size + 1
+      columns = columns.map { normalized(_1, max_width) }
       return columns, ret if ret >= 1
       saving_by_column += 1
-      columns = columns.dup
       until ret >= 1
         columns.pop
         ret += saving_by_column
@@ -53,6 +53,16 @@ module NattyUI
       [columns, ret]
     end
 
+    def normalized(value, max_width)
+      return (max_width * value).to_i if value.is_a?(Float)
+      return value unless value.is_a?(Range)
+      min = value.begin
+      max = value.end
+      min = (max_width * min).to_i if min.is_a?(Float)
+      max = (max_width * max).to_i if max.is_a?(Float)
+      (min..max)
+    end
+
     def expand(sum)
       max_width = [@columns.sum(&:max_val), @max_width].min
       expandables = @columns.find_all(&:expandable?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
 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.
@@ -44,13 +44,16 @@ files:
 - examples/cols.rb
 - examples/elements.rb
 - examples/examples.rb
+- examples/hbars.rb
 - examples/illustration.rb
+- examples/info.rb
 - examples/key-codes.rb
 - examples/ls.rb
 - examples/named-colors.rb
 - examples/sections.rb
 - examples/tables.rb
 - examples/tasks.rb
+- examples/vbars.rb
 - lib/natty-ui.rb
 - lib/natty-ui/attributes.rb
 - lib/natty-ui/choice.rb
@@ -58,6 +61,7 @@ files:
 - lib/natty-ui/element.rb
 - lib/natty-ui/features.rb
 - lib/natty-ui/framed.rb
+- lib/natty-ui/hbars_renderer.rb
 - lib/natty-ui/ls_renderer.rb
 - lib/natty-ui/progress.rb
 - lib/natty-ui/section.rb
@@ -67,6 +71,7 @@ files:
 - lib/natty-ui/temporary.rb
 - lib/natty-ui/theme.rb
 - lib/natty-ui/utils.rb
+- lib/natty-ui/vbars_renderer.rb
 - lib/natty-ui/version.rb
 - lib/natty-ui/width_finder.rb
 - lib/natty_ui.rb
@@ -75,9 +80,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   rubygems_mfa_required: 'true'
+  yard.run: yard
   source_code_uri: https://github.com/mblumtritt/natty-ui
   bug_tracker_uri: https://github.com/mblumtritt/natty-ui/issues
-  documentation_uri: https://rubydoc.info/gems/natty-ui/0.26.0/NattyUI
+  documentation_uri: https://rubydoc.info/gems/natty-ui/NattyUI
 rdoc_options: []
 require_paths:
 - lib