nazar 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2689adb3080ba628ef27ab5ce71804352ccb02b2a90dbf363a50373210f7b2bd
-  data.tar.gz: e8a4f1954eb5d67a62e1f54d4a9983f7d2cb034903bd24d5a7d2dfed626d0808
+  metadata.gz: 29342461f59fd102beeb9253deb00b6f54086d855a2a62a11c1e108933f72600
+  data.tar.gz: 758f662b5a103a244beea03963ebb79d658ae6e076874cba2cadea66c14869df
 SHA512:
-  metadata.gz: ee1752541ac4356428bce4298bb5a6ff011b83943784ed0727adeec0c82b9763465944324dd8672d5cfb27e0a28e05e44f2dc796a9a28d5459086804b5c1a7c4
-  data.tar.gz: 7eb125d122b3c424251eb6ef76554d5737d24509659d12c1414cab0ad48fb59f790b63a0c8cf264273b10f3786efb7b1397db2549a3ef4dc8af6963ef4e7e62c
+  metadata.gz: d0fcbdca62c72558c2ae5278efc603dbe30ef4a08ea7966a198a4f53ce58227cec71b36bdf5acc37954b47f7c379e460947c6ab8e12c804b38e74b08610aa1d9
+  data.tar.gz: 07e02b611b902f7736ff1936b80b285da36e3fcacfc1492832eaf1b9ae307eaaa274d12f407d7cbbac4abc22a250a723943b449955dcb764c393b0a8d3650803

data/README.md

@@ -240,9 +240,10 @@ You can also configure behaviour of Nazar:
 | `Nazar.config.formatter.layout` | `:auto` | Determines which layout should be used. See <a href="#layouts">Layouts</a> for more details |
 | `Nazar.config.formatter.paginate` | `true` | Determines if results too long/wide should be printed directly, or paginated with `less`. Horizontal layout is always paginated.
 | `Nazar.config.formatter.boolean` | ['✓', '✗'] | First item in array is a character for `true`, second for `false` |
-| `Nazar.config.formatter.resize`  | `true` | Determines if the table should always be resized to take full width |
 | `Nazar.config.enable_shorthand_method` | true | Determines if shorthand method should be defined. See <a href="#opt-in-setup">Opt-in setup</a> for more details |
-
+| `Nazar.config.table.resize`  | `true` | Determines if the table should always be resized to take full width |
+| `Nazar.config.table.min_width`  | `nil` | Sets minimum width. By default uses the longest header length |
+| `Nazar.config.table.max_width`  | `nil` | Determines maximum table width. If `resize` is set to true, uses terminal width by default, otherwise uses content length |
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/krzyzak/nazar.

data/lib/nazar/base_table.rb

@@ -25,7 +25,7 @@ module Nazar
     end
 
     def resize
-      Nazar.config.formatter.resize
+      Nazar.config.table.resize
     end
 
     def summary_row(value)

data/lib/nazar/horizontal_table.rb

@@ -3,7 +3,7 @@
 module Nazar
   class HorizontalTable < BaseTable
     def render
-      table.render(:unicode, border: { separator: :each_row }, multiline: true, resize: resize)
+      table.render(:unicode, options)
     end
 
     private
@@ -11,5 +11,11 @@ module Nazar
     def summary_row(value)
       super.fill(nil, 3, table.columns_size - 3)
     end
+
+    def options
+      { border: { separator: :each_row }, multiline: true, resize: resize }.tap do |hash|
+        hash[:width] = Nazar.config.table.max_width if Nazar.config.table.max_width
+      end
+    end
   end
 end

data/lib/nazar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nazar
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/nazar/vertical_table.rb

@@ -23,7 +23,7 @@ module Nazar
     end
 
     def render
-      table.render_with(VerticalBorder, multiline: true, resize: resize) do |renderer|
+      table.render_with(VerticalBorder, options) do |renderer|
         renderer.border.style = :green if Nazar.config.colors.enabled
         renderer.border.separator = separators_around_each_item
       end
@@ -37,6 +37,15 @@ module Nazar
       @table ||= TTY::Table.new(rows: cells)
     end
 
+    def options
+      {
+        multiline: true,
+        resize: resize,
+        column_widths: column_widths,
+        width: max_width
+      }
+    end
+
     def cells
       @cells.flat_map do |cell|
         cell.map.with_index do |item, index|
@@ -50,5 +59,43 @@ module Nazar
         (i % headers.size).zero? || ((i + 1) % headers.size).zero?
       end
     end
+
+    def column_widths
+      [headers_width, values_width]
+    end
+
+    def max_width
+      Nazar.config.table.max_width || default_width
+    end
+
+    def default_width
+      Nazar.config.table.resize ? TTY::Screen.width : natural_width + padding
+    end
+
+    def natural_width
+      content_size = headers_width + content_width
+
+      [content_size, TTY::Screen.width].min
+    end
+
+    def content_width
+      cells.flatten.map(&:size).max
+    end
+
+    def headers_width
+      [headers.map(&:size).max + 1, Nazar.config.table.min_width].compact.min
+    end
+
+    def values_width
+      if Nazar.config.table.resize
+        TTY::Screen.width - headers_width
+      else
+        [content_width, TTY::Screen.width - headers_width].min
+      end
+    end
+
+    def padding
+      3
+    end
   end
 end

data/lib/nazar.rb

@@ -24,7 +24,12 @@ module Nazar # rubocop:disable Metrics/ModuleLength
     setting :boolean, default: ['✓', '✗']
     setting :layout, default: :auto
     setting :paginate, default: true
+  end
+
+  setting :table do
     setting :resize, default: true
+    setting :min_width, default: nil
+    setting :max_width, default: nil
   end
 
   setting :colors do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nazar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michał Krzyżanowski