fat_core 1.6.0 → 1.7.1

data/lib/fat_core/formatters/org_formatter.rb

@@ -0,0 +1,72 @@
+module FatCore
+  # Output the table in the same way as org-mode for emacs does. This is almost
+  # identical to TextFormatter except that dates do get formatted as inactive
+  # 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
+    self.default_format[:date_fmt] = '[%F]'
+    self.default_format[:datetime_fmt] = '[%F %a %H:%M:%S]'
+
+    # Does this Formatter require a second pass over the cells to align the
+    # columns according to the alignment formatting instruction to the width of
+    # the widest cell in each column?
+    def aligned?
+      true
+    end
+
+    def pre_header(widths)
+      result = '|'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '|'
+      result + "\n"
+    end
+
+    def pre_row
+      '|'
+    end
+
+    # Add one space of padding.
+    def pre_cell(_h)
+      ' '
+    end
+
+    def quote_cell(v)
+      v
+    end
+
+    # Add one space of padding.
+    def post_cell
+      ' '
+    end
+
+    def inter_cell
+      '|'
+    end
+
+    def post_row
+      "|\n"
+    end
+
+    def hline(widths)
+      result = '|'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '|'
+      result + "\n"
+    end
+
+    def post_footers(widths)
+      result = '|'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '|'
+      result + "\n"
+    end
+  end
+end

data/lib/fat_core/formatters/text_formatter.rb

@@ -0,0 +1,91 @@
+module FatCore
+  # Output the table as plain text. This is almost identical to OrgFormatter
+  # except that dates do not get formatted as inactive timestamps and the
+  # connector at the beginning of hlines is a '+' rather than a '|' as for org
+  # tables.
+  class TextFormatter < Formatter
+    # Does this Formatter require a second pass over the cells to align the
+    # columns according to the alignment formatting instruction to the width of
+    # the widest cell in each column?
+    def aligned?
+      true
+    end
+
+    def pre_header(widths)
+      result = '|'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '|'
+      result + "\n"
+    end
+
+    def pre_row
+      '|'
+    end
+
+    # Add one space of padding.
+    def pre_cell(_h)
+      ' '
+    end
+
+    def quote_cell(v)
+      v
+    end
+
+    # Add one space of padding.
+    def post_cell
+      ' '
+    end
+
+    def inter_cell
+      '|'
+    end
+
+    def post_row
+      "|\n"
+    end
+
+    def hline(widths)
+      result = '+'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '+'
+      result + "\n"
+    end
+
+    def pre_group
+      ''
+    end
+
+    def post_group
+      ''
+    end
+
+    def pre_gfoot
+      ''
+    end
+
+    def post_gfoot
+      ''
+    end
+
+    def pre_foot
+      ''
+    end
+
+    def post_foot
+      ''
+    end
+
+    def post_footers(widths)
+      result = '+'
+      widths.values.each do |w|
+        result += '-' * (w + 2) + '+'
+      end
+      result[-1] = '+'
+      result + "\n"
+    end
+  end
+end

data/lib/fat_core/formatters.rb

@@ -0,0 +1,5 @@
+require 'fat_core/formatters/formatter'
+require 'fat_core/formatters/aoa_formatter'
+require 'fat_core/formatters/aoh_formatter'
+require 'fat_core/formatters/org_formatter'
+require 'fat_core/formatters/text_formatter'

data/lib/fat_core/hash.rb

@@ -1,4 +1,17 @@
 class Hash
+  # Yield each key-value pair in the Hash together with boolean flags that
+  # indicate whether the item is the first or last yielded.
+  def each_pair_with_flags
+    last_k = size - 1
+    k = 0
+    each_pair do |key, val|
+      first = (k == 0 ? true : false)
+      last  = (k == last_k ? true : false)
+      yield(key, val, first, last)
+      k += 1
+    end
+  end
+
   # Return all keys in hash that have a value == to the given value or have an
   # Enumerable value that includes the given value.
   def keys_with_value(val)

data/lib/fat_core/numeric.rb

@@ -1,8 +1,8 @@
 class Numeric
   def signum
-    if self > 0
+    if positive?
       1
-    elsif self < 0
+    elsif negative?
       -1
     else
       0
@@ -42,7 +42,7 @@ class Numeric
 
     # Pad out the fractional part with zeroes to the right
     n_zeroes = [places - frac.length, 0].max
-    frac += '0' * n_zeroes if n_zeroes > 0
+    frac += '0' * n_zeroes if n_zeroes.positive?
 
     # Place the commas in the whole part only
     whole = whole.reverse

data/lib/fat_core/period.rb

@@ -462,7 +462,11 @@ class Period
              round_up_last: false)
     size = size.to_sym
     if Period.chunk_sym_to_min_days(size) > length
-      raise ArgumentError, "any #{size} is longer than this period's #{length} days"
+      if partial_first || partial_last
+        return [self]
+      else
+        raise ArgumentError, "any #{size} is longer than this period's #{length} days"
+      end
     end
     result = []
     chunk_start = first.dup

data/lib/fat_core/string.rb

@@ -88,6 +88,26 @@ class String
     return false
   end
 
+  # If the string is a number, add grouping commas to the whole number part.
+  def commify
+    # Break the number into parts
+    return self unless clean =~ /\A(-)?(\d*)((\.)?(\d*))?\z/
+    neg = $1 || ''
+    whole = $2
+    frac = $5
+    # Place the commas in the whole part only
+    whole = whole.reverse
+    whole.gsub!(/([0-9]{3})/, '\\1,')
+    whole.gsub!(/,$/, '')
+    whole.reverse!
+    # Reassemble
+    if frac.blank?
+      neg + whole
+    else
+      neg + whole + '.' + frac
+    end
+  end
+
   def wrap(width = 70, hang = 0)
     offset = 0
     trip = 1

data/lib/fat_core/symbol.rb

@@ -3,7 +3,7 @@ class Symbol
   def entitle
     to_s.tr('_', ' ').split(' ').join(' ').entitle
   end
-  alias to_string entitle
+  alias as_string entitle
 
   def as_sym
     self