rbbt-util 5.5.9 → 5.5.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzZjOWMzZjRhNWIyMmRhMjc1MjM1NGU3NGNhNWJiMWU3MmE4ZDExYw==
+    NzRhMzNhNDZhYTY2ZDIzNGU4MGNhMzQ4YjBlZmEyMjI2ZjU3OGI3Yw==
   data.tar.gz: !binary |-
-    MzhlY2RmNWYxNDk4ZTNmMTk2ZTU3NTYyN2JhNmY4YmJiMzUxYzQ3MA==
+    MWYyN2IwZGMzMmQ5MWZlZjc2M2MxOGFiMGIwOGI2MTUwZTAwYzIxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDBmM2RhZWI3MTc3Nzc5OGQ5NGIxN2I0ZTg4ZDkyNmRlMmY5MzhjODU1YzU3
-    NWM4MjlmZmM5NGZiMjEzNjUyZWE0NjJkMDQ1NTEzNjJjNjVmMTcxOThiMTY5
-    YTQ0ZDNmYzJhOTQ3MzJmYWRkNDIwMDYxMmE4ZDZlN2ZlMTYyMzI=
+    N2ZmOGRmMTdmNzBlZDgxNmZmNmExMDk2ZjU3YWZhMDgzYTNlY2Y0Mjc1OWYx
+    NjRjYWI1NjE4MTM1Y2U1ZjMzOTZhMzFjODc1OTEyYmMyN2I5NmI4YTRmNzFm
+    NDMyZjQwZDNmMTFhMzNiYzkzZmU3OWNlNDU3NmEzMWFkYjQ5ZGU=
   data.tar.gz: !binary |-
-    N2QzYWEyNDAxYWRmOGIyMDM5YmU1YTAxZDQ3ZDA5Mzg5Njk4OTY1Zjc4Y2U4
-    ZDAwZjFiOWVlYzg1NzNkNDk2NzEzNzdkMjVjN2U2ZTk4MjQzMzY0MzRjMmY0
-    YzhkYmJiZDE3OGE0NmI0NTU4NjVmYzNhN2YwYzZmZDhkZDc4Y2E=
+    OTcwOTZkOWU1NDlhM2U0YjY2ZGIxNGY2MjJiOWZlN2Y5ZmMyZjRiMjU0MjE3
+    NTMwN2FlNjVlODgxMTFkNjJhZDNkNzcyN2Y3MDQ3ZDNkNGIwOTc5ZGZhMDQz
+    ZTNmNDI1OGQwMzFiMmZmMjUzZWU5MzUwMGU1ZGMzMzI4YTgyYzM=

data/lib/rbbt/association.rb

@@ -118,8 +118,7 @@ module Association
 
     if source_final_format and source_field != source_final_format and
       Entity.formats[source_field] and
-      Entity.formats[source_field] == Entity.formats[source_final_format]
-
+      Entity.formats[source_final_format].all_formats.include? source_field
       Log.debug("Changing source format from #{tsv.key_field} to #{source_final_format}")
 
       tsv.with_unnamed do

data/lib/rbbt/entity.rb

@@ -6,12 +6,14 @@ module Entity
     attr_accessor :formats, :entity_property_cache
   end
 
+
   self.entity_property_cache = "var/entity_property"
   self.formats = {}
   
   UNPERSISTED_PREFIX = "entity_unpersisted_property_"
 
 
+  attr_accessor :all_formats
   def self.extended(base)
     base.extend Annotation
     Entity.formats[base.to_s] = base
@@ -27,6 +29,8 @@ module Entity
 
       def self.format=(formats)
         formats = [formats] unless Array === formats
+        self.all_formats ||= []
+        self.all_formats = self.all_formats.concat(formats).uniq
         formats.each do |format|
           Entity.formats[format] = self
         end

data/lib/rbbt/knowledge_base.rb

@@ -57,14 +57,17 @@ class KnowledgeBase
   def syndicate(kb, name)
     kb.all_databases.each do |database|
       db_name = [database, name] * "@"
-      register(db_name) do
+      file, kb_options = kb.registry[database]
+      options = {}
+      options[:undirected] = true if kb_options and kb_options[:undirected]
+      register(db_name, nil, options) do
         kb.get_database(database)
       end
     end
   end
 
   def all_databases
-    (@indices.keys + @registry.keys).uniq
+    @registry.keys
   end
 
 
@@ -135,7 +138,8 @@ class KnowledgeBase
     options = open_options.merge(registered_options || {}).merge(options)
     raise "Repo #{ name } not found and not registered" if file.nil?
 
-    @indices[name] ||= begin 
+    code = [name, Misc.hash2md5(options)] * "_"
+    @indices[code] ||= begin 
                            Log.low "Opening index #{ name } from #{ Misc.fingerprint file }. #{options}"
                            Association.index(file, options, persist_options).
                              tap{|tsv| tsv.namespace = self.namespace}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.9
+  version: 5.5.10
 platform: ruby
 authors:
 - Miguel Vazquez