rbbt-util 5.21.67 → 5.21.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6fdfbe2c9f05d2feec86f7af0493388d3fd82ae6
4
- data.tar.gz: 76fdd311a0785941e491837ab1672c74ac4b1bf2
3
+ metadata.gz: 5a5a4298747149571e1f418373b2f619424bf59b
4
+ data.tar.gz: 7a3ebc764edda4f545ebecab158bafd4d2d115ea
5
5
  SHA512:
6
- metadata.gz: 5ff39d846bfe555f00ae2643a8510636d626044b7c93186fb30d3d10141fa3c24777aa4426e4fea0ffc7ccdffeb89d70ff7138b757f9cd714bf7ebf681119089
7
- data.tar.gz: 131a08fa2c1e7741e9542b508075021830dd708fd62f05e473b6f91c08a79670d669c2791daf31f1f4f11c351dd501702b2155f9b88dc39e686c552b91f21683
6
+ metadata.gz: f24daafda2a184bc396ea80fa6c8e5b3346991f0cf4aeaebad2e3d207a720b2225ed7ce6940641b42528907e6e025747bac5e33fff784c43f30119bdf42ccde2
7
+ data.tar.gz: 0bdb00bb76b613d436285b787f4e91d0ee98d94aecae760932bda85432d8b0e66e33a923b5cff2b993e57cabf455ebc0e50288a1f50a8a68f807a4ae2d185d90
@@ -84,7 +84,7 @@ module Association
84
84
  tsv.fields = field_headers
85
85
 
86
86
  if source_format or target_format
87
- tsv = translate tsv, source_format, target_format, :persist => true, :persist_data => data, :data => data
87
+ tsv = translate tsv, source_format, target_format, :persist => true, :persist_data => data
88
88
  else
89
89
  tsv.through do |k,v|
90
90
  data[k] = v
@@ -97,9 +97,11 @@ module Association
97
97
  end
98
98
 
99
99
  def self.open_stream(stream, options = {})
100
- fields, persist = Misc.process_options options, :fields, :persist
100
+ options = Misc.add_defaults options, :type => :double, :merge => true
101
+ fields, persist, data = Misc.process_options options, :fields, :persist, :data
102
+
101
103
 
102
- parser = TSV::Parser.new stream, options.merge(:fields => nil, :key_field => nil, :type => :double)
104
+ parser = TSV::Parser.new stream, options.merge(:fields => nil, :key_field => nil)
103
105
 
104
106
  key_field, *_fields = all_fields = parser.all_fields
105
107
 
@@ -140,7 +142,7 @@ module Association
140
142
  open_options = options.merge(parser.options).merge(:parser => parser)
141
143
  open_options = Misc.add_defaults open_options, :monitor => {:desc => "Parsing #{ Misc.fingerprint stream }"}
142
144
 
143
- data = open_options[:data] || {}
145
+ data ||= {}
144
146
  tsv = nil
145
147
  TmpFile.with_file do |tmpfile|
146
148
  tmp_data = Persist.open_database(tmpfile, true, :double, "HDB")
@@ -167,8 +167,9 @@ module TSV
167
167
  return nil
168
168
  end
169
169
 
170
- def self.translate(tsv, *args)
171
- new = TSV.open translate_stream(tsv, *args)
170
+ def self.translate(tsv, field, format, options = {})
171
+ persist_options = Misc.pull_keys options, :persist
172
+ new = TSV.open translate_stream(tsv, field, format, options), :persist => persist_options[:persist], :persist_data => persist_options[:data], :persist_file => persist_options[:file]
172
173
  new.identifiers = tsv.identifiers
173
174
  new
174
175
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.21.67
4
+ version: 5.21.68
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-30 00:00:00.000000000 Z
11
+ date: 2017-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake