fat_table 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c938654651af21d509d2a71fe8a7a9c36747f33e04d1be8eab4c020c1400a26e
-  data.tar.gz: 6d9191d19b79a70a963eb16eaabfaefb2643cd0df7b9dec7a77c5d36f2c836b0
+  metadata.gz: 10cc3b0171ec07f74b9e7067c0204c4f828271d18e648bf540664fdaa33b7af9
+  data.tar.gz: a95c4ab0fc7bfda4a00df537c2ad06383d67c77eb9b5b5007c9033008459d679
 SHA512:
-  metadata.gz: 38371b27911a835c34e7536bc6226b08a20225d399b4feaa6e6bb6e1dbb6031292d10ea6673c4dabb77c2576294188ce6ab6d76186f6d0a8c803a175e2db3907
-  data.tar.gz: 69a13614617e0423cb7739ec47939841bb96eb5c460d0711528e2163969b70339a14a129a96ed5d68f8908a86479c4ee596799197423cf2cbf3d56f7afe5ba90
+  metadata.gz: c3dd880a234f88c9c507b01854397e458b4987786cac9c5667f4697253dc4781b1833976251c95cfdfdd3c4ff6e9d033911e2ba02bcb6d04b92567f1beab8c3b
+  data.tar.gz: 6fb2f3309586c0053dc89cddee3509e934943ee70a2ffc105fd1b257eaec1ce81ff3deffce5ae5a389cf4461f716c54d6ae661102530ad4f3624bec34632e74e

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.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_table
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: Provides tools for working with tables as a data type.