spreadsheet 0.6.4 → 0.6.4.1

data/History.txt

@@ -1,3 +1,31 @@
+=== 0.6.4.1 / 2009-09-17
+
+* 3 Bugfixes
+
+  * Fixes the issue reported by Thomas Preymesser and tracked down most of the
+    way by Hugh McGowan in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=26647&group_id=678&atid=2677
+    where reading the value of the first occurrence of a shared formula
+    failed.
+
+  * Fixes the issue reported by Anonymous in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=26546&group_id=678&atid=2677
+    where InvalidDate was raised for some Dates.
+
+  * Fixes the issue reported by John Lee in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=27110&group_id=678&atid=2677
+    which is probably a duplicate of the Bug previously reported by Kadvin XJ in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=26182&group_id=678&atid=2677
+    where unchanged rows were marked as changed in the Excel-Writer while the
+    File was being written, triggering an Error.
+
+* 1 minor enhancement
+
+  * Detect row offsets from Cell data if Row-Ops are missing
+    This fixes a bug reported by Alexander Logvinov in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=26513&group_id=678&atid=2677
+
+
 === 0.6.4 / 2009-07-03
 
 * 5 Bugfixes

data/Manifest.txt

@@ -40,9 +40,12 @@ lib/spreadsheet/row.rb
 lib/spreadsheet/workbook.rb
 lib/spreadsheet/worksheet.rb
 lib/spreadsheet/writer.rb
+test/data/test_changes.xls
 test/data/test_copy.xls
 test/data/test_datetime.xls
 test/data/test_empty.xls
+test/data/test_formula.xls
+test/data/test_missing_row.xls
 test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
 test/data/test_version_excel97.xls

data/README.txt

@@ -1,18 +1,18 @@
-Last Update: 16.12.2008, 10.33 - zdavatz
+Last Update: 17.09.2009, 16.32 - hwyss
 
 
 = Spreadsheet
 
-  http://spreadsheet.rubyforge.org
-  http://scm.ywesee.com/spreadsheet
+http://spreadsheet.rubyforge.org
+http://scm.ywesee.com/spreadsheet
 
 For a viewable directory of all recent changes, please see:
 
-  http://scm.ywesee.com/?p=spreadsheet;a=summary
+http://scm.ywesee.com/?p=spreadsheet;a=summary
 
 For Non-GPLv3 commercial licencing, please see:
 
-  http://www.spreadsheet.ch
+http://www.spreadsheet.ch
 
 
 == Description

data/bin/xlsopcodes

@@ -12,7 +12,7 @@ end
 target = target ? File.open(target, 'w') : STDOUT
 
 reader = Spreadsheet::Excel::Reader.new :print_opcodes => target
-reader.setup source
+reader.setup File.open(source)
 
 while tuple = reader.get_next_chunk
 end

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/internals.rb

@@ -226,6 +226,7 @@ module Internals
     :string       => 0x0207, #    STRING ➜ 6.98
     :style        => 0x0293, # ●● STYLE ➜ 6.99
     :xf           => 0x00e0, # ●● XF ➜ 6.115
+    :sharedfmla   => 0x04bc, #    SHAREDFMLA ➜ 5.94
     ########################## Unhandled Opcodes ################################
     :extsst       => 0x00ff, # ●  EXTSST ➜ 6.40
     :index        => 0x020b, # ○  INDEX ➜ 5.7 (Row Blocks), ➜ 6.55

data/lib/spreadsheet/excel/reader.rb

@@ -16,10 +16,11 @@ module Spreadsheet
 class Reader
   include Spreadsheet::Encodings
   include Spreadsheet::Excel::Internals
-  ROW_BLOCK_OPS = [
-    :blank, :boolerr, :dbcell, :formula, :label, :labelsst, :mulblank, :mulrk,
-    :number, :rk, :rstring,
-  ]
+  ROW_BLOCK_OPS = {
+    :blank  => true, :boolerr  => true, :dbcell   => true, :formula => true,
+    :label  => true, :labelsst => true, :mulblank => true, :mulrk   => true,
+    :number => true, :rk       => true, :rstring  => true,
+  }
   def initialize opts = {}
     @pos = 0
     @bigendian = opts.fetch(:bigendian) {
@@ -378,6 +379,10 @@ class Reader
       formula.value = value
     elsif rtype == 0
       pos, op, len, work = get_next_chunk
+      if op == :sharedfmla
+        ## TODO: formula-support in 0.8.0
+        pos, op, len, work = get_next_chunk
+      end
       if op == :string
         formula.value = client read_string(work, 2), @workbook.encoding
       else
@@ -804,6 +809,7 @@ class Reader
   end
   def read_worksheet worksheet, offset
     @pos = offset
+    @detected_rows = {}
     previous = nil
     while tuple = get_next_chunk
       pos, op, len, work = tuple
@@ -835,6 +841,10 @@ class Reader
         read_hlink worksheet, work, pos, len
       when :window2
         read_window2 worksheet, work, pos, len
+      else
+        if ROW_BLOCK_OPS.include?(op)
+          set_missing_row_address worksheet, work, pos, len
+        end
       end
       previous = op
     end
@@ -1021,6 +1031,21 @@ class Reader
     cells.formats[column] = @workbook.format(xf) unless xf == 0
     cells[column] = value
   end
+  def set_missing_row_address worksheet, work, pos, len
+    # Offset  Size  Contents
+    #      0     2  Index of this row
+    #      2     2  Index to this column
+    row_index, column_index = work.unpack 'v2'
+    unless worksheet.offsets[row_index]
+      @current_row_block_offset ||= [pos]
+      data = {
+        :index          => row_index,
+        :row_block      => @current_row_block_offset,
+        :offset         => @current_row_block_offset[0],
+      }
+      worksheet.set_row_address row_index, data
+    end
+  end
   def set_row_address worksheet, work, pos, len
     # Offset  Size  Contents
     #      0     2  Index of this row

data/lib/spreadsheet/excel/row.rb

@@ -62,9 +62,11 @@ class Row < Spreadsheet::Row
       min += 1
     end
     if min > 59
+      min = 0
       hour += 1
     end
     if hour > 23
+      hour = 0
       date += 1
     end
     if LEAP_ERROR > base

data/lib/spreadsheet/excel/worksheet.rb

@@ -45,7 +45,7 @@ class Worksheet < Spreadsheet::Worksheet
       if addr = @row_addresses[idx]
         row = @reader.read_row self, addr
         [:default_format, :height, :outline_level, :hidden, ].each do |key|
-          row.send "#{key}=", addr[key]
+          row.send "unupdated_#{key}=", addr[key]
         end
         row.worksheet = self
         row

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

@@ -265,6 +265,7 @@ class Worksheet
     end
     row_offsets.sort!
     row_offsets.reverse!
+    control = changes.size
     @worksheet.each do |row|
       key = row.idx
       if changes.include?(key) && !work.include?(key)
@@ -272,6 +273,13 @@ class Worksheet
         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

data/lib/spreadsheet/row.rb

@@ -69,9 +69,9 @@ module Spreadsheet
     # stored for the cell.
     def default_format= format
       @worksheet.add_format format if @worksheet
-      @worksheet.row_updated @idx, self if @worksheet
       @default_format = format
     end
+    format_updater :default_format
     ##
     # #first_used the 0-based index of the first non-blank Cell.
     def first_used

data/test/excel/row.rb

@@ -24,6 +24,12 @@ class TestRow < Test::Unit::TestCase
     d2 = row.datetime 1
     assert_equal d1, d2
   end
+  def test_datetime_overflow
+    row = Row.new @worksheet, 0, [nil, 40010.6666666666]
+    d1 = DateTime.new(2009,07,16,16)
+    d2 = row.datetime 1
+    assert_equal d1, d2
+  end
 end
   end
 end

data/test/integration.rb

@@ -535,9 +535,19 @@ module Spreadsheet
       assert_equal 00, time.min
       assert_equal 00, time.sec
       time = sheet[1,0]
+      assert_equal 1899, time.year
+      assert_equal 12, time.month
+      assert_equal 30, time.day
       assert_equal 22, time.hour
       assert_equal 30, time.min
       assert_equal 45, time.sec
+      time = sheet[0,1]
+      assert_equal 1899, time.year
+      assert_equal 12, time.month
+      assert_equal 31, time.day
+      assert_equal 4, time.hour
+      assert_equal 30, time.min
+      assert_equal 45, time.sec
     end
     def test_change_encoding
       path = File.join @data, 'test_version_excel95.xls'
@@ -1234,5 +1244,31 @@ module Spreadsheet
       assert_equal date1, sheet.row(0).date(0)
       assert_equal datetime1, sheet.row(1).datetime(0)
     end
+    def test_sharedfmla
+      path = File.join @data, 'test_formula.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet 0
+      64.times do |idx|
+        assert_equal '5026', sheet[idx.next, 2].value
+      end
+    end
+    def test_missing_row_op
+      path = File.join @data, 'test_missing_row.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet 0
+      assert_not_nil sheet[1,0]
+      assert_not_nil sheet[2,1]
+    end
+    def test_changes
+      path = File.join @data, 'test_changes.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet 1
+      sheet[20,0] = 'Ciao Mundo!'
+      target = File.join @var, 'test_changes.xls'
+      assert_nothing_raised do book.write target end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.4.1
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 +02:00
+date: 2009-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.3
     version: 
-description: The Spreadsheet Library is designed to read and write Spreadsheet Documents. As of version 0.6.0, only Microsoft Excel compatible spreadsheets are supported. Spreadsheet is a combination/complete rewrite of the Spreadsheet::Excel Library by Daniel J. Berger and the ParseExcel Library by Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
+description: |-
+  The Spreadsheet Library is designed to read and write Spreadsheet Documents.
+  As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
+  supported. Spreadsheet is a combination/complete rewrite of the
+  Spreadsheet::Excel Library by Daniel J. Berger and the ParseExcel Library by
+  Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
 email: 
 - hannes.wyss@gmail.com
 executables: 
@@ -88,9 +93,12 @@ files:
 - lib/spreadsheet/workbook.rb
 - lib/spreadsheet/worksheet.rb
 - lib/spreadsheet/writer.rb
+- test/data/test_changes.xls
 - test/data/test_copy.xls
 - test/data/test_datetime.xls
 - test/data/test_empty.xls
+- test/data/test_formula.xls
+- test/data/test_missing_row.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls
@@ -103,7 +111,9 @@ files:
 - test/workbook.rb
 - test/worksheet.rb
 has_rdoc: true
-homepage: "  http://spreadsheet.rubyforge.org"
+homepage: http://spreadsheet.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -125,9 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spreadsheet
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
 test_files: []