tb 0.9 → 1.0

data/lib/tb/enumerator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2012-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,13 +44,25 @@ class Tb::Yielder
     if !@header_proc_called
       set_header(nil)
     end
+    unless args.is_a?(Array) && args.length == 1 && args[0].is_a?(Hash)
+      raise "unexpected args: #{args.inspect}"
+    end
     @base_yielder.yield(*args)
   end
   alias << yield
 end
 
 class Tb::Enumerator < Enumerator
-  include Tb::Enumerable
+  include Tb::EnumerableWithEach
+
+  def self.from_header_and_values(header, *values_list)
+    Tb::Enumerator.new {|y|
+      y.set_header header
+      values_list.each {|values|
+        y.yield Hash[header.zip(values)]
+      }
+    }
+  end
 
   def self.new(&enumerator_proc)
     super() {|y|
@@ -58,16 +70,12 @@ class Tb::Enumerator < Enumerator
       Thread.current[:tb_enumerator_header_proc] = nil
       ty = Tb::Yielder.new(header_proc, y)
       enumerator_proc.call(ty)
-      if !ty.header_proc_called
+      if header_proc && !ty.header_proc_called
         header_proc.call(nil)
       end
     }
   end
 
-  def each(&each_proc)
-    header_and_each(nil, &each_proc)
-  end
-
   def header_and_each(header_proc, &each_proc)
     old = Thread.current[:tb_enumerator_header_proc]
     begin

data/lib/tb/{fieldset.rb → hashreader.rb}

@@ -1,6 +1,6 @@
-# lib/tb/fieldset.rb - Tb::FieldSet class
+# lib/tb/hashreaderm.rb - reader mixin for table containing hashes
 #
-# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -28,75 +28,56 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-class Tb::FieldSet
-  def self.normalize(header)
-    Tb::FieldSet.new(*header).header
-  end
+require 'tempfile'
+
+class Tb::HashReader
+  include Tb::EnumerableWithEach
 
-  def initialize(*fs)
-    @header = []
-    @field2index = {}
-    fs.each {|f| add_field(f) }
+  def initialize(get_hash)
+    @get_hash = get_hash
   end
-  attr_reader :header
 
-  def add_field(hint)
-    hint = '1' if hint.nil? || hint == ''
-    while @field2index[hint]
-      case hint
-      when /\A[1-9][0-9]*\z/
-        hint = (hint.to_i + 1).to_s
-      when /\([1-9][0-9]*\)\z/
-        hint = hint.sub(/\(([1-9][0-9]*)\)\z/) { "(#{$1.to_i + 1})" }
-      else
-        hint = "#{hint}(2)"
-      end
-    end
-    @field2index[hint] = @header.length
-    @header << hint
-    hint
+  def header_known?
+    false
   end
-  private :add_field
 
-  def index_from_field_ex(f)
-    i = @field2index[f]
-    return i if !i.nil?
-    if /\A[1-9][0-9]*\z/ !~ f
-      raise ArgumentError, "unexpected field name: #{f.inspect}"
+  def get_named_header
+    if defined? @hashreader_header_complete
+      return @hashreader_header_complete
     end
-    while true
-      if add_field(nil) == f
-        return @header.length-1
-      end
+    @hashreader_buffer = []
+    while hash = @get_hash.call
+      update_header hash
+      @hashreader_buffer << hash
     end
+    update_header nil
   end
 
-  def index_from_field(f)
-    i = @field2index[f]
-    if i.nil?
-      raise ArgumentError, "unexpected field name: #{f.inspect}"
+  def get_hash
+    if defined? @hashreader_buffer
+      return @hashreader_buffer.shift
     end
-    i
+    hash = @get_hash.call
+    update_header hash
+    hash
   end
 
-  def field_from_index_ex(i)
-    raise ArgumentError, "negative index: #{i}" if i < 0
-    until i < @header.length
-      add_field(nil)
+  def update_header(hash)
+    unless defined? @hashreader_header_partial
+      @hashreader_header_partial = []
     end
-    @header[i]
-  end
-
-  def field_from_index(i)
-    raise ArgumentError, "negative index: #{i}" if i < 0
-    f = @header[i]
-    if f.nil?
-      raise ArgumentError, "index too big: #{i}"
+    if hash
+      @hashreader_header_partial.concat(hash.keys - @hashreader_header_partial)
+    else
+      @hashreader_header_complete = @hashreader_header_partial
     end
-    f
   end
 
-  def length
-    @header.length
+  def header_and_each(header_proc)
+    header_proc.call(get_named_header) if header_proc
+    while hash = get_hash
+      yield hash
+    end
+    nil
   end
 end

data/lib/tb/hashwriter.rb

@@ -0,0 +1,54 @@
+# lib/tb/hashwriterm.rb - writer mixin for table containing hashes
+#
+# Copyright (C) 2014 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.
+
+require 'tempfile'
+
+class Tb::HashWriter
+  def initialize(put_hash, put_finish=nil)
+    @put_hash = put_hash
+    @put_finish = put_finish
+  end
+
+  def header_required?
+    false
+  end
+
+  def header_generator=(gen)
+  end
+
+  def put_hash(hash)
+    @put_hash.call hash
+    nil
+  end
+
+  def finish
+    @put_finish.call if @put_finish
+  end
+end

data/lib/tb/headerreader.rb

@@ -0,0 +1,108 @@
+# lib/tb/headerreaderm.rb - reader mixin for table with header
+#
+# Copyright (C) 2014 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.
+
+class Tb::HeaderReader
+  include Tb::EnumerableWithEach
+
+  def initialize(get_array)
+    @get_array = get_array
+    @header_array_hook = nil
+    @row_array_hook = nil
+    @enable_warning = true
+  end
+  attr_accessor :header_array_hook
+  attr_accessor :row_array_hook
+  attr_accessor :enable_warning
+
+  def header_known?
+    true
+  end
+
+  def read_header_once
+    return if defined? @header
+    begin
+      @header = @get_array.call
+    end while @header && @header.all? {|elt| elt.nil? || elt == '' }
+    if !@header
+      @header = []
+    end
+    @header_array_hook.call(@header) if @header_array_hook
+    h = Hash.new { [] }
+    @header.each_with_index {|f, i|
+      h[f] <<= i
+    }
+    if h.has_key? nil
+      warn "Empty header field #{h[nil].map(&:succ).join(',')}" if @enable_warning
+    end
+    h.each {|f, is|
+      if 1 < is.length
+        warn "Ambiguous header field: field #{is.map(&:succ).join(',')} has same name #{f.inspect}" if @enable_warning
+        is[1..-1].each {|i|
+          @header[i] = nil
+        }
+      end
+    }
+  end
+  private :read_header_once
+
+  def get_named_header
+    read_header_once
+    @header.compact
+  end
+
+  def get_hash
+    read_header_once
+    ary = @get_array.call
+    if !ary
+      return nil
+    end
+    @row_array_hook.call(ary) if  @row_array_hook
+    hash = {}
+    if @header.length < ary.length
+      warn "Header too short: header has #{@header.length} fields but a record has #{ary.length} fields : #{ary[@header.length..-1].map(&:inspect).join(',')}" if @enable_warning
+      ary[@header.length..-1] = []
+    end
+    ary.each_with_index {|v, i|
+      field = @header[i]
+      if !field.nil?
+        hash[field] = v
+      end
+    }
+    hash
+  end
+
+  def header_and_each(header_proc)
+    header_proc.call(get_named_header) if header_proc
+    while hash = get_hash
+      yield hash
+    end
+    nil
+  end
+end

data/lib/tb/headerwriter.rb

@@ -0,0 +1,116 @@
+# lib/tb/headerwriterm.rb - writer mixin for table with header
+#
+# Copyright (C) 2014 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.
+
+require 'tempfile'
+
+class Tb::HeaderWriter
+  def initialize(put_array)
+    @put_array = put_array
+  end
+
+  def header_required?
+    true
+  end
+
+  def header_generator=(gen)
+    @header_generator = gen
+  end
+
+  def generate_header_if_possible
+    return if defined? @header_use_buffer
+    header = nil
+    if defined? @header_generator
+      header = @header_generator.call
+    end
+    if header
+      @header_use_buffer = false
+      @header = header
+      @put_array.call @header
+    else
+      @header_use_buffer = true
+      @header = []
+      @header_buffer = Tempfile.new('tb')
+    end
+  end
+
+  def put_hash(hash)
+    generate_header_if_possible
+    if @header_use_buffer
+      put_hash_buffer(hash)
+    else
+      put_hash_immediate(hash)
+    end
+    nil
+  end
+
+  def put_hash_buffer(hash)
+    Marshal.dump(hash, @header_buffer)
+    (hash.map {|k, v| k } - @header).each {|f|
+      @header << f
+    }
+  end
+  private :put_hash_buffer
+
+  def finish
+    generate_header_if_possible
+    if @header_use_buffer == nil
+      generate_header_if_possible
+    end
+    if @header_use_buffer
+      @header_buffer.rewind
+      @put_array.call @header
+      begin
+        while true
+          hash = Marshal.load(@header_buffer)
+          put_hash_immediate(hash)
+        end
+      rescue EOFError
+      end
+      @header_buffer.close!
+    end
+  end
+
+  def put_hash_immediate(hash)
+    ary = []
+    @header.each_with_index {|f, i|
+      if pair = hash.find {|k, v| k == f }
+        ary[i] = pair.last
+      end
+    }
+    (hash.map {|k, v| k } - @header).each {|f|
+      warn "unexpected field: #{f.inspect}" if /\A[1-9][0-9]*\z/ !~ f
+      i = @header.length
+      @header << f
+      ary[i] = hash[f]
+    }
+    @put_array.call ary
+  end
+  private :put_hash_immediate
+end