natty-ui 0.27.0 → 0.29.0

data/lib/natty-ui/theme.rb

@@ -55,7 +55,7 @@ module NattyUI
             failed: '[bright_red]𝑭[/fg]',
             current: '[bright_green]➔[/fg]',
             choice: '[bright_white]◦[/fg]',
-            current_choice: '[bright_green]◉[/fg]'
+            current_choice: '[bright_green]➔[/fg]'
           )
           theme.define_section(
             default: :bright_blue,
@@ -166,11 +166,13 @@ module NattyUI
     end
 
     class Compiled
-      attr_reader :task_style, :choice_current_style, :choice_style
+      attr_reader :task_style,
+                  :choice_current_style,
+                  :choice_style,
+                  :option_states
 
       def defined_marks = @mark.keys.sort!
       def defined_borders = @border.keys.sort!
-
       def heading(index) = @heading[index.to_i.clamp(1, 6) - 1]
 
       def mark(value)
@@ -208,12 +210,25 @@ module NattyUI
             SectionBorder.create(border(theme.section_border)),
             theme.section_styles.dup.compare_by_identity
           )
+        @option_states = create_option_states
       end
 
       private
 
       def as_style(value) = (Ansi[*value].freeze if value)
 
+      def create_option_states
+        # [current?][selected?]
+        c = @mark[:current_choice]
+        n = @mark[:none]
+        sel = @mark[:checkmark]
+        uns = @mark[:choice]
+        {
+          false => { false => n + uns, true => n + sel }.compare_by_identity,
+          true => { false => c + uns, true => c + sel }.compare_by_identity
+        }.compare_by_identity.freeze
+      end
+
       def create_sections(template, styles)
         Hash
           .new do |h, kind|
@@ -224,7 +239,9 @@ module NattyUI
 
       def create_mark(mark)
         return {} if mark.empty?
-        with_default(mark.to_h { |n, e| [n.to_sym, Str.new("#{e} ")] })
+        mark = mark.to_h { |n, e| [n.to_sym, Str.new("#{e} ")] }
+        mark[:none] ||= Str.new('  ', 2)
+        with_default(mark)
       end
 
       def create_border(border)
@@ -294,6 +311,7 @@ module NattyUI
 
       private_constant :SectionBorder
     end
+    # private_constant :Compiled
 
     private
 

data/lib/natty-ui/utils.rb

@@ -3,7 +3,6 @@
 module NattyUI
   module Utils
     class << self
-      # @!visibility private
       def style(value)
         value =
           case value
@@ -22,27 +21,22 @@ module NattyUI
         value.keep_if { Ansi.valid?(_1) }.empty? ? nil : value
       end
 
-      # @!visibility private
       def align(value)
         POS_ALI.include?(value) ? value : :left
       end
 
-      # @!visibility private
       def position(value)
         value if POS_ALI.include?(value)
       end
 
-      # @!visibility private
       def vertical(value)
         VERT.include?(value) ? value : :top
       end
 
-      # @!visibility private
       def split_table_attr(values)
         [values.slice(*TAB_ATTR), values.except(*TAB_ATTR)]
       end
 
-      # @!visibility private
       def padding(*value)
         value = value.flatten.take(4).map! { [0, _1.to_i].max }
         case value.size
@@ -59,6 +53,18 @@ module NattyUI
         end
       end
       alias margin padding
+
+      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
@@ -79,11 +85,25 @@ module NattyUI
       @width
     end
 
-    def initialize(str, width = nil)
-      @to_s = Ansi.bbcode(str).freeze
-      return unless width
-      @width = @width.is_a?(Integer) ? width : 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.27.0'
+  VERSION = '0.29.0'
 end

data/lib/natty-ui.rb

@@ -36,10 +36,8 @@ module NattyUI
     #   when terminal inoput is not supported
     def input_mode
       case Terminal.input_mode
-      when :csi_u
+      when :csi_u, :legacy
         :default
-      when :legacy
-        Terminal.ansi? ? :default : :dumb
       when :dumb
         :dumb
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.1
 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,22 +44,28 @@ 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/options.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
 - lib/natty-ui/dumb_choice.rb
+- lib/natty-ui/dumb_options.rb
 - 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/options.rb
 - lib/natty-ui/progress.rb
 - lib/natty-ui/section.rb
 - lib/natty-ui/table.rb
@@ -68,6 +74,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,10 +82,11 @@ homepage: https://github.com/mblumtritt/natty-ui
 licenses:
 - BSD-3-Clause
 metadata:
-  rubygems_mfa_required: 'true'
   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.27.0/NattyUI
+  documentation_uri: https://rubydoc.info/gems/natty-ui
+  rubygems_mfa_required: 'true'
+  yard.run: yard
 rdoc_options: []
 require_paths:
 - lib