table_pal 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5909bd4d2dccc7ccf6f2b13b71c126bf0065094977e52d842c785c6323960980
-  data.tar.gz: 49982443771fe482f62ceb31be5240922a9f93e1ffab747f2491a64d50a76356
+  metadata.gz: f95417189c9c2c4f52b6f01538b23dafd8831d87f204f30261006cd0d43262c8
+  data.tar.gz: 7bd18b009733e0442faf3a3cecb0018257a6eb7b1b08a3d7b8622c914a477529
 SHA512:
-  metadata.gz: 66a24580a7be428519549caba7f5a70bee869161210cb1fe8e9e7902589eea1605594da581b95e18343c6e01003fe228273ac8499acc402361121cf62ef5bde9
-  data.tar.gz: a56a7f1f6963236a50dccad48dccfa899c9e1d2e89c5edecf5159ad37d1552cbfff2f2d2657dabe20a52bce778206ae84f552f316cd43bb98244056cfcb91e3f
+  metadata.gz: 6771a4deffb3e214ab14ff93fef20b5fa503f35418874d27e3d7dd8a6367f191dfda064297dad5e7eefd8892ffb1ba81e65a21d3d05d0c4c4855f91dfe9917df
+  data.tar.gz: fbec272fc84a48a056d54d64ce46c17fc16f6eaaccaa8af49161bb78ca1a8f5d460d7ef86ace1a5c9131efb6d3c2b95757a410164a1c1f96fc2f6b1f0d350340

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_pal (0.3.1)
+    table_pal (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/cell.rb

@@ -3,6 +3,12 @@ module TablePal
 
     using Colours
 
+    JUSTIFICATIONS = {
+      left:   :ljust,
+      right:  :rjust,
+      center: :center
+    }.freeze
+
     attr_reader :row, :column, :content, :formatter, :justification, :colour
 
     def initialize(row:, column:, content: '', formatter: nil, justification: nil, colour: nil)
@@ -16,7 +22,7 @@ module TablePal
 
     def formatted(justified: false, coloured: false)
       result = format(content)
-      result = justify(result) if justified
+      result = justify(result)   if justified
       result = colourize(result) if coloured
 
       result
@@ -29,7 +35,7 @@ module TablePal
     end
 
     def justify(result)
-      result.send(justification_to_method, column.width)
+      result.send(JUSTIFICATIONS[justification], column.width)
     end
 
     def colourize(result)
@@ -37,15 +43,7 @@ module TablePal
     end
 
     def width
-      formatted.length
-    end
-
-    def justification_to_method
-      {
-        left:   :ljust,
-        right:  :rjust,
-        center: :center
-      }[justification]
+      @width ||= formatted.length
     end
 
   end

data/lib/column.rb

@@ -15,7 +15,7 @@ module TablePal
     end
 
     def width
-      table.select_cells(column: self).max_by(&:width).width
+      @width ||= table.select_cells(column: self).max_by(&:width).width
     end
 
     def left_padding_char(char)

data/lib/plain_text.rb

@@ -1,66 +1,111 @@
 module TablePal
   class PlainText
 
-    attr_reader :table
+    attr_reader :table, :coloured, :output, :result
 
-    def initialize(table:)
-      @table = table
+    def initialize(table:, coloured: false, output: true)
+      @table    = table
+      @coloured = coloured
+      @output   = output
+      @result   = ''
 
       table.rows.each do |row|
         print_row(row)
       end
     end
 
+    def to_s
+      result
+    end
+
     private
 
     def print_row(row)
-      row.cells_including_empty.each do |cell|
-        print_cell(cell)
+      if row.heading
+        print_heading_row(row)
+      elsif row.subheading
+        print_subheading_row(row)
+      elsif row.section_end
+        print_section_end_row(row)
+      else
+        print_regular_row(row)
       end
+    end
 
-      puts
+    def print_heading_row(row)
+      print_cells(row)
+      add_new_line
+      underline
+      empty
+    end
 
-      if row.heading
-        underline
-        empty
-      elsif row.subheading
-        empty
+    def print_subheading_row(row)
+      print_cells(row)
+      add_new_line
+      empty
+    end
+
+    def print_section_end_row(row)
+      print_cells(row)
+      add_new_line
+      empty
+    end
+
+    def print_regular_row(row)
+      print_cells(row)
+      add_new_line
+    end
+
+    def print_cells(row)
+      row.cells_including_empty.each do |cell|
+        print_cell(cell)
       end
     end
 
     def print_cell(cell)
-      print cell.column.left_border
-      print cell.column.left_padding
-      print cell.formatted(justified: true)
-      print cell.column.right_padding
-      print cell.column.right_border
+      add_chars cell.column.left_border
+      add_chars cell.column.left_padding
+      add_chars cell.formatted(justified: true, coloured: coloured)
+      add_chars cell.column.right_padding
+      add_chars cell.column.right_border
     end
 
     def underline
       table.columns.map do |column|
         char = '-'
-        print column.left_border
-        print column.left_padding_char(char)
-        print char * column.width
-        print column.right_padding_char(char)
-        print column.right_border
+        add_chars column.left_border
+        add_chars column.left_padding_char(char)
+        add_chars char * column.width
+        add_chars column.right_padding_char(char)
+        add_chars column.right_border
       end
 
-      puts
+      add_new_line
     end
 
     def empty
-      row = table.create_row
-
-      row.empty_cells.each do |cell|
-        print cell.column.left_border
-        print cell.column.left_padding
-        print cell.formatted(justified: true)
-        print cell.column.right_padding
-        print cell.column.right_border
+      table.columns.map do |column|
+        char = ' '
+        add_chars column.left_border
+        add_chars column.left_padding_char(char)
+        add_chars char * column.width
+        add_chars column.right_padding_char(char)
+        add_chars column.right_border
       end
 
-      puts
+      add_new_line
+    end
+
+    def add_chars(chars)
+      @result.concat(chars)
+
+      print chars if output
+    end
+
+    def add_new_line
+      @result.concat("\n")
+
+      puts if output
     end
 
   end

data/lib/{plain_text_coloured.rb → plain_text_not_coloured.rb}

@@ -1,5 +1,5 @@
 module TablePal
-  class PlainTextColoured
+  class PlainText
 
     attr_reader :table
 
@@ -58,7 +58,7 @@ module TablePal
     def print_cell(cell)
       print cell.column.left_border
       print cell.column.left_padding
-      print cell.formatted(justified: true, coloured: true)
+      print cell.formatted(justified: true, coloured: false)
       print cell.column.right_padding
       print cell.column.right_border
     end

data/lib/requires.rb

@@ -5,7 +5,6 @@ require_relative 'csv_formatted'
 require_relative 'csv_unformatted'
 require_relative 'formatters'
 require_relative 'plain_text'
-require_relative 'plain_text_coloured'
 require_relative 'row'
 require_relative 'table'
 require_relative 'table_pal_error'

data/lib/table.rb

@@ -1,12 +1,14 @@
 module TablePal
   class Table
 
-    attr_reader :rows, :columns, :cells
-
-    def initialize
-      @rows    = []
-      @columns = []
-      @cells   = []
+    attr_reader :validations, :rows, :columns, :cells_by_row_and_column, :cells_by_column
+
+    def initialize(validations: false)
+      @validations             = validations
+      @rows                    = []
+      @columns                 = []
+      @cells_by_column         = {}
+      @cells_by_row_and_column = {}
     end
 
     def create_row(options = {})
@@ -22,32 +24,46 @@ module TablePal
     end
 
     def create_column(options = {})
-      Validate.new(__method__, options)
+      Validate.new(__method__, options) if validations
 
       Column.new(options.merge(table: self)).tap do |column|
+        cells_by_column[column] = []
         @columns << column
       end
     end
 
     def create_cell(options = {})
-      Validate.new(__method__, options)
+      Validate.new(__method__, options) if validations
+
+      row    = options[:row]
+      column = options[:column]
 
-      ensure_cell_does_not_exist(options.slice(:row, :column))
+      ensure_cell_does_not_exist(row: row, column: column)
 
       Cell.new(options).tap do |cell|
-        @cells << cell
+        cells_by_column[column] << cell
+        cells_by_row_and_column[key(options)] = cell
       end
     end
 
-    def find_cell(row:, column:)
-      cells.find { |cell| cell.row == row && cell.column == column }
+    def find_cell(options)
+      cells_by_row_and_column[key(options)]
+    end
+
+    def key(options)
+      {
+        row:    options[:row],
+        column: options[:column]
+      }
     end
 
     def select_cells(column:)
-      cells.select { |cell| cell.column == column }
+      cells_by_column[column]
     end
 
     def ensure_cell_does_not_exist(row:, column:)
+      return unless validations
+
       cell = find_cell(row: row, column: column)
 
       return unless cell

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TablePal
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_pal
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sean Lerner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interesting_methods
@@ -99,7 +99,7 @@ files:
 - lib/csv_unformatted.rb
 - lib/formatters.rb
 - lib/plain_text.rb
-- lib/plain_text_coloured.rb
+- lib/plain_text_not_coloured.rb
 - lib/requires.rb
 - lib/row.rb
 - lib/table.rb