scout-gear 10.7.0 → 10.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac64d599e0df97b8ba5abd7aef4855ed1181ab9d9a3ba39196255b6649f56a0c
-  data.tar.gz: 9f1cf16da9432beb46eeb486de5bab1c57e460b09f2126556126eb356c6a6fd6
+  metadata.gz: 1182999631b54e94f842c90017e1f97dde904ddafe47129cd80b51097714a1c4
+  data.tar.gz: ec736a5762fc2e58450a7955dffffe61eb73584f0bdc53bf3cd368e194ae7cbf
 SHA512:
-  metadata.gz: 27015e493797ff3e80631a49e0d9bf2ccc115997e86d449b217dd55adc6dd0abd7701019c19467e9c48aa6bc7ff3c372238fcd58200069533686e2729870938f
-  data.tar.gz: 4930f226926fdc18b06952f037f8e60b45b49116be115409cbcee36bf66202f0bb909691f20fddc6711babbb2ec9b604a5f3e551742ab52cb3f96748665b13a6
+  metadata.gz: 66a5c6ab90c2aa047cfbd000731eaec3913994880adddc9ac2daac9802ee2ebef14a054c1e292200624a6411ac2244d5f915de8d3ed9113d1237edc3795ab027
+  data.tar.gz: 27a0e87ac1360420bffc87b34b01eb6f21631fdf3f6ef95983fb46152f6e0e390200518dd2bebcc95c880e74d6f6f8a98a76577be2fbad0aea7d1fbe9c0720b1

data/.vimproject

@@ -7,10 +7,12 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
   scout=scout{
    workflow.rb
    workflow=workflow{
+    exceptions.rb
     definition.rb
     documentation.rb
     usage.rb
     util.rb
+    path.rb
     step.rb
     step=step{
      config.rb
@@ -80,7 +82,6 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
      sort.rb
      unzip.rb
     }
-    entity.rb
     parser.rb
     dumper.rb
     transformer.rb
@@ -106,6 +107,7 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
     object.rb
     format.rb
     identifiers.rb
+    named_array.rb
    }
    association.rb
    association=association{
@@ -136,6 +138,11 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
   update
   template
   offsite
+  db=db{
+   register
+   query
+   show
+  }
   workflow=workflow{
    task
    list

data/VERSION

@@ -1 +1 @@
-10.7.0
+10.7.2

data/lib/scout/association/index.rb

@@ -157,7 +157,7 @@ module Association
                        new.read
                      end
 
-                     new.unnamed = true
+                     new.unnamed = self.unnamed
 
                      new.undirected = undirected
 

data/lib/scout/association.rb

@@ -6,17 +6,32 @@ require_relative 'association/item'
 
 module Association
   def self.open(obj, source: nil, target: nil, fields: nil, source_format: nil, target_format: nil, format: nil, **kwargs)
+
+
+    if Path.is_filename?(obj)
+      options = TSV.parse_options(obj).merge(kwargs)
+    else
+      options = kwargs.dup
+    end
+
+    if String === obj && options[:namespace] && obj.include?("NAMESPACE")
+      new_obj = obj.gsub(/\[?NAMESPACE\]?/, options[:namespace])
+      obj.annotate(new_obj)
+      obj = new_obj
+    end
+
     all_fields = TSV.all_fields(obj)
-    source_pos, field_pos, source_header, field_headers, source_format, target_format = headers(all_fields, fields, kwargs.merge(source: source, target: target, source_format: source_format, target_format: target_format, format: format))
+    source_pos, field_pos, source_header, field_headers, source_format, target_format = headers(all_fields, fields, options.merge(source: source, target: target, source_format: source_format, target_format: target_format, format: format))
 
     original_source_header = all_fields[source_pos]
     original_field_headers = all_fields.values_at(*field_pos)
     original_target_header = all_fields[field_pos.first]
 
-    type, identifiers = IndiferentHash.process_options kwargs, :type, :identifiers
+    type, identifiers = IndiferentHash.process_options options, :type, :identifiers
 
     if source_format
       translation_files = [TSV.identifier_files(obj), Entity.identifier_files(source_format), identifiers].flatten.compact
+      translation_files.collect!{|f| Path.is_filename?(f, false) ? Path.setup(f.gsub(/\[?NAMESPACE\]?/, options[:namespace])) : f }
       source_index = begin
                        TSV.translation_index(translation_files, source_header, source_format)
                      rescue
@@ -26,6 +41,7 @@ module Association
 
     if target_format
       translation_files = [TSV.identifier_files(obj), Entity.identifier_files(target_format), identifiers].flatten.compact
+      translation_files.collect!{|f| Path.is_filename?(f, false) ? Path.setup(f.gsub(/\[?NAMESPACE\]?/, options[:namespace])) : f }
       target_index = begin
                        TSV.translation_index(translation_files, field_headers.first, target_format)
                      rescue
@@ -67,10 +83,10 @@ module Association
     if source_index.nil? && target_index.nil?
       if TSV === obj
         IndiferentHash.pull_keys kwargs, :persist
-        type = kwargs[:type] || obj.type
-        res = obj.reorder original_source_header, all_fields.values_at(*field_pos), **kwargs.merge(type: type, merge: true)
+        type = options[:type] || obj.type
+        res = obj.reorder original_source_header, all_fields.values_at(*field_pos), **options.merge(type: type, merge: true)
       else
-        res = TSV.open(obj, key_field: original_source_header, fields: all_fields.values_at(*field_pos), **kwargs.merge(type: type))
+        res = TSV.open(obj, key_field: original_source_header, fields: all_fields.values_at(*field_pos), **options.merge(type: type))
       end
       res.key_field = final_key_field
       res.fields = final_fields

data/lib/scout/entity/format.rb

@@ -17,16 +17,20 @@ module Entity
     def find(value)
       @find_cache ||= {}
 
-      @find_cache[value] ||= begin
+      if @find_cache.include?(value)
+        @find_cache[value]
+      else
+        @find_cache[value] = begin
                                if orig_include? value
-                                 @find_cache[value] = value
+                                 value
                                else
+                                 value = value.to_s
                                  found = nil
                                  each do |k,v|
-                                   if value.to_s == k.to_s
+                                   if value == k.to_s
                                      found = k
                                      break
-                                   elsif value.to_s =~ /\(#{Regexp.quote k}\)/
+                                   elsif value =~ /\(#{Regexp.quote k.to_s}\)/
                                      found = k
                                      break
                                    end
@@ -34,6 +38,7 @@ module Entity
                                  found
                                end
                              end
+      end
     end
 
     def [](value)

data/lib/scout/entity/identifiers.rb

@@ -91,6 +91,8 @@ module Entity
       end
     end
 
+    name = default if name.nil?
+
     self.send(:include, Entity::Identified) unless Entity::Identified === self
 
     self.format = all_fields
@@ -106,6 +108,4 @@ module Entity
     @identifier_files << file
     @identifier_files.uniq!
   end
-
-
 end

data/lib/scout/entity/named_array.rb

@@ -0,0 +1,13 @@
+require 'scout/named_array'
+require 'scout/entity'
+
+module NamedArray
+
+  def [](key)
+    pos = NamedArray.identify_name(@fields, key)
+    return nil if pos.nil?
+    v = super(pos)
+    field = @fields && Integer === key && ! @fields.include?(key) ? @fields[key] : key
+    Entity.prepare_entity(v, field)
+  end
+end

data/lib/scout/entity/property.rb

@@ -20,7 +20,8 @@ module Entity
         Persist.annotation_repo_persist(repo, [name, obj.id] * ":", &block)
       else
 
-        Persist.persist([name, obj.id] * ":", type, options.dup, &block)
+        _id = obj.nil? ? 'nil' : obj.id
+        Persist.persist([name, _id] * ":", type, options.dup, &block)
       end
     end
 

data/lib/scout/entity.rb

@@ -3,6 +3,7 @@ require_relative 'entity/format'
 require_relative 'entity/property'
 require_relative 'entity/object'
 require_relative 'entity/identifiers'
+require_relative 'entity/named_array'
 
 module Entity
   def self.extended(base)
@@ -12,17 +13,19 @@ module Entity
     base.instance_variable_set(:@persisted_methods, {})
     base.include Entity::Object
     base.include AnnotatedArray
+    base.format = base.to_s
     base
   end
 
   def self.prepare_entity(entity, field, options = {})
     return entity unless defined? Entity
-    return entity unless String === entity or Array === entity
-    options ||= {}
-
-    dup_array = options.delete :dup_array
+    return entity unless String === entity or Array === entity or Numeric === entity
 
     if Entity === field or (Entity.respond_to?(:formats) and (_format = Entity.formats.find(field)))
+      options ||= {}
+
+      dup_array = options.delete :dup_array
+
       params = options.dup
 
       params[:format] ||= params.delete "format"
@@ -34,6 +37,8 @@ module Entity
       entity = (entity.frozen? and not entity.nil?) ? entity.dup : ((Array === entity and dup_array) ? entity.collect{|e| e.nil? ? e : e.dup} : entity) 
 
       entity = mod.setup(entity, params)
+
+      entity.extend AnnotatedArray if Array === entity && ! options[:annotated_array] == FalseClass
     end
 
     entity

data/lib/scout/persist/tsv/adapter/base.rb

@@ -23,7 +23,9 @@ module TSVAdapter
   end
 
   def save_annotation_hash
-    self.orig_set(ANNOTATION_ATTR_HASH_KEY, ANNOTATION_ATTR_HASH_SERIALIZER.dump(self.annotation_hash))
+    self.with_write do
+      self.orig_set(ANNOTATION_ATTR_HASH_KEY, ANNOTATION_ATTR_HASH_SERIALIZER.dump(self.annotation_hash))
+    end
   end
 
   def self.extended(base)
@@ -163,6 +165,16 @@ module TSVAdapter
     end
   end
 
+  def with_write(*args, &block)
+    if @write
+      yield
+    elsif @closed
+      write_and_close &block
+    else
+      write_and_read &block
+    end
+  end
+
   def close(*args)
     begin
       super(*args)

data/lib/scout/persist/tsv.rb

@@ -48,7 +48,8 @@ module Persist
 
   def self.tsv(id, options = {}, engine: nil, persist_options: {})
     engine ||= persist_options[:engine] || :HDB
-    Persist.persist(id, engine, persist_options.merge(:other_options => options)) do |filename|
+    persist_options[:other_options] = options unless persist_options.include?(:other_options)
+    Persist.persist(id, engine, persist_options) do |filename|
       if filename.nil?
         yield(persist_options[:data] || {})
       else

data/lib/scout/tsv/attach.rb

@@ -92,6 +92,9 @@ module TSV
         end
 
         other_field_positions = other.identify_field(fields.dup) 
+        fields.zip(other_field_positions) do |o,n|
+          raise "Field #{o} not found. Options: #{Log.fingerprint other.fields}" if n.nil? 
+        end
 
         log_message = "Attach #{Log.fingerprint fields - source.fields} to #{Log.fingerprint source} (#{[match_key, other_key] * "=~"})"
         Log.debug log_message
@@ -252,8 +255,13 @@ module TSV
   def self.identifier_files(obj)
     if TSV === obj
       obj.identifier_files
-    elsif Path === obj
-      obj.dirname.identifiers
+    elsif Path.is_filename?(obj)
+      path = Path === obj ? obj : Path.setup(obj)
+      if obj.dirname.identifiers.exists?
+        obj.dirname.identifiers
+      else
+        [TSV.parse_options(obj)[:identifiers]]
+      end
     else
       nil
     end

data/lib/scout/tsv/change_id.rb

@@ -6,6 +6,9 @@ module TSV
     identifiers = source.identifiers if identifiers.nil? and source.respond_to?(:identifiers)
     if identifiers && source.identify_field(new_key_field, strict: true).nil?
       identifiers = identifiers.nil? ? source.identifiers : identifiers
+      if Array === identifiers
+        identifiers = identifiers.select{|f| f.identify_field(new_key_field) }.last
+      end
       new = source.attach(identifiers, fields: [new_key_field], insitu: false, one2one: true, persist_input: persist_identifiers)
       new = new.change_key(new_key_field, keep: keep, stream: stream, one2one: one2one, merge: merge)
       return new

data/lib/scout/tsv/dumper.rb

@@ -26,12 +26,13 @@ module TSV
     end
 
 
-    attr_accessor :options, :initialized, :type, :sep, :filename, :namespace
+    attr_accessor :options, :initialized, :type, :sep, :compact, :filename, :namespace
     def initialize(options = {})
       options = options.options.merge(sep: nil) if TSV::Parser === options || TSV === options
       @sep, @type = IndiferentHash.process_options options, 
         :sep, :type, 
         :sep => "\t", :type => :double
+      @compact = options[:compact]
       @options = options
       @options[:type] = @type
       @sout, @sin = Open.pipe
@@ -39,8 +40,9 @@ module TSV
       @initialized = false
       @filename = options[:filename]
       @mutex = Mutex.new
+      @namespace = options[:namespace]
       ConcurrentStream.setup(@sin, pair: @sout)
-      ConcurrentStream.setup(@sout, pair: @sin)
+      ConcurrentStream.setup(@sout, pair: @sin, filename: filename)
     end
 
     def set_stream(stream)
@@ -96,11 +98,11 @@ module TSV
           when :list, :flat
             @sin << key + @sep + value * @sep << "\n"
           when :double
-            @sin << key + @sep + value.collect{|v| Array === v ? v * "|" : v } * @sep << "\n"
+            @sin << key + @sep + value.collect{|v| Array === v ? (@compact ? v.compact : v) * "|" : v } * @sep << "\n"
           else
             if Array === value 
               if Array === value.first
-                @sin << key + @sep + value.collect{|v| Array === v ? v * "|" : v } * @sep << "\n"
+                @sin << key + @sep + value.collect{|v| Array === v ? (@compact ? v.compact : v) * "|" : v } * @sep << "\n"
               else
                 @sin << key + @sep + value * @sep << "\n"
               end
@@ -173,13 +175,35 @@ module TSV
       end
     end
 
-    if stream.nil?
-      t = Thread.new do 
+    self.with_unnamed do
+      if stream.nil?
+        t = Thread.new do 
+          begin
+            Thread.current.report_on_exception = true
+            Thread.current["name"] = "Dumper thread"
+            dumper.init(preamble: preamble)
+
+            if keys
+              keys.each do |k|
+                dump_entry.call k, self[k]
+              end
+            else
+              self.each &dump_entry
+            end
+
+            dumper.close
+          rescue
+            dumper.abort($!)
+          end
+        end
+        Thread.pass until t["name"]
+        stream = dumper.stream
+        ConcurrentStream.setup(stream, :threads => [t])
+        stream
+      else
+        dumper.set_stream stream
         begin
-          Thread.current.report_on_exception = true
-          Thread.current["name"] = "Dumper thread"
           dumper.init(preamble: preamble)
-
           if keys
             keys.each do |k|
               dump_entry.call k, self[k]
@@ -192,28 +216,8 @@ module TSV
         rescue
           dumper.abort($!)
         end
+        stream
       end
-      Thread.pass until t["name"]
-      stream = dumper.stream
-      ConcurrentStream.setup(stream, :threads => [t])
-      stream
-    else
-      dumper.set_stream stream
-      begin
-        dumper.init(preamble: preamble)
-        if keys
-          keys.each do |k|
-            dump_entry.call k, self[k]
-          end
-        else
-          self.each &dump_entry
-        end
-
-        dumper.close
-      rescue
-        dumper.abort($!)
-      end
-      stream
     end
   end
 

data/lib/scout/tsv/open.rb

@@ -45,6 +45,7 @@ module Open
     elsif Path === into
       Open.write(into) do |io|
         self.traverse(obj, into: io, cpus: cpus, bar: bar, callback: callback, unnamed: unnamed, **options, &block)
+        io.join if io.respond_to?(:join)
       end
       return into
     end

data/lib/scout/tsv/parser.rb

@@ -7,7 +7,11 @@ module TSV
       if Proc === cast
         cast.call value
       else
-        value.send(cast)
+        if value.nil? || value.empty?
+          nil
+        else
+          value.send(cast)
+        end
       end
     end
   end
@@ -94,6 +98,8 @@ module TSV
           line.chomp!
           if Proc === fix
             line = fix.call line
+            break if (FalseClass === line) || :break == line
+            next if line.nil?
           elsif fix
             line = Misc.fixutf8(line)
           end
@@ -175,14 +181,14 @@ module TSV
               current = data[key]
               if merge == :concat
                 these_items.each_with_index do |new,i|
-                  new = [nil] if new.empty?
+                  new = one2one ? [nil] : [] if new.empty?
                   current[i].concat(new)
                 end
               else
                 merged = []
                 these_items.each_with_index do |new,i|
-                  new = [nil] if new.empty?
-                  merged[i] = current[i] + new
+                  new = one2one ? [nil] : [] if new.empty?
+                  merged[i] = (current[i] || []) + new
                 end
                 data[key] = merged
               end
@@ -290,7 +296,8 @@ module TSV
       opts[:cast] = opts[:cast].to_sym if opts[:cast]
 
       all_fields = [key_field] + fields if key_field && fields
-      NamedArray.setup([opts, key_field, fields, first_line, preamble, all_fields], %w(options key_field fields first_line preamble all_fields))
+      namespace = opts[:namespace]
+      NamedArray.setup([opts, key_field, fields, first_line, preamble, all_fields, namespace], %w(options key_field fields first_line preamble all_fields namespace))
     rescue Exception
       raise stream.stream_exception if stream.respond_to?(:stream_exception) && stream.stream_exception
       stream.abort($!) if stream.respond_to?(:abort)
@@ -298,6 +305,10 @@ module TSV
     end
   end
 
+  def self.parse_options(...)
+    parse_header(...)[:options]
+  end
+
   KEY_PARAMETERS = begin
                      params = []
                      (method(:parse_line).parameters + method(:parse_stream).parameters).each do |type, name|
@@ -352,6 +363,7 @@ module TSV
           all_field_names ||= [@key_field] + @fields
           fields = all_field_names if fields == :all
           positions = NamedArray.identify_name(all_field_names, fields)
+
           raise "Not all fields (#{Log.fingerprint fields}) identified in #{Log.fingerprint all_field_names}" if positions.include?(nil)
           kwargs[:positions] = positions
           field_names = all_field_names.values_at *positions
@@ -407,7 +419,7 @@ module TSV
       end
 
       if data
-        TSV.setup(data, :key_field => key_field_name, :fields => field_names, :type => @type)
+        TSV.setup(data, @source_options.merge(:key_field => key_field_name, :fields => field_names, :type => @type))
       else
         [key_field || self.key_field, fields || self.fields]
       end
@@ -434,7 +446,7 @@ module TSV
     end
   end
 
-  def self.parse(stream, fix: true, header_hash: "#", sep: "\t", filename: nil, namespace: nil, unnamed: false, serializer: nil, **kwargs, &block)
+  def self.parse(stream, fix: true, header_hash: "#", sep: "\t", filename: nil, namespace: nil, unnamed: nil, serializer: nil, **kwargs, &block)
     parser = TSV::Parser === stream ? stream : TSV::Parser.new(stream, fix: fix, header_hash: header_hash, sep: sep)
 
     cast = kwargs[:cast]
@@ -471,9 +483,9 @@ module TSV
     data = parser.traverse **kwargs, &block
     data.type = type
     data.cast = cast
-    data.filename = filename || parser.options[:filename]
-    data.namespace = namespace || parser.options[:namespace]
-    data.identifiers = identifiers
+    data.filename = filename || parser.options[:filename] if data.filename.nil?
+    data.namespace = namespace || parser.options[:namespace] if data.namespace.nil?
+    data.identifiers = identifiers || parser.options[:identifiers] if data.identifiers.nil?
     data.unnamed = unnamed
     data.save_annotation_hash if data.respond_to?(:save_annotation_hash)
     data

data/lib/scout/tsv/path.rb

@@ -14,4 +14,12 @@ module Path
     found = produce_and_find('tsv')
     TSV.index(found, *args, **kwargs, &block)
   end
+
+  def identifier_file_path
+    if self.dirname.identifiers.exists?
+      self.dirname.identifiers
+    else
+      nil
+    end
+  end
 end

data/lib/scout/tsv/stream.rb

@@ -1,5 +1,6 @@
 module TSV
-  def self.paste_streams(streams, type: nil, sort: nil, sort_memory: nil, sep: nil, preamble: nil, header: nil, same_fields: nil, fix_flat: nil, all_match: nil, field_prefix: nil)
+  def self.paste_streams(streams, type: nil, sort: nil, sort_memory: nil, sep: nil, preamble: nil, header: nil, same_fields: nil, fix_flat: nil, all_match: nil, one2one: true, field_prefix: nil)
+    sep = "\t" if sep.nil?
 
     streams = streams.collect do |stream|
       case stream
@@ -37,7 +38,8 @@ module TSV
 
       streams = streams.collect do |stream|
 
-        parser = TSV::Parser.new stream, type: type, sep: sep
+        parser = TSV::Parser.new stream, sep: sep
+        #parser.type = type
 
         sfields = parser.fields
 
@@ -102,8 +104,9 @@ module TSV
           keys[i]= nil
           parts[i]= nil
         else
-          vs = line.chomp.split(sep, -1)
+          vs = line.split(sep, -1)
           key, *p = vs
+          p = [p] if parser_types[i] == :flat
           keys[i]= key
           parts[i]= p
         end
@@ -112,7 +115,7 @@ module TSV
       done_streams =[]
 
       fields = nil if fields && fields.empty?
-      dumper = TSV::Dumper.new key_field: key_field, fields: fields, type: type
+      dumper = TSV::Dumper.new key_field: key_field, fields: fields, type: type, compact: !one2one
       dumper.init(preamble: preamble_txt || !!key_field)
 
       t = Thread.new do
@@ -130,7 +133,7 @@ module TSV
           keys.each_with_index do |key,i|
             case key
             when min
-              new_values << parts[i]
+              new_parts = parts[i]
 
               begin
                 line = lines[i]= begin
@@ -145,18 +148,20 @@ module TSV
               else
                 k, *p = line.chomp.split(sep, -1)
                 p = p.collect{|e| e.nil? ? "" : e }
+                p = [p] if parser_types[i] == :flat
 
                 if k == keys[i]
-                  new_values = NamedArray.zip_fields(new_values).zip(p).collect{|p| [p.flatten * "|"] }
+                  new_parts = NamedArray.zip_fields([new_parts]).zip(p).collect{|p| [p.flatten * "|"] }
                   raise TryAgain 
                 end
                 keys[i]= k
                 parts[i]= p
               end
+
+              new_values << new_parts
             rescue TryAgain
               keys[i]= nil
               parts[i]= nil
-              Log.debug "Skipping repeated key in stream #{i}: #{key} - #{min}"
               retry
             end
           else
@@ -180,6 +185,8 @@ module TSV
           new_values = new_values.inject([]){|acc,l| acc.concat l }
         end
 
+        new_values = new_values.collect{|l| Array === l ? l.compact : l } unless one2one
+
         dumper.add min, new_values
       end
 
@@ -187,7 +194,7 @@ module TSV
 
       streams.each do |stream|
         stream.close if stream.respond_to?(:close) && ! stream.closed?
-        stream.join if stream.respond_to? :join
+        stream.join if stream.respond_to?(:join)
       end
       end
     rescue Aborted

data/lib/scout/tsv/traverse.rb

@@ -1,6 +1,6 @@
 require_relative 'parser'
 module TSV
-  def traverse(key_field_pos = :key, fields_pos = nil, type: nil, one2one: false, unnamed: false, key_field: nil, fields: nil, bar: false, cast: nil, select: nil, uniq: false, &block)
+  def traverse(key_field_pos = :key, fields_pos = nil, type: nil, one2one: false, unnamed: nil, key_field: nil, fields: nil, bar: false, cast: nil, select: nil, uniq: false, &block)
     key_field = key_field_pos if key_field.nil?
     fields = fields_pos.dup if fields.nil?
     type = @type if type.nil?
@@ -9,6 +9,8 @@ module TSV
     fields = [fields] unless fields.nil? || Array === fields
     positions = (fields.nil? || fields == :all) ? nil : self.identify_field(fields)
     positions = nil if fields == self.fields
+    unnamed = @unnamed if unnamed.nil?
+    unnamed = false if unnamed.nil?
 
     if key_pos == :key
       key_name = @key_field
@@ -61,7 +63,6 @@ module TSV
             key = @type == :flat ? values : values[key_pos] if key_pos != :key 
 
             values = values.values_at(*positions)
-            NamedArray.setup(values, fields)
             if key_index
               if @type == :double
                 values.insert key_index, [orig_key]
@@ -71,6 +72,15 @@ module TSV
             end
           end
 
+          if ! unnamed && fields
+            case @type
+            when :flat, :single
+              values = Entity.prepare_entity(values, fields.first)
+            else
+              values = NamedArray.setup(values, fields, entity_options)
+            end
+          end
+
           values = TSV.cast_value(values, cast) if cast
 
           if Array === key