tabulo 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436c1fe445c0910e0084a47697d782f5910cd98b2840500804ef6120b33e6f7c
-  data.tar.gz: 4964c641d3a806af82acee1b4192c6d4a8a4c229cbdd3a679c0b394fde5d4c1c
+  metadata.gz: 6104501fe177f52639fb3e05c12c5cd53d62d1388ad85e2abecaa58f15b3d39d
+  data.tar.gz: 35648de653973f20a5871a71bb2cd9340eb1b80196dc25f510477e7e8143a9db
 SHA512:
-  metadata.gz: 82b090f560d056f9f9162d911b84db3a3b89b1761756f105fe3afd4b65361d56e17899f065bfc538e57ddc83546601e3de14853e33622913f474eb3a259afd7e
-  data.tar.gz: f4767057ce09370700e3245de955c8733d4c4f3c4c86e5289707d4fcd5e9d614b2e6cf462f75e496e76d5894db044209f35623c1386ed533457bd095650ec185
+  metadata.gz: e5c158f65f97272c637bf37fab53f542001264f3e094ea07a67b4a5e6d583cfb315a40d0a51abad2135fa84169b1edce77420dc9fded8f619f842aa5087c7262
+  data.tar.gz: 0d0f2abb4a82098b4c4886926254f65c17c80b751509818927f8a237c2f4dce35f61d8fcdf028ba9d47640611d14349437eb767ffd2deaf92ebc5c8ee16eda8c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v2.3.3
+
+* Fix styler option on Table initializer, which had no effect
+
 ### v2.3.2
 
 * Update Rake version to address vulnerability CVE-2020-8130

data/README.md

@@ -798,7 +798,7 @@ a new table in which the rows and columns are swapped:
 By default, a header row is added to the new table, showing the string value of the element
 represented in that column. This can be configured, however, along with other aspects of
 `transpose`’s behaviour. For details, see the
-[documentation](https://www.rubydoc.info/gems/tabulo/2.3.2/Tabulo/Table#transpose-instance_method).
+[documentation](https://www.rubydoc.info/gems/tabulo/2.3.3/Tabulo/Table#transpose-instance_method).
 
 <a name="borders"></a>
 ### Configuring borders
@@ -1107,14 +1107,14 @@ The gem is available as open source under the terms of the [MIT
 License](http://opensource.org/licenses/MIT).
 
 [Gem Version]: https://rubygems.org/gems/tabulo
-[Documentation]: http://www.rubydoc.info/gems/tabulo/2.3.2
+[Documentation]: http://www.rubydoc.info/gems/tabulo/2.3.3
 [Build Status]: https://travis-ci.org/matt-harvey/tabulo
 [Coverage Status]: https://coveralls.io/r/matt-harvey/tabulo
 [Code Climate]: https://codeclimate.com/github/matt-harvey/tabulo
 [Awesome Ruby]: https://github.com/markets/awesome-ruby#cli-utilities
 
 [GV img]: https://img.shields.io/gem/v/tabulo.svg
-[DC img]: https://img.shields.io/badge/documentation-v2.3.2-blue.svg
+[DC img]: https://img.shields.io/badge/documentation-v2.3.3-blue.svg
 [BS img]: https://img.shields.io/travis/matt-harvey/tabulo.svg
 [CS img]: https://img.shields.io/coveralls/matt-harvey/tabulo.svg
 [CC img]: https://codeclimate.com/github/matt-harvey/tabulo/badges/gpa.svg

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/lib/tabulo/cell.rb

@@ -87,7 +87,7 @@ module Tabulo
     end
 
     def style_and_align_cell_content(content)
-      padding = [@width - Unicode::DisplayWidth.of(content), 0].max
+      padding = Util.max(@width - Unicode::DisplayWidth.of(content), 0)
       left_padding, right_padding =
         case real_alignment
         when :center

data/lib/tabulo/table.rb

@@ -129,6 +129,7 @@ module Tabulo
       @header_frequency = header_frequency
       @header_styler = header_styler
       @row_divider_frequency = row_divider_frequency
+      @styler = styler
       @truncation_indicator = validate_character(truncation_indicator,
         DEFAULT_TRUNCATION_INDICATOR, InvalidTruncationIndicatorError, "truncation indicator")
       @wrap_body_cells_to = wrap_body_cells_to
@@ -286,17 +287,15 @@ module Tabulo
     # Note that when printed, the first row will visually include the headers (assuming these
     # were not disabled when the Table was initialized).
     def each
-      header_frequency_is_integer = (Integer === @header_frequency)
       @sources.each_with_index do |source, index|
-        is_first_row = (index == 0)
         header =
-          if is_first_row && (@header_frequency == :start || header_frequency_is_integer)
+          if (index == 0) && @header_frequency
             :top
-          elsif header_frequency_is_integer && (index % @header_frequency == 0)
+          elsif (Integer === @header_frequency) && Util.divides?(@header_frequency, index)
             :middle
           end
 
-        show_divider = @row_divider_frequency && !is_first_row && (index % @row_divider_frequency == 0)
+        show_divider = @row_divider_frequency && (index != 0) && Util.divides?(@row_divider_frequency, index)
 
         yield Row.new(self, source, header: header, divider: show_divider)
       end
@@ -363,14 +362,13 @@ module Tabulo
 
       @sources.each do |source|
         get_columns.each do |column|
-          width = wrapped_width(column.body_cell(source).formatted_content)
-          column.width = [width, column.width].max
+          cell_width = wrapped_width(column.body_cell(source).formatted_content)
+          column.width = Util.max(column.width, cell_width)
         end
       end
 
       if max_table_width
-        max_table_width = TTY::Screen.width if max_table_width == :auto
-        shrink_to(max_table_width)
+        shrink_to(max_table_width == :auto ? TTY::Screen.width : max_table_width)
       end
 
       self
@@ -532,8 +530,8 @@ module Tabulo
       # Ensure max table width is at least wide enough to accommodate table borders and padding
       # and one character of content.
       min_table_width = total_padding + total_borders + column_registry.count
-      max_table_width = min_table_width if min_table_width > max_table_width
-      required_reduction = [unadjusted_table_width - max_table_width, 0].max
+      max_table_width = Util.max(min_table_width, max_table_width)
+      required_reduction = Util.max(unadjusted_table_width - max_table_width, 0)
 
       required_reduction.times do
         widest_column = columns.inject(columns.first) do |widest, column|
@@ -600,7 +598,7 @@ module Tabulo
     def wrapped_width(str)
       segments = str.split($/)
       segments.inject(1) do |longest_length_so_far, segment|
-        [longest_length_so_far, Unicode::DisplayWidth.of(segment)].max
+        Util.max(longest_length_so_far, Unicode::DisplayWidth.of(segment))
       end
     end
   end

data/lib/tabulo/util.rb

@@ -3,6 +3,16 @@ module Tabulo
   # @!visibility private
   module Util
 
+    # @!visibility private
+    def self.divides?(smaller, larger)
+      larger % smaller == 0
+    end
+
+    # @!visibility private
+    def self.max(x, y)
+      x > y ? x : y
+    end
+
     # @!visibility private
     def self.slice_hash(hash, *keys)
       new_hash = {}

data/lib/tabulo/version.rb

@@ -1,3 +1,3 @@
 module Tabulo
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabulo
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-screen