censive 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b2018e7ca027d44e36061d9cdc983b56e510632bc125ca632b85fbdc15999b
-  data.tar.gz: 3ec807310f681afdec72505269c23a6a6d9b0262134dbbcd0b16cc6406c9fc50
+  metadata.gz: d3e3d32cc23e58416e6d9c2f962be016beff4f1555af801e969032162fcb9f95
+  data.tar.gz: 405c48fba04cbf797354d0732a6ccc9238a5d198469a6d927fc37de86da5eaa7
 SHA512:
-  metadata.gz: b0110e0ff7dc4f902ede1c7086e6431d3671f1c5886c6947e493bc85ad48bda3232d3604b269703ad3bfdb0d7b1d180cb55ea12fdf06bcc9729a1d67d2cd85a7
-  data.tar.gz: 90dbb68deed9124a723eba91574f46829bf870277f874433ad34fc63dfb4376a8bda243b9fdbb86fbfee90e18bd169e4b8cc97fa6f6f3dac43bbc2125dac877d
+  metadata.gz: 5afd52cdd519854a78977d778c05f0f9bad02bad177523e79c4f3fc96e4291178a2186f021d8a40d1be8ec16d1bc659a3a18a49721994d4c7326a90006362398
+  data.tar.gz: 378b0f4a3e289a0a1244d0a69ade975d15e6fae99b000d00d507e8ebd1ae0d29605b43bbb08e25b18f0306d3e54eb327f75f94e390de0fe3cb02da2fafe7185b

data/censive.gemspec

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 Gem::Specification.new do |s|
   s.name        = "censive"
-  s.version     = "0.17"
+  s.version     = "0.18"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =

data/lib/censive.rb

@@ -22,6 +22,9 @@
 require "strscan"
 
 class Censive < StringScanner
+  def self.parse(...)
+    new(...).parse
+  end
 
   def self.writer(obj=nil, **opts, &code)
     case obj
@@ -31,34 +34,32 @@ class Censive < StringScanner
     end
   end
 
-  def initialize(str=nil,
-    drop:   false   , # drop trailing empty fields?
-    excel:  false   , # literals ="01" formulas =A1 + B2 http://bit.ly/3Y7jIvc
-    mode:   :compact, # export mode: compact or full
-    out:    $stdout , # 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
-    sep:    ","     , # column separator character
-    strip:  false   , # strip fields when reading
+  def initialize(str="",
+    drop:     false   , # drop trailing empty fields?
+    encoding: "utf-8" , # character encoding
+    excel:    false   , # literals ="01" formulas =A1 + B2 http://bit.ly/3Y7jIvc
+    mode:     :compact, # export mode: compact or full
+    out:      $stdout , # 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
+    sep:      ","     , # column separator character
+    strip:    false   , # strip fields when reading
     **opts            # grab bag
   )
-    str = File.read(str) if str =~ /\A.{,100}\z/
-    super(str || "")
-    reset
-
     # options
-    @drop    = drop
-    @excel   = excel
-    @mode    = mode
-    @out     = out
-    @quote   = quote
-    @relax   = relax
-    @rowsep  = rowsep
-    @sep     = sep
-    @strip   = strip
-
-    # determined
+    @drop     = drop
+    @encoding = encoding
+    @excel    = excel
+    @mode     = mode
+    @out      = out
+    @quote    = quote
+    @relax    = relax
+    @rowsep   = rowsep
+    @sep      = sep
+    @strip    = strip
+
+    # definitions
     @cr  = "\r"
     @lf  = "\n"
     @es  = ""
@@ -66,6 +67,13 @@ class Censive < StringScanner
     @esc = (@quote * 2)
     @eol = /#{@cr}#{@lf}?|#{@lf}|\z/o             # end of line
     @eoc = /(?=#{"\\" + @sep}|#{@cr}|#{@lf}|\z)/o # end of cell
+
+    # data source
+    if str.size < 100 && File.readable?(str)
+      str = File.open(str, "r:#{encoding}").read
+    end
+    super(str)
+    reset
   end
 
   def reset(str=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: censive
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - Steve Shreeve