spreadsheet 0.6.3.1 → 0.6.4

data/History.txt

@@ -1,3 +1,35 @@
+=== 0.6.4 / 2009-07-03
+
+* 5 Bugfixes
+
+  * Fixes the issue reported by Harley Mackenzie in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=24119&group_id=678&atid=2677
+    where in some edge-cases numbers were stored incorrectly
+
+  * Fixes the issue reported and fixed by someone23 in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=25732&group_id=678&atid=2677
+    where using Row-updater methods with blocks caused LocalJumpErrors
+
+  * Fixes the issue reported and fixed by Corey Burrows in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=25784&group_id=678&atid=2677
+    where "Setting the height of a row, either in Excel directly, or via the
+    Spreadsheet::Row#height= method results in a row that Excel displays with
+    the maximum row height (409)."
+
+  * Fixes the issue reported by Don Park in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=25968&group_id=678&atid=2677
+    where some Workbooks could not be parsed due to the OLE-entry being all
+    uppercase
+
+  * Fixes the issue reported by Iwan Buetti in
+    http://rubyforge.org/tracker/index.php?func=detail&aid=24414&group_id=678&atid=2677
+    where parsing some Workbooks failed with an Invalid date error.
+
+
+* 1 major enhancement
+
+  * Spreadsheet now runs on Ruby 1.9
+
 === 0.6.3.1 / 2009-02-13
 
 * 3 Bugfixes

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/parseexcel/parseexcel.rb
 lib/parseexcel/parser.rb
 lib/spreadsheet.rb
 lib/spreadsheet/column.rb
+lib/spreadsheet/compatibility.rb
 lib/spreadsheet/datatypes.rb
 lib/spreadsheet/encodings.rb
 lib/spreadsheet/excel.rb

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/compatibility.rb

@@ -0,0 +1,23 @@
+module Spreadsheet
+  module Compatibility
+    ##
+    # One of the most incisive changes in terms of meta-programming in Ruby 1.9
+    # is the switch from representing instance-variable names as Strings to
+    # presenting them as Symbols. ivar_name provides compatibility.
+    if RUBY_VERSION >= '1.9'
+      def ivar_name symbol
+        :"@#{symbol}"
+      end
+      def method_name symbol
+        symbol.to_sym
+      end
+    else
+      def ivar_name symbol
+        "@#{symbol}"
+      end
+      def method_name symbol
+        symbol.to_s
+      end
+    end
+  end
+end

data/lib/spreadsheet/datatypes.rb

@@ -1,8 +1,11 @@
+require 'spreadsheet/compatibility'
+
 module Spreadsheet
   ##
   # This module defines convenience-methods for the definition of Spreadsheet
   # attributes (boolean, colors and enumerations)
   module Datatypes
+    include Compatibility
     def Datatypes.append_features mod
       super
       mod.module_eval do
@@ -21,7 +24,7 @@ class << self
   def boolean *args
     args.each do |key|
       define_method key do
-        name = "@#{key}"
+        name = ivar_name key
         !!(instance_variable_get(name) if instance_variables.include?(name))
       end
       define_method "#{key}?" do
@@ -29,7 +32,7 @@ class << self
       end
       define_method "#{key}=" do |arg|
         arg = false if arg == 0
-        instance_variable_set("@#{key}", !!arg)
+        instance_variable_set(ivar_name(key), !!arg)
       end
       define_method "#{key}!" do
         send "#{key}=", true
@@ -45,7 +48,7 @@ class << self
       define_method "#{key}=" do |name|
         name = name.to_s.downcase.to_sym
         if COLORS.include?(name)
-          instance_variable_set "@#{key}", name
+          instance_variable_set ivar_name(key), name
         else
           raise ArgumentError, "unknown color '#{name}'"
         end
@@ -74,7 +77,7 @@ class << self
       aliases.store value, value
     end
     define_method key do
