rbbt-util 5.21.89 → 5.21.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a5ab8b4aa58bad54d6716b49419cb715c6a161
-  data.tar.gz: 1dc0a78f1cb2b47a885f606a48e7c629fa415508
+  metadata.gz: e68de8ec56241c9fbc4bceed94f7c632a859c930
+  data.tar.gz: 3e4caace384777f8e4ecce35d89c003be40354fc
 SHA512:
-  metadata.gz: 2806f19bd8a01092da0aeb63064cb666c61fbdc298b741182c2f649cee70189d7da202cbfd0bf3c9d8d990b5ac70722cbe88cedc3bf9dc7a2812f695618aaf8e
-  data.tar.gz: 6673c36664b4674c1efed59f72b17cdcb0fa4c6cebf2be84bbbb25e158a90b2fdfce34bcc037b3493abee9ce7d9783605752b0f12ec5e51be531f92caf66dc40
+  metadata.gz: 29df479899b22d4577a28714247a80102836b4a63cd97548e3432d3d9cbcf469b13e3211c757ff4f83940e73f8a96696fa9779c0a5b9e43e8272f95b9738d926
+  data.tar.gz: a89236195f0add1240259fac4627a5e51e5808b73548f8d279586e3390688ef0aafc9e1d288f0704e68febbaf48a4159a6f3e86fbf875e836e320b12cccc3fe9

data/etc/app.d/entities.rb

@@ -28,9 +28,9 @@ $annotation_repo = Rbbt.var.sinatra.annotation_repo.find
 
      Log.debug("Persist #{name} #{prop}: #{[type, repo].compact * ", "}")
      if repo == 'repo'
-      options = {:annotation_repo => $annotation_repo}
+       options = {:annotation_repo => $annotation_repo}
      else
-      options = {}
+       options = {}
      end
      persist prop, type, options
    end

data/lib/rbbt/entity.rb

@@ -196,11 +196,10 @@ module Entity
 
         define_method method_name do |*args|
           id = self.id
-          persist_name = __method__.to_s << ":" << (Array === id ? Misc.hash2md5(:id => id) : id)
-          persist_name << ":" << Misc.hash2md5({:args => args}) unless args.nil? or args.empty?
+          persist_name = __method__.to_s << ":" << (Array === id ? Misc.obj2digest(id) : id)
 
           persist_options = options
-          persist_options = persist_options.merge(:other => {:args => args}) if args.any?
+          persist_options = persist_options.merge(:other => {:args => args}) if args and args.any?
 
           Persist.persist(persist_name, type, persist_options.merge(:persist => true)) do
             self.send(orig_name, *args)

data/lib/rbbt/tsv/excel.rb

@@ -151,6 +151,8 @@ module TSV
       sheet = Misc.process_options options, :sheet
       header = Misc.process_options options, :header
 
+      iii options
+      iii sheet
       header = true unless header == false
       TmpFile.with_file do |filename|
         workbook = RubyXL::Parser.parse file
@@ -248,7 +250,7 @@ module TSV
   end
 
   def self.excel2tsv(filename, options ={})
-    excel(filename, options={})
+    excel(filename, options)
   end
 
 end

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

@@ -8,7 +8,6 @@ module IndiferentHash
     new = self.dup
     IndiferentHash.setup(new)
     other.each do |k,value|
-      new.delete k
       new[k] = value
     end
     new

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

@@ -2,6 +2,23 @@ module Misc
   ARRAY_MAX_LENGTH = 1000
   STRING_MAX_LENGTH = ARRAY_MAX_LENGTH * 10
 
+  def self.break_lines(text, char_size=80)
+    text = text.gsub("\n", " ")
+    lines = []
+    line = []
+    text.split(/([\s\-]+)/).each do |part|
+      if line.join("").length + part.length > char_size
+        lines << line * ""
+        line = []
+      end
+      line << part
+    end
+
+    lines << line * ""
+
+    lines.flatten.collect{|l| l.strip} * "\n"
+  end
+
   def self.name2basename(file)
     sanitize_filename(file.gsub("/",'>').gsub("~", '-'))
   end

data/test/rbbt/util/test_misc.rb

@@ -551,4 +551,10 @@ eum fugiat quo voluptas nulla pariatur?"
       Log.debug  "Hola #{[p.first.inspect, p.last.inspect] * "=>"}" 
     end
   end
+
+  def test_sanitize_filename
+    text = "This is a very long line that needs to be split in several lines"
+    assert Misc.break_lines(text, 10).split("\n").length == 1 + text.length / 10
+    assert Misc.break_lines(text, 10).split("\n").select{|l| l.length > 10 }.empty?
+  end
 end

metadata

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