spreadsheet 0.6.1.9 → 0.6.2

data/History.txt

@@ -1,3 +1,70 @@
+=== 0.6.2 / 2008-12-11
+
+* 14 Bugfixes
+
+  * Fixed a bug where #<boolean>! methods did not trigger a call to
+    #row_updated
+
+  * Corrected the Row-Format in both Reader and Writer (was Biff5 for some
+    reason)
+
+  * Populates Row-instances with @default_format, @height, @outline_level
+    and @hidden attributes
+
+  * Fixed a Bug where Workbooks deriving from a Template-Workbook without
+    SST could not be saved
+    Reported in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=22863&group_id=678&atid=2678
+
+  * Improved handling of Numeric Values (writes a RK-Entry for a Float
+    only if it can be encoded with 4 leading zeroes, and a Number-Entry for an
+    Integer only if it cannot be encoded as an RK)
+
+  * Fixes a bug where changes to a Row were ignored if they were
+    outside of an existing Row-Block.
+
+  * Fixes a bug where MULRK-Entries sometimes only contained a single RK
+
+  * Fixes a bug where formatting was ignored if it was applied to empty Rows
+    Reported by Zomba Lumix in
+    http://rubyforge.org/forum/message.php?msg_id=61985
+
+  * Fixes a bug where modifying a Row in a loaded Workbook could lead to Rows
+    with smaller indices being set to nil.
+    Reported by Ivan Samsonov in
+    http://rubyforge.org/forum/message.php?msg_id=62816
+
+  * Deals with rounding-problems when calculating Time
+    Reported by Bughunter extraordinaire Bjørn Hjelle
+
+  * Correct splitting of wide characters in SST
+    Reported by Michel Ziegler and by Eugene Mikhailov in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=23085&group_id=678&atid=2677
+
+  * Fix an off-by-one error in write_mulrk that caused Excel to complain that
+    'Data may be lost', reported by Emma in
+    http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/321979
+    and by Chris Lowis in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=22892&group_id=678&atid=2677
+
+
+  * Read formats correctly in read_mulrk
+    Reported by Ivan Samsonov
+    Fixes that part of http://rubyforge.org/forum/message.php?msg_id=62821
+    which is a bug. Does nothing for the disappearance of Rich-Text
+    formatting, which will not be addressed until 0.7.0
+
+  * Fixes a (benign?) bug, where adding text to a template-file resulted in
+    a duplicate extsst-record.
+
+* 2 minor enhancements
+
+  * Improved recognition of Time-Formats
+
+  * Improvement to Robustness: allow Spreadsheet::Workbook.new
+    Takes care of http://rubyforge.org/forum/message.php?msg_id=62941
+    Reported by David Chamberlain
+
 === 0.6.1.9 / 2008-11-07
 
 * 1 Bugfix

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.1.9'
+  VERSION = '0.6.2'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/column.rb

@@ -37,7 +37,7 @@ module Spreadsheet
     attr_reader :default_format, :idx
     boolean :hidden, :collapsed
     enum :outline_level, 0, Integer
-    updater :width, :hidden, :outline_level
+    updater :collapsed, :hidden, :outline_level, :width
     def initialize idx, format, opts={}
       @idx = idx
       opts[:width] ||= 10

data/lib/spreadsheet/datatypes.rb

@@ -26,13 +26,13 @@ class << self
       define_method "#{key}?" do
         !!instance_variable_get("@#{key}")
       end
-      define_method "#{key}!" do
-        instance_variable_set("@#{key}", true)
-      end
       define_method "#{key}=" do |arg|
         arg = false if arg == 0
         instance_variable_set("@#{key}", !!arg)
       end
+      define_method "#{key}!" do
+        send "#{key}=", true
+      end
     end
   end
   ##

data/lib/spreadsheet/excel/internals.rb

@@ -99,7 +99,7 @@ module Internals
     :labelsst   => 'v3V',
     :number     => "v3#{EIGHT_BYTE_DOUBLE}",
     :rk         => 'v3V',
-    :row        => 'v5Cv',
+    :row        => 'v4x4V',
     :xf         => 'v3C4V2v',
   }
   # From BIFF5 on, the built-in number formats will be omitted. The built-in
@@ -339,6 +339,7 @@ module Internals
     :distributed => 4,
   }
   NGILA_V_FX = XF_V_ALIGN.invert
+  OPCODE_SIZE = 4
   def binfmt key
     BINARY_FORMATS[key]
   end

data/lib/spreadsheet/excel/reader.rb

@@ -16,7 +16,6 @@ module Spreadsheet
 class Reader
   include Spreadsheet::Encodings
   include Spreadsheet::Excel::Internals
-  OPCODE_SIZE = 4
   ROW_BLOCK_OPS = [
     :blank, :boolerr, :dbcell, :formula, :label, :labelsst, :mulblank, :mulrk,
     :number, :rk, :rstring,
@@ -598,7 +597,7 @@ class Reader
     # 4+2∙nc     2  Index to last column (lc)
     row, column, *xfs = work.unpack 'v*'
     last_column = xfs.pop # unused
-    xfs.each do |xf| set_cell worksheet, row, column, xf end
+    xfs.each_with_index do |xf, idx| set_cell worksheet, row, column + idx, xf end
   end
   def read_mulrk worksheet, addr, work
     # Offset  Size  Contents
@@ -746,7 +745,8 @@ class Reader
         read_sst work, pos, len
         # TODO: implement memory-efficient sst handling, possibly in conjunction
         #       with EXTSST
-        # when :extsst     # ●  EXTSST ➜ 6.40
+      when :extsst     # ●  EXTSST ➜ 6.40
+        read_extsst work, pos, len
       when :style      # ●● STYLE ➜ 6.99
         read_style work, pos, len
       when :format     # ○○ FORMAT (Number Format) ➜ 6.45
@@ -986,29 +986,66 @@ class Reader
     #                 15  0x8000  0 = Row has custom height;
     #                             1 = Row has default height
     #      8     2  Not used
-    #     10     1  0 = No defaults written;
-    #               1 = Default row attribute field and XF index occur below (fl)
-    #     11     2  Relative offset to calculate stream position of the first
-    #               cell record for this row (➜ 5.7.1)
-    #   [13]     3  (written only if fl = 1) Default row attributes (➜ 3.12)
-    #   [16]     2  (written only if fl = 1) Index to XF record (➜ 6.115)
+    #     10     2  In BIFF3-BIFF4 this field contains a relative offset to
+    #               calculate stream position of the first cell record for this
+    #               row (➜ 5.7.1). In BIFF5-BIFF8 this field is not used
+    #               anymore, but the DBCELL record (➜ 6.26) instead.
+    #     12     4  Option flags and default row formatting:
+    #                  Bit  Mask        Contents
+    #                  2-0  0x00000007  Outline level of the row
+    #                    4  0x00000010  1 = Outline group starts or ends here
+    #                                       (depending on where the outline
+    #                                       buttons are located, see WSBOOL
+    #                                       record, ➜ 6.113), and is collapsed
+    #                    5  0x00000020  1 = Row is hidden (manually, or by a
+    #                                       filter or outline group)
+    #                    6  0x00000040  1 = Row height and default font height
+    #                                       do not match
+    #                    7  0x00000080  1 = Row has explicit default format (fl)
+    #                    8  0x00000100  Always 1
+    #                27-16  0x0fff0000  If fl = 1: Index to default XF record
+    #                                              (➜ 6.115)
+    #                   28  0x10000000  1 = Additional space above the row.
+    #                                       This flag is set, if the upper
+    #                                       border of at least one cell in this
+    #                                       row or if the lower border of at
+    #                                       least one cell in the row above is
+    #                                       formatted with a thick line style.
+    #                                       Thin and medium line styles are not
+    #                                       taken into account.
+    #                   29  0x20000000  1 = Additional space below the row.
+    #                                       This flag is set, if the lower
+    #                                       border of at least one cell in this
+    #                                       row or if the upper border of at
+    #                                       least one cell in the row below is
+    #                                       formatted with a medium or thick
+    #                                       line style. Thin line styles are
+    #                                       not taken into account.
     @current_row_block_offset ||= [pos]
-    index, first_used, first_unused, flags,
-      hasdefaults, offset = work.unpack binfmt(:row)
+    index, first_used, first_unused, height, flags = work.unpack binfmt(:row)
+    height &= 0x7fff
     format = nil
     # TODO: read attributes from work[13,3], read flags
-    if hasdefaults > 0 && work.size > 13
-      xf, = work[-2..-1].unpack 'v'
-      format = @workbook.format(xf)
+    attrs = {
+      :default_format => format,
+      :first_used     => first_used,
+      :first_unused   => first_unused,
+      :index          => index,
+      :row_block      => @current_row_block_offset,
+      :offset         => @current_row_block_offset[0],
+      :outline_level  => flags & 0x00000007,
+      :collapsed      => (flags & 0x0000010) > 0,
+      :hidden         => (flags & 0x0000020) > 0,
+    }
+    if (flags & 0x00000040) > 0
+      attrs.store :height, height / TWIPS
+    end
+    if (flags & 0x00000080) > 0
+      xf = (flags & 0x0fff0000) >> 16
+      attrs.store :default_format, @workbook.format(xf)
     end
-    worksheet.set_row_address index,
-                              :default_format => format,
-                              :first_used     => first_used,
-                              :first_unused   => first_unused,
-                              :index        => index,
-                              :row_block    => @current_row_block_offset,
-                              :offset       => @current_row_block_offset[0]
-                              #:first_cell   => offset
+    # TODO: Row spacing
+    worksheet.set_row_address index, attrs
   end
   private
   def extend_internals version

data/lib/spreadsheet/excel/reader/biff8.rb

@@ -6,6 +6,7 @@ module Spreadsheet
 # Biff8.  This Module is likely to be expanded as Support for older Versions
 # of Excel grows and methods get moved here for disambiguation.
 module Biff8
+  include Spreadsheet::Excel::Internals
   ##
   # When a String is too long for one Opcode, it is continued in a Continue
   # Opcode. Excel may reconsider compressing the remainder of the string.
@@ -37,7 +38,7 @@ module Biff8
     wide = opts & 1
     owing = @incomplete_sst.continued_chars
     size = [work.size, owing * (1 + wide) + 1].min
-    chars = size - 1 / (1 + wide)
+    chars = (size - 1) / (1 + wide)
     @incomplete_sst.continue oppos + OPCODE_SIZE, size, chars
     unless @incomplete_sst.continued?
       @incomplete_sst = nil
@@ -60,6 +61,12 @@ module Biff8
     @incomplete_string, @sst_size, @sst_offset, @incomplete_sst = nil
   end
   ##
+  # Store the offset of extsst, so we can write a new extsst when the
+  # sst has changed
+  def read_extsst work, pos, len
+    @workbook.offsets.store :extsst, [pos, len]
+  end
+  ##
   # Read the Shared String Table present in all Biff8 Files.
   # This method only evaluates the header, the actual work is done in #_read_sst
   def read_sst work, pos, len

data/lib/spreadsheet/excel/row.rb

@@ -56,9 +56,20 @@ class Row < Spreadsheet::Row
     date = _date data
     hour = (data % 1) * 24
     min  = (hour % 1) * 60
-    sec  = (min  % 1) * 60
-    DateTime.new(date.year, date.month, date.day,
-                 hour.to_i, min.to_i, sec.round)
+    sec  = ((min  % 1) * 60).round
+    min = min.floor
+    hour = hour.floor
+    if sec > 59
+      sec = 0
+      min += 1
+    end
+    if min > 59
+      hour += 1
+    end
+    if hour > 23
+      date += 1
+    end
+    DateTime.new(date.year, date.month, date.day, hour, min, sec)
   end
   def enriched_data idx, data # :nodoc:
     res = nil

data/lib/spreadsheet/excel/worksheet.rb

@@ -40,10 +40,12 @@ class Worksheet < Spreadsheet::Worksheet
   end
   def row idx
     ensure_rows_read
-    @rows.fetch idx do
+    @rows[idx] or begin
       if addr = @row_addresses[idx]
         row = @reader.read_row self, addr
-        row.default_format = addr[:default_format]
+        [:default_format, :height, :outline_level, :hidden, ].each do |key|
+          row.send "#{key}=", addr[key]
+        end
         row.worksheet = self
         row
       else
@@ -51,7 +53,7 @@ class Worksheet < Spreadsheet::Worksheet
       end
     end
   end
-  def row_updated idx, row
+  def row_updated idx, row, args={}
     res = super
     @workbook.changes.store self, true
     @workbook.changes.store :boundsheets, true

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

@@ -17,7 +17,7 @@ module Spreadsheet
 class Workbook < Spreadsheet::Writer
   include Spreadsheet::Excel::Writer::Biff8
   include Spreadsheet::Excel::Internals
-  attr_reader :fonts
+  attr_reader :fonts, :date_base
   def initialize *args
     super
     @biff_version = 0x0600
@@ -76,7 +76,7 @@ class Workbook < Spreadsheet::Writer
     total = current.size
     current.uniq!
     current.delete ''
-    if (stored - current).empty?
+    if (stored - current).empty? && !stored.empty?
       ## if all previously stored strings are still needed, we don't have to
       #  rewrite all cells because the sst-index of such string does not change.
       additions = current - stored
@@ -192,19 +192,34 @@ class Workbook < Spreadsheet::Writer
               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
-            else
+            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
+          lastpos = [pos + len, reader.size - 1].min
           reader.seek lastpos
         end
         writer.write reader.read
@@ -215,8 +230,9 @@ class Workbook < Spreadsheet::Writer
     end
   end
   def write_datemode workbook, writer
+    mode = @date_base.year == 1899 ? 0x00 : 0x01
     data = [
-      0x00, # 0 = Base date is 1899-Dec-31
+      mode, # 0 = Base date is 1899-Dec-31
             #     (the cell value 1 represents 1900-Jan-01)
             # 1 = Base date is 1904-Jan-01
             #     (the cell value 1 represents 1904-Jan-02)
@@ -462,17 +478,18 @@ class Workbook < Spreadsheet::Writer
     data = [total, sst_size].pack 'V2'
     op = 0x00fc
     wide = 0
-    header =
     offsets = []
     strings.each_with_index do |string, idx|
       sst.store string, idx
       op_offset = data.size + 4
       offsets.push [offset + writer.pos + op_offset, op_offset] if idx % 8 == 0
-      header, packed, wide = _unicode_string string, 2
+      header, packed, next_wide = _unicode_string string, 2
+      # the first few bytes (header + first character) must not be split
       must_fit = header.size + wide + 1
       while data.size + must_fit > @recordsize_limit
         op, data, wide = write_string_part writer, op, data, wide
       end
+      wide = next_wide
       data << header << packed
     end
     until data.empty?
@@ -485,7 +502,17 @@ class Workbook < Spreadsheet::Writer
   end
   def write_string_part writer, op, data, wide
     bef = data.size
-    data = write_op writer, op, data
+    ## if we're writing wide characters, we need to make sure we don't cut
+    #  characters in half
+    if wide > 0 && data.size > @recordsize_limit
+      remove = @recordsize_limit - data.size
+      remove -= remove % 2
+      rest = data.slice!(remove..-1)
+      write_op writer, op, data
+      data = rest
+    else
+      data = write_op writer, op, data
+    end
     op = 0x003c
     # Unicode strings are split in a special way. At the beginning of each
     # CONTINUE record the option flags byte is repeated. Only the
@@ -565,8 +592,10 @@ class Workbook < Spreadsheet::Writer
   # depending on the class and state of _workbook_.
   def write_workbook workbook, io
     unless workbook.is_a?(Excel::Workbook) && workbook.io
+      @date_base = Date.new 1899, 12, 31
       write_from_scratch workbook, io
     else
+      @date_base = workbook.date_base
       if workbook.changes.empty?
         super
       else

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

@@ -1,5 +1,6 @@
 require 'stringio'
 require 'spreadsheet/excel/writer/biff8'
+require 'spreadsheet/excel/internals'
 require 'spreadsheet/excel/internals/biff8'
 
 module Spreadsheet
@@ -47,7 +48,7 @@ class Worksheet
       date = DateTime.new date.year, date.month, date.day,
                           date.hour, date.min, date.sec
     end
-    value = date - @worksheet.workbook.date_base
+    value = date - @workbook.date_base
     if date > LEAP_ERROR
       value += 1
     end
@@ -61,9 +62,13 @@ class Worksheet
     cent = 0
     int = 2
     higher = value * 100
-    if higher == higher.to_i
-      value = higher.to_i
+    if higher.is_a?(Float) && higher < 0xfffffffc
       cent = 1
+      if higher == higher.to_i
+        value = higher.to_i
+      else
+        value = higher
+      end
     end
     if value.is_a?(Integer)
       ## although not documented as signed, 'V' appears to correctly pack
@@ -80,6 +85,11 @@ class Worksheet
   def name
     unicode_string @worksheet.name
   end
+  def need_number? cell
+    (cell.is_a?(Numeric) && cell.abs > 0x1fffffff) \
+      || (cell.is_a?(Float) \
+          && !/^[\000\001]\000{3}/.match([cell * 100].pack(EIGHT_BYTE_DOUBLE)))
+  end
   def row_blocks
     # All cells in an Excel document are divided into blocks of 32 consecutive
     # rows, called Row Blocks. The first Row Block starts with the first used
@@ -174,8 +184,7 @@ class Worksheet
       #  Integers and Floats, that lie well below 2^30 significant bits, or
       #  Ruby's Bignum threshold. In that case we'll just write a Number
       #  record
-      need_number = (cell.is_a?(Float) && cell.to_s.length > 5) \
-                      || (cell.is_a?(Numeric) && cell.abs > 0x500000)
+      need_number = need_number? cell
       if multiples && (!multiples.last.is_a?(cell.class) || need_number)
         write_multiples row, first_idx, multiples
         multiples, first_idx = nil
@@ -223,19 +232,44 @@ class Worksheet
     blocks = row_blocks
     lastpos = reader.pos
     offsets = {}
+    row_offsets = []
+    changes = @worksheet.changes
     @worksheet.offsets.each do |key, pair|
-      if @worksheet.changes.include?(key) \
+      if changes.include?(key) \
         || (sst_status == :complete_update && key.is_a?(Integer))
         offsets.store pair, key
       end
     end
-    offsets.invert.sort_by do |key, (pos, len)|
-      pos
-    end.each do |key, (pos, len)|
-      @io.write reader.read(pos - lastpos)
+    ## 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!
+    @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
+    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)
-        block = blocks.find do |rows| rows.any? do |row| row.idx == key end end
-        write_rowblock block
+        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
@@ -544,7 +578,7 @@ class Worksheet
       fmt << 'vV'
     end
     # Index to last column (lc)
-    data.push idx + multiples.size
+    data.push idx + multiples.size - 1
     write_op opcode(:mulrk), data.pack(fmt << 'v')
   end
   def write_multiples row, idx, multiples
@@ -552,7 +586,11 @@ class Worksheet
     when NilClass
       write_mulblank row, idx, multiples
     when Numeric
-      write_mulrk row, idx, multiples
+      if multiples.size > 1
+        write_mulrk row, idx, multiples
+      else
+        write_rk row, idx
+      end
     end
   end
   ##
@@ -600,37 +638,61 @@ class Worksheet
     #                 15  0x8000  0 = Row has custom height;
     #                             1 = Row has default height
     #      8     2  Not used
-    #     10     1  0 = No defaults written;
-    #               1 = Default row attribute field and XF index occur below (fl)
-    #     11     2  Relative offset to calculate stream position of the first
-    #               cell record for this row (➜ 5.7.1)
-    #   [13]     3  (written only if fl = 1) Default row attributes (➜ 3.12)
-    #   [16]     2  (written only if fl = 1) Index to XF record (➜ 6.115)
-    has_defaults = row.default_format ? 1 : 0
+    #     10     2  In BIFF3-BIFF4 this field contains a relative offset to
+    #               calculate stream position of the first cell record for this
+    #               row (➜ 5.7.1). In BIFF5-BIFF8 this field is not used
+    #               anymore, but the DBCELL record (➜ 6.26) instead.
+    #     12     4  Option flags and default row formatting:
+    #                  Bit  Mask        Contents
+    #                  2-0  0x00000007  Outline level of the row
+    #                    4  0x00000010  1 = Outline group starts or ends here
+    #                                       (depending on where the outline
+    #                                       buttons are located, see WSBOOL
+    #                                       record, ➜ 6.113), and is collapsed
+    #                    5  0x00000020  1 = Row is hidden (manually, or by a
+    #                                       filter or outline group)
+    #                    6  0x00000040  1 = Row height and default font height
+    #                                       do not match
+    #                    7  0x00000080  1 = Row has explicit default format (fl)
+    #                    8  0x00000100  Always 1
+    #                27-16  0x0fff0000  If fl = 1: Index to default XF record
+    #                                              (➜ 6.115)
+    #                   28  0x10000000  1 = Additional space above the row.
+    #                                       This flag is set, if the upper
+    #                                       border of at least one cell in this
+    #                                       row or if the lower border of at
+    #                                       least one cell in the row above is
+    #                                       formatted with a thick line style.
+    #                                       Thin and medium line styles are not
+    #                                       taken into account.
+    #                   29  0x20000000  1 = Additional space below the row.
+    #                                       This flag is set, if the lower
+    #                                       border of at least one cell in this
+    #                                       row or if the upper border of at
+    #                                       least one cell in the row below is
+    #                                       formatted with a medium or thick
+    #                                       line style. Thin line styles are
+    #                                       not taken into account.
+    height = row.height || 12 # FIXME: where is the default font height?
+    opts = row.outline_level & 0x00000007
+    opts |= 0x00000010 if row.collapsed?
+    opts |= 0x00000020 if row.hidden?
+    opts |= 0x00000040 if height != 12 # FIXME: where is the default font height?
+    if fmt = row.default_format
+      xf_idx = @workbook.xf_index @worksheet.workbook, fmt
+      opts |= 0x00000080
+      opts |= xf_idx << 16
+    end
+    opts |= 0x00000100
+    # TODO: Row spacing
     data = [
       row.idx,
       row.first_used,
       row.first_unused,
-      row.height * TWIPS,
-      0, # Not used
-      has_defaults,
-      0, # OOffice does not set this - ignore until someone complains
-      1,
-      15,
-      0,
-    ]
-    # OpenOffice apparently can't read Rows with a length other than 16 Bytes
-    fmt = binfmt(:row) + 'C3'
-=begin
-    if format = row.default_format
-      fmt = fmt + 'xv'
-      data.concat [
-        #0, # Row attributes should only matter in BIFF2
-        workbook.xf_index(@worksheet.workbook, format),
-      ]
-    end
-=end
-    write_op opcode(:row), data.pack(fmt)
+      height * TWIPS,
+      opts,
+    ].pack binfmt(:row)
+    write_op opcode(:row), data
   end
   def write_rowblock block
     # ●● ROW Properties of the used rows

data/lib/spreadsheet/row.rb

@@ -15,12 +15,30 @@ module Spreadsheet
   #                   Format is stored in #formats for the cell.
   # #height::         The height of this Row in points (defaults to 12).
   class Row < Array
+    include Datatypes
     class << self
+      def format_updater *keys
+        keys.each do |key|
+          unless instance_methods.include? "unupdated_#{key}="
+            alias_method :"unupdated_#{key}=", :"#{key}="
+            define_method "#{key}=" do |value|
+              send "unupdated_#{key}=", value
+              if @worksheet
+                @formatted = true
+                @worksheet.row_updated @idx, self, :formatted => true
+              end
+              value
+            end
+          end
+        end
+      end
       def updater *keys
         keys.each do |key|
           define_method key do |*args|
             res = super
-            @worksheet.row_updated @idx, self if @worksheet
+            if @worksheet
+              @worksheet.row_updated @idx, self, :formatted => @formatted
+            end
             res
           end
         end
@@ -28,9 +46,12 @@ module Spreadsheet
     end
     attr_reader :formats, :default_format
     attr_accessor :idx, :height, :worksheet
+    boolean :hidden, :collapsed
+    enum :outline_level, 0, Integer
     updater :[]=, :clear, :concat, :delete, :delete_if, :fill, :insert, :map!,
             :pop, :push, :reject!, :replace, :reverse!, :shift, :slice!,
             :sort!, :uniq!, :unshift