-      name = "@#{key}"
+      name = ivar_name key
       value = instance_variable_get(name) if instance_variables.include? name
       value || values.first
     end
@@ -84,14 +87,14 @@ class << self
           aliases.fetch arg.to_s.downcase.gsub(/[ \-]/, '_').to_sym, arg
         end
         if values.any? do |val| val === arg end
-          instance_variable_set("@#{key}", arg)
+          instance_variable_set(ivar_name(key), arg)
         else
           valid = values.collect do |val| val.inspect end.join ', '
           raise ArgumentError,
             "Invalid value '#{arg.inspect}' for #{key}. Valid values are: #{valid}"
         end
       else
-        instance_variable_set "@#{key}", values.first
+        instance_variable_set ivar_name(key), values.first
       end
     end
   end

data/lib/spreadsheet/encodings.rb

@@ -4,10 +4,16 @@ module Spreadsheet
   module Encodings
     if RUBY_VERSION >= '1.9'
       def client string, internal='UTF-16LE'
+        string.force_encoding internal
         string.encode Spreadsheet.client_encoding
       end
-      def internal string, internal='UTF-16LE'
-        string.encode internal
+      def internal string, client=Spreadsheet.client_encoding
+        string.force_encoding client
+        string.encode('UTF-16LE').force_encoding('ASCII-8BIT')
+      end
+      def utf8 string, client=Spreadsheet.client_encoding
+        string.force_encoding client
+        string.encode('UTF-8')
       end
     else
       require 'iconv'
@@ -17,9 +23,14 @@ module Spreadsheet
         iconv = @@iconvs[key] ||= Iconv.new(Spreadsheet.client_encoding, internal)
         iconv.iconv string
       end
-      def internal string, internal='UTF-16LE'
-        key = [internal, Spreadsheet.client_encoding]
-        iconv = @@iconvs[key] ||= Iconv.new(internal, Spreadsheet.client_encoding)
+      def internal string, client=Spreadsheet.client_encoding
+        key = ['UTF-16LE', client]
+        iconv = @@iconvs[key] ||= Iconv.new('UTF-16LE', client)
+        iconv.iconv string
+      end
+      def utf8 string, client=Spreadsheet.client_encoding
+        key = ['UTF-8', client]
+        iconv = @@iconvs[key] ||= Iconv.new('UTF-8', client)
         iconv.iconv string
       end
     end

data/lib/spreadsheet/excel/offset.rb

@@ -1,9 +1,13 @@
+require 'spreadsheet/compatibility'
+
 module Spreadsheet
   module Excel
 ##
 # This module is used to keep track of offsets in modified Excel documents.
 # Considered internal and subject to change without notice.
 module Offset
+  include Compatibility
+  attr_reader :changes, :offsets
   def initialize *args
     super
     @changes = {}
@@ -11,18 +15,18 @@ module Offset
   end
   def Offset.append_features mod
     super
-    attr_reader :changes, :offsets
     mod.module_eval do
       class << self
+        include Compatibility
         def offset *keys
           keys.each do |key|
-            attr_reader key unless instance_methods.include? key.to_s
+            attr_reader key unless instance_methods.include? method_name(key)
             define_method "#{key}=" do |value|
               @changes.store key, true
-              instance_variable_set "@#{key}", value
+              instance_variable_set ivar_name(key), value
             end
             define_method "set_#{key}" do |value, pos, len|
-              instance_variable_set "@#{key}", value
+              instance_variable_set ivar_name(key), value
               @offsets.store key, [pos, len]
               havename = "have_set_#{key}"
               send(havename, value, pos, len) if respond_to? havename

data/lib/spreadsheet/excel/reader.rb

@@ -487,7 +487,7 @@ class Reader
         size, = work.unpack "x#{pos}V"
         pos += 4
         data = work[pos, size].chomp "\000\000"
-        link.url = client data, 'UTF-16LE'
+        link.url = client data
         pos += size
       else
         # 6.53.3 Hyperlink to a Local File
@@ -532,7 +532,7 @@ class Reader
         total, size = work.unpack "x#{pos}V2"
         pos += 10
         if total > 0
-          link.url = client work[pos, size], 'UTF-16LE'
+          link.url = client work[pos, size]
           pos += size
         end
       end
@@ -770,9 +770,9 @@ class Reader
       when :datemode   # ○  DATEMODE ➜ 6.25
         flag, _ = work.unpack 'v'
         if flag == 1
-          @workbook.date_base = Date.new 1904, 1, 1
+          @workbook.date_base = DateTime.new 1904, 1, 1
         else
-          @workbook.date_base = Date.new 1899, 12, 31
+          @workbook.date_base = DateTime.new 1899, 12, 31
         end
       when :continue   # ○  CONTINUE ➜ 6.22
         case previous_op
@@ -1095,9 +1095,18 @@ class Reader
     worksheet.set_row_address index, attrs
   end
   def setup io
+    ## Reading from StringIO fails without forced encoding
+    if io.respond_to?(:string) && (str = io.string) \
+      && str.respond_to?(:force_encoding)
+      str.force_encoding 'ASCII-8BIT'
+    end
+    ##
+    io.rewind
     @ole = Ole::Storage.open io
     @workbook = Workbook.new io, {}
-    @book = @ole.file.open("Book") rescue @ole.file.open("Workbook")
+    %w{Book Workbook BOOK WORKBOOK book workbook}.any? do |name|
+      @book = @ole.file.open(name) rescue false
+    end
     @data = @book.read
     read_bof
     @workbook.ole = @book

data/lib/spreadsheet/excel/row.rb

@@ -45,18 +45,16 @@ class Row < Spreadsheet::Row
   private
   def _date data # :nodoc:
     return data if data.is_a?(Date)
-    date = @worksheet.date_base + data.to_i
-    if date > LEAP_ERROR
-      date -= 1
-    end
-    date
+    datetime = _datetime data
+    Date.new datetime.year, datetime.month, datetime.day
   end
   def _datetime data # :nodoc:
     return data if data.is_a?(DateTime)
-    date = _date data
+    base = @worksheet.date_base
+    date = base + data.to_f
     hour = (data % 1) * 24
     min  = (hour % 1) * 60
-    sec  = ((min  % 1) * 60).round
+    sec  = ((min % 1) * 60).round
     min = min.floor
     hour = hour.floor
     if sec > 59
@@ -69,6 +67,9 @@ class Row < Spreadsheet::Row
     if hour > 23
       date += 1
     end
+    if LEAP_ERROR > base
+      date -= 1
+    end
     DateTime.new(date.year, date.month, date.day, hour, min, sec)
   end
   def enriched_data idx, data # :nodoc:

data/lib/spreadsheet/excel/workbook.rb

@@ -61,7 +61,7 @@ class Workbook < Spreadsheet::Workbook
     end
   end
   def date_base
-    @date_base ||= Date.new 1899, 12, 31
+    @date_base ||= DateTime.new 1899, 12, 31
   end
   def shared_string idx
     @sst[idx.to_i].content

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

@@ -36,11 +36,12 @@ module Biff8
     header, data, _ = _unicode_string string, count_length
     header << data
   end
+  @@bytesize = RUBY_VERSION >= '1.9' ? :bytesize : :size
   ##
   # Encode _string_ into a Biff8 Unicode String Header and Body.
   def _unicode_string string, count_length=1
     data = internal string
-    size = data.size / 2
+    size = data.send(@@bytesize) / 2
     fmt = count_length == 1 ? 'C2' : 'vC'
     data, wide = compress_unicode_string data
     opts = wide

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

@@ -640,7 +640,7 @@ class Workbook < Spreadsheet::Writer
     @sst[worksheet][str]
   end
   def xf_index workbook, format
-    if fmt = @formats[workbook].find do |fmt| fmt.format == format end
+    if fmt = @formats[workbook].find do |fm| fm.format == format end
       fmt.xf_index
     else
       0

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

@@ -48,8 +48,9 @@ class Worksheet
       date = DateTime.new date.year, date.month, date.day,
                           date.hour, date.min, date.sec
     end
-    value = date - @workbook.date_base
-    if date > LEAP_ERROR
+    base = @workbook.date_base
+    value = date - base
+    if LEAP_ERROR > base
       value += 1
     end
     value
@@ -86,9 +87,19 @@ class Worksheet
     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)))
+    if cell.is_a?(Numeric) && cell.abs > 0x1fffffff
+      true
+    elsif cell.is_a?(Float)
+      higher = cell * 100
+      if higher == higher.to_i
+        need_number? higher.to_i
+      else
+        test1, test2 = [cell * 100].pack(EIGHT_BYTE_DOUBLE).unpack('V2')
+        test1 > 0 || need_number?(test2)
+      end
+    else
+      false
+    end
   end
   def row_blocks
     # All cells in an Excel document are divided into blocks of 32 consecutive
@@ -501,15 +512,17 @@ class Worksheet
 
     ].pack('V2')
     tail = []
+    ## call internal to get the correct internal encoding in Ruby 1.9
+    nullstr = internal "\000"
     unless link == link.url
-      desc = internal(link).dup << "\000\000"
+      desc = internal(link).dup << nullstr
       tail.push [desc.size / 2].pack('V'), desc
     end
     if link.target_frame
-      frme = internal(link.target_frame).dup << "\000\000"
+      frme = internal(link.target_frame).dup << nullstr
       tail.push [frme.size / 2].pack('V'), frme
     end
-    url = internal(link.url).dup << "\000\000"
+    url = internal(link.url).dup << nullstr
     tail.push [
       # 6.53.2 Hyperlink containing a URL (Uniform Resource Locator)
       # These data fields occur for links which are not local files or files
@@ -526,7 +539,7 @@ class Worksheet
                 # string.
     ].pack('H32V'), url
     if link.fragment
-      frag = internal(link.fragment).dup << "\000\000"
+      frag = internal(link.fragment).dup << nullstr
       tail.push [frag.size / 2].pack('V'), frag
     end
     write_op opcode(:hlink), cell_range, guid, options, *tail
@@ -691,9 +704,9 @@ class Worksheet
     end
     opts |= 0x00000100
     height = if height == ROW_HEIGHT
-               height * TWIPS
+               (height * TWIPS).to_i | 0x8000
              else
