kor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58658c4082c827571e029a7851e4827ab0b75a3
-  data.tar.gz: 56ecb7a4bbc4ae99c2f6a95f32e2cebfcdf7f75f
+  metadata.gz: 51199de55957675466e9c245d132e9dce9aa7cbf
+  data.tar.gz: 751abcb7c42a7c87f548ab81b99d692419431690
 SHA512:
-  metadata.gz: 470b0b4d6420f96372afd6aece408e0c889a9081d075a4d1852c4f5cfbd356e30c9f29aaf2f032791743bf55ab27814b513649e8cf148e18a1e3b07e60397804
-  data.tar.gz: 97952a281731440dd46875791159eb6a890da919a088f319992f2b00928b01567a7abf8379709f6022784278afa1613247f132d3bd3b4e8a675383b753654c1d
+  metadata.gz: 0919829c9f6a662b4177452978e880ec626db3a1c2bf1453e1e975ca896a8ea508306acf48226d451f5b8a51e495a920e364183e5650fdb4c6d9c918b7060c57
+  data.tar.gz: f1cf7f676811c2d3e4e7b941d3fe9b1ab78c6ef3327d2212ea793b4077d5350e932582deacc5e52ceecd655ae7a6a4be4a11021ffc8c89ad5ec29df3cd081c50

data/lib/kor/input/csv.rb

@@ -1,15 +1,24 @@
+require 'csv'
+
 module Kor
   module Input
     class Csv < Base
+      class ReadError < StandardError
+      end
+
       DELIM = ","
 
       def head
-        io.gets.chomp.split(self.class::DELIM).map(&:strip)
+        if line = io.gets
+          ::CSV.new(line.strip, col_sep: self.class::DELIM).gets
+        else
+          raise ReadError, "cannot get csv header"
+        end
       end
 
       def gets
         if line = io.gets
-          line.chomp.split(self.class::DELIM).map(&:strip)
+          ::CSV.new(line.strip, col_sep: self.class::DELIM).gets
         else
           nil
         end

data/lib/kor/input/csv_test.rb

@@ -4,8 +4,8 @@ require 'kor/input/csv'
 module KorInputCsvTest
   def test_main(m)
     @io = StringIO.new(<<-CSV)
-foo,bar,baz
-1,2,3
+foo,bar,"baz,qux"
+1,"2,3,4",5
 a,b,c
 CSV
     exit m.run
@@ -15,8 +15,15 @@ CSV
     @io.rewind
     csv = Kor::Input::Csv.new(@io)
     head = csv.head
-    if head != %w(foo bar baz)
-      t.error("expect #{%w(foo bar baz)} got #{head}")
+    if head != %w(foo bar baz,qux)
+      t.error("expect #{%w(foo bar baz,qux)} got #{head}")
+    end
+
+    io2 = StringIO.new("")
+    csv = Kor::Input::Csv.new(io2)
+    head, err = go { csv.head }
+    unless Kor::Input::Csv::ReadError === err
+      t.error("expect Kor::Input::Csv::ReadError got #{err.class}:#{err}")
     end
   end
 
@@ -26,8 +33,8 @@ CSV
     csv.head
 
     value = csv.gets
-    if value != %w(1 2 3)
-      t.error("expect #{%w(1 2 3)} got #{value}")
+    if value != %w(1 2,3,4 5)
+      t.error("expect #{%w(1 2,3,4 5)} got #{value}")
     end
     value = csv.gets
     if value != %w(a b c)
@@ -40,4 +47,12 @@ CSV
       end
     end
   end
+
+  private
+
+  def go
+    [yield, nil]
+  rescue Exception => err
+    [nil, err]
+  end
 end

data/lib/kor/output/csv.rb

@@ -4,11 +4,11 @@ module Kor
       DELIM = ","
 
       def head(keys)
-        io.puts keys.join(self.class::DELIM)
+        io.puts keys.map{|k| "\"#{k}\""}.join(self.class::DELIM)
       end
 
       def puts(values)
-        io.puts values.join(self.class::DELIM)
+        io.puts values.map{|k| "\"#{k}\""}.join(self.class::DELIM)
       end
     end
   end

data/lib/kor/output/csv_test.rb

@@ -5,18 +5,20 @@ module KorOutputCsvTest
   def test_head(t)
     io = StringIO.new
     csv = Kor::Output::Csv.new(io)
-    csv.head(%w(foo bar baz))
-    if io.string != "foo,bar,baz\n"
-      t.error("expect output 'foo,bar,baz\\n' got #{io.string.inspect}")
+    csv.head(%w(foo bar baz,qux))
+    expect = %Q{"foo","bar","baz,qux"\n}
+    if io.string != expect
+      t.error("expect output #{expect} got #{io.string.inspect}")
     end
   end
 
   def test_puts(t)
     io = StringIO.new
     csv = Kor::Output::Csv.new(io)
-    csv.puts(%w(aaa bbb ccc))
-    if io.string != "aaa,bbb,ccc\n"
-      t.error("expect output 'aaa,bbb,ccc\\n' got #{io.string.inspect}")
+    csv.puts(%w(aaa bbb,ccc ddd))
+    expect = %Q{"aaa","bbb,ccc","ddd"\n}
+    if io.string != expect
+      t.error("expect output #{expect} got #{io.string.inspect}")
     end
   end
 end

data/lib/kor/output/markdown_test.rb

@@ -1,7 +1,7 @@
 require 'kor'
 require 'kor/output/markdown'
 
-module KorOutputCsvTest
+module KorOutputMarkdownTest
   def test_head(t)
     io = StringIO.new
     csv = Kor::Output::Markdown.new(io)

data/lib/kor/output/tsv_test.rb

@@ -5,18 +5,20 @@ module KorOutputTsvTest
   def test_head(t)
     io = StringIO.new
     tsv = Kor::Output::Tsv.new(io)
-    tsv.head(%w(foo bar baz))
-    if io.string != "foo\tbar\tbaz\n"
-      t.error("expect output 'foo\\tbar\\tbaz\\n' got #{io.string.inspect}")
+    tsv.head(["foo", "bar", "baz\tqux"])
+    expect = %Q{"foo"\t"bar"\t"baz\tqux"\n}
+    if io.string != expect
+      t.error("expect output #{expect.inspect} got #{io.string.inspect}")
     end
   end
 
   def test_puts(t)
     io = StringIO.new
     tsv = Kor::Output::Tsv.new(io)
-    tsv.puts(%w(aaa bbb ccc))
-    if io.string != "aaa\tbbb\tccc\n"
-      t.error("expect output 'aaa\\tbbb\\tccc\\n' got #{io.string.inspect}")
+    tsv.puts(["aaa", "bbb\tccc", "ddd"])
+    expect = %Q{"aaa"\t"bbb\tccc"\t"ddd"\n}
+    if io.string != expect
+      t.error("expect output #{expect.inspect} got #{io.string.inspect}")
     end
   end
 end

data/lib/kor/version.rb

@@ -1,3 +1,3 @@
 module Kor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ksss