+    format_updater :collapsed, :height, :hidden, :outline_level
     def initialize worksheet, idx, cells=[]
       @worksheet = worksheet
       @idx = idx
@@ -48,6 +69,7 @@ module Spreadsheet
     # stored for the cell.
     def default_format= format
       @worksheet.add_format format if @worksheet
+      @worksheet.row_updated @idx, self, :formatted => true if @worksheet
       @default_format = format
     end
     ##
@@ -71,7 +93,7 @@ module Spreadsheet
     def set_format idx, fmt
       @formats[idx] = fmt
       @worksheet.add_format fmt
-      @worksheet.row_updated @idx, self if @worksheet
+      @worksheet.row_updated @idx, self, :formatted => true if @worksheet
       fmt
     end
     def inspect

data/lib/spreadsheet/worksheet.rb

@@ -173,9 +173,12 @@ module Spreadsheet
     ##
     # Tell Worksheet that the Row at _idx_ has been updated and the #dimensions
     # need to be recalculated. You should not need to call this directly.
-    def row_updated idx, row
+    def row_updated idx, row, opts={}
       @dimensions = nil
-      row = @rows[idx] = shorten(row)
+      unless opts[:formatted]
+        row = shorten(row)
+      end
+      @rows[idx] = row
       format_dates row
       row
     end

