spreadsheet 0.6.1.7 → 0.6.1.8

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.6.1.8 / 2008-10-31
+
+* 1 Bugfix
+
+  * Fixes a bug where out-of-sequence reading of multiple Worksheets could
+    lead to data from the wrong Sheet being returned.
+    (Thanks to Bugreporter extraordinaire Bjørn Hjelle)
+
 === 0.6.1.7 / 2008-10-30
 
 * 1 Bugfix

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/reader.rb

@@ -635,9 +635,9 @@ class Reader
   end
   def read_row worksheet, addr
     row = addr[:index]
-    @current_row_block.fetch row do
+    @current_row_block.fetch [worksheet, row] do
       @current_row_block.clear
-      cells = @current_row_block[row] = Row.new(nil, row)
+      cells = @current_row_block[[worksheet, row]] = Row.new(nil, row)
       @pos = addr[:offset]
       found = false
       while tuple = get_next_chunk
@@ -969,7 +969,7 @@ class Reader
     @workbook.add_format fmt
   end
   def set_cell worksheet, row, column, xf, value=nil
-    cells = @current_row_block[row] ||= Row.new(nil, row)
+    cells = @current_row_block[[worksheet, row]] ||= Row.new(nil, row)
     cells.formats[column] = @workbook.format(xf) unless xf == 0
     cells[column] = value
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.7
+  version: 0.6.1.8
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-30 00:00:00 +01:00
+date: 2008-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency