carray-io-csv 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9cb40651d13b603f919dced66f36937c7b116381be98f4d2e27ce9bf69608c4
-  data.tar.gz: 8b5c8cc847d24dc3ba46b1969da7f2ede0fdcc18646577db32883a7a8b70b9e1
+  metadata.gz: 3f4aad4e63e332f57709cd3b0c13791ae93fa43e39cc6627729302be5f255f89
+  data.tar.gz: cd0c329a6612e7ebca7c3b831ffbba6b3525cbe91f95e06e467d70604d8662e9
 SHA512:
-  metadata.gz: f3bfe3db49f4c1ce530bf5a640d9ba4d6fd3f2673ee813fa3b2de778de86fbf9ec1618e3a5a2fbd0883b981159a92329f0ea9ec9b81df938b606c36199aa6462
-  data.tar.gz: 6ccb47ecd46ecacac1c13dba205206527d2ac4692226c1659cc9f1affe60bd8f6a45e1c6899b960a1d1f0b7a2591a3fc4933193b29f77376b6ffa8ed62939da5
+  metadata.gz: 72874fc22721a412621f0a47f31f74240b40b79f87b419a2f74c84c40754262f9ea816884b96b26ecd233efe20e40d584064dcd0eb01fe6d4b2b18210e3b1844
+  data.tar.gz: fc04ddc1a7a05aca96a1afb92480c09fb00c74f0deb6723476edd9abe43576eebdfc98c5ea7dfb726f297c8e2232c4725185301f2412d0af9025a3af731969b8

