fat_table 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9661335d0ae8ec4d87b9e16c3055552af05a354c5222b9838d51f8109ddd749
-  data.tar.gz: fe23c745a61b2fff7d3380221ee133b5e38c3bdd9d4ff429bdce2094cbe47755
+  metadata.gz: ba8791fd0b89302cb5127adc325afd0a84bee337298955ecb48119805bcff53a
+  data.tar.gz: da6f4923fe75df0707c3fc21f96fef52127188e76f8a9ae1b923ea768689d31e
 SHA512:
-  metadata.gz: 201d3df5ba9820b96e22b1a035013c128c2f8cf2efd054cd16b9b6f372c13381334db9cc11b268daa0537d25e2d0475c35cd73f1749d08d8a008a2498010ead1
-  data.tar.gz: e067fc5bedae6541e0ce88e41025fffbff64a16a3545fccd89a6b171f2b6d648fd8e1716227ceafd770db509417361781c3c6d4cc718824ec8b9098a266eafab
+  metadata.gz: 7f9b047a93e55f7752173dc7f2c927db2bf45669ede7de1d652b89f1052054f90763c7910b850f84d80ea86a959c82e48f9f9d5b5fe9192ff6b15f9dabb104a7
+  data.tar.gz: 498eb355cce5f5fa8597ad23657d4699cfead201b6bbf5200386f50773c846061199de0373edbe41ff94c79e1a5d90da8c1f9a37d275c580a0a021109c2d8780

data/lib/fat_table/formatters/formatter.rb

@@ -53,35 +53,38 @@ module FatTable
     # 'Average'.
     attr_reader :gfooters
 
-    class_attribute :default_format
-    self.default_format = {
-      nil_text: '',
-      case: :none,
-      alignment: :left,
-      bold: false,
-      italic: false,
-      color: 'none',
-      bgcolor: 'none',
-      hms: false,
-      pre_digits: 0,
-      post_digits: 0,
-      commas: false,
-      currency: false,
-      datetime_fmt: '%F %H:%M:%S',
-      date_fmt: '%F',
-      true_text: 'T',
-      false_text: 'F',
-      true_color: 'none',
-      true_bgcolor: 'none',
-      false_color: 'none',
-      false_bgcolor: 'none',
-      underline: false,
-      blink: false,
-    }
-
     class_attribute :valid_colors
     self.valid_colors = ['none']
 
+    def self.default_format
+      {
+        nil_text: '',
+        case: :none,
+        alignment: :left,
+        bold: false,
+        italic: false,
+        color: 'none',
+        bgcolor: 'none',
+        hms: false,
+        pre_digits: 0,
+        post_digits: 0,
+        commas: false,
+        currency: false,
+        datetime_fmt: '%F %H:%M:%S',
+        date_fmt: '%F',
+        true_text: 'T',
+        false_text: 'F',
+        true_color: 'none',
+        true_bgcolor: 'none',
+        false_color: 'none',
+        false_bgcolor: 'none',
+        underline: false,
+        blink: false,
+        _h: nil,
+        _location: nil
+      }
+    end
+
     # :category: Constructors
 
     # Return a new Formatter for the given +table+ which must be of the class
@@ -659,7 +662,7 @@ module FatTable
         # hash.
         format_h =
           if format_at[location][h].empty?
-            default_format.dup
+            default_format
           else
             format_at[location][h].to_h
           end
@@ -700,17 +703,17 @@ module FatTable
         # format_for call with those locations.
         if location == :body
           format_h.each_pair do |k, v|
-            if format_at[:bfirst][h].send(k) == default_format[k]
+            if format_at[:bfirst][h].send(k) == self.class.default_format[k]
               format_at[:bfirst][h].send("#{k}=", v)
             end
-            if format_at[:gfirst][h].send(k) == default_format[k]
+            if format_at[:gfirst][h].send(k) == self.class.default_format[k]
               format_at[:gfirst][h].send("#{k}=", v)
             end
           end
         elsif location == :gfirst
           # Copy :gfirst formatting to :bfirst if it is still the default
           format_h.each_pair do |k, v|
-            if format_at[:bfirst][h].send(k) == default_format[k]
+            if format_at[:bfirst][h].send(k) == self.class.default_format[k]
               format_at[:bfirst][h].send("#{k}=", v)
             end
           end
@@ -942,9 +945,10 @@ module FatTable
     # Convert a value to a string based on the instructions in istruct,
     # depending on the type of val. "Formatting," which changes the content of
     # the string, such as adding commas, is always performed, except alignment
-    # which is only performed when the width parameter is non-nil. "Decorating",
-    # which changes the appearance without changing the content, is performed
-    # only if the decorate parameter is true.
+    # which is only performed when the width parameter is
+    # non-nil. "Decorating", which changes the appearance without changing the
+    # content, is performed only if the decorate parameter is true.  Priority:
+    # lowest to highest: type, location, column_name
     def format_cell(val, istruct, width: nil, decorate: false)
       case val
       when Numeric
@@ -982,8 +986,6 @@ module FatTable
       end
     end
 
-    private
-
     # Add LaTeX control sequences, ANSI terminal escape codes, or other
     # decorations to string to decorate it with the given attributes. None of
     # the decorations may affect the displayed width of the string. Return the
@@ -992,6 +994,8 @@ module FatTable
       str
     end
 
+    private
+
     # Convert a boolean to a string according to instructions in istruct, which
     # is assumed to be the result of parsing a formatting instruction string as
     # above. Only device-independent formatting is done here. Device dependent
@@ -1099,7 +1103,7 @@ module FatTable
           val
         end
       if width && aligned?
-        pad = width - width(val)
+        pad = [width - width(val), 0].max
         case istruct.alignment
         when :left
           val += ' ' * pad

data/lib/fat_table/formatters/latex_formatter.rb

@@ -95,18 +95,6 @@ module FatTable
       result
     end
 
-    private
-
-    def color_valid?(clr)
-      valid_colors.include?(clr)
-    end
-
-    def invalid_color_msg(clr)
-      valid_colors_list = valid_colors.join(' ').wrap
-      "LaTeXFormatter invalid color '#{clr}'. Valid colors are:\n" +
-        valid_colors_list
-    end
-
     # Add LaTeX control sequences. Ignore background color, underline, and
     # blink. Alignment needs to be done by LaTeX, so we have to take it into
     # account unless it's the same as the body alignment, since that is the
@@ -119,15 +107,29 @@ module FatTable
         result = "{\\textcolor{#{istruct.color}}{#{result}}}"
       end
       if istruct.bgcolor && istruct.bgcolor != 'none'
-        result = "\\cellcolor{#{istruct.bgcolor}}#{result}"
+        result = "{\\cellcolor{#{istruct.bgcolor}}{#{result}}}"
       end
-      unless istruct.alignment == format_at[:body][istruct._h].alignment
+      if (istruct._h && format_at[:body][istruct._h] &&
+         istruct.alignment != format_at[:body][istruct._h].alignment) ||
+         (istruct._h.nil? && istruct.alignment.to_sym != :left)
         ac = alignment_code(istruct.alignment)
         result = "\\multicolumn{1}{#{ac}}{#{result}}"
       end
       result
     end
 
+    private
+
+    def color_valid?(clr)
+      valid_colors.include?(clr)
+    end
+
+    def invalid_color_msg(clr)
+      valid_colors_list = valid_colors.join(' ').wrap
+      "LaTeXFormatter invalid color '#{clr}'. Valid colors are:\n" +
+        valid_colors_list
+    end
+
     # Return +str+ with quote marks oriented and special TeX characters quoted.
     def quote(str)
       # Replace single and double quotes with TeX oriented quotes.
@@ -159,7 +161,7 @@ module FatTable
     end
 
     def alignment_code(al_sym)
-      case al_sym
+      case al_sym.to_sym
       when :center
         'c'
       when :right

data/lib/fat_table/formatters/org_formatter.rb

@@ -6,9 +6,12 @@ module FatTable
   # timestamps and the connector at the beginning of hlines is a '|' rather than
   # a '+' as for text tables.
   class OrgFormatter < Formatter
-    self.default_format = default_format.dup
-    default_format[:date_fmt] = '[%F %a]'
-    default_format[:datetime_fmt] = '[%F %a %H:%M:%S]'
+    def self.default_format
+      fmt = super
+      fmt[:date_fmt] = '[%F %a]'
+      fmt[:datetime_fmt] = '[%F %a %H:%M:%S]'
+      fmt
+    end
 
     private
 

data/lib/fat_table/formatters/term_formatter.rb

@@ -38,6 +38,17 @@ module FatTable
     self.valid_colors = ['none'] +
                         ::Rainbow::X11ColorNames::NAMES.keys.map(&:to_s).sort
 
+    # Add ANSI codes to string to implement the given decorations
+    def decorate_string(str, istruct)
+      result = Rainbow(str)
+      result = colorize(result, istruct.color, istruct.bgcolor)
+      result = result.bold if istruct.bold
+      result = result.italic if istruct.italic
+      result = result.underline if istruct.underline
+      result = result.blink if istruct.blink
+      result
+    end
+
     private
 
     def color_valid?(clr)
@@ -66,17 +77,6 @@ module FatTable
       str.gsub(/\e\[[0-9;]+m/, '')
     end
 
-    # Add ANSI codes to string to implement the given decorations
-    def decorate_string(str, istruct)
-      result = Rainbow(str)
-      result = colorize(result, istruct.color, istruct.bgcolor)
-      result = result.bold if istruct.bold
-      result = result.italic if istruct.italic
-      result = result.underline if istruct.underline
-      result = result.blink if istruct.blink
-      result
-    end
-
     def colorize(str, fg_color, bg_color)
       fg_color = nil if fg_color == 'none'
       bg_color = nil if bg_color == 'none'

data/lib/fat_table/version.rb

@@ -2,5 +2,5 @@
 
 module FatTable
   # The current version of FatTable
-  VERSION = '0.6.6'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler