fat_table 0.9.3 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c938654651af21d509d2a71fe8a7a9c36747f33e04d1be8eab4c020c1400a26e
-  data.tar.gz: 6d9191d19b79a70a963eb16eaabfaefb2643cd0df7b9dec7a77c5d36f2c836b0
+  metadata.gz: 0eecda446a24945c159963cc45088fdd281fa8e67acc995eacea8b0daa9f428b
+  data.tar.gz: 497feefa41678e0b95c257953c72d7a435cb692d70b4e59eabc681c69a758747
 SHA512:
-  metadata.gz: 38371b27911a835c34e7536bc6226b08a20225d399b4feaa6e6bb6e1dbb6031292d10ea6673c4dabb77c2576294188ce6ab6d76186f6d0a8c803a175e2db3907
-  data.tar.gz: 69a13614617e0423cb7739ec47939841bb96eb5c460d0711528e2163969b70339a14a129a96ed5d68f8908a86479c4ee596799197423cf2cbf3d56f7afe5ba90
+  metadata.gz: 601e15e198b25d248c049e48484b4fe4c43fb83ee19fa8a7d477c5b1b91d3c99d4f5b5b6a9887bf0e532f93a37ee1616b301154dc0eeac01541bc2ae568d9c66
+  data.tar.gz: 10168ba22085112da7abe6cfb013554566920fbd0d3e166f3a0ff306b1d460cc611d4e96dd57e473431128a3027e8d33191c692e283c34f0771472938a2f9faa

data/Gemfile

@@ -4,3 +4,16 @@ gem 'rubocop-shopify', require: false
 
 # Specify your gem's dependencies in fat_table.gemspec
 gemspec
+
+gem 'bundler'
+gem 'debug', '>= 1.0.0'
+gem 'pry'
+gem 'pry-doc'
+gem 'rake', '~> 13.0'
+gem 'redcarpet'
+gem 'pg'
+gem 'sqlite3'
+gem 'rspec', '~> 3.0'
+gem 'rubocop-rspec'
+gem 'rubocop-performance'
+gem 'simplecov'

data/README.org

@@ -79,90 +79,10 @@ org-mode buffer as an org-table, ready for processing by other code blocks.
   - [[#quick-start][Quick Start]]
   - [[#a-word-about-the-examples][A Word About the Examples]]
   - [[#anatomy-of-a-table][Anatomy of a Table]]
-    - [[#columns][Columns]]
-    - [[#headers][Headers]]
-    - [[#groups][Groups]]
   - [[#constructing-tables][Constructing Tables]]
-    - [[#empty-tables][Empty Tables]]
-      - [[#without-headers][Without Headers]]
-      - [[#with-headers][With Headers]]
-      - [[#forcing-string-type][Forcing String Type]]
-      - [[#designating-tolerant-columns][Designating "Tolerant" Columns]]
-    - [[#from-csv-or-org-mode-files-or-strings][From CSV or Org Mode files or strings]]
-    - [[#from-arrays-of-arrays][From Arrays of Arrays]]
-      - [[#in-ruby-code][In Ruby Code]]
-      - [[#in-emacs-org-files][In Emacs Org Files]]
-    - [[#from-arrays-of-hashes][From Arrays of Hashes]]
-    - [[#from-sql-queries][From SQL queries]]
-    - [[#marking-groups-in-input][Marking Groups in Input]]
-      - [[#manually][Manually]]
-      - [[#when-reading-in-tables][When Reading in Tables]]
   - [[#accessing-parts-of-tables][Accessing Parts of Tables]]
-    - [[#rows][Rows]]
-    - [[#columns-1][Columns]]
-    - [[#cells][Cells]]
-    - [[#other-table-attributes][Other table attributes]]
   - [[#operations-on-tables][Operations on Tables]]
-    - [[#example-input-tables][Example Input Tables]]
-    - [[#select][Select]]
-      - [[#selecting-existing-columns-also-of-omni][Selecting Existing Columns (Also of :omni)]]
-      - [[#copying-and-renaming-existing-columns][Copying and Renaming Existing Columns.]]
-      - [[#adding-new-columns][Adding New Columns]]
-      - [[#adding-constant-strings-and-other-types-in-select][Adding Constant Strings and Other Types in select]]
-      - [[#custom-instance-variables-and-hooks][Custom Instance Variables and Hooks]]
-      - [[#argument-order-and-boundaries][Argument Order and Boundaries]]
-    - [[#where][Where]]
-    - [[#order_by][Order_by]]
-    - [[#order_with][Order_with]]
-    - [[#group_by][Group_by]]
-    - [[#join][Join]]
-      - [[#join-types][Join Types]]
-      - [[#join-expressions][Join Expressions]]
-      - [[#join-examples][Join Examples]]
-        - [[#inner-joins][Inner Joins]]
-        - [[#left-and-right-joins][Left and Right Joins]]
-        - [[#full-join][Full Join]]
-        - [[#cross-join][Cross Join]]
-    - [[#set-operations][Set Operations]]
-      - [[#unions][Unions]]
-      - [[#intersections][Intersections]]
-      - [[#set-differences-with-except][Set Differences with Except]]
-    - [[#uniq-aka-distinct][Uniq (aka Distinct)]]
-    - [[#remove-groups-with-degroup][Remove groups with degroup!]]
   - [[#formatting-tables][Formatting Tables]]
-    - [[#available-formatter-output-targets][Available Formatter Output Targets]]
-      - [[#output-media][Output Media]]
-      - [[#examples][Examples]]
-        - [[#to-text][To Text]]
-        - [[#to-org][To Org]]
-        - [[#to-term][To Term]]
-        - [[#to-latex][To LaTeX]]
-        - [[#to-aoa-array-of-arrays][To AoA (Array of Arrays)]]
-        - [[#to-aoh-array-of-hashes][To AoH (Array of Hashes)]]
-    - [[#formatting-directives][Formatting Directives]]
-      - [[#all-types-as-strings][All Types as Strings]]
-      - [[#numeric][Numeric]]
-      - [[#datetime][DateTime]]
-      - [[#boolean][Boolean]]
-      - [[#nilclass][NilClass]]
-    - [[#the-format-and-format_for-methods][The ~format~ and ~format_for~ methods]]
-      - [[#table-locations][Table Locations]]
-      - [[#location-priority][Location priority]]
-      - [[#type-and-column-priority][Type and Column priority]]
-    - [[#footers][Footers]]
-      - [[#adding-footers][Adding Footers]]
-      - [[#dynamic-labels][Dynamic Labels]]
-      - [[#aggregators][Aggregators]]
-      - [[#footer-objects][Footer objects]]
-      - [[#footer-examples][Footer Examples]]
-        - [[#built-in-aggregators][Built-in Aggregators]]
-        - [[#string-aggregators][String Aggregators]]
-        - [[#ruby-objects][Ruby Objects]]
-        - [[#lambdas][Lambdas]]
-    - [[#invoking-formatters][Invoking Formatters]]
-      - [[#by-instantiating-a-formatter][By Instantiating a Formatter]]
-      - [[#by-using-fattable-module-level-method-calls][By Using ~FatTable~ module-level method calls]]
-      - [[#by-calling-methods-on-table-objects][By Calling Methods on Table Objects]]
 - [[#development][Development]]
 - [[#contributing][Contributing]]
 

data/fat_table.gemspec

@@ -63,20 +63,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'debug', '>= 1.0.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'redcarpet'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'simplecov'
-
   spec.add_runtime_dependency 'fat_core', '>= 4.9.0'
+  spec.add_runtime_dependency 'csv'
   spec.add_runtime_dependency 'rainbow'
   spec.add_runtime_dependency 'sequel'
   spec.add_runtime_dependency 'gem-path'

data/lib/fat_table/errors.rb

@@ -16,4 +16,7 @@ module FatTable
   # Raised when an external resource is not available due to caller or
   # programmer error or some failure of the external resource to be available.
   class TransientError < StandardError; end
+
+  # Raise when an expected table was not found.
+  class NoTable < UserError; end
 end

data/lib/fat_table/table.rb

@@ -156,14 +156,18 @@ module FatTable
       File.open(fname, 'r') do |io|
         from_csv_io(io, **types)
       end
+    rescue NoTable
+      raise NoTable, "no table found in CSV file '#{fname}'"
     end
 
     # :category: Constructors
 
     # Construct a Table from a CSV string +str+, treated in the same manner as
     # the input from a CSV file in ::from_org_file.
-    def self.from_csv_string(str, **types)
-      from_csv_io(StringIO.new(str), **types)
+    def self.from_csv_string(str, has_headers: true, **)
+      from_csv_io(StringIO.new(str), has_headers:, **)
+    rescue NoTable
+      raise NoTable, "no table found in string '#{str[0..20]}...'"
     end
 
     # :category: Constructors
@@ -176,6 +180,8 @@ module FatTable
       File.open(fname, 'r') do |io|
         from_org_io(io, **types)
       end
+    rescue NoTable
+      raise NoTable, "no table found in file '#{fname}'"
     end
 
     # :category: Constructors
@@ -184,6 +190,8 @@ module FatTable
     # contents of an org-mode file in ::from_org_file.
     def self.from_org_string(str, **types)
       from_org_io(StringIO.new(str), **types)
+    rescue NoTable
+      raise NoTable, "no table found in string '#{str[0..20]...}'"
     end
 
     # :category: Constructors
@@ -275,9 +283,9 @@ module FatTable
       # Construct table from an array of hashes or an array of any object that
       # can respond to #to_h. If an array element is a nil, mark it as a group
       # boundary in the Table.
-      def from_array_of_hashes(hashes, hlines: false, **types)
+      def from_array_of_hashes(hashes, hlines: false, **)
         heads = hashes.first.keys
-        result = new(*heads, **types)
+        result = new(*heads, **)
         hashes.each do |hsh|
           if hsh.nil?
             unless hlines
@@ -305,7 +313,7 @@ module FatTable
       # hlines are stripped from the table, otherwise (:hlines yes) they are
       # indicated with nil elements in the outer array as expected by this
       # method when hlines is set true.
-      def from_array_of_arrays(rows, hlines: false, **types)
+      def from_array_of_arrays(rows, hlines: false, **)
         headers = []
         if !hlines
           # Take the first row as headers
@@ -324,7 +332,7 @@ module FatTable
           headers = (1..rows[0].size).to_a.map { |k| "col_#{k}".as_sym }
           first_data_row = 0
         end
-        result = new(*headers, **types)
+        result = new(*headers, **)
         rows[first_data_row..-1].each do |row|
           if row.nil?
             unless hlines
@@ -342,24 +350,35 @@ module FatTable
         result
       end
 
-      def from_csv_io(io, **types)
-        result = new(**types)
-        ::CSV.new(io, headers: true, header_converters: :symbol,
-                  skip_blanks: true).each do |row|
-          result << row.to_h
+      def from_csv_io(io, has_headers: true, **)
+        result = new(**)
+        if has_headers
+          ::CSV.new(io, headers: has_headers, header_converters: :symbol, skip_blanks: true).each do |row|
+            result << row.to_h
+          end
+        else
+          nfields = io.readline.split(',').size
+          io.seek(0, IO::SEEK_SET)
+          heads = (1..nfields).map {|n| "col_#{n}"}
+          ::CSV.new(io, headers: heads, skip_blanks: true).each do |row|
+            result << row.to_h
+          end
         end
         result.normalize_boundaries
         result
+      rescue StandardError
+        raise NoTable
       end
 
       # Form rows of table by reading the first table found in the org file. The
       # header row must be marked with an hline (i.e, a row that looks like
       # '|---+--...--|') and groups of rows may be marked with hlines to
       # indicate group boundaries.
-      def from_org_io(io, **types)
+      def from_org_io(io, **)
         table_re = /\A\s*\|/
         hrule_re = /\A\s*\|[-+]+/
         rows = []
+        ncols = nil
         table_found = false
         header_found = false
         io.each do |line|
@@ -388,10 +407,17 @@ module FatTable
             break
           else
             line = line.sub(/\A\s*\|/, '').sub(/\|\s*\z/, '')
-            rows << line.split('|').map(&:clean)
+            # Don't include any rows with a size different from that
+            # established by the header row.
+            cols = line.split('|').map(&:clean)
+            ncols ||= cols.size
+            next unless cols.size == ncols
+
+            rows << cols
           end
         end
-        from_array_of_arrays(rows, hlines: true, **types)
+        raise NoTable unless table_found
+        from_array_of_arrays(rows, hlines: true, **)
       end
     end
 
@@ -717,6 +743,7 @@ module FatTable
         self.explicit_boundaries = explicit_boundaries.uniq.sort
       end
       explicit_boundaries
+      self
     end
 
     # Return the explicit_boundaries, augmented by an implicit boundary for

data/lib/fat_table/version.rb

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

data/lib/fat_table.rb

@@ -11,6 +11,7 @@ module FatTable
   require 'fat_core/array'
   require 'fat_core/hash'
   require 'fat_core/numeric'
+  require 'ostruct'
   require 'csv'
   require 'sequel'
   require 'active_support'

metadata

@@ -1,197 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.7
 platform: ruby
 authors:
 - Daniel E. Doherty
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2024-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: fat_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 4.9.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fat_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +165,6 @@ licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
   yard.run: yri
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -335,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Provides tools for working with tables as a data type.
 test_files: []