rbbt-util 5.21.69 → 5.21.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399599687a33ccd54d3e3072a1293d167e39af90
-  data.tar.gz: a615f143621c1d9b81346ca23b8ee432fc6a67fc
+  metadata.gz: f18a8bff029729b54d079392ab9063a03312bb1d
+  data.tar.gz: 838cfd2bf2a85c5f5f287b370291b659d67be601
 SHA512:
-  metadata.gz: '029a96a494c99358d38858cdb772e78314d6e923248589a2145e6b3e1d52dec61eb66429890d7ede8224be097c41c53c0a6d4ffbae23d3263f8ba9c250997a89'
-  data.tar.gz: 4b05254ba442351affed8db14ae7b462b06f6f92d310adf9e9336cd04e33dc626e3ed3d86c8bfb84544d81ef764e1ec5abe743fb971843df9a04fb8362d76bd4
+  metadata.gz: 24e5cfe8cd0adc01dd3ad4cce33a86a36d0767bd36b35544d0da2b960ee09f3373516214c0827496700ab38ab93f8d44ea2f14f465292c11b8b9b9130d339ea3
+  data.tar.gz: 75ff7b5627b32940769a1b3146ad113bc638f372c0cc04ef0c253b541cad2b5bc20416f30ab9199eb4b1365e380ecd8ff14ea71d03c94ea851492d2c16781eb3

data/lib/rbbt/association/index.rb

@@ -51,6 +51,10 @@ module Association
             next if source.nil? or source.empty?
             next if values.empty?
 
+            #targets, *rest = Misc.zip_fields(Misc.zip_fields(values).uniq)
+            
+            next if values.first.empty?
+            values =  Misc.zip_fields(Misc.zip_fields(values).uniq)
             targets, *rest = values
 
             size = targets ? targets.length : 0

data/lib/rbbt/association/item.rb

@@ -57,11 +57,19 @@ module AssociationItem
   end
 
   property :target_type => :both do
-    knowledge_base.target(database)
+    if reverse
+      knowledge_base.source(database)
+    else
+      knowledge_base.target(database)
+    end
   end
 
   property :source_type => :both do
-    knowledge_base.source(database)
+    if reverse
+      knowledge_base.target(database)
+    else
+      knowledge_base.source(database)
+    end
   end
 
   property :undirected => :both do
@@ -69,12 +77,12 @@ module AssociationItem
   end
 
   property :target_entity => :array2single do
-    type = knowledge_base.target(database)
+    type = target_type
     knowledge_base.annotate self.target, type, database #if self.target.any?
   end
 
   property :source_entity => :array2single do
-    type = knowledge_base.source(database)
+    type = source_type
     knowledge_base.annotate self.source, type, database #if self.source.any?
   end
 
@@ -83,7 +91,7 @@ module AssociationItem
   end
   property :value => :array2single do
     index = index(database)
-    value = index.chunked_values_at self
+    value = self.reverse ? index.chunked_values_at(self.invert) : index.chunked_values_at(self)
     value.collect{|v| NamedArray.setup(v, index.fields)}
   end
 

data/lib/rbbt/entity/identifiers.rb

@@ -31,7 +31,7 @@ module Entity
         end
 
         def identifier_index(format = nil, source = nil)
-          Persist.memory("Entity index #{identity_type}: #{format} (from #{source || "All"})", :format => format, :source => source, :update => true) do
+          Persist.memory("Entity index #{identity_type}: #{format} (from #{source || "All"})", :persist => true, :format => format, :source => source) do
             source ||= self.respond_to?(:format)? self.format : nil
 
             begin

data/lib/rbbt/util/misc/format.rb

@@ -174,7 +174,11 @@ module Misc
   end
 
   def self.humanize_list(list)
-    list[0..-2].collect{|e| e.to_s} * ", " << " and " << list[-1].to_s
+    if list.length == 1
+      list.first
+    else
+      list[0..-2].collect{|e| e.to_s} * ", " << " and " << list[-1].to_s
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.69
+  version: 5.21.70
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake