censive 0.23 → 0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a787932ff608f1df361b6faca419ce69eac2cafe853aa7c16155c5f2ace4621
-  data.tar.gz: 1818249a3e778223297adaff85216c6497d2f802c25e77664ec1525e51dc9d2d
+  metadata.gz: 576378807981d5da8807494a94c45c7a9c42939f216b579daa97b39bfd179b28
+  data.tar.gz: 325e720a55384d7ecee7059b3889e2c401f0bed74bf3a212b44533113017a3a1
 SHA512:
-  metadata.gz: 9ecf977a34e9cd5f86fdc8843aa64b2212bcf608a30eef579593e5af5d3c9ab00164d0dac1030738898ccfe4b541366d711ac8a029b2f907071c113543d10003
-  data.tar.gz: 90780a1b7ca9be28eb7e83392ba00f0d4a7374c05b91845605cf9f8c64d58d5e187d468de96dfabe2126f331944ca94b4d4f5af286750c054db13731bfe8830d
+  metadata.gz: 5975a7104ed337ce034e76d322cc6096714cbfd3807261ec127d5c8ed78f438e618d1d72ea1d8e7fa058e561690c63cf4662967f6d5311c100169144e974225f
+  data.tar.gz: 359d426bd92041250647aa85c17262b1a6356c49147236c3b6ab86df16c56e87708b09839c74970ccafa17121d80ee764b80824b5723ea3817447ba43d514ae9

data/censive.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "censive"
-  s.version     = "0.23"
+  s.version     = `grep '^VERSION' lib/censive.rb | cut -f 2 -d '"'`
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =

data/lib/censive.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+VERSION="0.25"
+
 # ============================================================================
 # censive - A quick and lightweight CSV handling library for Ruby
 #
@@ -36,7 +38,7 @@ class Censive < StringScanner
 
   def self.writer(obj=nil, **opts, &code)
     case obj
-    when String then File.open(obj, "w") {|io| yield new(out: io, **opts, &code) }
+    when String then File.open(obj, "w") {|io| new(out: io, **opts, &code) }
     when IO,nil then new(out: obj, **opts, &code)
     else abort "#{File.basename($0)}: invalid #{obj.class} object in writer"
     end
@@ -71,7 +73,7 @@ class Censive < StringScanner
     @encoding = str.encoding
     @excel    = excel
     @mode     = mode
-    @out      = out || ""
+    @out      = out || $stdout
     @relax    = relax
     @strip    = strip
 
@@ -100,6 +102,8 @@ class Censive < StringScanner
     @quoted   = @excel ? /(?:=)?#{@quote}/o : @quote
     @unquoted = /[^#{@sep}#{@cr}#{@lf}][^#{@quote}#{@cr}#{@lf}]*/o
     @leadzero = /\A0\d*\z/
+
+    yield self if block_given?
   end
 
   def reset(str=nil)
@@ -153,6 +157,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
@@ -190,7 +195,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
@@ -247,37 +252,3 @@ class Censive < StringScanner
     abort "\n#{File.basename($0)}: #{msg} at character #{pos} near '#{string[pos-4,7]}'"
   end
 end
-
-if __FILE__ == $0
-  str = DATA.gets("\n\n").chomp
-  # str = File.read(ARGV.first || "lc-2023.csv")
-  # str = File.open("KEN_ALL.CSV", "r:cp932").read
-
-  # require "stringio"
-  # csv = Censive.new(str, excel: true, relax: true)
-  # out = "" # StringIO.new
-  # 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
-
-  Censive.parse(str, excel: true, relax: true).to_csv
-end
-
-__END__
-"Don",="007",10,"Ed"
-Name,Age,,,Shoe,,,
-"Alice",27,5
-Bob,33,10 1/2
-Charlie or "Chuck",=B2 + B3,9
-Subtotal,=sum(B2:B5),="01234"
-A,B,C,D
-A,B,"C",D
-A,B,C",D
-A,B,"C",D
-123,"CHO, JOELLE "JOJO"",456
-123,"CHO, JOELLE ""JOJO""",456
-=,=x,x=,="x",="","","=",123,0123,="123",="0123"
-,=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.23'
+  version: '0.25'
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies: []
 description: A quick and lightweight CSV handling library for Ruby
 email: steve.shreeve@gmail.com
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: A quick and lightweight CSV handling library for Ruby