terminal-table 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe53fefe455edfe656cec0324c7303976548eab6
-  data.tar.gz: 2b52d6330087eb91537b8180d2162a4321865df0
+  metadata.gz: 6c0927620bf05c372458c73382bfd171be972288
+  data.tar.gz: e7aad54b23b37641a9edf68867d8b741af52563e
 SHA512:
-  metadata.gz: e3a220c191de479bd21f661d583911c3cedaa539e9d5036df754d866c7d2a6b069f2a37f1b7b424bcc1c13cc0cc6cf6aacc297b72b55ba9abfc89ef7ecf41c5b
-  data.tar.gz: 2eb2846a2e1a0e448bb87bc0f0f6c6701338137a7c82cb5642bbb5040060e99a83251d440c4afb0ffb2a746d3f4aec36d9b5f250091b24ea0a07aac5ca2ff0aa
+  metadata.gz: 469f18cf16097c03b06e4e39696f04b8fa7547facc206cdfc52ac4fa918b78109d6ef6caeb14366c3bc2d4902ef3e6fd23587d453c90d80fabd7249a94b1c0ec
+  data.tar.gz: d6c9253df10b4bed36b4a494ef20c39dc462e2c388ad3b1cdeb464676bbe31458b718f14283818c99713e813c5c9cd728ddd7ce8f4bd64cebdba8f300633b689

data/History.rdoc

@@ -1,3 +1,8 @@
+1.7.2 / 2016-09-09
+==================
+
+* Fix packing table to a minimal width (@vizv, #76)
+
 1.7.1 / 2016-08-29
 ==================
 

data/lib/terminal-table/row.rb

@@ -43,6 +43,10 @@ module Terminal
           end.join(y) + y
         end.join("\n")
       end
+
+      def number_of_columns
+        @cells.collect(&:colspan).inject(0, &:+)
+      end
     end
   end
 end

data/lib/terminal-table/style.rb

@@ -62,6 +62,15 @@ module Terminal
           @@defaults = defaults.merge(options)
         end
       end
+
+      def on_change attr
+        method_name = :"#{attr}="
+        old_method = method method_name
+        define_singleton_method(method_name) do |value|
+          old_method.call value
+          yield attr.to_sym, value
+        end
+      end
     end
   end
 end

data/lib/terminal-table/table.rb

@@ -10,12 +10,16 @@ module Terminal
     # Generates a ASCII table with the given _options_.
 
     def initialize options = {}, &block
+      @headings = []
+      @rows = []
       @column_widths = []
       self.style = options.fetch :style, {}
       self.headings = options.fetch :headings, []
       self.rows = options.fetch :rows, []
       self.title = options.fetch :title, nil
       yield_or_eval(&block) if block
+
+      style.on_change(:width) { require_column_widths_recalc }
     end
 
     ##
@@ -35,7 +39,7 @@ module Terminal
     def add_row array
       row = array == :separator ? Separator.new(self) : Row.new(self, array)
       @rows << row
-      recalc_column_widths row
+      require_column_widths_recalc unless row.is_a?(Separator)
     end
     alias :<< :add_row
 
@@ -90,8 +94,7 @@ module Terminal
     # Return length of column _n_.
 
     def column_width n
-      width = @column_widths[n] || 0
-      width + additional_column_widths[n].to_i
+      width = column_widths[n] || 0
     end
     alias length_of_column column_width # for legacy support
 
@@ -99,7 +102,7 @@ module Terminal
     # Return total number of columns available.
 
     def number_of_columns
-      headings_with_rows.map { |r| r.cells.size }.max
+      headings_with_rows.map { |r| r.number_of_columns }.max || 0
     end
 
     ##
@@ -109,7 +112,7 @@ module Terminal
       arrays = [arrays] unless arrays.first.is_a?(Array)
       @headings = arrays.map do |array|
         row = Row.new(self, array)
-        recalc_column_widths row
+        require_column_widths_recalc
         row
       end
     end
@@ -162,7 +165,7 @@ module Terminal
 
     def title=(title)
       @title = title
-      recalc_column_widths Row.new(self, [title_cell_options])
+      require_column_widths_recalc
     end
 
     ##
@@ -178,42 +181,134 @@ module Terminal
     private
 
     def columns_width
-      @column_widths.inject(0) { |s, i| s + i + cell_spacing } + style.border_y.length
+      column_widths.inject(0) { |s, i| s + i + cell_spacing } + style.border_y.length
     end
 
-    def additional_column_widths
-      return [] if style.width.nil?
-      spacing = style.width - columns_width
-      if spacing < 0
-        raise "Table width exceeds wanted width of #{style.width} characters."
-      else
-        per_col = spacing / number_of_columns
-        arr = (1...number_of_columns).to_a.map { |i| per_col }
-        other_cols = arr.inject(0) { |s, i| s + i }
-        arr << spacing - other_cols
-        arr
+    def recalc_column_widths
+      @require_column_widths_recalc = false
+      n_cols = number_of_columns
+      space_width = cell_spacing
+      return if n_cols == 0
+
+      # prepare rows
+      all_rows = headings_with_rows
+      all_rows << Row.new(self, [title_cell_options]) unless @title.nil?
+
+      # DP states, dp[colspan][index][split_offset] => column_width.
+      dp = []
+
+      # prepare initial value for DP.
+      all_rows.each do |row|
+        index = 0
+        row.cells.each do |cell|
+          cell_value = cell.value_for_column_width_recalc
+          cell_width = Unicode::DisplayWidth.of(cell_value.to_s)
+          colspan = cell.colspan
+
+          # find column width from each single cell.
+          dp[colspan] ||= []
+          dp[colspan][index] ||= [0]        # add a fake cell with length 0.
+          dp[colspan][index][colspan] ||= 0 # initialize column length to 0.
+
+          # the last index `colspan` means width of the single column (split
+          # at end of each column), not a width made up of multiple columns.
+          single_column_length = [cell_width, dp[colspan][index][colspan]].max
+          dp[colspan][index][colspan] = single_column_length
+
+          index += colspan
+        end
       end
-    end
 
-    def recalc_column_widths row
-      return if row.is_a? Separator
-      i = 0
-      row.cells.each do |cell|
-        colspan = cell.colspan
-        cell_value = cell.value_for_column_width_recalc
-        colspan.downto(1) do |j|
-          cell_length = Unicode::DisplayWidth.of(cell_value.to_s)
-          if colspan > 1
-            spacing_length = cell_spacing * (colspan - 1)
-            length_in_columns = (cell_length - spacing_length)
-            cell_length = (length_in_columns.to_f / colspan).ceil
+      # run DP.
+      (1..n_cols).each do |colspan|
+        dp[colspan] ||= []
+        (0..n_cols-colspan).each do |index|
+          dp[colspan][index] ||= [1]
+          (1...colspan).each do |offset|
+            # processed level became reverse map from width => [offset, ...].
+            left_colspan = offset
+            left_index = index
+            left_width = dp[left_colspan][left_index].keys.first
+
+            right_colspan = colspan - left_colspan
+            right_index = index + offset
+            right_width = dp[right_colspan][right_index].keys.first
+
+            dp[colspan][index][offset] = left_width + right_width + space_width
           end
-          if @column_widths[i].to_i < cell_length
-            @column_widths[i] = cell_length
+
+          # reverse map it for resolution (max width and short offset first).
+          rmap = {}
+          dp[colspan][index].each_with_index do |width, offset|
+            rmap[width] ||= []
+            rmap[width] << offset
           end
-          i = i + 1
+
+          # sort reversely and store it back.
+          dp[colspan][index] = rmap.sort.reverse.to_h
         end
       end
+
+      resolve = -> (colspan, full_width, index = 0) do
+        # stop if reaches the bottom level.
+        return @column_widths[index] = full_width if colspan == 1
+
+        # choose best split offset for partition, or second best result
+        # if first one is not dividable.
+        candidate_offsets = dp[colspan][index].collect(&:last).flatten
+        offset = candidate_offsets[0]
+        offset = candidate_offsets[1] if offset == colspan
+
+        # prepare for next round.
+        left_colspan = offset
+        left_index = index
+        left_width = dp[left_colspan][left_index].keys.first
+
+        right_colspan = colspan - left_colspan
+        right_index = index + offset
+        right_width = dp[right_colspan][right_index].keys.first
+
+        # calculate reference column width, give remaining spaces to left.
+        total_non_space_width = full_width - (colspan - 1) * space_width
+        ref_column_width = total_non_space_width / colspan
+        remainder = total_non_space_width % colspan
+        rem_left_width = [remainder, left_colspan].min
+        rem_right_width = remainder - rem_left_width
+        ref_left_width = ref_column_width * left_colspan +
+                         (left_colspan - 1) * space_width + rem_left_width
+        ref_right_width = ref_column_width * right_colspan +
+                          (right_colspan - 1) * space_width + rem_right_width
+
+        # at most one width can be greater than the reference width.
+        if left_width <= ref_left_width and right_width <= ref_right_width
+          # use refernce width (evenly partition).
+          left_width = ref_left_width
+          right_width = ref_right_width
+        else
+          # the wider one takes its value, shorter one takes the rest.
+          if left_width > ref_left_width
+            right_width = full_width - left_width - space_width
+          else
+            left_width = full_width - right_width - space_width
+          end
+        end
+
+        # run next round.
+        resolve.call(left_colspan, left_width, left_index)
+        resolve.call(right_colspan, right_width, right_index)
+      end
+
+      full_width = dp[n_cols][0].keys.first
+      unless style.width.nil?
+        new_width = style.width - space_width - style.border_y.length
+        if new_width < full_width
+          raise "Table width exceeds wanted width " +
+                "of #{style.width} characters."
+        end
+        full_width = new_width
+      end
+
+      resolve.call(n_cols, full_width)
     end
 
     ##
@@ -235,5 +330,14 @@ module Terminal
     def title_cell_options
       {:value => @title, :alignment => :center, :colspan => number_of_columns}
     end
+
+    def require_column_widths_recalc
+      @require_column_widths_recalc = true
+    end
+
+    def column_widths
+      recalc_column_widths if @require_column_widths_recalc
+      @column_widths
+    end
   end
 end

data/lib/terminal-table/version.rb

@@ -1,5 +1,5 @@
 module Terminal
   class Table
-    VERSION = '1.7.1'
+    VERSION = '1.7.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-table
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler