rbbt-util 5.26.171 → 5.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30207a19261c11a2613c091fde28604cc9186a6fafec8f74b33ecbb4e9cbac9
-  data.tar.gz: 3822e3009d4955690eff0e5554756cf6b1e898e1e9235814630f37a7e3192cfd
+  metadata.gz: ce00e5bba751f062a2cf055c1b0e5d937936a452c6edb6eed6da174aadeaa111
+  data.tar.gz: a54bc18f2cc45f0879151f44904ab312cbba26eddeed5a68f592ccd667258d0a
 SHA512:
-  metadata.gz: 187d8e5dd75a5bfc750e93e6f8d41b4bf813ab800bb33b6aefd07695fc5d3d7531b904cb049b72f56cd06089d651d090152a8e7adfe3e0642182bf229d3b5ee9
-  data.tar.gz: 383c16854ec7772f32ced9fc0a57708b626b3db59cce5b41cee7ae909418f96f0058eba3e488db167a68d760bc8b85f252998f7aa9fb577ba9aec45d461c5d8f
+  metadata.gz: 86fd735a87478a1c37ea38eb075d76093db55178f5c6aae7d97a3b7fe70e68df82774ec830f7e6f55e1370df60df6cfe6312a42220af389876263669eb966aa4
+  data.tar.gz: 9facd461d8a5d6f8f549310df3257be39d9cc939abf2a36dcb2eb45e7c48c65d3aae09e269efc50fb67fc4e574dc9c801b9111986ae3b9483c53c3015631e463

data/lib/rbbt/annotations.rb

@@ -120,7 +120,7 @@ module Annotated
     if object.instance_variables.include?(:@annotation_values)
       hash = {}
       object.instance_variable_get(:@annotation_values).each{|k,v| hash[k] = v}
-      self.annotation_values.each{|k,v| hash[k] = v}
+      self.annotation_values.each{|k,v| hash[k] = v unless v.nil?}
 
       object.instance_variable_set(:@annotation_values, hash)
       object.instance_variable_set(:@shared_annotations,  false)
@@ -289,6 +289,7 @@ module Annotation
     object.instance_variable_set(:@annotation_types, nil)
 
     if Hash === (hash = values.last)
+      setup_positional(object, *values[0..-2]) if values.length > 1
       clean_and_setup_hash(object, hash)
     else
       setup_positional(object, *values)

data/lib/rbbt/annotations/util.rb

@@ -115,19 +115,21 @@ module Annotated
 
     fields = case
 
-             when ((fields.compact.empty?) and not annotations.empty?)
+             when ((fields.compact.empty?) && ! annotations.empty?)
                fields = AnnotatedArray === annotations ? annotations.annotations : annotations.compact.first.annotations
                fields << :annotation_types
 
              when (fields == [:literal] and not annotations.compact.empty?)
                fields << :literal
 
-             when (fields == [:all] and Annotated === annotations)
-               fields = [:annotation_types] + annotations.annotations 
+             when (fields == [:all] && Annotated === annotations)
+               annotation_names = annotations.annotations
+               annotation_names += annotations.first.annotations if Annotated === annotations.first
+               fields = [:annotation_types] + annotation_names.uniq
                fields << :annotated_array if AnnotatedArray === annotations
                fields << :literal
 
-             when (fields == [:all] and not annotations.compact.empty?)
+             when (fields == [:all] && ! annotations.compact.empty?)
                raise "Input array must be annotated or its elements must be" if not Annotated === annotations.compact.first and not Array === annotations.compact.first
                raise "Input array must be annotated or its elements must be. No double arrays of singly annotated entities." if not Annotated === annotations.compact.first and Array === annotations.compact.first
                fields = [:annotation_types] + (Annotated === annotations ? 
@@ -157,12 +159,11 @@ module Annotated
       tsv = TSV.setup({}, :key_field => "ID", :fields => fields, :type => :list, :unnamed => true)
 
       annotations.compact.each_with_index do |annotation,i|
-        tsv[annotation.id + ":" << i.to_s] = annotation.tsv_values(*fields).dup
+        tsv[annotation.id + "#" << i.to_s] = annotation.tsv_values(*fields).dup
       end
 
     else
       raise "Annotations need to be an Array to create TSV"
-
     end
 
     tsv

data/lib/rbbt/entity.rb

@@ -5,6 +5,8 @@ module Entity
   
   UNPERSISTED_PREFIX = "entity_unpersisted_property_"
 
+  class MultipleEntity < Exception; end
+
   class DontPersist < Exception
     attr_accessor :payload
     def self.initialize(payload)
@@ -170,7 +172,7 @@ module Entity
         when :array, :array2single
           ary_name = "_ary_" << name
           define_method ary_name, &block 
-          
+
           define_method name do |*args|
             case
             when Array === self
@@ -188,6 +190,53 @@ module Entity
               Hash === res ? res[self] : res[0]
             end
           end
+        when :multiple
+          multi_name = "_multiple_" << name
+
+          define_method multi_name do
+            if self.instance_variable_get("@multiple_result")
+              return self.instance_variable_get("@multiple_result")
+            end
+            raise MultipleEntity, "Entity #{name} runs with multiple entities: #{self}"
+          end
+
+          define_method name do |*args|
+            obj = if Array === self
+                    self
+                  elsif self.respond_to?(:container) && Array === self.container
+                    self.container
+                  else
+                    self.make_list
+                  end
+
+            missing = []
+            obj.each do |e|
+              begin 
+                e.send(multi_name)
+              rescue MultipleEntity
+                missing << e
+              end
+            end
+
+            res = missing.any? ? block.call(missing) : nil
+            case res
+            when Array
+              missing.zip(res).each do |o,res|
+                o.instance_variable_set("@multiple_result", res)
+              end
+            when Hash
+              res.each do |o,res|
+                o.instance_variable_set("@multiple_result", res)
+              end
+            end
+
+            if Array === self
+              self.collect{|o| o.send(multi_name)}
+            else
+              self.send(multi_name)
+            end
+          end
+
         else 
           raise "Type not undestood in property: #{ type }"
         end
@@ -200,12 +249,16 @@ module Entity
         options ||= {}
         options = Misc.add_defaults options, :dir => Entity.entity_property_cache
 
+        orig_method_name = method_name
+        multi_name = "_multiple_" + method_name.to_s
+        method_name = multi_name if self.instance_methods.include?(multi_name.to_sym)
+
         orig_name = UNPERSISTED_PREFIX + method_name.to_s
         alias_method orig_name, method_name unless self.instance_methods.include? orig_name.to_sym
 
         define_method method_name do |*args|
           id = self.id
-          persist_name = __method__.to_s << ":" << (Array === id ? Misc.obj2digest(id) : id)
+          persist_name = orig_method_name.to_s << ":" << (Array === id ? Misc.obj2digest(id) : id)
 
           persist_options = options
           persist_options = persist_options.merge(:other => {:args => args}) if args and args.any?

data/lib/rbbt/persist.rb

@@ -402,6 +402,7 @@ module Persist
         subkey = name + ":"
 
         if String === repo
+          repo = repo.find if Path === repo
           repo = Persist.open_tokyocabinet(repo, false, :list, "BDB")
           repo.read_and_close do
             keys = repo.range subkey + 0.chr, true, subkey + 254.chr, true

data/share/rbbt_commands/tsv/get

@@ -14,6 +14,7 @@ Use - to read from STDIN
 -tch--tokyocabinet File is a tokyocabinet hash database
 -tcb--tokyocabinet_bd File is a tokyocabinet B database
 -f--fields* Fields to extract
+-s--sep* Separation character
 -hh--header_hash* Change the character used to mark the header line (defaults to #)
 -k--key_field* Use this field as key
 -h--help Print this help
@@ -46,7 +47,7 @@ fields = options[:fields]
 key_field = options[:key_field]
 fields = fields.split(/[,|]/, -1) unless fields.nil?
 
-parser = TSV::Parser.new tsv, :key_field => key_field,  :fields => fields, :type => options[:type], :header_hash => options[:header_hash]
+parser = TSV::Parser.new tsv, :key_field => key_field,  :fields => fields, :type => options[:type], :header_hash => options[:header_hash], :sep => options[:sep]
 fields ||= parser.fields
 
 TSV.traverse(parser) do |k,v|

data/share/rbbt_commands/tsv/read

@@ -13,6 +13,7 @@ Use - to read from STDIN
 -k--key_field* Key field
 -f--fields* Fields
 -t--type* Type
+-s--sep* Separation character
 -m--merge Merge from multiple rows
 -h--help Print this help
 -tch--tokyocabinet File is a tokyocabinet hash database

data/test/rbbt/annotations/test_util.rb

@@ -1,7 +1,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'test_helper.rb')
 require 'rbbt/annotations'
 
-class TestClass < Test::Unit::TestCase
+class TestAnnotation < Test::Unit::TestCase
   def test_marshal
     a = "STRING"
     a.extend Annotated

data/test/rbbt/test_annotations.rb

@@ -77,11 +77,11 @@ class TestAnnotations < Test::Unit::TestCase
     AnnotatedString.setup(str1, annotation_str1)
     AnnotatedString.setup(str2, annotation_str2)
     
-    assert_equal str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + ":0"]["literal"] 
-    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + ":0"]["annotation_str"] 
-    assert_equal str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + ":0"]["literal"] 
-    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + ":0"]["annotation_str"] 
-    assert_equal annotation_str1, Annotated.tsv([str1, str2], :annotation_str, :JSON).tap{|t| t.unnamed = false}[str1.id + ":0"]["annotation_str"] 
+    assert_equal str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + "#0"]["literal"] 
+    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + "#0"]["annotation_str"] 
+    assert_equal str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + "#0"]["literal"] 
+    assert_equal annotation_str1, Annotated.tsv([str1, str2], :all).tap{|t| t.unnamed = false}[str1.id + "#0"]["annotation_str"] 
+    assert_equal annotation_str1, Annotated.tsv([str1, str2], :annotation_str, :JSON).tap{|t| t.unnamed = false}[str1.id + "#0"]["annotation_str"] 
   end
 
   def test_literal

data/test/rbbt/test_entity.rb

@@ -59,6 +59,19 @@ module ReversableString
   persist :reverse_text_ary_p_array, :array, :dir => TmpFile.tmp_file
 
   persist :annotation_list, :annotations, :dir => TmpFile.tmp_file
+
+
+  $processed_multiple = []
+  property :multiple_annotation_list => :multiple do |list|
+    $processed_multiple.concat list
+    res = {}
+    list.collect do |e|
+      e.chars.to_a.collect{|c| 
+        ReversableString.setup(c)
+      }
+    end
+  end
+  persist :multiple_annotation_list, :annotations, :dir => TmpFile.tmp_file
 end
 
 class TestEntity < Test::Unit::TestCase
@@ -174,6 +187,42 @@ class TestEntity < Test::Unit::TestCase
     assert_equal string.length, string.annotation_list.length
   end
 
+  def test_persist_multiple_annotations
+    string1 = 'aaabbbccc'
+    string2 = 'AAABBBCCC'
+    string3 = 'AAABBBCCC_3'
+    string4 = 'AAABBBCCC_4'
+
+    array = ReversableString.setup([string1, string2])
+    assert_equal [string1, string2].collect{|s| s.chars}, array.multiple_annotation_list
+
+    assert_equal string1.length, array[0].multiple_annotation_list.length
+    assert_equal $processed_multiple, [string1, string2]
+
+    array = ReversableString.setup([string2, string3])
+    assert_equal string2.length, array[0].multiple_annotation_list.length
+    assert_equal $processed_multiple, [string1, string2, string3]
+
+    array = ReversableString.setup([string2, string3])
+    assert_equal string2.length, array[0].multiple_annotation_list.length
+    assert_equal $processed_multiple, [string1, string2, string3]
+
+    $processed_multiple = []
+    array = ReversableString.setup([string2, string3, string4])
+    assert_equal string2.length, array[0].multiple_annotation_list.length
+    assert_equal $processed_multiple, [string4]
+
+    string1 = 'aaabbbccc'
+    string2 = 'AAABBBCCC'
+    string3 = 'AAABBBCCC_3'
+    string4 = 'AAABBBCCC_4'
+    $processed_multiple = []
+    array = ReversableString.setup([string2, string3, string4])
+    assert_equal string2.length, array[0].multiple_annotation_list.length
+    assert_equal $processed_multiple, [string4]
+
+  end
+
   def test_clean_annotations
 
     string = "test_string"
@@ -184,7 +233,7 @@ class TestEntity < Test::Unit::TestCase
   end
 
   def test_all_properties
-    puts ReversableString.setup("TEST").all_properties
-    puts ReversableString.all_properties
+    assert ReversableString.setup("TEST").all_properties.include?("reverse_text_ary")
+    assert_equal ReversableString.setup("TEST").all_properties, ReversableString.all_properties
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.171
+  version: 5.27.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake