rbbt-util 5.32.25 → 5.32.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4709cccef1b9d9d46e4b8888f336b65e6059b41f2289a891bcc58795e949d155
-  data.tar.gz: 373e0ec6458f1d6cfdbfbe6aadb9e585ee1c347f2395480ba950beca3b3ad38f
+  metadata.gz: 072aa8b010c3f395051fd4e29f6ac22647944eec529bdf05be77ac6ad5260a37
+  data.tar.gz: d68843b2fe56019dd63165a34c97ec23d9e60933e4493bdb61f29985548bca69
 SHA512:
-  metadata.gz: 276e9b6ab9988cb3e53ed44ee166e81f72da3f9eb119ed8269ea47bbe9cddc3bbebff5faa44b16d2d67c8f3ae575217e081c9aa8e740579c27ab4c6cfae2644d
-  data.tar.gz: e3c977b86918ed7c8efdf75d6aa6468cd078bbaf4d3acbb18202a6b2325bca8de4b901973c27a111558d83de7bfab7a0bfaa8f919b26301bb3532ba76636b6aa
+  metadata.gz: 9d572a394b5736d8780021bc8ec65ba4381dc8cb84f111704854ce77ceca8da0ca72626e0144a04ab5c9b552a5566f4bdd553cad2a70050216fae231179beb95
+  data.tar.gz: ce51f8a4f0f5b4028148deb7fd3e57a4fbf5bb531f366378a2bae31354b799a66c6ba2768d9ae25578b3a0b09ee4e29f817f6ab768166bed39e4245b35a4a7e4

data/lib/rbbt/tsv/excel.rb

@@ -177,7 +177,7 @@ module TSV
 
       sheet ||= "0"
       workbook = RubyXL::Parser.parse file
-      if sheet &&  sheet =~ /^\d+$/
+      if sheet && sheet =~ /^\d+$/
         sheet = workbook.worksheets.collect{|s| s.sheet_name }[sheet.to_i]
       end
       sheet_name = sheet
@@ -185,7 +185,9 @@ module TSV
 
       TmpFile.with_file :extension => Misc.sanitize_filename(sheet_name.to_s) do |filename|
 
-        sheet    = sheet ? workbook[sheet] : workbook.worksheets.first
+        sheet    = sheet_name ? workbook[sheet_name] : workbook.worksheets.first
+
+        raise "No sheet #{sheet_name} found" if sheet.nil?
 
         rows = []
 
@@ -217,21 +219,27 @@ module TSV
     end
 
     def self.write(tsv, file, options = {})
-      sheet = Misc.process_options options, :sheet
+      sheet, add_sheet = Misc.process_options options, :sheet, :add_sheet
 
       fields, rows = TSV._excel_data(tsv, options)
 
-      book = RubyXL::Workbook.new
-      sheet1 = book.worksheets.first
-      sheet1.sheet_name = sheet if sheet
+      if Open.exists?(file) && add_sheet
+        book = RubyXL::Parser.parse file
+        sheet1 = book.add_worksheet(sheet)
+      else
+        book = RubyXL::Workbook.new
+        sheet1 = book.worksheets.first
+        sheet1.sheet_name = sheet if sheet
+      end
 
       fields.each_with_index do |e,i|
         sheet1.add_cell(0, i, e)
-      end
+      end if fields
 
       rows.each_with_index do |cells,i|
+        i += 1 if fields
         cells.each_with_index do |e,j|
-          sheet1.add_cell(i+1, j, e)
+          sheet1.add_cell(i, j, e)
         end
       end
 

data/test/rbbt/tsv/test_excel.rb

@@ -2,7 +2,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'test_helpe
 require 'rbbt/tsv/excel'
 
 class TestExcel < Test::Unit::TestCase
-  def _test_xls
+  def test_xls
     content =<<-EOF
 #Id    ValueA    ValueB    OtherID
 row1    a|aa|aaa    b    Id1|Id2
@@ -19,7 +19,7 @@ row2    A    B    Id3
     end
   end
 
-  def _test_xlsx
+  def test_xlsx
     content =<<-EOF
 #Id    ValueA    ValueB    OtherID
 row1    a|aa|aaa    b    Id1|Id2
@@ -36,7 +36,7 @@ row2    A    B    Id3
     end
   end
 
-  def _test_excel
+  def test_excel
     content =<<-EOF
 #Id    ValueA    ValueB    OtherID
 row1    a|aa|aaa    b    Id1|Id2
@@ -63,7 +63,7 @@ row2    A    B    Id3
     end
   end
   
-  def _test_excel_sheets
+  def test_excel_sheets
     content =<<-EOF
 #Id    ValueA    ValueB    OtherID
 row1    a|aa|aaa    b    Id1|Id2
@@ -133,5 +133,39 @@ row2    A    B    Id3
       end
     end
   end
+
+  def test_excel_multi_sheets
+    content =<<-EOF
+#Id    ValueA    ValueB    OtherID
+row1    a|aa|aaa    b    Id1|Id2
+row2    A    B    Id3
+    EOF
+
+    TmpFile.with_file(content) do |filename|
+      tsv1 = TSV.open(filename, :sep => /\s+/)
+      tsv2 = tsv1.annotate(tsv1.dup)
+      tsv3 = tsv1.annotate(tsv1.dup)
+
+      tsv2["row2"] = [["AA"], ["BB"], ["Id4"]]
+      tsv3["row2"] = [["AAA"], ["BBB"], ["Id5"]]
+
+      TmpFile.with_file(nil, false, :extension => 'xlsx') do |excelfile|
+        tsv1.xlsx(excelfile, :sheet => "S1")
+        tsv2.xlsx(excelfile, :sheet => "S2", :add_sheet => true)
+        workbook = RubyXL::Parser.parse excelfile
+
+        assert_equal %w(S1 S2), workbook.worksheets.collect{|s| s.sheet_name} 
+
+        new = TSV.excel(excelfile, :sheet => "S1")
+        assert_equal %w(row1 row2), new.keys.sort
+        assert_equal %w(A), new["row2"]["ValueA"]
+
+        new = TSV.excel(excelfile, :sheet => "S2")
+        assert_equal %w(row1 row2), new.keys.sort
+        assert_equal %w(AA), new["row2"]["ValueA"]
+
+      end
+    end
+  end
 end
 

metadata

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