tb 0.2 → 0.3

data/test/test_reader.rb

@@ -79,19 +79,38 @@ class TestTbReader < Test::Unit::TestCase
         a\tb
         1\t3
       End
-      Tb::Reader.open("csv:#{ic}") {|r|
-        assert_equal(%w[a b], r.header)
-        assert_equal([%w[1 3]], r.read_all)
+      open(ij="#{d}/j", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+        [{"a":1,"b":3}]
+      End
+      Tb.open_reader("csv:#{ic}") {|r|
+        header = nil
+        all = []
+        r.with_header {|h| header = h}.each {|pairs| all << pairs.map {|f, v| v } }
+        assert_equal(%w[a b], header)
+        assert_equal([%w[1 3]], all)
+      }
+      Tb.open_reader("tsv:#{it}") {|r|
+        header = nil
+        all = []
+        r.with_header {|h| header = h}.each {|pairs| all << pairs.map {|f, v| v } }
+        assert_equal(%w[a b], header)
+        assert_equal([%w[1 3]], all)
       }
-      Tb::Reader.open("tsv:#{it}") {|r|
-        assert_equal(%w[a b], r.header)
-        assert_equal([%w[1 3]], r.read_all)
+      Tb.open_reader("json:#{ij}") {|r|
+        header = nil
+        all = []
+        r.with_header {|h| header = h}.each {|pairs| all << pairs.map {|f, v| v } }
+        assert_equal(nil, header)
+        assert_equal([[1, 3]], all)
       }
-      Tb::Reader.open(ic) {|r|
-        assert_equal(%w[a b], r.header)
-        assert_equal([%w[1 3]], r.read_all)
+      Tb.open_reader(ic) {|r|
+        header = nil
+        all = []
+        r.with_header {|h| header = h}.each {|pairs| all << pairs.map {|f, v| v } }
+        assert_equal(%w[a b], header)
+        assert_equal([%w[1 3]], all)
       }
-      assert_raise(ArgumentError) { Tb::Reader.open(Object.new) }
+      assert_raise(ArgumentError) { Tb.open_reader(Object.new) }
     }
   end
 
@@ -101,9 +120,12 @@ class TestTbReader < Test::Unit::TestCase
         a,b
         1,3
       End
-      Tb::Reader.open(i) {|r|
-        assert_equal(%w[a b], r.header)
-        assert_equal([%w[1 3]], r.read_all)
+      Tb.open_reader(i) {|r|
+        header = nil
+        all = []
+        r.with_header {|h| header = h}.each {|pairs| all << pairs.map {|f, v| v } }
+        assert_equal(%w[a b], header)
+        assert_equal([%w[1 3]], all)
         assert_equal("a", r.field_from_index(0))
         assert_equal("b", r.field_from_index(1))
         assert_raise(ArgumentError) { r.field_from_index(2) }

data/test/test_revcmp.rb

@@ -0,0 +1,10 @@
+require 'tb'
+require 'test/unit'
+
+class TestRevCmp < Test::Unit::TestCase
+  def test_cmp
+    assert_equal(2 <=> 1, Tb::RevCmp.new(1) <=> Tb::RevCmp.new(2))
+    assert_equal(1 <=> 2, Tb::RevCmp.new(2) <=> Tb::RevCmp.new(1))
+    assert_equal(3 <=> 3, Tb::RevCmp.new(3) <=> Tb::RevCmp.new(3))
+  end
+end

data/test/test_tbenum.rb

@@ -0,0 +1,173 @@
+require 'tb'
+require 'test/unit'
+require 'tmpdir'
+
+class TestTbEnum < Test::Unit::TestCase
+  def test_cat_without_block
+    t1 = Tb.new(%w[a b], [1, 2], [3, 4])
+    t2 = Tb.new(%w[c d], [5, 6], [7, 8])
+    e = t1.cat(t2)
+    result = []
+    e.with_header {|header|
+      result << [:header, header]
+    }.each {|x|
+      assert_kind_of(Tb::Record, x)
+      result << [x.to_a]
+    }
+    assert_equal(
+      [[:header, %w[a b c d]],
+       [[['a', 1], ['b', 2]]],
+       [[['a', 3], ['b', 4]]],
+       [[['c', 5], ['d', 6]]],
+       [[['c', 7], ['d', 8]]]],
+      result)
+  end
+
+  def test_cat_with_block
+    t1 = Tb.new(%w[a b], [1, 2], [3, 4])
+    t2 = Tb.new(%w[c d], [5, 6], [7, 8])
+    result = []
+    t1.cat(t2) {|x|
+      assert_kind_of(Tb::Record, x)
+      result << x.to_a
+    }
+    assert_equal(
+      [[['a', 1], ['b', 2]],
+       [['a', 3], ['b', 4]],
+       [['c', 5], ['d', 6]],
+       [['c', 7], ['d', 8]]],
+      result)
+  end
+
+  def test_write_to_csv_basic
+    obj = [
+      [['a', 0], ['b', 1], ['c', 2]],
+      [['a', 3], ['b', 4], ['c', 5]],
+      [['a', 6], ['b', 7], ['c', 8]],
+    ]
+    def obj.header_and_each(header_proc, &block)
+      header_proc.call(nil) if header_proc
+      self.each(&block)
+    end
+    obj.extend Tb::Enum
+    Dir.mktmpdir {|d|
+      open("#{d}/foo.csv", 'w') {|f|
+        obj.write_to_csv(f)
+      }
+      assert_equal(<<-'End'.gsub(/^\s*/, ''), File.read("#{d}/foo.csv"))
+        a,b,c
+        0,1,2
+        3,4,5
+        6,7,8
+      End
+    }
+  end
+
+  def test_write_to_csv_header_extension
+    obj = [
+      [['a', 0]],
+      [['b', 1]],
+      [['c', 2]],
+    ]
+    def obj.header_and_each(header_proc, &block)
+      header_proc.call(nil) if header_proc
+      self.each(&block)
+    end
+    obj.extend Tb::Enum
+    Dir.mktmpdir {|d|
+      open("#{d}/foo.csv", 'w') {|f|
+        obj.write_to_csv(f)
+      }
+      assert_equal(<<-'End'.gsub(/^\s*/, ''), File.read("#{d}/foo.csv"))
+        a,b,c
+        0
+        ,1
+        ,,2
+      End
+    }
+  end
+
+  def test_write_to_csv_without_header
+    obj = [
+      [['a', 0]],
+      [['b', 1]],
+      [['c', 2]],
+    ]
+    def obj.header_and_each(header_proc, &block)
+      header_proc.call(nil) if header_proc
+      self.each(&block)
+    end
+    obj.extend Tb::Enum
+    Dir.mktmpdir {|d|
+      open("#{d}/foo.csv", 'w') {|f|
+        obj.write_to_csv(f, false)
+      }
+      assert_equal(<<-'End'.gsub(/^\s*/, ''), File.read("#{d}/foo.csv"))
+        0
+        ,1
+        ,,2
+      End
+    }
+  end
+
+  def test_extsort_by
+    er = Tb::Enumerator.new {|y|
+      y.yield("a" => 1, "b" => 2)
+      y.yield("b" => 3, "c" => 4)
+    }
+    er2 = er.extsort_by {|pairs| -pairs["b"] }
+    result = []
+    er2.with_header {|h|
+      result << h
+    }.each {|pairs|
+      result << pairs
+    }
+    assert_equal([%w[a b c], {"b" => 3, "c" => 4}, {"a" => 1, "b" => 2}], result)
+  end
+
+  def test_with_cumulative_header
+    er = Tb::Enumerator.new {|y|
+      y.set_header %w[a c]
+      y.yield("c" => 1, "d" => 2)
+      y.yield("b" => 1, "c" => 2)
+      y.yield("a" => 3, "b" => 4)
+    }
+    result = []
+    er.with_cumulative_header {|header|
+      result << header
+    }.each {|pairs, cheader|
+      result << pairs << cheader
+    }
+    assert_equal(
+      [%w[a c],
+       { "c" => 1, "d" => 2 },
+       %w[a c d],
+       { "b" => 1, "c" => 2 },
+       %w[a c d b],
+       { "a" => 3, "b" => 4 },
+       %w[a c d b]],
+      result)
+  end
+
+  def test_with_cumulative_header_no_header_proc
+    er = Tb::Enumerator.new {|y|
+      y.set_header %w[a c]
+      y.yield("c" => 1, "d" => 2)
+      y.yield("b" => 1, "c" => 2)
+      y.yield("a" => 3, "b" => 4)
+    }
+    result = []
+    er.with_cumulative_header.each {|pairs, cheader|
+      result << pairs << cheader
+    }
+    assert_equal(
+      [{ "c" => 1, "d" => 2 },
+       %w[a c d],
+       { "b" => 1, "c" => 2 },
+       %w[a c d b],
+       { "a" => 3, "b" => 4 },
+       %w[a c d b]],
+      result)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tb
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-29 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies: []
-description: ! 'tb is a manipulation tool for table: CSV, TSV, etc.
+description: ! 'tb is a manipulation tool for table: CSV, TSV, JSON, etc.
 
 
   tb provides a command and a library for manipulating tables:
@@ -38,35 +38,45 @@ files:
 - lib/tb/cmd_consecutive.rb
 - lib/tb/cmd_crop.rb
 - lib/tb/cmd_cross.rb
-- lib/tb/cmd_csv.rb
 - lib/tb/cmd_cut.rb
+- lib/tb/cmd_git_log.rb
 - lib/tb/cmd_grep.rb
 - lib/tb/cmd_group.rb
 - lib/tb/cmd_gsub.rb
 - lib/tb/cmd_help.rb
 - lib/tb/cmd_join.rb
-- lib/tb/cmd_json.rb
 - lib/tb/cmd_ls.rb
 - lib/tb/cmd_mheader.rb
+- lib/tb/cmd_nest.rb
 - lib/tb/cmd_newfield.rb
-- lib/tb/cmd_pnm.rb
-- lib/tb/cmd_pp.rb
 - lib/tb/cmd_rename.rb
 - lib/tb/cmd_shape.rb
 - lib/tb/cmd_sort.rb
 - lib/tb/cmd_svn_log.rb
-- lib/tb/cmd_tsv.rb
-- lib/tb/cmd_yaml.rb
+- lib/tb/cmd_tar_tvf.rb
+- lib/tb/cmd_to_csv.rb
+- lib/tb/cmd_to_json.rb
+- lib/tb/cmd_to_pnm.rb
+- lib/tb/cmd_to_pp.rb
+- lib/tb/cmd_to_tsv.rb
+- lib/tb/cmd_to_yaml.rb
+- lib/tb/cmd_unnest.rb
 - lib/tb/cmdmain.rb
 - lib/tb/cmdtop.rb
 - lib/tb/cmdutil.rb
 - lib/tb/csv.rb
+- lib/tb/enum.rb
 - lib/tb/enumerable.rb
+- lib/tb/enumerator.rb
 - lib/tb/fieldset.rb
+- lib/tb/fileenumerator.rb
+- lib/tb/json.rb
 - lib/tb/pager.rb
+- lib/tb/pairs.rb
 - lib/tb/pnm.rb
 - lib/tb/reader.rb
 - lib/tb/record.rb
+- lib/tb/revcmp.rb
 - lib/tb/ropen.rb
 - lib/tb/search.rb
 - lib/tb/tsv.rb
@@ -85,34 +95,43 @@ files:
 - test/test_cmd_consecutive.rb
 - test/test_cmd_crop.rb
 - test/test_cmd_cross.rb
-- test/test_cmd_csv.rb
 - test/test_cmd_cut.rb
+- test/test_cmd_git_log.rb
 - test/test_cmd_grep.rb
 - test/test_cmd_group.rb
 - test/test_cmd_gsub.rb
 - test/test_cmd_help.rb
 - test/test_cmd_join.rb
-- test/test_cmd_json.rb
 - test/test_cmd_ls.rb
 - test/test_cmd_mheader.rb
+- test/test_cmd_nest.rb
 - test/test_cmd_newfield.rb
-- test/test_cmd_pnm.rb
-- test/test_cmd_pp.rb
 - test/test_cmd_rename.rb
 - test/test_cmd_shape.rb
 - test/test_cmd_sort.rb
-- test/test_cmd_tsv.rb
-- test/test_cmd_yaml.rb
+- test/test_cmd_tar_tvf.rb
+- test/test_cmd_to_csv.rb
+- test/test_cmd_to_json.rb
+- test/test_cmd_to_pnm.rb
+- test/test_cmd_to_pp.rb
+- test/test_cmd_to_tsv.rb
+- test/test_cmd_to_yaml.rb
+- test/test_cmd_unnest.rb
 - test/test_cmdtty.rb
 - test/test_cmdutil.rb
 - test/test_csv.rb
 - test/test_enumerable.rb
 - test/test_fieldset.rb
+- test/test_fileenumerator.rb
+- test/test_json.rb
 - test/test_pager.rb
+- test/test_pairs.rb
 - test/test_pnm.rb
 - test/test_reader.rb
 - test/test_record.rb
+- test/test_revcmp.rb
 - test/test_search.rb
+- test/test_tbenum.rb
 - test/test_tsv.rb
 homepage: https://github.com/akr/tb
 licenses: []
@@ -125,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +156,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ! 'manipulation tool for table: CSV, TSV, etc.'
+summary: ! 'manipulation tool for tables: CSV, TSV, JSON, etc.'
 test_files:
 - test/test_basic.rb
 - test/test_catreader.rb
@@ -145,32 +164,41 @@ test_files:
 - test/test_cmd_consecutive.rb
 - test/test_cmd_crop.rb
 - test/test_cmd_cross.rb
-- test/test_cmd_csv.rb
 - test/test_cmd_cut.rb
+- test/test_cmd_git_log.rb
 - test/test_cmd_grep.rb
 - test/test_cmd_group.rb
 - test/test_cmd_gsub.rb
 - test/test_cmd_help.rb
 - test/test_cmd_join.rb
-- test/test_cmd_json.rb
 - test/test_cmd_ls.rb
 - test/test_cmd_mheader.rb
+- test/test_cmd_nest.rb
 - test/test_cmd_newfield.rb
-- test/test_cmd_pnm.rb
-- test/test_cmd_pp.rb
 - test/test_cmd_rename.rb
 - test/test_cmd_shape.rb
 - test/test_cmd_sort.rb
-- test/test_cmd_tsv.rb
-- test/test_cmd_yaml.rb
+- test/test_cmd_tar_tvf.rb
+- test/test_cmd_to_csv.rb
+- test/test_cmd_to_json.rb
+- test/test_cmd_to_pnm.rb
+- test/test_cmd_to_pp.rb
+- test/test_cmd_to_tsv.rb
+- test/test_cmd_to_yaml.rb
+- test/test_cmd_unnest.rb
 - test/test_cmdtty.rb
 - test/test_cmdutil.rb
 - test/test_csv.rb
 - test/test_enumerable.rb
 - test/test_fieldset.rb
+- test/test_fileenumerator.rb
+- test/test_json.rb
 - test/test_pager.rb
+- test/test_pairs.rb
 - test/test_pnm.rb
 - test/test_reader.rb
 - test/test_record.rb
+- test/test_revcmp.rb
 - test/test_search.rb
+- test/test_tbenum.rb
 - test/test_tsv.rb

data/lib/tb/cmd_csv.rb

@@ -1,42 +0,0 @@
-# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-Tb::Cmd.subcommands << 'csv'
-
-def (Tb::Cmd).op_csv
-  op = OptionParser.new
-  op.banner = 'Usage: tb csv [OPTS] [TABLE ...]'
-  define_common_option(op, "hNo", "--no-pager")
-  op
-end
-
-def (Tb::Cmd).main_csv(argv)
-  op_csv.parse!(argv)
-  exit_if_help('csv')
-  argv = ['-'] if argv.empty?
-  tbl = Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|creader| build_table(creader) }
-  with_output {|out|
-    tbl_generate_csv(tbl, out)
-  }
-end