-               ( height * TWIPS ) | 0x8000
+               height * TWIPS
              end
     # TODO: Row spacing
     data = [

data/lib/spreadsheet/font.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spreadsheet/datatypes'
 require 'spreadsheet/encodings'
 
@@ -73,17 +74,18 @@ module Spreadsheet
     end
     def key # :nodoc:
       key = @name.dup
-      key << '_' << size.to_s
-      key << '_' << weight.to_s
-      key << '_italic'    if italic?
-      key << '_strikeout' if strikeout?
-      key << '_outline'   if outline?
-      key << '_shadow'    if shadow?
-      key << '_' << escapement.to_s
-      key << '_' << underline.to_s
-      key << '_' << color.to_s
-      key << '_' << family.to_s
-      key << '_' << encoding.to_s
+      underscore = client('_', 'UTF-8')
+      key << underscore << client(size.to_s, 'US-ASCII')
+      key << client('_', 'UTF-8') << client(weight.to_s, 'US-ASCII')
+      key << client('_italic', 'UTF-8')    if italic?
+      key << client('_strikeout', 'UTF-8') if strikeout?
+      key << client('_outline', 'UTF-8')   if outline?
+      key << client('_shadow', 'UTF-8')    if shadow?
+      key << underscore << client(escapement.to_s, 'US-ASCII')
+      key << underscore << client(underline.to_s, 'US-ASCII')
+      key << underscore << client(color.to_s, 'US-ASCII')
+      key << underscore << client(family.to_s, 'US-ASCII')
+      key << underscore << client(encoding.to_s, 'US-ASCII')
     end
   end
 end

data/lib/spreadsheet/format.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spreadsheet/datatypes'
 require 'spreadsheet/encodings'
 require 'spreadsheet/font'
@@ -155,22 +156,22 @@ module Spreadsheet
     ##
     # Is the cell formatted as a Date?
     def date?
-      !!/[YMD]/.match(@number_format.to_s)
+      !!Regexp.new(client("[YMD]", 'UTF-8')).match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a Date or Time?
     def date_or_time?
-      !!/[hmsYMD]/.match(@number_format.to_s)
+      !!Regexp.new(client("[hmsYMD]", 'UTF-8')).match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a DateTime?
     def datetime?
-      !!/([YMD].*[HS])|([HS].*[YMD])/.match(@number_format.to_s)
+      !!Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')).match(@number_format.to_s)
     end
     ##
     # Is the cell formatted as a Time?
     def time?
-      !!/[hms]/.match(@number_format.to_s)
+      !!Regexp.new(client("[hms]", 'UTF-8')).match(@number_format.to_s)
     end
   end
 end

data/lib/spreadsheet/link.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'spreadsheet/encodings'
 
 module Spreadsheet
   ##
@@ -17,6 +18,7 @@ module Spreadsheet
   #                  Filename introduced in VFAT. You probably will not need this,
   #                  but if you do, here is where you can find it.
   class Link < String
+    include Encodings
     attr_accessor :target_frame, :url, :dos, :fragment
     def initialize url='', description=url, fragment=nil
       super description
@@ -28,7 +30,7 @@ module Spreadsheet
     def href
       href = (@url || @dos).to_s.dup
       if @fragment
-        href << '#' << @fragment
+        href << client('#') << @fragment
       end
       href
     end

data/lib/spreadsheet/row.rb

@@ -33,11 +33,18 @@ module Spreadsheet
       end
       def updater *keys
         keys.each do |key|
-          define_method key do |*args|
-            res = super
-            @worksheet.row_updated @idx, self if @worksheet
-            res
-          end
+          ## Passing blocks to methods defined with define_method is not possible
+          #  in Ruby 1.8:
+          #  http://groups.google.com/group/ruby-talk-google/msg/778184912b769e5f
+          #  use class_eval as suggested by someone else in
+          #  http://rubyforge.org/tracker/index.php?func=detail&aid=25732&group_id=678&atid=2677
+          class_eval <<-SRC, __FILE__, __LINE__
+            def #{key}(*args)
+              res = super(*args)
+              @worksheet.row_updated @idx, self if @worksheet
+              res
+            end
+          SRC
         end
       end
     end

data/lib/spreadsheet/worksheet.rb

@@ -232,8 +232,8 @@ module Spreadsheet
     ##
     # Renumbers all Rows starting at _idx_ and calls #row_updated for each of
     # them.
-    def updated_from idx
-      idx.upto(@rows.size - 1) do |idx|
+    def updated_from index
+      index.upto(@rows.size - 1) do |idx|
         row = row(idx)
         row.idx = idx
         row_updated idx, row
@@ -264,7 +264,6 @@ module Spreadsheet
       compact = @rows.compact
       @dimensions[2] = compact.collect do |row| row.first_used end.compact.min || 0
       @dimensions[3] = compact.collect do |row| row.first_unused end.max || 0
-      puts caller if @dimensions.nil?
       @dimensions
     end
     def shorten ary # :nodoc:

data/lib/spreadsheet/writer.rb

@@ -8,6 +8,7 @@ module Spreadsheet
     end
     def write workbook
       if @io_or_path.respond_to? :seek
+        @io_or_path.binmode
         write_workbook workbook, @io_or_path
       else
         File.open(@io_or_path, "wb+") do |fh|

data/test/excel/writer/worksheet.rb

@@ -15,6 +15,7 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal false, sheet.need_number?(0.1)
     assert_equal false, sheet.need_number?(0.01)
     assert_equal true, sheet.need_number?(0.001)
+    assert_equal true, sheet.need_number?(10000000.0)
   end
 end
     end

data/test/font.rb

@@ -4,7 +4,7 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'test/unit'
-require 'spreadsheet/font'
+require 'spreadsheet'
 
 module Spreadsheet
   class TestFont < Test::Unit::TestCase

data/test/integration.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 # TestIntegration -- Spreadheet -- 08.10.2007 -- hwyss@ywesee.com
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
@@ -9,7 +10,23 @@ require 'fileutils'
 
 module Spreadsheet
   class TestIntegration < Test::Unit::TestCase
-    @@iconv = Iconv.new('UTF-16LE', 'UTF-8')
+    if RUBY_VERSION >= '1.9'
+      class IconvStub
+        def initialize to, from
+          @to, @from = to, from
+        end
+        def iconv str
+          dp = str.dup
+          dp.force_encoding @from
+          dp.encode @to
+        end
+      end
+      @@iconv = IconvStub.new('UTF-16LE', 'UTF-8')
+      @@bytesize = :bytesize
+    else
+      @@iconv = Iconv.new('UTF-16LE', 'UTF-8')
+      @@bytesize = :size
+    end
     def setup
       @var = File.expand_path 'var', File.dirname(__FILE__)
       FileUtils.mkdir_p @var
@@ -66,6 +83,7 @@ module Spreadsheet
       assert_equal 25, book.formats.size
       assert_equal 5, book.fonts.size
       str1 = book.shared_string 0
+      other = @@iconv.iconv('Shared String')
       assert_equal @@iconv.iconv('Shared String'), str1
       str2 = book.shared_string 1
       assert_equal @@iconv.iconv('Another Shared String'), str2
@@ -305,7 +323,7 @@ module Spreadsheet
       assert_equal str2, sheet[1,1]
       assert_equal str2, sheet.cell(1,1)
       row = sheet.row 2
-      assert_equal 510, row[0].size
+      assert_equal 510, row[0].send(@@bytesize)
       assert_equal str3, row[0]
       assert_equal str3, sheet[2,0]
       assert_equal str3, sheet.cell(2,0)
@@ -313,7 +331,7 @@ module Spreadsheet
       assert_nil sheet[2,1]
       assert_nil sheet.cell(2,1)
       row = sheet.row 3
-      assert_equal 510, row[0].size
+      assert_equal 510, row[0].send(@@bytesize)
       assert_equal str4, row[0]
       assert_equal str4, sheet[3,0]
       assert_equal str4, sheet.cell(3,0)
@@ -378,7 +396,7 @@ module Spreadsheet
       assert_equal str2, sheet[1,1]
       assert_equal str2, sheet.cell(1,1)
       row = sheet.row 2
-      assert_equal 255, row[0].size
+      assert_equal 255, row[0].send(@@bytesize)
       assert_equal str3, row[0]
       assert_equal str3, sheet[2,0]
       assert_equal str3, sheet.cell(2,0)
@@ -386,7 +404,7 @@ module Spreadsheet
       assert_nil sheet[2,1]
       assert_nil sheet.cell(2,1)
       row = sheet.row 3
-      assert_equal 255, row[0].size
+      assert_equal 255, row[0].send(@@bytesize)
       assert_equal str4, row[0]
       assert_equal str4, sheet[3,0]
       assert_equal str4, sheet.cell(3,0)
@@ -451,7 +469,7 @@ module Spreadsheet
       assert_equal str2, sheet[1,1]
       assert_equal str2, sheet.cell(1,1)
       row = sheet.row 2
-      assert_equal 255, row[0].size
+      assert_equal 255, row[0].send(@@bytesize)
       assert_equal str3, row[0]
       assert_equal str3, sheet[2,0]
       assert_equal str3, sheet.cell(2,0)
@@ -459,7 +477,7 @@ module Spreadsheet
       assert_nil sheet[2,1]
       assert_nil sheet.cell(2,1)
       row = sheet.row 3
-      assert_equal 255, row[0].size
+      assert_equal 255, row[0].send(@@bytesize)
       assert_equal str4, row[0]
       assert_equal str4, sheet[3,0]
       assert_equal str4, sheet.cell(3,0)
@@ -501,9 +519,13 @@ module Spreadsheet
       assert_equal 3, sheets.size
       sheet = book.worksheet 0
       assert_instance_of Excel::Worksheet, sheet
-      assert_equal sheet, book.worksheet("S\000h\000e\000e\000t\0001\000")
+      str = "S\000h\000e\000e\000t\0001\000"
+      if RUBY_VERSION >= '1.9'
+        str.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
+      end
+      assert_equal sheet, book.worksheet(str)
     end
-    def test_datetime
+    def test_read_datetime
       path = File.join @data, 'test_datetime.xls'
       book = Spreadsheet.open path
       assert_instance_of Excel::Workbook, book
@@ -582,9 +604,9 @@ module Spreadsheet
       assert_equal 12, sheet.column_count
       useds = [0,0,0,0,0,0,0,0,0,0,0]
       unuseds = [2,2,1,1,1,2,1,11,1,2,12]
-      sheet.each do |row|
-        assert_equal useds.shift, row.first_used
-        assert_equal unuseds.shift, row.first_unused
+      sheet.each do |rw|
+        assert_equal useds.shift, rw.first_used
+        assert_equal unuseds.shift, rw.first_unused
       end
       assert unuseds.empty?, "not all rows were visited in Spreadsheet#each"
       row = sheet.row 0
@@ -691,9 +713,9 @@ module Spreadsheet
       assert_equal 12, sheet.column_count
       useds = [0,0,0,0,0,0,0,0,0,0,0]
       unuseds = [2,2,1,1,1,2,1,11,1,2,12]
-      sheet.each do |row|
-        assert_equal useds.shift, row.first_used
-        assert_equal unuseds.shift, row.first_unused
+      sheet.each do |rw|
+        assert_equal useds.shift, rw.first_used
+        assert_equal unuseds.shift, rw.first_unused
       end
       assert unuseds.empty?, "not all rows were visited in Spreadsheet#each"
       row = sheet.row 0
@@ -844,7 +866,11 @@ module Spreadsheet
       str3 = @@iconv.iconv str3
       str4 = @@iconv.iconv str4
       assert_nothing_raised do book = Spreadsheet.open path end
-      assert_equal 'UTF-16LE', book.encoding
+      if RUBY_VERSION >= '1.9'
+        assert_equal 'UTF-16LE', book.encoding.name
+      else
+        assert_equal 'UTF-16LE', book.encoding
+      end
       assert_equal str1, book.shared_string(0)
       assert_equal str2, book.shared_string(1)
       test = nil
@@ -873,8 +899,9 @@ module Spreadsheet
       assert_equal 2, book.worksheets.size
       sheet = book.worksheets.first
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
-      assert_equal "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000",
-                   sheet.name
+      name = "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000"
+      name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
+      assert_equal name, sheet.name
       assert_not_nil sheet.offset
       assert_not_nil col = sheet.column(1)
       assert_equal true, col.default_format.font.italic?
@@ -968,8 +995,9 @@ module Spreadsheet
       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",
-                   sheet.name
+      name = "m\000y\000 \000n\000a\000m\000e\000"
+      name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
+      assert_equal name, sheet.name
       assert_not_nil sheet.offset
     end
     def test_write_new_workbook__utf16
@@ -999,12 +1027,12 @@ module Spreadsheet
       sheet1.row(6).set_format 0, fmt
       sheet1[6,1] = Date.new 2008, 10, 10
       sheet1[6,2] = Date.new 2008, 10, 12
-      fmt = Format.new :number_format => "D\0D\0.\0M\0M\0.\0Y\0Y\0Y\0Y\0"
+      fmt = Format.new :number_format => @@iconv.iconv("DD.MM.YYYY")
       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"
+      sheet2 = book.create_worksheet :name => @@iconv.iconv("my name")
       book.write path
       Spreadsheet.client_encoding = 'UTF-8'
       str1 = 'Shared String'
@@ -1012,7 +1040,11 @@ module Spreadsheet
       str3 = '1234567890 ' * 1000
       str4 = '9876543210 ' * 1000
       assert_nothing_raised do book = Spreadsheet.open path end
-      assert_equal 'UTF-16LE', book.encoding
+      if RUBY_VERSION >= '1.9'
+        assert_equal 'UTF-16LE', book.encoding.name
+      else
+        assert_equal 'UTF-16LE', book.encoding
+      end
       assert_equal str1, book.shared_string(0)
       assert_equal str2, book.shared_string(1)
       test = book.shared_string 2
@@ -1153,5 +1185,54 @@ module Spreadsheet
       assert_equal smallnum - 0.1, book.worksheet(0)[0,3]
       assert_equal(-smallnum - 0.1, book.worksheet(0)[1,3])
     end
+    def test_bigfloat
+      # reported in http://rubyforge.org/tracker/index.php?func=detail&aid=24119&group_id=678&atid=2677
+      bigfloat = 10000000.0
+      book = Spreadsheet::Workbook.new
+      sheet = book.create_worksheet
+      sheet[0,0] = bigfloat
+      sheet[0,1] = bigfloat + 0.1
+      sheet[0,2] = bigfloat - 0.1
+      sheet[1,0] = -bigfloat
+      sheet[1,1] = -bigfloat + 0.1
+      sheet[1,2] = -bigfloat - 0.1
+      path = File.join @var, 'test_big-float.xls'
+      book.write path
+      assert_nothing_raised do
+        book = Spreadsheet.open path
+      end
+      sheet = book.worksheet(0)
+      assert_equal bigfloat, sheet[0,0]
+      assert_equal bigfloat + 0.1, sheet[0,1]
+      assert_equal bigfloat - 0.1, sheet[0,2]
+      assert_equal(-bigfloat, sheet[1,0])
+      assert_equal(-bigfloat + 0.1, sheet[1,1])
+      assert_equal(-bigfloat - 0.1, sheet[1,2])
+    end
+    def test_datetime__off_by_one
+      # reported in http://rubyforge.org/tracker/index.php?func=detail&aid=24414&group_id=678&atid=2677
+      datetime1 = DateTime.new(2008)
+      datetime2 = DateTime.new(2008, 1, 1, 1, 0, 1)
+      date1 = Date.new(2008)
+      date2 = Date.new(2009)
+      book = Spreadsheet::Workbook.new
+      sheet = book.create_worksheet
+      sheet[0,0] = datetime1
+      sheet[0,1] = datetime2
+      sheet[1,0] = date1
+      sheet[1,1] = date2
+      path = File.join @var, 'test_datetime.xls'
+      book.write path
+      assert_nothing_raised do
+        book = Spreadsheet.open path
+      end
+      sheet = book.worksheet(0)
+      assert_equal datetime1, sheet[0,0]
+      assert_equal datetime2, sheet[0,1]
+      assert_equal date1, sheet[1,0]
+      assert_equal date2, sheet[1,1]
+      assert_equal date1, sheet.row(0).date(0)
+      assert_equal datetime1, sheet.row(1).datetime(0)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.3.1
+  version: 0.6.4
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 +01:00
+date: 2009-07-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/parseexcel/parser.rb
 - lib/spreadsheet.rb
 - lib/spreadsheet/column.rb
+- lib/spreadsheet/compatibility.rb
 - lib/spreadsheet/datatypes.rb
 - lib/spreadsheet/encodings.rb
 - lib/spreadsheet/excel.rb