rbbt-util 5.6.11 → 5.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c30ab5dc60391c384494c4607cc74c765d507b5
-  data.tar.gz: 8a599300be751940d1feb9b11a14fc83be187722
+  metadata.gz: f7078269d0f470647e84541e1db1cb8a088e804c
+  data.tar.gz: ae9b295bb59220995ba1d8b81d833e809a4ddf0b
 SHA512:
-  metadata.gz: 05b7d25435ee522bb08c7b0d8ad5355d56d1b1d91816c191bf1a4d831ae2fb829af9b0201ae84f7544fd51f37abb72395f4cd1d88bdc432ac0688c6e6fd27de7
-  data.tar.gz: 185cfbaa226f9512d56a42c76a9fbcc2c8b24de266c7ed4a91e7d1f6055608c4a5b7e6f087ac3090a673015af29c5d93e4b19d292a04fdf00c48ab5f8b4de4cc
+  metadata.gz: c6c0e5e5b36bc9b9606ebcc45b9f2ab6d00ef4c86f1ca1ee16740e3674a8c594f71c93cef42330f7b85c7c168934b9b4973ca73eb9cde3e4b8c92f0b7fe976f4
+  data.tar.gz: 99e0a39b90f299e839136bbe618189ee37d5b48089a82209d58eca81481f5d5a1a3bedaef3d332b73bc34aaac6cc2439273756a1629d789dcb71c468129b733f

data/lib/rbbt/tsv/accessor.rb

@@ -548,21 +548,68 @@ Example:
     new
   end
 
-  def unzip(field = 0)
+  def unzip(field = 0, merge = false)
     new = {}
     field_pos = self.identify_field field
 
     self.through do |key,values|
       field_values = values.delete_at field_pos
       zipped = values.zip_fields
-      field_values.zip(zipped) do |value, *rest|
-        new[[key,value]*":"] = Misc.zip_fields(rest)
+      field_values.zip(zipped).each do |value, *rest|
+        k = [key,value]*":"
+        if merge and new.include? k
+          new[k] = Misc.zip_fields(rest)
+        else
+          new[k] = Misc.zip_fields(rest)
+        end
       end
     end
 
     self.annotate new
     new.type = :list
 
+    new.key_field = [self.key_field, self.fields[field_pos]] * ":"
+    new_fields = self.fields.dup
+    new_fields.delete_at field_pos
+    new.fields = new_fields
+
+    new
+  end
+
+  def unzip(field = 0, merge = false)
+    new = {}
+    self.annotate new
+
+    field_pos = self.identify_field field
+    new.with_unnamed do
+      if merge
+        self.through do |key,values|
+          field_values = values.delete_at field_pos
+          zipped = values.zip_fields
+          field_values.zip(zipped).each do |field_value,rest|
+            k = [key,field_value]*":"
+            if new.include? k
+              new[k] = Misc.zip_fields(Misc.zip_fields(new[k]) << rest)
+            else
+              new[k] = rest.collect{|v| [v]}
+            end
+          end
+        end
+        new.type = :double
+      else
+        self.through do |key,values|
+          field_values = values.delete_at field_pos
+          zipped = values.zip_fields
+          field_values.zip(zipped).each do |field_value,rest|
+            k = [key,field_value]*":"
+            new[k] = rest
+          end
+        end
+        new.type = :list
+      end
+    end
+
+
     new.key_field = [self.key_field, self.fields[field_pos]] * ":"
     new_fields = self.fields.dup
     new_fields.delete_at field_pos

data/lib/rbbt/util/misc.rb

@@ -278,7 +278,11 @@ module Misc
         obj.each do |k,v|
           new << k.to_s << '=>' << fingerprint(v) << ' '
         end
-        new[-1] =  "}"
+        if new.length > 1
+           new[-1] =  "}"
+        else
+          new << '}'
+        end
         new
       end
     else

data/share/rbbt_commands/tsv/unzip

@@ -3,12 +3,15 @@
 require 'rbbt-util'
 require 'rbbt/util/simpleopt'
 
-options = SOPT.get("-tch--tokyocabinet:-tcb--tokyocabinet_bd")
+options = SOPT.get("-tch--tokyocabinet:-tcb--tokyocabinet_bd:-f--field Field to append to key:-m--merge Consider multiple values even after unzip")
 
 file = ARGV.shift
 
 file = STDIN if file == '-'
 
+field = options[:field] || 0
+merge = options[:merge] || false
+
 case
 when options[:tokyocabinet]
   tsv = Persist.open_tokyocabinet(file, false)
@@ -22,4 +25,4 @@ else
   tsv = TSV.open(file)
 end
 
-puts tsv.unzip.to_s
+puts tsv.unzip(field, merge).to_s

data/test/rbbt/tsv/test_accessor.rb

@@ -185,4 +185,16 @@ row3    A|AA|AAA|AAA    B    Id3    3
     assert_equal (0..10-1).to_a, pos
   end
 
+  def test_unzip
+    content =<<-EOF
+#Id    ValueA    ValueB    OtherID
+row1    a|A    b|B    Id1|Id2
+row2    aa|aa|AA|AA    b1|b2|B1|B2    Id1|Id1|Id2|Id2
+    EOF
+
+    TmpFile.with_file(content) do |filename|
+      tsv = TSV.open(filename, :sep => /\s+/)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.6.11
+  version: 5.6.12
 platform: ruby
 authors:
 - Miguel Vazquez