censive 0.22 → 0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9bbebb5cd4aba5b0d22ec2f87e129a47292fc999ada61284ea53e5458c1d42
-  data.tar.gz: 9db7f322767ab0fe4275e2c40c0e466dd3654b1180aed55a4aa8826bddee3f78
+  metadata.gz: 76c05b90f6a522a328f86d7d142ed150b33c487e74619707e10f40453c7e9079
+  data.tar.gz: 1e5a93d293ad708b323e20e1323926f2bf70e219ffc502e8fc87025be7be23b6
 SHA512:
-  metadata.gz: a6b3eda844db32d8f50a9972eff3a2c1d690dc8bdcc0eb0276df6dea722d6a45790236e2b0dfaceb17555e153ce44f54c7b18df961babea70ac764ca03aeffa5
-  data.tar.gz: f3c153d47ddc3e2e27be33407d0ca9159776590d42b79e4cfa41c932b9cde3daa3dfdc68de238b3e34a243bc6aff4cfc34df7cc0a1b1aafc27cd0a77c185a8fa
+  metadata.gz: e56b1a6a0f943d962ff8c240625a8354283fcbccd1a640cd66054873e1803779ddb36e128841590e8a8aa0022694e1e22a4fa25b6f88eba7056dc68b838262fb
+  data.tar.gz: 41ddfb9d77a686bef546836d0a110b9603ac7e4f205b7d9760ed37203d23f32f6ba9d2cc5fcb9f8996713fbcdec8fcb924298b1052c1ecc5e9f6442deed3078f

data/censive.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "censive"
-  s.version     = "0.22"
+  s.version     = "0.24"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =

data/lib/censive.rb

@@ -4,7 +4,7 @@
 # censive - A quick and lightweight CSV handling library for Ruby
 #
 # Author: Steve Shreeve (steve.shreeve@gmail.com)
-#   Date: Feb 14, 2023
+#   Date: Feb 17, 2023
 #
 # https://crystal-lang.org/api/1.7.2/CSV.html (Crystal's CSV library)
 # https://github.com/ruby/strscan/blob/master/ext/strscan/strscan.c
@@ -46,11 +46,11 @@ class Censive < StringScanner
     drop:     false   , # drop trailing empty columns?
     encoding: nil     , # character encoding
     excel:    false   , # literals ="01" formulas =A1 + B2 http://bit.ly/3Y7jIvc
-    mode:     :compact, # export mode: compact or full
+    mode:     :compact, # output mode: compact or full
     out:      nil     , # output stream, needs to respond to <<
     quote:    '"'     , # quote character
     relax:    false   , # relax quote parsing so ,"Fo"o, => ,"Fo""o",
-    rowsep:   "\n"    , # row separator for export
+    rowsep:   "\n"    , # row separator for output
     sep:      ","     , # column separator character
     strip:    false   , # strip columns when reading
     **opts              # grab bag
@@ -71,7 +71,7 @@ class Censive < StringScanner
     @encoding = str.encoding
     @excel    = excel
     @mode     = mode
-    @out      = out || $stdout
+    @out      = out || ""
     @relax    = relax
     @strip    = strip
 
@@ -121,7 +121,7 @@ class Censive < StringScanner
       @cols = count if count > @cols
       @cells += count
     end
-    @rows
+    self
   end
 
   def next_row
@@ -153,6 +153,7 @@ class Censive < StringScanner
         scan(@eoc) and break
         @relax or bomb "invalid character after quote"
         token << @quote + (scan_until(@quotes) or bomb "bad inline quote")
+        scan(@eoc) and break
       end
       scan(@sep)
       @strip ? token.strip : token
@@ -179,10 +180,10 @@ class Censive < StringScanner
     @rows.each {|row| yield row }
   end
 
-  def export(**opts)
+  def to_csv(**opts)
     dest = opts.empty? ? self : self.class.writer(**opts)
     each {|row| dest << row }
-    dest
+    dest.out
   end
 
   # ==[ Helpers ]==
@@ -190,7 +191,7 @@ class Censive < StringScanner
   # returns 2 (must be quoted and escaped), 1 (must be quoted), 0 (neither)
   def grok(str)
     if idx = str.index(@escapes)
-      $1 ? 2 : str.index(@quotes, idx) ? 2 : 1
+      $1 ? 2 : str.index(@quote, idx) ? 2 : 1
     else
       0
     end
@@ -259,12 +260,17 @@ if __FILE__ == $0
   # csv.export(out: out) # (excel: true) # sep: "|")
   # puts out # .string
 
-  csv = Censive.new(str, excel: true, relax: true, out: "")
-  out = csv.export
-  puts out.out
+  # csv = Censive.new(str, excel: true, relax: true, out: "")
+  # out = csv.export
+  # puts out.out
+
+  puts Censive.parse(str, excel: true, relax: true).to_csv
 end
 
 __END__
+"AAA "BBB",CCC,"DDD"
+
+"CHUI, LOK HANG "BENNY",224325325610,="001453","Hemoglobin A1c",=""
 "Don",="007",10,"Ed"
 Name,Age,,,Shoe,,,
 "Alice",27,5
@@ -275,6 +281,8 @@ A,B,C,D
 A,B,"C",D
 A,B,C",D
 A,B,"C",D
+08/27/2022,="73859443",="04043260",,"Crossover @ Mathilda","CHO, JOELLE "JOJO"",08/19/2022
+123,
 123,"CHO, JOELLE "JOJO"",456
 123,"CHO, JOELLE ""JOJO""",456
 =,=x,x=,="x",="","","=",123,0123,="123",="0123"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censive
 version: !ruby/object:Gem::Version
-  version: '0.22'
+  version: '0.24'
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies: []
 description: A quick and lightweight CSV handling library for Ruby
 email: steve.shreeve@gmail.com
@@ -19,7 +19,6 @@ files:
 - LICENSE
 - README.md
 - censive.gemspec
-- diagram/NFA to Regex.pdf
 - diagram/censive@ce9d51d.png
 - diagram/csv-ragel.dot
 - diagram/csv.dot
@@ -29,9 +28,6 @@ files:
 - diagram/diagram.dot
 - diagram/diagram.rl
 - lib/censive.rb
-- lib/test-censive.rb
-- lib/test-csv.rb
-- test/a-uses-tabs-and-single-quotes-and-no-trailing-newline.tsv
 homepage: https://github.com/shreeve/censive
 licenses:
 - MIT

data/lib/test-censive.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require "./censive"
-require "digest/md5"
-
-path = ARGV[0] || "KEN_ALL.CSV"
-mode = path =~ /^ken/i ? "r:cp932" : "r"
-
-data = File.open(path, mode).read
-rows = Censive.parse(data)
-
-puts "%s %s (%d size)" % [Digest::MD5.hexdigest(rows.join), path, File.stat(path).size], ""

data/lib/test-csv.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require "csv"
-require "digest/md5"
-
-path = ARGV[0] || "KEN_ALL.CSV"
-mode = path =~ /^ken/i ? "r:cp932" : "r"
-
-data = File.open(path, mode).read
-rows = CSV.parse(data)
-
-puts "%s %s (%d size)" % [Digest::MD5.hexdigest(rows.join), path, File.stat(path).size], ""

data/test/a-uses-tabs-and-single-quotes-and-no-trailing-newline.tsv

@@ -1,3 +0,0 @@
-age	name
-5	'Mike the ''man!'''
-10	Tommy