tabulo 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e98d88f8794a4a99a88e7b03ddd98cde4800a1d
-  data.tar.gz: 7cd37619d53da0c9914e6dce651dd56cb427d182
+  metadata.gz: 5a2f88a15024f1728f244d9f72a14b6f88a893fc
+  data.tar.gz: c6f23f4a1568575083122f501d2e61492057b2b7
 SHA512:
-  metadata.gz: d8c1ee3777ad66c2e28475798f3d565f830c583110ab02ca47f7bab9308f826cc877487569ce9a9f13b7578e74c9e237998d8c36dbca9016835fdff0dc0f8980
-  data.tar.gz: 9782a06e2877da5aa7d6ba3ecb827f5915b217beb50b02f97684705aaf5ce6fb0d9614cbb9a6592c049ad16da7cc09777176349af172059daf7edc4a0abe5d35
+  metadata.gz: 703ef06a5ea3c9c0dbf1b01b1572b02f0eca2e9ef6dc64508cb7a93459211c1c420f32af29c95a22581dd31c6a02ed3308ee7e913dfa37be65cf592633650b14
+  data.tar.gz: f17355d77642115e8bca70c5601164dfe16e186d1b5c79e3577d1e292eda46942a1fd9f0f9ccd730bbedaf2c4ce2a526832425715ae0c6d13e11a470ff018a2c

data/.travis.yml

@@ -1,6 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.14.6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.6.2
+
+* Explicitly support only Ruby >= 2.1.10.
+
 ### v0.6.1
 
 * Fix Table#shrinkwrap! handling of newlines within header cell content.

data/README.md

@@ -1,10 +1,11 @@
 # Tabulo
 
 [![Gem Version][GV img]][Gem Version]
-[![Build Status][BS img]][Build Status]
 [![Dependency Status][DS img]][Dependency Status]
 [![Coverage Status][CS img]][Coverage Status]
+[![Build Status][BS img]][Build Status]
 [![Code Climate][CC img]][Code Climate]
+[![Documentation][DC img]][Documentation]
 
 ## Overview
 
@@ -29,11 +30,11 @@ end
 
 ## Features
 
-* Set [fixed widths](#fixed-column-widths) on individual columns, then either [wrap](#overflow-handling) or
+* Set [fixed column widths](#fixed-column-widths), 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).
+* Alternatively, [shrinkwrap](#shrinkwrap) the table so that each column is just wide enough for its contents.
+* Put an upper limit on total 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).
@@ -390,9 +391,11 @@ License](http://opensource.org/licenses/MIT).
 [Dependency Status]: https://gemnasium.com/matt-harvey/tabulo
 [Coverage Status]: https://coveralls.io/r/matt-harvey/tabulo
 [Code Climate]: https://codeclimate.com/github/matt-harvey/tabulo
-
-[GV img]: https://img.shields.io/gem/v/tabulo.svg
-[BS img]: https://img.shields.io/travis/matt-harvey/tabulo.svg
-[DS img]: https://img.shields.io/gemnasium/matt-harvey/tabulo.svg
-[CS img]: https://img.shields.io/coveralls/matt-harvey/tabulo.svg
-[CC img]: https://img.shields.io/codeclimate/github/matt-harvey/tabulo.svg
+[Documentation]: http://www.rubydoc.info/gems/tabulo/0.6.2
+
+[GV img]: https://img.shields.io/gem/v/tabulo.svg?style=plastic
+[BS img]: https://img.shields.io/travis/matt-harvey/tabulo.svg?style=plastic
+[DS img]: https://img.shields.io/gemnasium/matt-harvey/tabulo.svg?style=plastic
+[CS img]: https://img.shields.io/coveralls/matt-harvey/tabulo.svg?style=plastic
+[CC img]: https://img.shields.io/codeclimate/github/matt-harvey/tabulo.svg?style=plastic
+[DC img]: https://img.shields.io/badge/docs-v0.6.2-blue.svg?style=plastic

data/Rakefile

@@ -1,6 +1,12 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake-version'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+RakeVersion::Tasks.new do |v|
+  v.copy "lib/tabulo/version.rb"
+  v.copy "README.md", all: true
+end

data/VERSION

@@ -0,0 +1 @@
+0.6.2

data/lib/tabulo/row.rb

@@ -40,12 +40,10 @@ module Tabulo
 
     # @return a Hash representation of the {Row}, with column labels acting
     #   as keys and the calculated cell values (before formatting) providing the values.
-    #
     # @example
     #   table = Tabulo::Table.new([1, 10], columns: %i(itself even?))
     #   row = table.first
     #   row.to_h  # => { :itself => 1, :even? => false }
-    #
     def to_h
       @table.columns.map(&:label).zip(to_a).to_h
     end

data/lib/tabulo/table.rb

@@ -7,9 +7,11 @@ module Tabulo
     include Enumerable
 
     DEFAULT_COLUMN_WIDTH = 12
-
     HORIZONTAL_RULE_CHARACTER = "-"
+    VERTICAL_RULE_CHARACTER = "|"
     CORNER_CHARACTER = "+"
+    PADDING_CHARACTER = " "
+    TRUNCATION_INDICATOR = "~"
 
     # @!visibility private
     attr_reader :columns
@@ -33,7 +35,6 @@ module Tabulo
     #   headers), if their content is longer than the column's fixed width. If passed <tt>nil</tt>, content will
     #   be wrapped for as many rows as required to accommodate it. If passed a Fixnum N (> 0), content will be
     #   wrapped up to N rows and then truncated thereafter.
-    #
     # @return [Table] a new Table
     def initialize(sources, columns: [], column_width: nil, header_frequency: :start,
       wrap_header_cells_to: nil, wrap_body_cells_to: nil)
@@ -45,10 +46,6 @@ module Tabulo
 
       @default_column_width = (column_width || DEFAULT_COLUMN_WIDTH)
 
-      @joiner = "|"
-      @truncation_indicator = "~"
-      @padding_character = " "
-
       @columns = []
       columns.each { |item| add_column(item) }
 
@@ -62,7 +59,6 @@ module Tabulo
     #   extractor argument is not also provided, then the label argument should correspond to
     #   a method to be called on each item in the table sources to provide the content
     #   for this column.
-    #
     # @param [nil, #to_s] header (nil) Text to be displayed in the column header. If passed nil,
     #   the column's label will also be used as its header text.
     # @param [:left, :center, :right] align_header (:center) Specifies how the header text
@@ -85,7 +81,6 @@ module Tabulo
     #   that will be passed each of the Table sources to determine the value in each cell of this
     #   column. If this is not provided, then the column label will be treated as a method to be
     #   called on each source item to determine each cell's value.
-    #
     def add_column(label, header: nil, align_header: :center, align_body: nil,
       width: nil, formatter: :to_s.to_proc, &extractor)
 
@@ -136,12 +131,12 @@ module Tabulo
 
     # @return [String] an "ASCII" graphical representation of the Table column headers.
     def formatted_header
-      format_row(@wrap_header_cells_to, &:header_subcells)
+      cells = @columns.map(&:header_subcells)
+      format_row(cells, @wrap_header_cells_to)
     end
 
     # @return [String] an "ASCII" graphical representation of a horizontal
     #   dividing line suitable for printing at any point in the table.
-    #
     # @example Print a horizontal divider after every row:
     #   table.each do |row|
     #     puts row
@@ -173,7 +168,6 @@ module Tabulo
     #   in each column, together with border characters (1 on each side of the table and 1 between
     #   adjacent columns). I.e. there is a certain width below width the Table will refuse to
     #   shrink itself.
-    #
     # @return [Table] the Table itself
     def shrinkwrap!(max_table_width: nil)
       return self if columns.none?
@@ -218,7 +212,8 @@ module Tabulo
 
     # @!visibility private
     def formatted_body_row(source, with_header: false)
-      inner = format_row(@wrap_body_cells_to) { |column| column.body_subcells(source) }
+      cells = @columns.map { |column| column.body_subcells(source) }
+      inner = format_row(cells, @wrap_body_cells_to)
       if with_header
         join_lines([horizontal_rule, formatted_header, horizontal_rule, inner])
       else
@@ -235,52 +230,44 @@ module Tabulo
 
     # @!visibility private
     #
-    # Yields each column to passed block, then wraps and joins the results to form
-    # a formatted row.
-    def format_row(wrap_cells_to)
-
-      # 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|
-
-        # Get the raw, non-wrapped, non-truncated content of the cell.
-        raw_subcells = yield column
-
-        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 = (subcell_truncated ? @truncation_indicator : @padding_character)
-          "#{lpad}#{subcell}#{rpad}"
+    # Formats a single header row or body row as a String.
+    #
+    # @param [String[][]] cells an Array of Array-of-Strings, each of which represents a
+    #   "stack" of "subcells". Each such stack represents the wrapped content of a given
+    #   "cell" in this row, from the top down, one String for each "line".
+    #   Each String includes the spaces, if any, on either side required for the
+    #   "internal padding" of the cell to carry out the cell content alignment -- but
+    #   does not include the single character of padding around each column.
+    # @param [Fixnum] wrap_cells_to the number of "lines" of wrapped content to allow
+    #   before truncating.
+    # @return [String] the entire formatted row including all padding and borders.
+    def format_row(cells, wrap_cells_to)
+      row_height = ([wrap_cells_to, cells.map(&:size).max].compact.min || 1)
+
+      subrows = (0...row_height).map do |subrow_index|
+        subrow_components = cells.map.with_index do |cell, column_index|
+          num_subcells = cell.size
+          cell_truncated = (num_subcells > row_height)
+          append_truncator = (cell_truncated && subrow_index + 1 == row_height)
+
+          lpad = PADDING_CHARACTER
+          rpad = (append_truncator ? TRUNCATION_INDICATOR : PADDING_CHARACTER)
+
+          inner =
+            if subrow_index < num_subcells
+              cell[subrow_index]
+            else
+              column_width = @columns[column_index].width
+              PADDING_CHARACTER * column_width
+            end
+
+          "#{lpad}#{inner}#{rpad}"
         end
-      end
 
-      max_cell_stack_height = cell_stacks.map(&:size).max || 1
-
-      # A subrow is a string representing a single horizontal slice of this row that's
-      # strictly one character high.
-      subrows = (0...max_cell_stack_height).map do |subrow_index|
-        cell_stacks.map.with_index do |cell_stack, column_index|
-          if subrow_index < cell_stack.size
-            # This cell stack is at least as "deep" as the subrow we're on. So just
-            # grab the subcell for this subrow from this cell stack.
-            cell_stack[subrow_index]
-          else
-            # This cell stack is not "deep" enough. So we make an empty subcell to
-            # add to this subrow for this column
-            surround(' ' * @columns[column_index].width, @padding_character)
-          end
-        end
+        surround_join(subrow_components, VERTICAL_RULE_CHARACTER)
       end
 
-      # Join each subrow with border characters, then join these with newlines, to form
-      # the wrapped, formatted row as a single string.
-      join_lines(subrows.map { |subrow| surround_join(subrow, @joiner) })
+      join_lines(subrows)
     end
 
     # @!visibility private

data/lib/tabulo/version.rb

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

data/tabulo.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2.1.10"
 
   spec.add_development_dependency "bundler", "~> 1.14.6"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "redcarpet"
   spec.add_development_dependency "github-markup"
+  spec.add_development_dependency "rake-version", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabulo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Enumerable ASCII table
 email:
 - software@matthewharvey.net
@@ -140,6 +154,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - bin/console
 - bin/setup
 - lib/tabulo.rb
@@ -158,9 +173,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.1.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="