table_pal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1c3f5234498b916d764d00cc8e9d6a050fd91cac4bc803791b015934494e86
-  data.tar.gz: 42e49d8eee541a96e21090e467f3abdd87bd96545b0a6dacb12e67cacda061d2
+  metadata.gz: 48767bd03cc5c790c74a94af5e6aa8543f67685b3f241d5de639786edc24f09d
+  data.tar.gz: 59ccde4f78da37851987b132e86d245b04dd798499615efd3fdb97359e26e05d
 SHA512:
-  metadata.gz: 7f7cb22a2a031b3d48bad82329d3d76393d855491b78be17e218b7b235db23b06b0a47c6a54a5725d4d9ea178b761b51039635fa81c605a59d46ce844d8677a0
-  data.tar.gz: 8dfea9dfe91bc61d63f03ad30aced9bfafbf756c07e0b3aa0027b6eda44123d93e14592c1fee490454f34cf397a7f27cf9646ab6a39f304f3ca223a49eccc3f0
+  metadata.gz: 80e74c7849b253a12fe954ed950efd98d3889a7e0d47c4e47b3302c159042f11731ed22378978a9e000461ac32568d1f5943653568bde62d407362be89866811
+  data.tar.gz: 97802a7e8f6855f7f1ef3612c018a27a4dae7d628b32b0db51dbb29f52c6775587e946dc4435fd645c05855b9276c083ab925fc1484d1ceda4ad02a67b8a3b81

data/Gemfile.lock

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

data/lib/column.rb

@@ -1,10 +1,11 @@
 module TablePal
   class Column
 
-    attr_reader :table, :left_padding, :right_padding, :left_border, :right_border, :justification, :colour
+    attr_reader :table, :left_padding, :right_padding, :left_border, :right_border, :justification, :colour, :formatter
 
-    def initialize(table:, left_padding: ' ', right_padding: ' ', left_border: '', right_border: '|', justification: :left, colour: nil)
+    def initialize(table:, formatter: nil, left_padding: ' ', right_padding: ' ', left_border: '', right_border: '|', justification: :left, colour: nil)
       @table         = table
+      @formatter     = formatter
       @left_padding  = left_padding
       @right_padding = right_padding
       @left_border   = left_border

data/lib/formatters.rb

@@ -1,7 +1,11 @@
 module TablePal
-  Dollar             = -> content { format('$%.2f', content) }
-  FourFractionDigits = -> content { format('%.4f', content) }
-  NoFormatting       = -> content { content }
-  Titleize           = -> content { content.titleize }
-  Upper              = -> content { content.upcase }
+  Dollar = lambda { |content|
+    return content unless content.is_a?(Float)
+
+    format('$%.2f', content)
+  }
+
+  NoFormatting = -> content { content }
+  Titleize     = -> content { content.titleize }
+  Upper        = -> content { content.upcase }
 end

data/lib/plain_text_coloured.rb

@@ -14,17 +14,14 @@ module TablePal
     private
 
     def print_row(row)
-      row.cells_including_empty.each do |cell|
-        print_cell(cell)
-      end
-
+      print_cells(row)
       puts
+      underline if row.heading
+    end
 
-      if row.heading
-        underline
-        empty
-      elsif row.subheading
-        empty
+    def print_cells(row)
+      row.cells_including_empty.each do |cell|
+        print_cell(cell)
       end
     end
 
@@ -49,13 +46,5 @@ module TablePal
       puts
     end
 
-    def empty
-      table.create_row.empty_cells.each do |cell|
-        print_cell(cell)
-      end
-
-      puts
-    end
-
   end
 end

data/lib/requires.rb

@@ -1,5 +1,4 @@
 require_relative 'colours'
-require_relative 'table_pal'
 require_relative 'cell'
 require_relative 'column'
 require_relative 'csv_formatted'
@@ -9,3 +8,5 @@ require_relative 'plain_text'
 require_relative 'plain_text_coloured'
 require_relative 'row'
 require_relative 'table'
+require_relative 'table_pal_error'
+require_relative 'validate'

