rbbt-util 5.34.16 → 5.34.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b76f18c79a3b52708203f69eb7cd9baff8cb07feb2a4b26850094cfda9b9edc
-  data.tar.gz: 8511317ae202283e8138746485e74d39b28881b78b85539c521e94309337782e
+  metadata.gz: 7908cbea1335046bacccf47660d8856ca1a0b0cca90ab485016db0a1f69ddbb3
+  data.tar.gz: ef217b34b1a3ca47405a3a58f77975a4e9395d9977b2d03bf4cea2c015a566bb
 SHA512:
-  metadata.gz: 71dd9c6806e8129fa08b466ddd3e8ea7172a0938000f399b030ef89a5f40321b08f24f6b98ba823ac72317460f45dbc9a8fc88c65899582766a542fde55adb24
-  data.tar.gz: 0b6d4b0aea41c92161193ffb379ee86e44715298ebf6d26d585ffb6292ae89a77e82a9764f07630106510c45bc5b56193b716de9edd71ed52cb4046f711d2e24
+  metadata.gz: 56b7b51a7291715af3af357d58166b82aeae89fc70ad2e68d854a2beec2ee0dd253319f1d785303454bb06245603c2b798112c403324a1a5c829cb86a0ef2a34
+  data.tar.gz: 906cfaf9ca2945cf68214b04d15b67c19ce8551f626ea65379d562e7059edd0d16b9b07bc6eec5889249050ba89fbc1da54c612599f44aed557ec6d32610e4af

data/lib/rbbt/association/item.rb

@@ -136,7 +136,8 @@ module AssociationItem
   end
 
   property :filter => :array do |*args,&block|
-    keys = tsv.with_unnamed do tsv.select(*args,&block).keys end
+    block = args.pop if Proc === args.last
+    keys = tsv.with_unnamed do tsv.select(*args, &block).keys end
     keys = self.annotate keys
     keys
   end

data/lib/rbbt/entity.rb

@@ -158,23 +158,23 @@ module Entity
         when :single, :single2array
           single_name = "_single_" << name
           define_method single_name, &block 
-          define_method name do |*args|
+          define_method name do |*args, &block|
             if Array === self
               res = self.collect{|e| e.send(single_name, *args)}
               res.first.annotate(res) if Annotated === res.first && type == :single2array
               res
             else
-              self.send(single_name, *args)
+              self.send(single_name, *args, &block)
             end
           end
         when :array, :array2single
           ary_name = "_ary_" << name
           define_method ary_name, &block 
 
-          define_method name do |*args|
+          define_method name do |*args, &block|
             case
             when Array === self
-              self.send(ary_name, *args)
+              self.send(ary_name, *args, &block)
             when (Array === self.container and not self.container_index.nil? and self.container.respond_to? ary_name)
               cache_code = Misc.hash2md5({:name => ary_name, :args => args})
               res = (self.container._ary_property_cache[cache_code] ||=  self.container.send(name, *args))
@@ -184,7 +184,7 @@ module Entity
                 res[self.container_index]
               end
             else
-              res = self.make_list.send(ary_name, *args)
+              res = self.make_list.send(ary_name, *args, &block)
               Hash === res ? res[self] : res[0]
             end
           end

data/lib/rbbt/knowledge_base/entity.rb

@@ -23,7 +23,7 @@ class KnowledgeBase
     entity_options = self.entity_options
     IndiferentHash.setup entity_options if entity_options and not IndiferentHash === entity_options
     options = entity_options[type.to_s] || entity_options[Entity.formats[type.to_s].to_s] || {}
-    options[:format] = @format[type] if @format.include? :type
+    options[:format] = @format[type] if Hash === @format && @format.include?(type)
     namespace = self.namespace
     namespace = db_namespace(database_name) if namespace.nil? and database_name
     options = {:organism => namespace}.merge(options)

data/lib/rbbt/resource/path.rb

@@ -354,7 +354,7 @@ module Path
 
   def yaml
     self.open do |f|
-      YAML.load f
+      YAML.unsafe_load f
     end
   end
 

data/lib/rbbt/resource.rb

@@ -71,6 +71,10 @@ module Resource
     end
   end
 
+  def claims
+    resources.keys.collect{|path| path.sub(subdir, '').sub(/^\//,'') }
+  end
+
   attr_accessor :server_missing_resource_cache
   def get_from_server(path, final_path, remote_server = nil)
     remote_server ||= self.remote_server

data/lib/rbbt/tsv/util.rb

@@ -377,7 +377,7 @@ module TSV
         return self
       when :list
         through do |k,v|
-          new[k] = v.first
+          new[k] = v.nil? ? nil : v.first
         end
       end
     end

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

@@ -35,7 +35,7 @@ module Misc
     v_range = v_max - v_min
     range = max.to_f - min.to_f
 
-    v.collect{|e| min + range * (e.to_f - v_min) / v_range } 
+    v.collect{|e| (e.nil? || e.nan?) ? e : min + range * (e.to_f - v_min) / v_range } 
   end
 
   def self.sum(list)

data/lib/rbbt/workflow/step/dependencies.rb

@@ -493,7 +493,7 @@ class Step
       begin Exception
         execute_and_dup(step, dep_step) 
       rescue 
-        raise $! unless canfail_paths.include? step.path
+        raise $! unless canfail_paths.include?(step.path)
       end
     end
 

data/test/rbbt/util/log/test_progress.rb

@@ -87,5 +87,25 @@ class TestProgress < Test::Unit::TestCase
     end
   end
 
+  def test_file
+    size = 10000
+
+    TmpFile.with_file do |file|
+
+      Log::ProgressBar.with_bar(size, :desc => "Bar 1", :file => file) do |bar|
+        bar.init
+        nums = []
+        100.times do
+          nums << rand(size)
+        end
+        nums.sort.each do |num|
+          bar.pos num
+          sleep 0.1
+        end
+        bar.tick
+      end
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.34.16
+  version: 5.34.18
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake