rbbt-util 5.21.67 → 5.21.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fdfbe2c9f05d2feec86f7af0493388d3fd82ae6
-  data.tar.gz: 76fdd311a0785941e491837ab1672c74ac4b1bf2
+  metadata.gz: 5a5a4298747149571e1f418373b2f619424bf59b
+  data.tar.gz: 7a3ebc764edda4f545ebecab158bafd4d2d115ea
 SHA512:
-  metadata.gz: 5ff39d846bfe555f00ae2643a8510636d626044b7c93186fb30d3d10141fa3c24777aa4426e4fea0ffc7ccdffeb89d70ff7138b757f9cd714bf7ebf681119089
-  data.tar.gz: 131a08fa2c1e7741e9542b508075021830dd708fd62f05e473b6f91c08a79670d669c2791daf31f1f4f11c351dd501702b2155f9b88dc39e686c552b91f21683
+  metadata.gz: f24daafda2a184bc396ea80fa6c8e5b3346991f0cf4aeaebad2e3d207a720b2225ed7ce6940641b42528907e6e025747bac5e33fff784c43f30119bdf42ccde2
+  data.tar.gz: 0bdb00bb76b613d436285b787f4e91d0ee98d94aecae760932bda85432d8b0e66e33a923b5cff2b993e57cabf455ebc0e50288a1f50a8a68f807a4ae2d185d90

data/lib/rbbt/association/database.rb

@@ -84,7 +84,7 @@ module Association
       tsv.fields = field_headers
 
       if source_format or target_format
-        tsv = translate tsv, source_format, target_format, :persist => true, :persist_data => data, :data => data
+        tsv = translate tsv, source_format, target_format, :persist => true, :persist_data => data
       else
         tsv.through do |k,v|
           data[k] = v
@@ -97,9 +97,11 @@ module Association
   end
 
   def self.open_stream(stream, options = {})
-    fields, persist = Misc.process_options options, :fields, :persist
+    options = Misc.add_defaults options, :type => :double, :merge => true
+    fields, persist, data = Misc.process_options options, :fields, :persist, :data
+
 
-    parser = TSV::Parser.new stream, options.merge(:fields => nil, :key_field => nil, :type => :double)
+    parser = TSV::Parser.new stream, options.merge(:fields => nil, :key_field => nil)
 
     key_field, *_fields = all_fields = parser.all_fields
 
@@ -140,7 +142,7 @@ module Association
     open_options = options.merge(parser.options).merge(:parser => parser)
     open_options = Misc.add_defaults open_options, :monitor => {:desc => "Parsing #{ Misc.fingerprint stream }"}
 
-    data = open_options[:data] || {}
+    data ||= {}
     tsv = nil
     TmpFile.with_file do |tmpfile|
       tmp_data = Persist.open_database(tmpfile, true, :double, "HDB")

data/lib/rbbt/tsv/change_id.rb

@@ -167,8 +167,9 @@ module TSV
     return nil
   end
 
-  def self.translate(tsv, *args)
-    new = TSV.open translate_stream(tsv, *args)
+  def self.translate(tsv, field, format, options = {})
+    persist_options = Misc.pull_keys options, :persist
+    new = TSV.open translate_stream(tsv, field, format, options), :persist => persist_options[:persist], :persist_data => persist_options[:data], :persist_file => persist_options[:file]
     new.identifiers = tsv.identifiers
     new
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.67
+  version: 5.21.68
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake