tabulo 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693e05e168841c6a0e0b615025c6afce4e6a2c78
-  data.tar.gz: 51cf627f60299c912a5cb94f6bf29c2ae69435b1
+  metadata.gz: 6ee932d2d03998f4b0e537e8d5302887660326e4
+  data.tar.gz: 3884ac4f5a066f67819423fd7ca0c86437b7e690
 SHA512:
-  metadata.gz: 9dadb888b2dad1bc4e64729fd2caad40bc83787411ce80b305d1d5743b15b5c59ac3e0fe531a297d1789dc4801d06664bbbedaad7f1cfbea5095a41ec7db86c5
-  data.tar.gz: 51a5a75a4efd0f6fb487784a97682793ac43d29d986496d14ebb63cadf8662077cbed3b1ca3a2523ca49ca461ac5549855b2f71faa303f40e9db5c8b627f5459
+  metadata.gz: 23ea187faca64ed1343c42d82db8858bdda1ee219a53e93f6a1d2cb1dc14805d729cc5503e989df30f637ecb10807c59f051d7b48e8bc85527b9035b4b75beba
+  data.tar.gz: 5170b8b8761296d4cb05d620bf98d9871a94ea32938b32945b98dc72b8f64f3d4fe9bed6df7444727364d0658816abf94e3b21e92065d9a140e9cbbca60e8774

data/.ackrc

@@ -0,0 +1,10 @@
+# Additional options for `ack` search utility
+
+## Directories to ignore ##
+
+# Documentation generator output
+--ignore-directory=is:.yardoc
+--ignore-directory=is:doc
+
+# Generated coverage reports
+--ignore-directory=is:coverage

data/.rdoc_options

@@ -3,7 +3,6 @@ encoding: UTF-8
 static_path: []
 rdoc_include:
 - "."
-- "/Users/matthew/Workbench/versioned/linode/tabulo"
 charset: UTF-8
 exclude: 
 hyperlink_all: false

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.4.0
+
+* Increase default column width from 8 to 12
+* Allow default column width to be configured when initializing a Table
+* Minor code tidy-ups, including removal of undocumented ability for
+  Table#add_column to accept a Column instance directly.
+
 ## v0.3.1
 
 * Fix width and other options ignored by Table#add_column.

data/README.md

@@ -137,13 +137,22 @@ the `align_header` or `align_body` options of `add_column`, e.g.:
 
 ### Column width, wrapping and truncation
 
-By default, column width is fixed at 8 characters, plus 1 character of padding on either side.
+By default, column width is fixed at 12 characters, plus 1 character of padding on either side.
 This can be customized using the `width` option of `add_column`:
 
 ```ruby
   table.add_column(:even?, width: 5)
 ```
 
+If you want to set the default column width for all columns of the table to something other
+than 12, use the `column_width` option when initializing the table:
+
+```ruby
+  Tabulo::Table.new([1, 2], columns: %i(itself even?), column_width: 6)
+```
+
+The widths set for individual columns will override the default column width for the table.
+
 ### Overflow handling
 
 By default, if cell contents exceed their column width, they are wrapped for as many rows as

data/TODO.md

@@ -4,7 +4,6 @@
 * Raise an ArgumentError for disallowed arguments and options (this is
   a library!)
 * Document :formatter option in README.
-* Allow default column width to be configured at level of Table.
 * Column#initialize should have the same signature as Table#add_column.
 * Handle multiline cell content (i.e. when the calculated cell value
   itself contains a newline).

data/lib/tabulo/column.rb

@@ -12,7 +12,7 @@ module Tabulo
       @align_body = options[:align_body]  || nil
       @extractor = options[:extractor] || @label.to_proc
       @formatter = options[:formatter] || :to_s.to_proc
-      @width = options[:width] || Table::DEFAULT_COLUMN_WIDTH
+      @width = options[:width]
     end
 
     # @!visibility private

data/lib/tabulo/table.rb

@@ -6,7 +6,7 @@ module Tabulo
   class Table
     include Enumerable
 
-    DEFAULT_COLUMN_WIDTH = 8
+    DEFAULT_COLUMN_WIDTH = 12
 
     HORIZONTAL_RULE_CHARACTER = "-"
     CORNER_CHARACTER = "+"
@@ -20,6 +20,8 @@ module Tabulo
     #   Each element of the Array  will be used to create a column whose content is
     #   created by calling the corresponding method on each element of sources. Note
     #   the {#add_column} method is a much more flexible way to set up columns on the table.
+    # @option options [Fixnum, nil] :column_width (nil) The default column width for columns in this
+    #   table, not excluding padding. If nil, then DEFAULT_COLUMN_WIDTH will be used.
     # @option options [:start, nil, Fixnum] :header_frequency (:start) Controls the display of column headers.
     #   If passed <tt>:start</tt>, headers will be shown at the top of the table only. If passed <tt>nil</tt>,
     #   headers will not be shown. If passed a Fixnum N (> 0), headers will be shown at the top of the table,
@@ -37,6 +39,7 @@ module Tabulo
     def initialize(sources, options = { })
       opts = {
         columns: [],
+        column_width: DEFAULT_COLUMN_WIDTH,
         header_frequency: :start,
 
         # nil to wrap to no max, 1 to wrap to 1 row then truncate, etc..
@@ -52,7 +55,7 @@ module Tabulo
       @joiner = "|"
       @truncation_indicator = "~"
       @padding_character = " "
-      @default_column_width = DEFAULT_COLUMN_WIDTH
+      @default_column_width = opts[:column_width] || DEFAULT_COLUMN_WIDTH
       @columns = opts[:columns].map { |item| make_column(item) }
       yield self if block_given?
     end
@@ -75,8 +78,9 @@ module Tabulo
     #   by the type of the cell value, with numbers aligned right, booleans center-aligned, and
     #   other values left-aligned. Note header text alignment is configured separately using the
     #   :align_header option.
-    # @option options [Fixnum] :width (8) Specifies the width of the
-    #   column, excluding padding.
+    # @option options [Fixnum] :width (nil) Specifies the width of the column, excluding padding. If
+    #   nil, then the column will take the width provided by the `column_width` option
+    #   with which the Table was initialized.
     # @option options [#to_proc] :formatter (:to_s.to_proc) A lambda or other callable object that
     #   will be passed the calculated value of each cell to determine how it should be displayed. This
     #   is distinct from the extractor (see below). For example, if the extractor for this column
@@ -195,19 +199,14 @@ module Tabulo
 
     # @!visibility private
     def make_column(item, options = { })
-      case item
-      when Column
-        item
-      else
-        Column.new({
-          label: item.to_sym,
-          header: item.to_s,
-          align_header: :center,
-          width: @default_column_width,
-          formatter: :to_s.to_proc
-
-        }.merge(options))
-      end
+      Column.new({
+        label: item.to_sym,
+        header: item.to_s,
+        align_header: :center,
+        width: @default_column_width,
+        formatter: :to_s.to_proc
+
+      }.merge(options))
     end
   end
 end

data/lib/tabulo/version.rb

@@ -1,3 +1,3 @@
 module Tabulo
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthew Harvey
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ackrc"
 - ".gitignore"
 - ".rdoc_options"
 - ".rspec"