spreadsheet 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4b84832d5a9a7616d0948a54c34342df9205b691ef561d24725c33fcb65b27
-  data.tar.gz: 29dff00bcafb3b46674a1cbd2f57ee433e27d058e69f4da9a6964cac1961f323
+  metadata.gz: a831e5c252775858cbdba547a3ac3228028cb6c9a56a92a77ab8fdc393de0658
+  data.tar.gz: 1240cd6a3b8362fa9c807c26d36fd6f8df19872e195ce09e98583597f73fa8cc
 SHA512:
-  metadata.gz: c924c33e13250366696b1ea4d969559d320e270554d0b691d02874980f01442eaaccbe55fdfb2d00bfc37201e7d0be691091a1de2f72a04ad3cb83f47db0134b
-  data.tar.gz: b3526dc452d2f8fc983d0af1a1b531737898d22f03ddf6c9e717fd5eb715444df46f36d9942019751bebaf3c9a1ec825eba7e3bdb7b5ad4dfb83605722de03fa
+  metadata.gz: 35dd4c09f32c793bf85f4290a497eb25a298b2f59e107eb4ecebf3c37e1e6a1ee505eaec3409057c0914754ca9036fb8a4c173c8d251e448ef932e38489d0c04
+  data.tar.gz: b20106050e1370ced689559af16e97efc4b19abde21165091d9f4a1ebea02758625713f09e20be0ccf7b8be2075fc59567c5bf581e583a2250ccc81ee04b2e5f

data/lib/spreadsheet/excel/writer/n_worksheet.rb

@@ -241,81 +241,6 @@ class Worksheet
     end
     write_multiples row, first_idx, multiples if multiples
   end
-  def write_changes reader, endpos, sst_status
-
-    ## FIXME this is not smart solution to update outline_level.
-    #        without this process, outlines in row disappear in MS Excel.       
-    @worksheet.row_count.times do |i|
-      if @worksheet.row(i).outline_level > 0
-        @worksheet.row(i).outline_level = @worksheet.row(i).outline_level
-      end
-    end
-
-    reader.seek @worksheet.offset
-    blocks = row_blocks
-    lastpos = reader.pos
-    offsets = {}
-    row_offsets = []
-    changes = @worksheet.changes
-    @worksheet.offsets.each do |key, pair|
-      if changes.include?(key) \
-        || (sst_status == :complete_update && key.is_a?(Integer))
-        offsets.store pair, key
-      end
-    end
-    ## FIXME it may be smarter to simply write all rowblocks, instead of doing a
-    #        song-and-dance routine for every row...
-    work = offsets.invert
-    work.each do |key, (pos, len)|
-      case key
-      when Integer
-        row_offsets.push [key, [pos, len]]
-      when :dimensions
-        row_offsets.push [-1, [pos, len]]
-      end
-    end
-    row_offsets.sort!
-    row_offsets.reverse!
-    control = changes.size
-    @worksheet.each do |row|
-      key = row.idx
-      if changes.include?(key) && !work.include?(key)
-        row, pair = row_offsets.find do |idx, _| idx <= key end
-        work.store key, pair
-      end
-    end
-    if changes.size > control
-      warn <<-EOS
-Your Worksheet was modified while it was being written. This should not happen.
-Please contact the author (hannes dot wyss at gmail dot com) with a sample file
-and minimal code that generates this warning. Thanks!
-      EOS
-    end
-    work = work.sort_by do |key, (pos, len)|
-      [pos, key.is_a?(Integer) ? key : -1]
-    end
-    work.each do |key, (pos, len)|
-      @io.write reader.read(pos - lastpos) if pos > lastpos
-      if key.is_a?(Integer)
-        if block = blocks.find do |rows| rows.any? do |row| row.idx == key end end
-          write_rowblock block
-          blocks.delete block
-        end
-      else
-        send "write_#{key}"
-      end
-      lastpos = pos + len
-      reader.seek lastpos
-    end
-
-    # Necessary for outline (grouping) and hiding functions 
-    # but these below are not necessary to run
-    # if [Row|Column]#hidden? = false and [Row|Column]#outline_level == 0
-    write_colinfos
-    write_guts
-
-    @io.write reader.read(endpos - lastpos)
-  end
   def write_colinfo bunch
     col = bunch.first
     width = col.width.to_f * 256

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -164,93 +164,6 @@ class Workbook < Spreadsheet::Writer
     end
   end
   ##
-  # Copy unchanged data verbatim, adjust offsets and write new records for
-  # changed data.
-  def write_changes workbook, io
-    sanitize_worksheets workbook.worksheets
-    collect_formats workbook, :existing_document => true
-    reader = workbook.ole
-    sheet_data = {}
-    sst_status, sst_total, sst_strings = complete_sst_update? workbook
-    sst = {}
-    sst_strings.each_with_index do |str, idx| sst.store str, idx end
-    sheets = worksheets(workbook)
-    positions = []
-    newsheets = []
-    sheets.each do |sheet|
-      @sst[sheet] = sst
-      pos, len = workbook.offsets[sheet.worksheet]
-      if pos
-        positions.push pos
-        sheet.write_changes reader, pos + len, sst_status
-      else
-        newsheets.push sheet
-        sheet.write_from_scratch
-      end
-      sheet_data[sheet.worksheet] = sheet.data
-    end
-    Ole::Storage.open io do |ole|
-      ole.file.open 'Workbook', 'w' do |writer|
-        reader.seek lastpos = 0
-        workbook.offsets.select do |key, pair|
-          workbook.changes.include? key
-        end.sort_by do |key, (pos, _)|
-          pos
-        end.each do |key, (pos, len)|
-          data = reader.read(pos - lastpos)
-          writer.write data
-          case key
-          when Spreadsheet::Worksheet
-            writer.write sheet_data[key]
-          when :boundsheets
-            ## boundsheets are hard to calculate. The offset below is only
-            #  correct if there are no more changes in the workbook globals
-            #  string after this.
-            oldoffset = positions.min - len
-            lastpos = pos + len
-            bytechange = 0
-            buffer = StringIO.new ''.dup
-            if tuple = workbook.offsets[:sst]
-              write_sst_changes workbook, buffer, writer.pos,
-                                sst_total, sst_strings
-              pos, len = tuple
-              if offset = workbook.offsets[:extsst]
-                len += offset[1].to_i
-              end
-              bytechange = buffer.size - len
-              write_boundsheets workbook, writer, oldoffset + bytechange
-              reader.seek lastpos
-              writer.write reader.read(pos - lastpos)
-              buffer.rewind
-              writer.write buffer.read
-            elsif sst.empty? || workbook.biff_version < 8
-              write_boundsheets workbook, writer, oldoffset + bytechange
-            else
-              write_sst workbook, buffer, writer.pos
-              write_boundsheets workbook, writer, oldoffset + buffer.size
-              pos = lastpos
-              len = positions.min - lastpos
-              if len > OPCODE_SIZE
-                reader.seek pos
-                writer.write reader.read(len - OPCODE_SIZE)
-              end
-              buffer.rewind
-              writer.write buffer.read
-              write_eof workbook, writer
-            end
-          else
-            send "write_#{key}", workbook, writer
-          end
-          lastpos = [pos + len, reader.size - 1].min
-          reader.seek lastpos
-        end
-        writer.write reader.read
-        newsheets.each do |sheet|
-          writer.write sheet.data
-        end
-      end
-    end
-  end
   def write_datemode workbook, writer
     mode = @date_base.year == 1899 ? 0x00 : 0x01
     data = [
@@ -639,8 +552,7 @@ class Workbook < Spreadsheet::Writer
     write_op writer, 0x003d, data.pack('v*')
   end
   ##
-  # The main writer method. Calls #write_from_scratch or #write_changes
-  # depending on the class and state of _workbook_.
+  # The main writer method. Calls #write_from_scratch.
   def write_workbook workbook, io
     unless workbook.is_a?(Excel::Workbook) && workbook.io
       @date_base = Date.new 1899, 12, 31
@@ -650,7 +562,8 @@ class Workbook < Spreadsheet::Writer
       if workbook.changes.empty?
         super
       else
-        write_changes workbook, io
+        @date_base = Date.new 1899, 12, 31
+        write_from_scratch workbook, io
       end
     end
   ensure

data/lib/spreadsheet/excel/writer/worksheet.rb

@@ -243,84 +243,6 @@ class Worksheet
     end
     write_multiples row, first_idx, multiples if multiples
   end
-  def write_changes reader, endpos, sst_status
-
-    ## FIXME this is not smart solution to update outline_level.
-    #        without this process, outlines in row disappear in MS Excel.
-    @worksheet.row_count.times do |i|
-      if @worksheet.row(i).outline_level > 0
-        @worksheet.row(i).outline_level = @worksheet.row(i).outline_level
-      end
-    end
-
-    reader.seek @worksheet.offset
-    blocks = row_blocks
-    lastpos = reader.pos
-    offsets = {}
-    row_offsets = []
-    changes = @worksheet.changes
-    @worksheet.offsets.each do |key, pair|
-      if changes.include?(key) \
-        || (sst_status == :complete_update && key.is_a?(Integer))
-        offsets.store pair, key
-      end
-    end
-    ## FIXME it may be smarter to simply write all rowblocks, instead of doing a
-    #        song-and-dance routine for every row...
-    work = offsets.invert
-    work.each do |key, (pos, len)|
-      case key
-      when Integer
-        row_offsets.push [key, [pos, len]]
-      when :dimensions
-        row_offsets.push [-1, [pos, len]]
-      end
-    end
-    row_offsets.sort!
-    row_offsets.reverse!
-    control = changes.size
-    @worksheet.each do |row|
-      key = row.idx
-      if changes.include?(key) && !work.include?(key)
-        row, pair = row_offsets.find do |idx, _| idx <= key end
-        work.store key, pair
-      end
-    end
-    if changes.size > control
-      warn <<-EOS
-Your Worksheet was modified while it was being written. This should not happen.
-Please contact the author (hannes dot wyss at gmail dot com) with a sample file
-and minimal code that generates this warning. Thanks!
-      EOS
-    end
-    work = work.sort_by do |key, (pos, _)|
-      [pos, key.is_a?(Integer) ? key : -1]
-    end
-    work.each do |key, (pos, len)|
-      @io.write reader.read(pos - lastpos) if pos > lastpos
-      if key.is_a?(Integer)
-        if block = blocks.find do |rows| rows.any? do |row| row.idx == key end end
-          write_rowblock block
-          blocks.delete block
-        end
-      else
-        send "write_#{key}"
-      end
-      lastpos = pos + len
-      reader.seek lastpos
-    end
-
-    # Necessary for outline (grouping) and hiding functions
-    # but these below are not necessary to run
-    # if [Row|Column]#hidden? = false and [Row|Column]#outline_level == 0
-    write_merged_cells
-    write_pagesetup
-    write_margins
-    write_colinfos
-    write_guts
-
-    @io.write reader.read(endpos - lastpos)
-  end
   def write_colinfo bunch
     col = bunch.first
     width = col.width.to_f * 256

data/lib/spreadsheet/version.rb

@@ -3,5 +3,5 @@
 module Spreadsheet
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.2.9'
+  VERSION = '1.3.0'
 end

data/test/integration.rb

@@ -1401,6 +1401,30 @@ module Spreadsheet
       assert_equal(:visible, book2.worksheet(1).visibility)
     end
 
+    def test_append_and_reopen
+      filename = path = File.join @var, 'test.xls'
+      sheet_name = 'Test Sheet'
+
+      # Create excel
+      excel = Spreadsheet::Workbook.new(filename)
+      sheet = excel.create_worksheet(name: sheet_name)
+      sheet.row(1).replace ['Data']
+      excel.write(filename)
+
+      # Append something
+      excel = Spreadsheet.open(filename, 'a+')
+      sheet = excel.worksheet(sheet_name)
+      sheet.row(2).replace ['Data2']
+      filename = "test2.xls"
+      excel.write(filename)
+
+      # Reopen
+      excel = Spreadsheet.open filename
+      sheet = excel.worksheet sheet_name
+    ensure
+      File.delete filename if File.exist? filename
+    end
+
     def test_text_drawing
       path = File.join @data, 'test_text_drawing.xls'
       book = Spreadsheet.open path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole