tabulo 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84dadcb8679194ba436e2e213defc55800771628
-  data.tar.gz: aa8d2182569ba3a439bce0b82ef8ceeeb36a4b81
+  metadata.gz: 1e98d88f8794a4a99a88e7b03ddd98cde4800a1d
+  data.tar.gz: 7cd37619d53da0c9914e6dce651dd56cb427d182
 SHA512:
-  metadata.gz: 91d583322688d1db9f7c0dd21111f40d039da50fc767c78eecda2d640b75e42bae6478bc73a88b2c0810e1ce20fe35b61c7ad550a00b5c8a261fb2bf9e7c4b34
-  data.tar.gz: e0cee253d0513f05158b84bacd7c3e40ad0c546e5765b28c726ecab9936d7c67fa5893d032925bb43c28a96bc2002533c218105bf1ac0fdf43de07559b1106ad
+  metadata.gz: d8c1ee3777ad66c2e28475798f3d565f830c583110ab02ca47f7bab9308f826cc877487569ce9a9f13b7578e74c9e237998d8c36dbca9016835fdff0dc0f8980
+  data.tar.gz: 9782a06e2877da5aa7d6ba3ecb827f5915b217beb50b02f97684705aaf5ce6fb0d9614cbb9a6592c049ad16da7cc09777176349af172059daf7edc4a0abe5d35

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### v0.6.1
+
+* Fix Table#shrinkwrap! handling of newlines within header cell content.
+* README now correctly formatted by rubydoc.info.
+
 ### v0.6.0
 
 * Correctly handle newlines in cell content.

data/README.md

@@ -29,28 +29,18 @@ end
 
 ## Features
 
-* [Fix](#fixed-column-widths) individual column widths, then either [wrap](#overflow-handling) or
-  [truncate](#overflow-handling) the overflow as you prefer.
-* Alternatively, [shrinkwrap](#shrinkwrap) the table so that each column is just wide enough for
-  its contents.
-* You can cap total table width when shrinkwrapping, to [stop it overflowing your terminal](#max-table-width)
-  horizontally and becoming an unreadable mess.
-* Cell content alignment is [configurable](#cell-alignment), but with useful defaults, with numbers
-  aligned right and strings left.
-* Headers are [repeatable](#repeating-headers)
+* Set [fixed widths](#fixed-column-widths) on individual columns, then either [wrap](#overflow-handling) or
+  [truncate](#overflow-handling) the overflow.
+* Alternatively, [shrinkwrap](#shrinkwrap) the table so that each column is just wide enough for its
+  contents.
+* Put an upper limit on table width when shrinkwrapping, to [stop it overflowing your terminal horizontally](#max-table-width).
+* Alignment of cell content is [configurable](#cell-alignment), but has helpful content-based defaults
+  (numbers right, strings left).
+* Headers are [repeatable](#repeating-headers).
 * Newlines within cell content are correctly handled.
-* A `Tabulo::Table` is an `Enumerable`, so you can [step through it](#enumerator) one row at a time,
-  without having to wait for the entire underlying collection to load.
-* Each `Tabulo::Row` is also an `Enumerable`:
-
->
-  ```ruby
-    table.each do |row|
-      row.each do |cell|
-        # cell => 1, 2 ... 2, 4 ... etc.
-      end
-    end
-  ```
+* A `Tabulo::Table` is an `Enumerable`, so you can [step through it](#enumerator) a row at a time,
+  printing as you go, without waiting for the entire underlying collection to load.
+* Each `Tabulo::Row` is also an `Enumerable`, providing access to the underlying cell values.
 
 ## Installation
 

data/lib/tabulo/table.rb

@@ -178,16 +178,17 @@ module Tabulo
     def shrinkwrap!(max_table_width: nil)
       return self if columns.none?
 
-      header_widths = columns.map { |c| c.header.length }
+      wrapped_width = -> (str) { str.split($/).map(&:length).max || 1 }
 
-      column_widths = @sources.inject(header_widths) do |widths, source|
-        columns.map do |c|
-          c.formatted_cell_content(source).split($/, -1).map(&:length).max || 1
-        end.zip(widths).map(&:max)
+      columns.each do |column|
+        column.width = wrapped_width.call(column.header)
       end
 
-      columns.zip(column_widths).each do |column, width|
-        column.width = width
+      @sources.each do |source|
+        columns.each do |column|
+          width = wrapped_width.call(column.formatted_cell_content(source))
+          column.width = width if width > column.width
+        end
       end
 
       if max_table_width
@@ -241,17 +242,20 @@ module Tabulo
       # Create an array of "cell stacks", each of which is an array of strings that
       # will be stacked on top of each other to form a wrapped cell.
       cell_stacks = @columns.map do |column|
-        column_width = column.width
 
         # Get the raw, non-wrapped, non-truncated content of the cell.
         raw_subcells = yield column
 
-        truncated = (wrap_cells_to && (raw_subcells.size > wrap_cells_to))
-        subcells = (wrap_cells_to ? raw_subcells[0...wrap_cells_to] : raw_subcells)
+        num_raw_subcells = raw_subcells.size
+        num_wrapped_subcells = (wrap_cells_to || num_raw_subcells)
+
+        truncated = (num_raw_subcells > num_wrapped_subcells)
+        subcells = raw_subcells[0...num_wrapped_subcells]
 
         subcells.map.with_index do |subcell, i|
+          subcell_truncated = (truncated && (i == subcells.size - 1))
           lpad = @padding_character
-          rpad = (truncated && (i == subcells.size - 1) ? @truncation_indicator : @padding_character)
+          rpad = (subcell_truncated ? @truncation_indicator : @padding_character)
           "#{lpad}#{subcell}#{rpad}"
         end
       end

data/lib/tabulo/version.rb

@@ -1,3 +1,3 @@
 module Tabulo
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabulo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - bin/console
 - bin/setup
 - lib/tabulo.rb

data/TODO.md

@@ -1,3 +0,0 @@
-# TODO
-
-* Fix broken appearance of http://www.rubydoc.info/gems/tabulo/<version> .