data/carray-io-csv.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification::new do |s|
-  version = "0.9.1"
+  version = "1.0.0"
   files = Dir.glob("**/*") - [ 
                                Dir.glob("carray-io-csv-*.gem"), 
                                Dir.glob("test/**/*"),
@@ -18,10 +18,8 @@ Gem::Specification::new do |s|
   s.email       = ""
   s.homepage    = 'https://github.com/himotoyoshi/carray-io-csv'
   s.files       = files
-#  s.extensions  = [ "ext/extconf.rb" ]
-  s.required_ruby_version = ">= 1.8.1"
-  s.add_runtime_dependency 'carray', '~> 1.3'
-  s.add_runtime_dependency 'rcsv', '~> 0.3.1'
+  s.required_ruby_version = ">= 2.4.0"
+  s.add_runtime_dependency 'carray', '~> 1.5'
   
 end
 

data/lib/carray-io-csv/core.bak.rb

@@ -0,0 +1,593 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/io/csv.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#  You can redistribute it and/or modify it under the terms of
+#  the Ruby Licence.
+#
+#  Copyright (C) 2005 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
+#
+# CSV data reader/writer for CArray (in DSL approach)
+#
+# For reading (explicit form)
+#
+#   csv = CA::CSVReader.new {
+#     header          # read a line as "names" header 
+#     header :units   # read a line as "units" header 
+#     skip 1          # skip a line
+#     body 10         # read values
+#     process { |name, column|    # post processing
+#       case name                 #   name   : name of columns (string|integer) 
+#       when "Date"               #   column : column carray
+#         column.map!{|x| Date.parse(x) }
+#       else
+#         column[] = column.double
+#       end
+#     }
+#   }
+#
+#   data1 = csv.read_file(file1)
+#   data2 = csv.read_file(file2)
+#   data3 = csv.read_file(file3)
+#
+# For reading (implicit form)
+#
+#   data = CArray.load_csv(file) { ... definitions ... }
+#   data = CArray.from_csv(io|string) { ... definitions ... }
+#
+# For writing (explict form)
+#
+#   csv = CA::CSVWriter.new {
+#     names ["Date", "a", "b", "c"]   # set name of columns
+#     process { |name, column|        # pre processing
+#       case name                     #   name   : name of column
+#       when "Date"                   #   column : column carray
+#         column.map!{|x| x.to_s }
+#       else
+#         column.map!{|x| "%.2f" % x }
+#       end
+#     }
+#     puts "sample CSV data"          # print any string
+#     header                          # write names in header
+#     header ["","mm","cm","m"]       # write units in header
+#     write                           # write values
+#   }
+#
+#   data1.write_file(file1)
+#   data2.write_file(file2)
+#   data3.write_file(file3)
+#
+# For writing (implicit form)
+#
+#   data.save_csv(file) { ... definitions ... }
+#   data.to_csv([io|string]) { ... definitions ... }
+#
+
+require "stringio"
+require "rcsv"
+require "strscan"
+
+module CA
+
+  class CSVReader
+  
+    def initialize (sep: ",", rs: $/, &block)
+      @sep = sep
+      @rs  = rs
+      @block = block
+    end
+
+    def read_io (io)
+      return Processor.new(io, sep: @sep, rs: @rs, &@block).run
+    end
+
+    def read_string (string)
+      return read_io(StringIO.new(string))
+    end
+
+    def read_file (filename, encoding: nil)
+      File.open(filename, encoding: encoding) { |io|
+        return read_io(io)
+      }
+    end
+  
+    class Processor 
+    
+      def initialize (io, sep:, rs:, &block)
+        @io       = io
+        @sep      = sep
+        @rs       = rs
+        @block    = block || proc { body }
+        @namelist = nil
+        @names    = nil
+        @headerlist = []
+        @header   = {}
+        @note     = ""
+        @table    = nil
+        @regexp_simple1 = /#{@sep}/
+        @regexp_simple2 = / *#{@sep} */
+        @regexp_pat1    = /\A([^"#{@sep}][^#{@sep}]*) *#{@sep} */
+        @regexp_pat2    = /\A"([^"]+)" *#{@sep} */
+        @regexp_pat3    = /\A"((?:[^"]+|"")+)" *#{@sep} */
+        @regexp_pat4    = /\A(?:""|) *#{@sep} */ 
+        @sc       = StringScanner.new("")
+      end
+
+      def run
+        case @block.arity
+        when 1
+          @block.call(self)
+        when -1, 0
+          instance_exec(&@block)
+        else
+          raise "invalid block paramter"
+        end
+        if @header.has_key?("names")          
+          @header["names"].each_with_index do |name, k|
+            if name.nil? or name.empty?
+              @header["names"][k] = "c#{k}"
+            end
+          end
+        else
+          @header["names"] = (0...@cols).map{|k| "c#{k}"}
+        end
+        header = @header
+        note  = @note
+        @table.instance_exec{ 
+          @names  = header["names"]
+          @header = header
+          @note  = note
+        }
+        @table.extend(CArray::TableMethods)
+        @table.column_names = header["names"]
+        class << @table
+          attr_reader :note
+          def header (name=nil)
+            if name
+              return @header[name.to_s]
+            else
+              return @header
+            end
+          end
+        end
+        return @table
+      end
+
+      def column_names (*namelist)
+        if @header.has_key?("names")
+          warn "override header['names']"
+        end
+        @names = namelist.map(&:to_s)
+        @header["names"] = @names
+        return namelist
+      end
+
+      alias columns column_names
+
+      def header (name = "names")
+        name = name.to_s
+        list = csv_feed()
+        if name == "names"
+          if @names 
+            raise "already 'names' defined"
+          end
+          @names = list
+        end
+        @header[name] = list
+        @headerlist.push(name)
+        return list
+      end
+
+      attr_reader :names
+
+      def note (n=1)
+        list = []
+        n.times { list << @io.gets(@rs) }
+        @note << (text = list.join)
+        return text
+      end
+
+      def skip (n=1)
+        n.times { @io.gets(@rs) }
+      end
+
+      def body (n=nil, cols=nil)
+        data = []
+        count = 0
+        if cols
+          @cols = cols
+        elsif @names
+          @cols = @names.size
+        else
+          list = csv_feed()
+          if list.nil?
+            @rows  = 0
+            @table = CArray.object(@rows, @cols)
+            return
+          end
+          data.push(list)
+          count += 1
+          @cols = list.size
+        end
+        if n
+          lsize = nil
+          while count < n and list = csv_feed(@cols)
+            lsize = list.size
+            if lsize == @cols
+              data.push(list)             
+            elsif lsize <= @cols
+              record = Array.new(@cols, nil)
+              record[0,lsize] = list
+              data.push(record)
+            else
+              extra = Array.new(lsize - @cols, nil)
+              data.each do |row|
+                row.push(*extra)
+              end
+              data.push(list)
+              @cols = lsize
+  #            raise "csv parse error : too large column number at line #{@io.lineno}"
+            end
+            count += 1
+          end
+        else
+          unless @io.eof?
+            data += Rcsv.parse(@io, column_separator: @sep, header: :none)
+          end
+        end
+        @rows  = data.size
+        @table = CArray.object(@rows, @cols){ data }
+        @table[:eq,""] = nil
+      end
+
+      def rename (name, newname)
+        names = @header["names"]
+        i = names.index(name)
+        names[i] = newname
+        @names = @header["names"]
+      end
+
+      def downcase
+        @header["names"] = @header["names"].map(&:downcase)
+        @names = @header["names"]
+      end
+
+      def select (*namelist)
+        @namelist = namelist.empty? ? nil : namelist
+        case @namelist
+        when nil
+        when Array
+          index = (0...@cols).map.to_a
+          index_list = @namelist.map{ |x|
+            case x
+            when Integer
+              x
+            when Range
+              index[x]
+            when String, Symbol
+              if @names and i = @names.index(x.to_s) 
+                i
+              else
+                raise "invalid argument #{x}"
+              end
+            else
+              raise "invalid argument"
+            end
+          }.flatten
+          @table = @table[nil, CA_INT(index_list)].to_ca
+          @header.keys.each do |k|
+            @header[k] = @header[k].values_at(*index_list)
+          end
+          @names = @header["names"]
+        else
+          raise
+        end
+      end
+
+      def process
+        if @namelist
+          @namelist.each_with_index do |name, i|
+            yield(name, @table[nil, i])
+          end
+        elsif @names
+          @names.each_with_index do |name, i|
+            yield(name, @table[nil, i])
+          end
+        else
+          @table.dim1.times do |i|
+            yield(i, @table[nil,i])
+          end
+        end
+      end
+
+      def convert (data_type, options={}, &block)
+        if block_given?
+          if data_type.is_a?(Class) and data_type < CA::Struct
+            @table = @table[:i, nil].convert(data_type, &block) 
+          else
+            @table = @table.convert(data_type, options, &block)
+          end
+        else
+          if data_type.is_a?(Class) and data_type < CA::Struct
+            @table = @table[:i,nil].convert(data_type) { |b|
+              data_type.new(*b[0,nil])
+            }
+          else
+            @table = @table.to_type(data_type, options)
+          end
+        end
+      end
+
+      private
+
+      def csv_feed (cols=nil)
+        if @io.eof?
+          return nil
+        end
+        line = nil
+        loop do
+          if newline = @io.gets(@rs)
+            if line
+              line << newline
+            else
+              line = newline
+            end
+            count_quote = line.count('"')
+          else
+            line = ""
+            count_quote = 0
+          end
+          if count_quote == 0
+            line.chomp!
+            if line.count(' ') == 0
+              return line.split(@sep, -1) ### /#{@sep}/
+            else
+              return line.split(@regexp_simple2, -1) ### / *#{@sep} */
+            end
+          end
+          if count_quote % 2 == 0 
+            line.chomp!
+            return csv_split(line, cols)
+          else
+            if newline
+              next
+            else
+              raise "csv parse error"
+            end
+          end
+        end
+      end
+
+      def csv_split (text, cols=nil)
+        if cols
+          csv = Array.new(cols)
+        else
+          csv = []
+        end
+        text << @sep
+        @sc.string = text
+        i = 0
+        begin
+          case
+          when @sc.scan(@regexp_pat1)
+                    ### /\A([^"#{@sep}][^#{@sep}]*) *#{@sep} */
+            csv[i] = @sc[1]
+          when @sc.scan(@regexp_pat2)
+                    ### /\A"([^"]+)" *#{@sep} */
+            csv[i] = @sc[1]
+          when @sc.scan(@regexp_pat3)
+                    ### /\A"((?:[^"]+|"")+)" *#{@sep} */
+            s = @sc[1]
+            if s =~ /"/
+              csv[i] = s.gsub(/""/, '"') 
+            else
+              csv[i] = s
+            end
+          when @sc.scan(@regexp_pat4)
+                    ### /\A(?:""|) *#{@sep} */
+            csv[i] = nil
+          else
+            raise "csv parse error"
+          end
+          i += 1
+        end until @sc.eos?
+        return csv
+      end
+
+    end
+  
+  end
+  
+end
+
+module CA
+
+  class CSVWriter      # :nodoc:
+
+    def initialize (sep=",", rs=$/, fill="", &block)
+      @block = block
+      @sep   = sep
+      @rs    = rs
+      @fill  = fill
+    end
+
+    def write_io (table, io)
+      return Processor.new(table, io, @sep, @rs, @fill, &@block).run
+    end
+
+    def write_string (table, string) 
+      write_io(table, StringIO.new(string))
+      return string
+    end
+
+    def write_file (table, filename, mode="w")
+      open(filename, mode) { |io|
+        return write_io(table, io)
+      }
+    end
+
+    class Processor   # :nodoc:
+
+      def initialize (table, io, sep, rs, fill, &block)
+        @io       = io
+        @sep      = sep
+        @rs       = rs
+        @fill     = fill
+        @block    = block || proc { body }
+        if table.has_data_class?
+          @names = table.members
+          @table = CArray.merge(CA_OBJECT, table[nil].fields)
+        else
+          @names = table.instance_exec{ @names }
+          if @names.nil?
+            @names = table.instance_exec{ @column_names }          
+          end
+          case
+          when table.rank > 2
+            @table = table.reshape(false,nil).object
+          when table.rank == 1
+            @table = table[:%,1].object  ### convert to CA_OBJECT            
+          else
+            @table = table.object  ### convert to CA_OBJECT
+          end
+        end
+        if @table.has_mask?
+          @table.unmask(@fill)
+        end
+        @regexp_simple = /#{@sep}/o
+      end
+
+      def csv_quote (text)
+        text = text.dup
+        if text.gsub!(/"/, '""') or text =~ @regexp_simple ### /#{@sep}|"/
+          text = '"' + text + '"'
+        end
+        return text
+      end
+
+      def run 
+        case @block.arity
+        when 1
+          @block.call(self)
+        when -1, 0
+          instance_exec(&@block)
+        else
+          raise "invalid block parameter"
+        end
+      end
+
+      # set @names 
+      def names (list)
+        @names = list
+      end
+
+      # puts header
+      def header (list = @names)
+        @io.write list.map{|s| csv_quote(s)}.join(@sep)
+        @io.write(@rs)
+      end
+
+      # puts any strings
+      def puts (*argv)
+        @io.print(*argv)
+        @io.write(@rs)
+      end
+
+      # write value
+      # If option :strict is set, do csv_quote for string element
+      def body (strict: true, format: nil)
+        if strict
+          case @table.data_type
+          when CA_OBJECT
+            table = @table.to_ca
+            table[:is_kind_of, String].map! { |s| csv_quote(s) } 
+          when CA_FIXLEN
+            table = @table.object
+            table.map! { |s| csv_quote(s) }
+          else
+            table = @table.object 
+          end
+        else
+          table = @table
+        end
+        if format
+          table.dim0.times do |i|
+            @io.write Kernel::format(format,*table[i,nil].to_a)
+            @io.write(@rs)
+          end          
+        else
+          table.dim0.times do |i|
+            @io.write table[i,nil].to_a.join(@sep)
+            @io.write(@rs)
+          end
+        end
+      end
+
+      # pre processing data
+      def process (namelist = @names)
+        if namelist 
+          namelist.each_with_index do |name, i|
+            yield(name, @table[nil, i])
+          end
+        else
+          @table.dim1.times do |i|
+            yield(i, @table[nil,i])
+          end
+        end
+      end
+    end
+  end
+end
+
+class CArray
+
+  def self.load_csv (file, sep: ",", rs: $/, encoding: nil, &block)
+    reader = CA::CSVReader.new(sep: sep, rs: rs, &block)
+    return reader.read_file(file, encoding: encoding)
+  end
+  
+  def self.from_csv (io, sep: ",", rs: $/, &block)
+    reader = CA::CSVReader.new(sep: sep, rs: rs, &block)
+    case io
+    when IO, StringIO
+      return reader.read_io(io)
+    when String
+      return reader.read_string(io)
+    else
+      raise "invalid argument"
+    end
+  end
+
+  def save_csv (file, rs: $/, sep: ",", fill: "", mode: "w", &block)
+    writer = CA::CSVWriter.new(sep, rs, fill, &block)
+    return writer.write_file(self, file, mode)
+  end
+
+  def to_csv (io="", rs: $/, sep: ",", fill: "", &block)
+    writer = CA::CSVWriter.new(sep, rs, fill, &block)
+    case io
+    when IO, StringIO
+      return writer.write_io(self, io)
+    when String
+      return writer.write_string(self, io)
+    end
+  end
+
+  def to_tabular (**option)
+    option = {:sep=>" ", :names=>nil}.update(option)
+    if option[:names]
+      names = option[:names]
+    elsif self.respond_to?(:names)
+      names = self.names
+    end
+    sep = option[:sep]
+    data = self.to_ca.map! {|s| s.to_s }
+    table  = CArray.join([names.to_ca], [data])
+    length = table.convert{|s| s.length}.max(0)
+    table.map_with_index! {|s, idx| s.rjust(length[idx[1]]) }.to_csv.gsub(/,/,sep)
+  end
+end
+

data/lib/carray-io-csv/core.rb

@@ -67,21 +67,21 @@
 #
 
 require "stringio"
-require "rcsv"
 require "strscan"
 
 module CA
 
-  class CSVReader
-  
-    def initialize (sep: ",", rs: $/, &block)
-      @sep = sep
-      @rs  = rs
+  class CSVReader  # :nodoc:
+
+    def initialize (sep: ",", rs: $/, quote_char: '"', &block)
       @block = block
+      @sep   = sep
+      @rs    = rs
+      @quote_char = quote_char
     end
 
     def read_io (io)
-      return Processor.new(io, sep: @sep, rs: @rs, &@block).run
+      return Processor.new(io, @sep, @rs, @quote_char, &@block).run
     end
 
     def read_string (string)
@@ -93,13 +93,15 @@ module CA
         return read_io(io)
       }
     end
-  
-    class Processor 
-    
-      def initialize (io, sep:, rs:, &block)
+
+    class Processor  # :nodoc:
+      
+      def initialize (io, sep, rs=$/, quote_char='"', &block)
         @io       = io
         @sep      = sep
         @rs       = rs
+        @quote_char = quote_char
+        @sc       = StringScanner.new("")
         @block    = block || proc { body }
         @namelist = nil
         @names    = nil
@@ -109,14 +111,15 @@ module CA
         @table    = nil
         @regexp_simple1 = /#{@sep}/
         @regexp_simple2 = / *#{@sep} */
-        @regexp_pat1    = /\A([^"#{@sep}][^#{@sep}]*) *#{@sep} */
-        @regexp_pat2    = /\A"([^"]+)" *#{@sep} */
-        @regexp_pat3    = /\A"((?:[^"]+|"")+)" *#{@sep} */
-        @regexp_pat4    = /\A(?:""|) *#{@sep} */ 
-        @sc       = StringScanner.new("")
+        @regexp_pat1    = /\A([^#{@quote_char}#{@sep}][^#{@sep}]*) *#{@sep} */
+        @regexp_pat2    = /\A#{@quote_char}([^#{@quote_char}]+)#{@quote_char} *#{@sep} */
+        @regexp_pat3    = /\A#{@quote_char}((?:[^#{@quote_char}]+|#{@quote_char}#{@quote_char})+)#{@quote_char} *#{@sep} */
+        @regexp_pat4    = /\A(?:#{@quote_char}#{@quote_char}|) *#{@sep} */ 
+        @regexp_pat5    = /#{@quote_char}/ 
+        @regexp_pat6    = /#{@quote_char}#{@quote_char}/ 
       end
 
-      def run
+      def run 
         case @block.arity
         when 1
           @block.call(self)
@@ -125,15 +128,6 @@ module CA
         else
           raise "invalid block paramter"
         end
-        if @header.has_key?("names")          
-          @header["names"].each_with_index do |name, k|
-            if name.nil? or name.empty?
-              @header["names"][k] = "c#{k}"
-            end
-          end
-        else
-          @header["names"] = (0...@cols).map{|k| "c#{k}"}
-        end
         header = @header
         note  = @note
         @table.instance_exec{ 
@@ -165,8 +159,6 @@ module CA
         return namelist
       end
 
-      alias columns column_names
-
       def header (name = "names")
         name = name.to_s
         list = csv_feed()
@@ -180,7 +172,7 @@ module CA
         @headerlist.push(name)
         return list
       end
-
+      
       attr_reader :names
 
       def note (n=1)
@@ -195,8 +187,12 @@ module CA
       end
 
       def body (n=nil, cols=nil)
+        unless n
+          n = 0x80000000
+        end
         data = []
         count = 0
+
         if cols
           @cols = cols
         elsif @names
@@ -212,49 +208,33 @@ module CA
           count += 1
           @cols = list.size
         end
-        if n
-          lsize = nil
-          while count < n and list = csv_feed(@cols)
-            lsize = list.size
-            if lsize == @cols
-              data.push(list)             
-            elsif lsize <= @cols
-              record = Array.new(@cols, nil)
-              record[0,lsize] = list
-              data.push(record)
-            else
-              extra = Array.new(lsize - @cols, nil)
-              data.each do |row|
-                row.push(*extra)
-              end
-              data.push(list)
-              @cols = lsize
-  #            raise "csv parse error : too large column number at line #{@io.lineno}"
+
+        lsize = nil
+        while count < n and list = csv_feed(@cols)
+          lsize = list.size
+          if lsize == @cols
+            data.push(list)             
+          elsif lsize < @cols
+            record = Array.new(@cols, nil)
+            record[0,lsize] = list
+            data.push(record)
+          else
+            extra = Array.new(lsize - @cols, nil)
+            data.each do |row|
+              row.push(*extra)
             end
-            count += 1
-          end
-        else
-          unless @io.eof?
-            data += Rcsv.parse(@io, column_separator: @sep, header: :none)
+            data.push(list)
+            @cols = lsize
+#            raise "csv parse error : too large column number at line #{@io.lineno}"
           end
+          count += 1
         end
+
         @rows  = data.size
         @table = CArray.object(@rows, @cols){ data }
         @table[:eq,""] = nil
       end
 
-      def rename (name, newname)
-        names = @header["names"]
-        i = names.index(name)
-        names[i] = newname
-        @names = @header["names"]
-      end
-
-      def downcase
-        @header["names"] = @header["names"].map(&:downcase)
-        @names = @header["names"]
-      end
-
       def select (*namelist)
         @namelist = namelist.empty? ? nil : namelist
         case @namelist
@@ -281,7 +261,6 @@ module CA
           @header.keys.each do |k|
             @header[k] = @header[k].values_at(*index_list)
           end
-          @names = @header["names"]
         else
           raise
         end
@@ -335,7 +314,7 @@ module CA
             else
               line = newline
             end
-            count_quote = line.count('"')
+            count_quote = line.count(@quote_char)
           else
             line = ""
             count_quote = 0
@@ -381,8 +360,9 @@ module CA
           when @sc.scan(@regexp_pat3)
                     ### /\A"((?:[^"]+|"")+)" *#{@sep} */
             s = @sc[1]
-            if s =~ /"/
-              csv[i] = s.gsub(/""/, '"') 
+            if s =~ @regexp_pat5 ### /"/
+              csv[i] = s.gsub(@regexp_pat6, @quote_char) 
+                          ### /""/
             else
               csv[i] = s
             end
@@ -398,24 +378,21 @@ module CA
       end
 
     end
-  
   end
-  
 end
 
 module CA
 
   class CSVWriter      # :nodoc:
 
-    def initialize (sep=",", rs=$/, fill="", &block)
+    def initialize (sep=",", rs=$/, fill=nil, &block) ### FIXME: fill is not used
       @block = block
       @sep   = sep
       @rs    = rs
-      @fill  = fill
     end
 
     def write_io (table, io)
-      return Processor.new(table, io, @sep, @rs, @fill, &@block).run
+      return Processor.new(table, io, @sep, @rs, &@block).run
     end
 
     def write_string (table, string) 
@@ -431,19 +408,19 @@ module CA
 
     class Processor   # :nodoc:
 
-      def initialize (table, io, sep, rs, fill, &block)
+      def initialize (table, io, sep, rs, &block)
         @io       = io
         @sep      = sep
         @rs       = rs
-        @fill     = fill
         @block    = block || proc { body }
         if table.has_data_class?
           @names = table.members
           @table = CArray.merge(CA_OBJECT, table[nil].fields)
         else
-          @names = table.instance_exec{ @names }
-          if @names.nil?
-            @names = table.instance_exec{ @column_names }          
+          if table.respond_to?(:column_names)
+            @names = table.column_names
+          else
+            @names = table.instance_exec{ @names }
           end
           case
           when table.rank > 2
@@ -454,9 +431,6 @@ module CA
             @table = table.object  ### convert to CA_OBJECT
           end
         end
-        if @table.has_mask?
-          @table.unmask(@fill)
-        end
         @regexp_simple = /#{@sep}/o
       end
 
@@ -485,7 +459,7 @@ module CA
       end
 
       # puts header
-      def header (list = @names)
+      def header (list=@names)
         @io.write list.map{|s| csv_quote(s)}.join(@sep)
         @io.write(@rs)
       end
@@ -498,29 +472,25 @@ module CA
 
       # write value
       # If option :strict is set, do csv_quote for string element
-      def body (strict: true, format: nil)
-        if strict
+      def body (opt = {:strict=>true})
+        if opt[:strict]
           case @table.data_type
           when CA_OBJECT
-            table = @table.to_ca
+            table = @table
             table[:is_kind_of, String].map! { |s| csv_quote(s) } 
           when CA_FIXLEN
             table = @table.object
             table.map! { |s| csv_quote(s) }
           else
-            table = @table.object 
+            table = @table.object         
           end
-        else
-          table = @table
-        end
-        if format
           table.dim0.times do |i|
-            @io.write Kernel::format(format,*table[i,nil].to_a)
+            @io.write table[i,nil].to_a.join(@sep)
             @io.write(@rs)
-          end          
+          end
         else
-          table.dim0.times do |i|
-            @io.write table[i,nil].to_a.join(@sep)
+          @table.dim0.times do |i|
+            @io.write @table[i,nil].to_a.join(@sep)
             @io.write(@rs)
           end
         end
@@ -544,13 +514,32 @@ end
 
 class CArray
 
-  def self.load_csv (file, sep: ",", rs: $/, encoding: nil, &block)
-    reader = CA::CSVReader.new(sep: sep, rs: rs, &block)
+  def self.read_csv (file, sep: ",", rs: $/, quote_char: '"', encoding: nil, &block)
+    reader = CA::CSVReader.new(sep: sep, rs: rs, quote_char: quote_char, &block)
     return reader.read_file(file, encoding: encoding)
   end
+
+  def self.load_csv (file, sep: ",", rs: $/, quote_char: '"', encoding: nil, &block)
+    warn "CArray.load_csv will obsolete, use CArray.read_csv"
+    reader = CA::CSVReader.new(sep: sep, rs: rs, quote_char: quote_char, &block)
+    return reader.read_file(file, encoding: encoding)
+  end
+
+  def self.parse_csv (io, sep: ",", rs: $/, quote_char: '"', &block)
+    reader = CA::CSVReader.new(sep: sep, rs: rs, quote_char: quote_char, &block)
+    case io
+    when IO, StringIO
+      return reader.read_io(io)
+    when String
+      return reader.read_string(io)
+    else
+      raise "invalid argument"
+    end
+  end
   
-  def self.from_csv (io, sep: ",", rs: $/, &block)
-    reader = CA::CSVReader.new(sep: sep, rs: rs, &block)
+  def self.from_csv (io, sep: ",", rs: $/, quote_char: '"', &block)
+    warn "CArray.from_csv will obsolete, use CArray.parse_csv"
+    reader = CA::CSVReader.new(sep: sep, rs: rs, quote_char: quote_char, &block)
     case io
     when IO, StringIO
       return reader.read_io(io)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray-io-csv
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carray
@@ -16,37 +16,25 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rcsv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.5'
 description: "    CSV interface for CArray\n"
 email: ''
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - Rakefile
 - carray-io-csv.gemspec
 - lib/carray-io-csv.rb
+- lib/carray-io-csv/core.bak.rb
 - lib/carray-io-csv/core.rb
 homepage: https://github.com/himotoyoshi/carray-io-csv
 licenses:
@@ -60,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="