data/lib/table.rb

@@ -10,6 +10,8 @@ module TablePal
     end
 
     def create_row(options = {})
+      Validate.new(__method__, options)
+
       Row.new(options.merge(table: self)).tap do |row|
         @rows << row
       end
@@ -20,12 +22,18 @@ module TablePal
     end
 
     def create_column(options = {})
+      Validate.new(__method__, options)
+
       Column.new(options.merge(table: self)).tap do |column|
         @columns << column
       end
     end
 
     def create_cell(options = {})
+      Validate.new(__method__, options)
+
+      ensure_cell_does_not_exist(options.slice(:row, :column))
+
       Cell.new(options).tap do |cell|
         @cells << cell
       end
@@ -39,5 +47,13 @@ module TablePal
       cells.select { |cell| cell.column == column }
     end
 
+    def ensure_cell_does_not_exist(row:, column:)
+      cell = find_cell(row: row, column: column)
+
+      return unless cell
+
+      raise TablePalError, "Cell with content: '#{cell.content}' already exists at this row and column."
+    end
+
   end
 end

data/lib/table_pal.rb

@@ -1,2 +1,4 @@
 module TablePal
 end
+
+require_relative 'requires'

data/lib/table_pal_error.rb

@@ -0,0 +1,25 @@
+module TablePal
+  class TablePalError < StandardError
+
+    # def initialize(message)
+    #   @meth = meth
+
+    #   options.each do |key, value|
+    #     validate_option(key, value)
+    #   end
+    # end
+
+    # def validate_option(key, value)
+    #   case key
+    #   when :row then validate_row(value)
+    #   end
+    # end
+
+    # def validate_row(value)
+    #   return if value.is_a?(Row)
+
+    #   raise "Table.#{meth} error. Expected `row:` to be a Row instance, not a #{value.class}"
+    # end
+
+  end
+end

data/lib/validate.rb

@@ -0,0 +1,49 @@
+module TablePal
+  class Validate
+
+    attr_reader :meth
+
+    def initialize(meth, options)
+      @meth = meth
+
+      options.each do |key, value|
+        validate_option(key, value)
+      end
+    end
+
+    def validate_option(key, value)
+      case key
+      when :colour        then validate(key: key, value: value, classes: [Symbol, NilClass])
+      when :column        then validate(key: key, value: value, classes: Column)
+      when :content       then validate(key: key, value: value, classes: [String, Float, Integer, NilClass])
+      when :formatter     then validate(key: key, value: value, classes: Proc)
+      when :heading       then validate(key: key, value: value, classes: [TrueClass])
+      when :justification then validate(key: key, value: value, classes: Symbol)
+      when :left_border   then validate(key: key, value: value, classes: [String, NilClass])
+      when :left_padding  then validate(key: key, value: value, classes: String)
+      when :right_border  then validate(key: key, value: value, classes: [String, NilClass])
+      when :right_padding then validate(key: key, value: value, classes: String)
+      when :row           then validate(key: key, value: value, classes: Row)
+      when :subheading    then validate(key: key, value: value, classes: [TrueClass])
+      else raise TablePalError, "#{class_method} received Unexpected option: `#{key}`"
+      end
+    end
+
+    def validate(key:, value:, classes:)
+      classes = [classes].flatten
+
+      return if classes.any? { |klass| value.is_a?(klass) }
+
+      raise TablePalError, "#{class_method} expected `#{key}:` to be a #{for_sentence(classes)}, not a `#{value.class}`"
+    end
+
+    def class_method
+      "Table.#{meth}"
+    end
+
+    def for_sentence(classes)
+      classes.map { |klass| "`#{klass}`" }.join(' or ')
+    end
+
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TablePal
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_pal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Lerner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interesting_methods
@@ -104,6 +104,8 @@ files:
 - lib/row.rb
 - lib/table.rb
 - lib/table_pal.rb
+- lib/table_pal_error.rb
+- lib/validate.rb
 - lib/version.rb
 - table_pal.gemspec
 homepage: https://github.com/seanlerner/table_pal