rbbt-util 5.0.1 → 5.1.0

data/lib/rbbt/tsv/manipulate.rb

@@ -521,8 +521,8 @@ module TSV
     @monitor = old_monitor
 
     if not fields.nil? and not name.nil?
-      fields = self.fields + [name]
-      self.fields = fields
+      new_fields = self.fields + [name]
+      self.fields = new_fields
     end
 
     self

data/lib/rbbt/tsv/parser.rb

@@ -306,7 +306,7 @@ module TSV
       merge = Misc.process_options(options, :merge) || false
 
       @sep2 = Misc.process_options(options, :sep2) || "|"
-      @cast = Misc.process_options options, :cast
+      @cast = Misc.process_options options, :cast; @cast = @cast.to_sym if String === @cast
       @type ||= Misc.process_options options, :type
       @fix = Misc.process_options(options, :fix) 
       @select= Misc.process_options options, :select

data/lib/rbbt/util/misc.rb

@@ -101,12 +101,13 @@ module Misc
   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
 
-    if defined?(Entity) and Entity.respond_to?(:formats) and Entity.formats.include? field
+    if  Entity.respond_to?(:formats) and Entity.formats.include? field
       params = options.dup
 
       params[:format] ||= params.delete "format"
@@ -120,7 +121,7 @@ module Misc
 
     entity
   end
-
+ 
   ARRAY_MAX_LENGTH = 10000
   STRING_MAX_LENGTH = ARRAY_MAX_LENGTH * 10
 
@@ -641,7 +642,7 @@ end
       next unless %w(Symbol String Float Fixnum Integer TrueClass FalseClass Module Class Object Array).include? v.class.to_s
       v = case 
           when Symbol === v
-            ":" << v.to_s
+            v.to_s
           when Array === v
             v * ","
           else

data/lib/rbbt/util/named_array.rb

@@ -17,6 +17,32 @@ module NamedArray
     array
   end
 
+  def prepare_entity(entity, field, options = {})
+    return entity if entity.nil?
+    return entity unless defined? Entity
+    @entity_templates ||= {}
+    if (template = @entity_templates[field])
+      entity = template.annotate(entity.frozen? ? entity.dup : entity)
+      entity.extend AnnotatedArray if Array === entity
+      entity
+    else
+      if @entity_templates.include? field
+        entity
+      else
+        template = Misc.prepare_entity("TEMPLATE", field, options)
+        if Annotated === template
+          @entity_templates[field] = template
+          entity = template.annotate(entity.frozen? ? entity.dup : entity)
+          entity.extend AnnotatedArray if Array === entity
+          entity
+        else
+          @entity_templates[field] = nil
+          entity
+        end
+      end
+    end
+  end
+
   def merge(array)
     double = Array === array.first 
     new = self.dup
@@ -47,14 +73,14 @@ module NamedArray
     return elem if @fields.nil? or @fields.empty?
 
     field = NamedArray === @fields ? @fields.named_array_clean_get_brackets(pos) : @fields[pos]
-    elem = Misc.prepare_entity(elem, field, entity_options)
+    elem = prepare_entity(elem, field, entity_options)
     elem
   end
 
   def named_array_each(&block)
     if defined?(Entity) and not @fields.nil? and not @fields.empty?
       @fields.zip(self).each do |field,elem|
-        elem = Misc.prepare_entity(elem, field, entity_options)
+        elem = prepare_entity(elem, field, entity_options)
         yield(elem)
         elem
       end

data/lib/rbbt/workflow/accessor.rb

@@ -254,7 +254,7 @@ module Workflow
     if inputs.any? or dependencies.any?
       tagged_jobname = case TAG
                        when :hash
-                         jobname + '_' + Misc.digest((inputs + dependencies.collect{|dep| dep.name}).inspect)
+                         jobname + '_' + Misc.digest((inputs * "\n" + ";" + dependencies.collect{|dep| dep.name} * "\n"))
                        else
                          jobname
                        end

data/lib/rbbt/workflow/step.rb

@@ -45,9 +45,20 @@ class Step
   end
 
   def prepare_result(value, description = nil, info = {})
-    return value if description.nil?
-    Entity.formats[description].setup(value, info.merge(:format => description)) if defined?(Entity) and Entity.respond_to?(:formats) and Entity.formats.include? description
-    value
+    case
+    when (not defined? Entity or description.nil? or not Entity.formats.include? description)
+      value
+    when (Annotated === value and info.empty?)
+      value
+    when Annotated === value
+      annotations = value.annotations
+      info.each do |k,v|
+        value.send("#{h}=", v) if annotations.include? k
+      end
+      value
+    else
+      Entity.formats[description].setup(value, info.merge(:format => description))
+    end
   end
 
   def exec

data/test/rbbt/test_annotations.rb

@@ -17,6 +17,7 @@ module AnnotatedString2
   include AnnotatedString
   self.annotation :annotation_str2
 end
+puts AnnotatedString.annotations.inspect
 
 class TestAnnotations < Test::Unit::TestCase
 
@@ -61,7 +62,7 @@ class TestAnnotations < Test::Unit::TestCase
     annotation_str = "Annotation String"
     AnnotatedString.setup(ary, annotation_str)
     
-    assert_equal({:annotation_str => annotation_str, :annotation_types => [AnnotatedString]}, ary.info)
+    assert_equal({:annotation_str => annotation_str, :annotation_types => [AnnotatedString], :annotated_array => true}, ary.info)
   end
 
   def test_load
@@ -89,7 +90,10 @@ class TestAnnotations < Test::Unit::TestCase
     annotation_str2 = "Annotation String 2"
     AnnotatedString.setup(str1, annotation_str1)
     AnnotatedString.setup(str2, annotation_str2)
+    
+    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all)[str1.id + ":0"]["annotation_str"] 
     assert_equal str1, Annotated.tsv([str1, str2], :all)[str1.id + ":0"]["literal"] 
+    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all)[str1.id + ":0"]["annotation_str"] 
     assert_equal annotation_str1, Annotated.tsv([str1, str2], :annotation_str, :JSON)[str1.id + ":0"]["annotation_str"] 
   end
 
@@ -129,7 +133,6 @@ class TestAnnotations < Test::Unit::TestCase
     str = "string1"
     annotation_str1 = "Annotation String 1"
     annotation_str2 = "Annotation String 2"
-    assert_equal [AnnotatedString], AnnotatedString2.inheritance
     AnnotatedString2.setup(str, annotation_str1, annotation_str2)
     assert_equal annotation_str1, str.annotation_str
     assert_equal annotation_str2, str.annotation_str2
@@ -147,8 +150,9 @@ class TestAnnotations < Test::Unit::TestCase
     b = AnnotatedString.setup([AnnotatedString.setup(["a"])])
     AnnotatedString.setup(a)
     a.extend AnnotatedArray
-    b.extend AnnotatedArray
     assert AnnotatedString === b[0]
+    b.extend AnnotatedArray
+    assert AnnotatedString === b[0, true]
     assert(!a.double_array)
     assert(b.double_array)
   end

data/test/rbbt/tsv/test_index.rb

@@ -118,7 +118,6 @@ row3    A    a|B    Id4
 
     TmpFile.with_file(content) do |filename|
       index = TSV.index(filename, :target => "OtherID", :data_sep => /\s+/, :order => true, :persist => false)
-      ddd index
       assert_equal "Id1", index['a']
       assert_equal "Id3", index['A']
       assert_equal "OtherID", index.fields.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,6 +174,8 @@ files:
 - lib/rbbt-util.rb
 - lib/rbbt.rb
 - lib/rbbt/annotations.rb
+- lib/rbbt/annotations/annotated_array.rb
+- lib/rbbt/annotations/util.rb
 - lib/rbbt/fix_width_table.rb
 - lib/rbbt/persist.rb
 - lib/rbbt/persist/tsv.rb