rbbt-util 5.14.2 → 5.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e22611b53d0c2a89c0e2a3b21317d44247bd015d
-  data.tar.gz: c75e90adddd0e88805458e51bdd28a4b46143b90
+  metadata.gz: 0861b4fc08580d2d67c2359eb41ba10d8f98fc54
+  data.tar.gz: 20f541a44866d348ebbde761c95b66acec879f5f
 SHA512:
-  metadata.gz: 02abe6b04eb5877e7be78d8742e861cb21df05694e7e467a12076ca2cb3b9e772f1f30f1f6a9bb21843e6f4e301618c561a6813b3b2fc147530819ea03657c4d
-  data.tar.gz: cba9bdf10dd98e2e8ea022984ca4c74282a74c780431034cd738c48941d5174d0fdae3faeaf47f3a3dcddef09490ec386351f069b944e06cc4a4702967b8408a
+  metadata.gz: 3ca34de7e7851c59df081c5ca65647341a4688f597c79e14ca2b5ec19d742defbdb0dcf9200eaa48a937b670a5384ac1584e5cf6826414d947a86913c21ec115
+  data.tar.gz: 7815dd4a71975589f9d849950d2e0b4053cce9a65a798b98bf74184a3b9135906194bc752a72b3174d40ab221304dc2a43a5c7cf9f7d4f289b8c57bb4baf39d1

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -479,7 +479,8 @@ module TSV
   def self.traverse(obj, options = {}, &block)
     into = options[:into]
 
-    if into == :stream
+    case into
+    when :stream
       sout = Misc.open_pipe false, false do |sin|                                                                                                                                           
         begin
           traverse(obj, options.merge(:into => sin), &block)                                                                                                                                  
@@ -489,6 +490,12 @@ module TSV
         end
       end                                                                                                                                                                                   
       return sout
+    when :dumper
+      obj_options = obj.respond_to?(:options) ? obj.options : {}
+      dumper = TSV::Dumper.new obj_options.merge(options)
+      dumper.init
+      traverse(obj, obj_options.merge(:into => dumper), &block)                                                                                                                                  
+      return dumper
     end
 
     threads = Misc.process_options options, :threads

data/lib/rbbt/tsv/parser.rb

@@ -363,6 +363,7 @@ module TSV
     def initialize(stream = nil, options = {})
       @header_hash = Misc.process_options(options, :header_hash) || "#"
       @sep = Misc.process_options(options, :sep) || "\t"
+      stream = TSV.get_stream stream
       @stream = stream
 
 

data/lib/rbbt/tsv/stream.rb

@@ -31,10 +31,12 @@ module TSV
           stream.get_stream || stream.join.path.open
         when Path
           stream.open
+        when TSV::Dumper
+          stream.stream
         else
           stream
         end
-      end
+      end.compact
 
       num_streams = streams.length
 
@@ -54,13 +56,15 @@ module TSV
 
       streams = streams.collect do |stream|
         parser = TSV::Parser.new stream, options
-        lines << parser.first_line
-        empty << stream if parser.first_line.nil?
-        key_fields << parser.key_field
-        fields << parser.fields
-        sizes << parser.fields.length if parser.fields
+
+        lines         << parser.first_line
+        empty         << stream               if parser.first_line.nil?
+        key_fields    << parser.key_field
+        fields        << parser.fields
+        sizes         << parser.fields.length if parser.fields
         input_options << parser.options
-        preambles << parser.preamble if TrueClass === preamble and not parser.preamble.empty?
+        preambles     << parser.preamble      if TrueClass === preamble and 
+                                                 not parser.preamble.empty?
 
         parser.stream
       end
@@ -136,7 +140,7 @@ module TSV
                 retry
               end
             else
-              if sizes[i] > 0
+              if sizes[i] and sizes[i] > 0
                 p = sep * (sizes[i]-1)
                 str << p
               end
@@ -177,13 +181,13 @@ module TSV
   end
 
   def self.stream_flat2double(stream, options = {})
-    parser = TSV::Parser.new stream
+    parser = TSV::Parser.new TSV.get_stream(stream)
     dumper_options = parser.options.merge(options).merge(:type => :double)
     dumper = TSV::Dumper.new dumper_options
     dumper.init
     TSV.traverse parser, :into => dumper do |key,values|
       [key, [values]]
     end
-    dumper.stream
+    dumper
   end
 end

data/test/rbbt/tsv/test_stream.rb

@@ -193,7 +193,7 @@ row2 a|aa|aaa
     s1 = StringIO.new text1
     s2 = TSV.stream_flat2double(s1, :sep => " ")
 
-    assert_equal text2, s2.read
+    assert_equal text2, s2.stream.read
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.14.2
+  version: 5.14.3
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake