Merge pull request #28 from slowbro/master

Fix Issue #20
piotrmurach · Oct 7, 2019 · dbd1b8c · dbd1b8c
2 parents 83ef4cd + 3106b83
commit dbd1b8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lib/tty/table/column_constraint.rb b/lib/tty/table/column_constraint.rb
@@ -141,7 +141,11 @@ def shrink
         ratio       = ((natural_width - renderer.width) / column_size.to_f).ceil
 
         widths = (0...column_size).reduce([]) do |lengths, col|
-          lengths + [renderer.column_widths[col] - ratio]
+          width = (renderer.column_widths[col] - ratio)
+          # basically ruby 2.4 Numeric#clamp
+          width = width < minimum_width ? minimum_width : width
+          width = width > renderer.width ? renderer.width : width
+          lengths << width
         end
         distribute_extra_width(widths)
       end

diff --git a/spec/unit/renderer/ascii/resizing_spec.rb b/spec/unit/renderer/ascii/resizing_spec.rb
@@ -99,12 +99,12 @@
 
       it 'resizes each column' do
         expect(renderer.render).to eql unindent(<<-EOS)
-         +---+---+-----+
-         |h… |h… |head3|
-         +---+---+-----+
-         |a… |aa2|aaa… |
-         |b1 |b2 |b3   |
-         +---+---+-----+
+         +----+----+---+
+         |he… |he… |h… |
+         +----+----+---+
+         |aaa1|aa2 |a… |
+         |b1  |b2  |b3 |
+         +----+----+---+
         EOS
       end
     end

diff --git a/spec/unit/renderer/basic/resizing_spec.rb b/spec/unit/renderer/basic/resizing_spec.rb
@@ -84,9 +84,9 @@
 
       it 'resizes each column' do
         expect(renderer.render).to eql unindent(<<-EOS)
-          he…  he…  head3 
-          aaa1 aa2  aaaa… 
-          b1   b2   b3    
+          head1 he…  head3
+          aaa1  aa2  aaa… 
+          b1    b2   b3   
         EOS
       end
     end