data/test/integration.rb

@@ -749,14 +749,33 @@ module Spreadsheet
       row = sheet.row 9
       assert_equal 0.00009, row[0]
     end
-    def test_write_new_workbook
+    def test_write_to_stringio
       book = Spreadsheet::Excel::Workbook.new
+      sheet = book.create_worksheet :name => 'My Worksheet'
+      sheet[0,0] = 'my cell'
+      data = StringIO.new ''
+      assert_nothing_raised do
+        book.write data
+      end
+      assert_nothing_raised do
+        book = Spreadsheet.open data
+      end
+      assert_instance_of Spreadsheet::Excel::Workbook, book
+      assert_equal 1, book.worksheets.size
+      sheet = book.worksheet 0
+      assert_equal 'My Worksheet', sheet.name
+      assert_equal 'my cell', sheet[0,0]
+    end
+    def test_write_new_workbook
+      book = Spreadsheet::Workbook.new
       path = File.join @var, 'test_write_workbook.xls'
       sheet1 = book.create_worksheet
-      str1 = 'Shared String'
+      str1 = 'My Shared String'
       str2 = 'Another Shared String'
-      str3 = '1234567890 ' * 1000
-      str4 = '9876543210 ' * 1000
+      assert_equal 1, (str1.size + str2.size) % 2, 
+        "str3 should start at an odd offset to test splitting of wide strings"
+      str3 = '–––––––––– ' * 1000
+      str4 = '1234567890 ' * 1000
       fmt1 = Format.new :italic => true, :color => :blue
       sheet1.format_column 1, fmt1, :width => 20
       fmt2 = Format.new(:weight => :bold, :color => :yellow)
@@ -764,6 +783,7 @@ module Spreadsheet
       sheet1.format_column 3, Format.new(:weight => :bold, :color => :red)
       sheet1.format_column 6..9, fmt1
       sheet1.format_column [4,5,7], fmt2
+      sheet1.row(0).height = 20
       sheet1[0,0] = str1
       sheet1.row(0).push str1
       sheet1.row(1).concat [str2, str2]
@@ -811,6 +831,10 @@ module Spreadsheet
       assert_equal 'b', sheet1[9,1]
       assert_equal 'c', sheet1[9,2]
       sheet1.delete_row 9
+      row = sheet1.row(11)
+      row.height = 40
+      row.push 'x'
+      row.pop
       sheet2 = book.create_worksheet :name => 'my name'
       book.write path
       Spreadsheet.client_encoding = 'UTF-16LE'
@@ -822,7 +846,10 @@ module Spreadsheet
       assert_equal 'UTF-16LE', book.encoding
       assert_equal str1, book.shared_string(0)
       assert_equal str2, book.shared_string(1)
-      test = book.shared_string 2
+      test = nil
+      assert_nothing_raised "I've probably split a two-byte-character" do
+        test = book.shared_string 2
+      end
       if test != str3
         str3.size.times do |idx|
           len = idx.next
@@ -854,6 +881,7 @@ module Spreadsheet
       assert_equal 20, col.width
       row = sheet.row 0
       assert_equal col.default_format, row.format(1)
+      assert_equal 20, row.height
       assert_equal str1, row[0]
       assert_equal str1, sheet[0,0]
       assert_equal str1, sheet.cell(0,0)
@@ -936,6 +964,7 @@ module Spreadsheet
       assert_equal 100.005, sheet1[10,2]
       assert_equal 10.0005, sheet1[10,3]
       assert_equal 1.00005, sheet1[10,4]
+      assert_equal 40, sheet1.row(11).height
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
       sheet = book.worksheets.last
       assert_equal "m\000y\000 \000n\000a\000m\000e\000",
@@ -944,7 +973,7 @@ module Spreadsheet
     end
     def test_write_new_workbook__utf16
       Spreadsheet.client_encoding = 'UTF-16LE'
-      book = Spreadsheet::Excel::Workbook.new
+      book = Spreadsheet::Workbook.new
       path = File.join @var, 'test_write_workbook.xls'
       sheet1 = book.create_worksheet
       str1 = @@iconv.iconv 'Shared String'
@@ -972,6 +1001,8 @@ module Spreadsheet
       fmt = Format.new :number_format => "D\0D\0.\0M\0M\0.\0Y\0Y\0Y\0Y\0"
       sheet1.row(6).set_format 1, fmt
       sheet1.update_row 7, nil, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0
+      sheet1.row(8).default_format = fmt
+      sheet1[8,0] = @@iconv.iconv 'formatted when empty'
       sheet2 = book.create_worksheet :name => "m\0y\0 \0n\0a\0m\0e\0"
       book.write path
       Spreadsheet.client_encoding = 'UTF-8'
@@ -1070,14 +1101,32 @@ module Spreadsheet
       assert_equal [1,2,3,4,5,6,7,8,9,0], row[1,10]
       assert_equal [1,2,3,4,5,6,7,8,9,0], sheet[7,1..10]
       assert_equal [1,2,3,4,5,6,7,8,9,0], sheet.cell(7,1..10)
+      row = sheet.row 8
+      assert_equal 'formatted when empty', row[0]
+      assert_not_nil row.default_format
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
       sheet = book.worksheets.last
       assert_equal "my name",
                    sheet.name
       assert_not_nil sheet.offset
     end
+    def test_template
+      template = File.join @data, 'test_copy.xls'
+      output = File.join @var, 'test_template.xls'
+      book = Spreadsheet.open template
+      sheet1 = book.worksheet 0
+      sheet1.row(4).replace [ 'Daniel J. Berger', 'U.S.A.',
+        'Author of original code for Spreadsheet::Excel' ]
+      book.write output
+      assert_nothing_raised do
+        book = Spreadsheet.open output
+      end
+      sheet = book.worksheet 0
+      row = sheet.row(4)
+      assert_equal 'Daniel J. Berger', row[0]
+    end
     def test_bignum
-      smallnum = 0x500000
+      smallnum = 0x1fffffff
       bignum = smallnum + 1
       book = Spreadsheet::Workbook.new
       sheet = book.create_worksheet
@@ -1085,6 +1134,10 @@ module Spreadsheet
       sheet[1,0] = -bignum
       sheet[0,1] = smallnum
       sheet[1,1] = -smallnum
+      sheet[0,2] = bignum - 0.1
+      sheet[1,2] = -bignum - 0.1
+      sheet[0,3] = smallnum - 0.1
+      sheet[1,3] = -smallnum - 0.1
       path = File.join @var, 'test_big-number.xls'
       book.write path
       assert_nothing_raised do
@@ -1094,6 +1147,10 @@ module Spreadsheet
       assert_equal -bignum, book.worksheet(0)[1,0]
       assert_equal smallnum, book.worksheet(0)[0,1]
       assert_equal -smallnum, book.worksheet(0)[1,1]
+      assert_equal bignum - 0.1, book.worksheet(0)[0,2]
+      assert_equal -bignum - 0.1, book.worksheet(0)[1,2]
+      assert_equal smallnum - 0.1, book.worksheet(0)[0,3]
+      assert_equal -smallnum - 0.1, book.worksheet(0)[1,3]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.9
+  version: 0.6.2
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 +01:00
+date: 2008-12-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency