fat_core 1.7.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dee8f90ed96b24c51a40eaaf816cda967450ed78
-  data.tar.gz: 83fe257ef4ceba08a7bf11e6ed281a17f452b26f
+  metadata.gz: 8c3d2ea26248f15906e7885b3efeaa09ffa10554
+  data.tar.gz: 0d14aa12596198d1add2e0ae2922a89411da65fe
 SHA512:
-  metadata.gz: 6f7c36cf04a7b5c0b36c8cdd84014f8b31481834dd674869ff1993af8024e2b42fd8cd5e07685173b236f0c16610972f61eb5c996e71c5fa9360f8f36aa3dee9
-  data.tar.gz: a41b43ff052e3eddf9c46e8047f3ccf424d8070e8afc3bf1b57f5e8fa2fe063057b1800ff8718bff2719429726f9490ce439db07d89b74599e1012b795af520d
+  metadata.gz: 9a68397f420d5a775818d7071e12e4bf15aadbe05f77e8fe1a34066bab5c3ab853040be1399d5bd08be587a33bade93cd7bbade821806a18df5f6f5c4508bb12
+  data.tar.gz: e1e0c5b69ba7d652c17cf41a788c2d5291c725e9c5fb80cbef1b2edd016146ab67bd4f68b767828bea4d5c5ce9779a47b01bfd6a0299cd3480b9d6bd5ff628c1

data/TODO.org

@@ -1,19 +0,0 @@
-* Conversion to Spreadsheets
-This is a [[https://github.com/westonganger/spreadsheet_architect][gem]] that I can include into the Table model to convert a table into
-a spread-sheet, or even a sheet in a multi-sheet spreadsheet file.
-
-* Formatters
-Need to think about ways to define formatters for Table for different output
-types, including tty, color-tty, latex, csv, spreadsheet?
-
-* Add a Group Boundary concept
-If I want a table to perform sub-totals at various break points, need to have a
-way for a table to record its grouping boundaries. Maybe an array of row
-numbers?  Automatically injected by the group-by method?
-
-* DONE Add uniq method and set operations
-CLOSED: [2017-03-02 Thu 15:54]
-- State "WAIT"       from "TODO"       [2017-03-02 Thu 15:54]
-- State "TODO"       from              [2017-03-02 Thu 15:54]
-  For tables, add a method that eliminates any duplicate rows. Perhaps just
-  apply Array#uniq to the columns?

data/lib/fat_core/string.rb

@@ -109,20 +109,28 @@ class String
   end
 
   def wrap(width = 70, hang = 0)
-    offset = 0
-    trip = 1
     result = ''
-    while (s = slice(offset, width))
-      offset += width
-      if trip == 1
-        width -= hang
-      else
-        s = (' ' * hang) + s
+    first_line = true
+    first_word_on_line = true
+    line_width_so_far = 0
+    words = split(' ')
+    words.each do |w|
+      if !first_line && first_word_on_line
+        w = ' ' * hang + w
+      end
+      unless first_word_on_line
+        w = ' ' + w
+      end
+      result << w
+      first_word_on_line = false
+      line_width_so_far += 1 + w.length
+      if line_width_so_far >= width
+        result << "\n"
+        line_width_so_far = 0
+        first_line = false
+        first_word_on_line = true
       end
-      result << s + "\n"
-      trip += 1
     end
-    # Remove the final newline before exiting
     result.strip
   end
 
@@ -254,6 +262,10 @@ class String
     colorize(self, "\001\e[1m\e[35m\002")
   end
 
+  def console_cyan
+    colorize(self, "\001\e[1m\e[36m\002")
+  end
+
   def console_def
     colorize(self, "\001\e[1m\002")
   end

data/lib/fat_core/version.rb

@@ -1,7 +1,7 @@
 module FatCore
-  MAJOR = 1
-  MINOR = 7
-  PATCH = 1
+  MAJOR = 2
+  MINOR = 0
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/lib/fat_core.rb

@@ -20,7 +20,3 @@ require 'fat_core/period'
 require 'fat_core/range'
 require 'fat_core/string'
 require 'fat_core/symbol'
-require 'fat_core/evaluator'
-require 'fat_core/column'
-require 'fat_core/table'
-require 'fat_core/formatters'

data/spec/lib/string_spec.rb

@@ -25,34 +25,36 @@ the last full measure of devotion--that we here highly resolve that th\
 ese dead shall not have died in vain--that this nation, under God, sha\
 ll have a new birth of freedom--and that government of the people, by \
 the people, for the people, shall not perish from the earth."
-    ##123456789012345678901234567890123456789012345678901234567890123456789|
-    #     @getty = "\
-    # Four score and seven years ago our fathers brought forth on this conti\
-    #           nent a new nation, conceived in liberty, and dedicated to th\
-    #           e proposition that all men are created equal.  Now we are en\
-    #           gaged in a great civil war, testing whether that nation, or \
-    #           any nation, so conceived and so dedicated, can long endure. \
-    #           We are met on a great battle-field of that war. We have come\
-    #            to dedicate a portion of that field, as a final resting pla\
-    #           ce for those who here gave their lives that that nation migh\
-    #           t live. It is altogether fitting and proper that we should d\
-    #           o this.  But, in a larger sense, we can not dedicate, we can\
-    #            not consecrate, we can not hallow this ground. The brave me\
-    #           n, living and dead, who struggled here, have consecrated it,\
-    #            far above our poor power to add or detract. The world will \
-    #           little note, nor long remember what we say here, but it can \
-    #           never forget what they did here. It is for us the living, ra\
-    #           ther, to be dedicated here to the unfinished work which they\
-    #            who fought here have thus far so nobly advanced. It is rath\
-    #           er for us to be here dedicated to the great task remaining b\
-    #           efore us--that from these honored dead we take increased dev\
-    #           otion to that cause for which they gave the last full measur\
-    #           e of devotion--that we here highly resolve that these dead s\
-    #           hall not have died in vain--that this nation, under God, sha\
-    #           ll have a new birth of freedom--and that government of the p\
-    #           eople, by the people, for the people, shall not perish from \
-    #           the earth."
-    ##123456789012345678901234567890123456789012345678901234567890123456789|
+
+    # 0000000000111111111122222222223333333333444444444455555555556666666666
+    # 0123456789012345678901234567890123456789012345678901234567890123456789|
+    # Four score and seven years ago our fathers brought forth on
+    #          this continent a new nation, conceived in liberty, and
+    #          dedicated to the proposition that all men are created
+    #          equal. Now we are engaged in a great civil war, testing
+    #          whether that nation, or any nation, so conceived and
+    #          so dedicated, can long endure. We are met on a great
+    #          battle-field of that war. We have come to dedicate a
+    #          portion of that field, as a final resting place for
+    #          those who here gave their lives that that nation might
+    #          live. It is altogether fitting and proper that we should
+    #          do this. But, in a larger sense, we can not dedicate,
+    #          we can not consecrate, we can not hallow this ground.
+    #          The brave men, living and dead, who struggled here,
+    #          have consecrated it, far above our poor power to add
+    #          or detract. The world will little note, nor long remember
+    #          what we say here, but it can never forget what they
+    #          did here. It is for us the living, rather, to be dedicated
+    #          here to the unfinished work which they who fought here
+    #          have thus far so nobly advanced. It is rather for us
+    #          to be here dedicated to the great task remaining before
+    #          us--that from these honored dead we take increased devotion
+    #          to that cause for which they gave the last full measure
+    #          of devotion--that we here highly resolve that these dead
+    #          shall not have died in vain--that this nation, under
+    #          God, shall have a new birth of freedom--and that government
+    #          of the people, by the people, for the people, shall
+    #          not perish from the earth.
   end
 
   describe 'class methods' do
@@ -77,20 +79,22 @@ the people, for the people, shall not perish from the earth."
     end
 
     it 'should wrap a long string' do
-      @getty.wrap.split("\n").each { |l| expect(l.length).to be <= 70 }
+      str = @getty.wrap
+      str.split("\n").each { |l| expect(l.length).to be <= 70 }
     end
 
     it 'should wrap a long string with a hangining indent' do
-      @getty.wrap(70, 10).split("\n").each { |l| expect(l.length).to be <= 70 }
-      @getty.wrap(70, 10).split("\n")[1..-1].each do |l|
+      str = @getty.wrap(70, 10)
+      str.split("\n").each { |l| expect(l.length).to be <= 70 }
+      str.split("\n")[1..-1].each do |l|
         expect(l).to match(/^          /)
       end
-      second_line = ' ' * 10 + 'nent a new nation'
-      third_line =  ' ' * 10 + 'e proposition'
-      twenty_fourth_line = ' ' * 10 + 'eople, by the people, for the people'
-      expect(@getty.wrap(70, 10).split("\n")[1]).to match(/^#{second_line}/)
-      expect(@getty.wrap(70, 10).split("\n")[2]).to match(/^#{third_line}/)
-      expect(@getty.wrap(70, 10).split("\n")[23]).to match(/^#{twenty_fourth_line}/)
+      second_line = ' ' * 10 + 'this continent a new nation'
+      third_line =  ' ' * 10 + 'dedicated to the proposition'
+      twenty_fourth_line = ' ' * 10 + 'shall not have died in vain'
+      expect(str.split("\n")[1]).to match(/^#{second_line}/)
+      expect(str.split("\n")[2]).to match(/^#{third_line}/)
+      expect(str.split("\n")[23]).to match(/^#{twenty_fourth_line}/)
     end
 
     it 'should be able to quote special TeX characters' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -204,16 +204,8 @@ files:
 - lib/fat_core/ChangeLog
 - lib/fat_core/array.rb
 - lib/fat_core/boolean.rb
-- lib/fat_core/column.rb
 - lib/fat_core/date.rb
 - lib/fat_core/enumerable.rb
-- lib/fat_core/evaluator.rb
-- lib/fat_core/formatters.rb
-- lib/fat_core/formatters/aoa_formatter.rb
-- lib/fat_core/formatters/aoh_formatter.rb
-- lib/fat_core/formatters/formatter.rb
-- lib/fat_core/formatters/org_formatter.rb
-- lib/fat_core/formatters/text_formatter.rb
 - lib/fat_core/hash.rb
 - lib/fat_core/kernel.rb
 - lib/fat_core/latex_eruby.rb
@@ -223,21 +215,10 @@ files:
 - lib/fat_core/range.rb
 - lib/fat_core/string.rb
 - lib/fat_core/symbol.rb
-- lib/fat_core/table.rb
 - lib/fat_core/version.rb
-- spec/example_files/datawatch.org
-- spec/example_files/goldberg.org
-- spec/example_files/wpcs.csv
 - spec/lib/array_spec.rb
-- spec/lib/column_spec.rb
 - spec/lib/date_spec.rb
 - spec/lib/enumerable_spec.rb
-- spec/lib/evaluator_spec.rb
-- spec/lib/formatters/aoa_formatter_spec.rb
-- spec/lib/formatters/aoh_formatter_spec.rb
-- spec/lib/formatters/formatter_spec.rb
-- spec/lib/formatters/org_formatter_spec.rb
-- spec/lib/formatters/text_formatter_spec.rb
 - spec/lib/hash_spec.rb
 - spec/lib/kernel_spec.rb
 - spec/lib/nil_spec.rb
@@ -246,7 +227,6 @@ files:
 - spec/lib/range_spec.rb
 - spec/lib/string_spec.rb
 - spec/lib/symbol_spec.rb
-- spec/lib/table_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -273,19 +253,9 @@ signing_key:
 specification_version: 4
 summary: fat_core provides some useful core extensions
 test_files:
-- spec/example_files/datawatch.org
-- spec/example_files/goldberg.org
-- spec/example_files/wpcs.csv
 - spec/lib/array_spec.rb
-- spec/lib/column_spec.rb
 - spec/lib/date_spec.rb
 - spec/lib/enumerable_spec.rb
-- spec/lib/evaluator_spec.rb
-- spec/lib/formatters/aoa_formatter_spec.rb
-- spec/lib/formatters/aoh_formatter_spec.rb
-- spec/lib/formatters/formatter_spec.rb
-- spec/lib/formatters/org_formatter_spec.rb
-- spec/lib/formatters/text_formatter_spec.rb
 - spec/lib/hash_spec.rb
 - spec/lib/kernel_spec.rb
 - spec/lib/nil_spec.rb
@@ -294,5 +264,4 @@ test_files:
 - spec/lib/range_spec.rb
 - spec/lib/string_spec.rb
 - spec/lib/symbol_spec.rb
-- spec/lib/table_spec.rb
 - spec/spec_helper.rb

data/lib/fat_core/column.rb

@@ -1,345 +0,0 @@
-module FatCore
-  # Column objects are just a thin wrapper around an Array to allow columns to
-  # be summed and have other operations performed on them, but compacting out
-  # nils before proceeding. My original attempt to do this by monkey-patching
-  # Array turned out badly.  This works much nicer.
-  class Column
-    attr_reader :header, :raw_header, :type, :items
-
-    TYPES = %w(NilClass Boolean DateTime Numeric String).freeze
-
-    def initialize(header:, items: [])
-      @raw_header = header
-      @header =
-        if @raw_header.is_a?(Symbol)
-          @raw_header
-        else
-          @raw_header.gsub(/[^A-Za-z0-9 ]/, '').as_sym
-        end
-      @type = 'NilClass'
-      raise "Unknown column type '#{type}" unless TYPES.include?(@type.to_s)
-      @items = []
-      items.each { |i| self << i }
-    end
-
-    ##########################################################################
-    # Attributes
-    ##########################################################################
-
-    def [](k)
-      items[k]
-    end
-
-    def to_a
-      items
-    end
-
-    def size
-      items.size
-    end
-
-    def empty?
-      items.empty?
-    end
-
-    def last_i
-      size - 1
-    end
-
-    ##########################################################################
-    # Aggregates
-    ##########################################################################
-
-    VALID_AGGREGATES = %s(first last rng
-                          sum count min max avg var dev
-                          any? all? none? one?)
-
-    # Return the first non-nil item in the column.  Works with any column type.
-    def first
-      items.compact.first
-    end
-
-    # Return the last non-nil item in the column.  Works with any column type.
-    def last
-      items.compact.last
-    end
-
-    # Return a string of the first and last non-nil values.  Works with any
-    # column type.
-    def rng
-      "#{first}..#{last}"
-    end
-
-    # Return the sum of the non-nil items in the column.  Works with numeric and
-    # string columns. For a string column, it will return the concatenation of
-    # the non-nil items.
-    def sum
-      only_with('sum', 'Numeric', 'String')
-      items.compact.sum
-    end
-
-    # Return a count of the non-nil items in the column.  Works with any column
-    # type.
-    def count
-      items.compact.count
-    end
-
-    # Return the smallest non-nil item in the column.  Works with numeric,
-    # string, and datetime columns.
-    def min
-      only_with('min', 'NilClass', 'Numeric', 'String', 'DateTime')
-      items.compact.min
-    end
-
-    # Return the largest non-nil item in the column.  Works with numeric,
-    # string, and datetime columns.
-    def max
-      only_with('max', 'NilClass', 'Numeric', 'String', 'DateTime')
-      items.compact.max
-    end
-
-    # Return the average value of the non-nil items in the column.  Works with
-    # numeric and datetime columns.  For datetime columns, it converts each date
-    # to its Julian day number, computes the average, and then converts the
-    # average back to a DateTime.
-    def avg
-      only_with('avg', 'DateTime', 'Numeric')
-      if type == 'DateTime'
-        avg_jd = items.compact.map(&:jd).sum / items.compact.size.to_d
-        DateTime.jd(avg_jd)
-      else
-        sum / items.compact.size.to_d
-      end
-    end
-
-    # Return the variance, the average squared deviation from the mean, of the
-    # non-nil items in the column.  Works with numeric and datetime columns.
-    # For datetime columns, it converts each date to its Julian day number and
-    # computes the variance of those numbers.
-    def var
-      only_with('var', 'DateTime', 'Numeric')
-      all_items =
-        if type == 'DateTime'
-          items.compact.map(&:jd)
-        else
-          items.compact
-        end
-      mu = Column.new(header: :mu, items: all_items).avg
-      sq_dev = 0.0
-      all_items.compact.each do |itm|
-        sq_dev += (itm - mu) * (itm - mu)
-      end
-      sq_dev / items.compact.size.to_d
-    end
-
-    # Return the standard deviation, the square root of the variance, of the
-    # non-nil items in the column.  Works with numeric and datetime columns.
-    # For datetime columns, it converts each date to its Julian day number and
-    # computes the standard deviation of those numbers.
-    def dev
-      only_with('dev', 'DateTime', 'Numeric')
-      Math.sqrt(var)
-    end
-
-    # Return true if any of the items in the column are true; otherwise return
-    # false.  Works only with boolean columns.
-    def any?
-      only_with('any?', 'Boolean')
-      items.compact.any?
-    end
-
-    # Return true if all of the items in the column are true; otherwise return
-    # false.  Works only with boolean columns.
-    def all?
-      only_with('all?', 'Boolean')
-      items.compact.all?
-    end
-
-    # Return true if none of the items in the column are true; otherwise return
-    # false.  Works only with boolean columns.
-    def none?
-      only_with('any?', 'Boolean')
-      items.compact.none?
-    end
-
-    # Return true if precisely one of the items in the column is true;
-    # otherwise return false.  Works only with boolean columns.
-    def one?
-      only_with('any?', 'Boolean')
-      items.compact.one?
-    end
-
-    private
-
-    def only_with(agg, *valid_types)
-      return self if valid_types.include?(type)
-      raise "Aggregate '#{agg}' cannot be applied to a #{type} column"
-    end
-
-    public
-
-    ##########################################################################
-    # Construction
-    ##########################################################################
-
-    # Append item to end of the column
-    def <<(itm)
-      items << convert_to_type(itm)
-    end
-
-    # Return a new Column appending the items of other to our items, checking
-    # for type compatibility.
-    def +(other)
-      raise 'Cannot combine columns with different types' unless type == other.type
-      Column.new(header: header, items: items + other.items)
-    end
-
-    private
-
-    # Convert val to the type of key, a ruby class constant, such as Date,
-    # Numeric, etc. If type is NilClass, the type is open, and a non-blank val
-    # will attempt conversion to one of the allowed types, typing it as a String
-    # if no other type is recognized. If the val is blank, and the type is nil,
-    # the column type remains open. If the val is nil or a blank and the type is
-    # already determined, the val is set to nil, and should be filtered from any
-    # column computations. If the val is non-blank and the column type
-    # determined, raise an error if the val cannot be converted to the column
-    # type. Otherwise, returns the converted val as an object of the correct
-    # class.
-    def convert_to_type(val)
-      case type
-      when 'NilClass'
-        if val != false && val.blank?
-          # Leave the type of the column open. Unfortunately, false counts as
-          # blank and we don't want it to. It should be classified as a boolean.
-          new_val = nil
-        else
-          # Only non-blank values are allowed to set the type of the column
-          bool_val = convert_to_boolean(val)
-          new_val =
-            if bool_val.nil?
-              convert_to_date_time(val) ||
-                convert_to_numeric(val) ||
-                convert_to_string(val)
-            else
-              bool_val
-            end
-          @type =
-            if new_val == true || new_val == false
-              'Boolean'
-            elsif new_val.is_a?(Date) || new_val.is_a?(DateTime)
-              'DateTime'
-            elsif new_val.is_a?(Numeric)
-              'Numeric'
-            elsif new_val.is_a?(String)
-              'String'
-            else
-              raise "Cannot add #{val} of type #{new_val.class.name} to a column"
-            end
-        end
-        new_val
-      when 'Boolean'
-        if val.nil?
-          nil
-        else
-          new_val = convert_to_boolean(val)
-          if new_val.nil?
-            raise "Attempt to add '#{val}' to a column already typed as #{type}"
-          end
-          new_val
-        end
-      when 'DateTime'
-        if val.nil?
-          nil
-        else
-          new_val = convert_to_date_time(val)
-          if new_val.nil?
-            raise "Attempt to add '#{val}' to a column already typed as #{type}"
-          end
-          new_val
-        end
-      when 'Numeric'
-        if val.nil?
-          nil
-        else
-          new_val = convert_to_numeric(val)
-          if new_val.nil?
-            raise "Attempt to add '#{val}' to a column already typed as #{type}"
-          end
-          new_val
-        end
-      when 'String'
-        if val.nil?
-          nil
-        else
-          new_val = convert_to_string(val)
-          if new_val.nil?
-            raise "Attempt to add '#{val}' to a column already typed as #{type}"
-          end
-          new_val
-        end
-      else
-        raise "Mysteriously, column has unknown type '#{type}'"
-      end
-    end
-
-    # Convert the val to a boolean if it looks like one, otherwise return nil.
-    # Any boolean or a string of t, f, true, false, y, n, yes, or no, regardless
-    # of case is assumed to be a boolean.
-    def convert_to_boolean(val)
-      return val if val.is_a?(TrueClass) || val.is_a?(FalseClass)
-      val = val.to_s.clean
-      return nil if val.blank?
-      if val =~ /\A(false|f|n|no)\z/i
-        false
-      elsif val =~ /\A(true|t|y|yes)\z/i
-        true
-      end
-    end
-
-    # Convert the val to a DateTime if it is either a DateTime, a Date, or a
-    # String that can be parsed as a DateTime, otherwise return nil. It only
-    # recognizes strings that contain a something like '2016-01-14' or
-    # '2/12/1985' within them, otherwise DateTime.parse would treat many bare
-    # numbers as dates, such as '2841381', which it would recognize as a valid
-    # date, but the user probably does not intend it to be so treated.
-    def convert_to_date_time(val)
-      return val if val.is_a?(DateTime)
-      return val.to_datetime if val.is_a?(Date) && type == 'DateTime'
-      return val if val.is_a?(Date)
-      begin
-        val = val.to_s.clean
-        return nil if val.blank?
-        return nil unless val =~ %r{\b\d\d\d\d[-/]\d\d?[-/]\d\d?\b}
-        val = DateTime.parse(val.to_s.clean)
-        val = val.to_date if val.seconds_since_midnight.zero?
-        val
-      rescue ArgumentError
-        return nil
-      end
-    end
-
-    # Convert the val to a Numeric if is already a Numberic or is a String that
-    # looks like one. Any Float is promoted to a BigDecimal. Otherwise return
-    # nil.
-    def convert_to_numeric(val)
-      return BigDecimal.new(val, Float::DIG) if val.is_a?(Float)
-      return val if val.is_a?(Numeric)
-      # Eliminate any commas, $'s, or _'s.
-      val = val.to_s.clean.gsub(/[,_$]/, '')
-      return nil if val.blank?
-      case val
-      when /\A(\d+\.\d*)|(\d*\.\d+)\z/
-        BigDecimal.new(val.to_s.clean)
-      when /\A[\d]+\z/
-        val.to_i
-      when %r{\A(\d+)\s*[:/]\s*(\d+)\z}
-        Rational($1, $2)
-      end
-    end
-
-    def convert_to_string(val)
-      val.to_s
-    end
-  end
-end