spreadsheet 0.6.1.5 → 0.6.1.6

data/History.txt

@@ -1,4 +1,19 @@
-=== 0.6.1.4 / 2008-10-24
+=== 0.6.1.6 / 2008-10-28
+
+* 2 Bugfixes
+
+  * Fixed encoding and decoding of BigNums, negative and other large Numbers
+    http://rubyforge.org/tracker/index.php?func=detail&aid=22581&group_id=678&atid=2677
+  * Fix a bug where modifications to default columns weren't stored
+    http://rubyforge.org/forum/message.php?msg_id=61567
+
+* 1 minor enhancement
+
+  * Row#enriched_data won't return a Bogus-Date if the data isn't a Numeric
+    value
+    (Thanks to Bjørn Hjelle for the report)
+
+=== 0.6.1.5 / 2008-10-24
 
 * 2 Bugfixes
 

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/column.rb

@@ -17,12 +17,27 @@ module Spreadsheet
   # #collapsed::      The Column is collapsed.
   # #outline_level::  Outline level of the column.
   class Column
+    class << self
+      def 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
+              @worksheet.column_updated @idx, self if @worksheet
+              value
+            end
+          end
+        end
+      end
+    end
     include Datatypes
     include Enumerable
     attr_accessor :width, :worksheet
     attr_reader :default_format, :idx
     boolean :hidden, :collapsed
     enum :outline_level, 0, Integer
+    updater :width, :hidden, :outline_level
     def initialize idx, format, opts={}
       @idx = idx
       opts[:width] ||= 10
@@ -36,6 +51,8 @@ module Spreadsheet
     def default_format= format
       @worksheet.add_format format if @worksheet
       @default_format = format
+      @worksheet.column_updated @idx, self if @worksheet
+      format
     end
     ##
     # Iterate over all cells in this column.

data/lib/spreadsheet/excel/reader.rb

@@ -54,13 +54,12 @@ class Reader
       integer &= 0xfffffffc
       value, = ("\0\0\0\0" << [integer].pack('V')).unpack EIGHT_BYTE_DOUBLE
     else
+      ## I can't find a format for unpacking a little endian signed integer.
+      #  'V' works for packing, but not for unpacking. But the following works
+      #  fine afaics:
+      unsigned, = (@bigendian ? work.reverse : work).unpack 'l'
       ## remove two bits
-      unsigned, = work.unpack 'V'
-      unsigned = unsigned >> 2
-      shifted = [unsigned].pack 'V'
-      ## I can't find a format for unpacking a little endian signed integer
-      shifted.reverse! if @bigendian
-      value, = shifted.unpack 'l'
+      value = unsigned >> 2
     end
     if cent == 1
       value /= 100.0
@@ -621,11 +620,7 @@ class Reader
     #      2     2  Index to column
     #      4     2  Index to XF record (➜ 6.115)
     #      6     8  IEEE 754 floating-point value (64-bit double precision)
-    row, column, xf, value = work.unpack 'v3E'
-    unless value
-      # on architectures where sizeof(double) > 8
-      value, = work.unpack 'x6e'
-    end
+    row, column, xf, value = work.unpack binfmt(:number)
     set_cell worksheet, row, column, xf, value
   end
   def read_rk worksheet, addr, work

data/lib/spreadsheet/excel/row.rb

@@ -55,7 +55,7 @@ class Row < Spreadsheet::Row
     res = nil
     if link = @worksheet.links[[@idx, idx]]
       res = link
-    elsif fmt = format(idx)
+    elsif data.is_a?(Numeric) && fmt = format(idx)
       res = if fmt.datetime? || fmt.time?
               _datetime data
             elsif fmt.date?

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

@@ -66,10 +66,8 @@ class Worksheet
       cent = 1
     end
     if value.is_a?(Integer)
-      shifted = [value].pack 'l'
-      ## I can't find a format for packing a little endian signed integer
-      shifted.reverse! if @bigendian
-      value, = shifted.unpack 'V'
+      ## although not documented as signed, 'V' appears to correctly pack
+      #  negative numbers.
       value <<= 2
     else
       # FIXME: precision of small numbers
@@ -172,8 +170,13 @@ class Worksheet
     multiples, first_idx = nil
     row.each_with_index do |cell, idx|
       cell = nil if cell == ''
-      number = cell.is_a?(Float) && cell.to_s.length > 5
-      if multiples && (!multiples.last.is_a?(cell.class) || number)
+      ## it appears that there are limitations to RK precision, both for
+      #  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)
+      if multiples && (!multiples.last.is_a?(cell.class) || need_number)
         write_multiples row, first_idx, multiples
         multiples, first_idx = nil
       end
@@ -197,7 +200,7 @@ class Worksheet
         #  10^9. Not sure what is a good rule of thumb here, but it seems that
         #  Decimal Numbers with more than 4 significant digits are not represented
         #  with sufficient precision by RK
-        if number
+        if need_number
           write_number row, idx
         elsif multiples
           multiples.push cell

data/lib/spreadsheet/worksheet.rb

@@ -54,6 +54,9 @@ module Spreadsheet
     def column_count
       dimensions[3] - dimensions[2]
     end
+    def column_updated idx, column
+      @columns[idx] = column
+    end
     ##
     # Delete the Row at _idx_ (0-based) from this Worksheet.
     def delete_row idx

data/test/integration.rb

@@ -1062,5 +1062,24 @@ module Spreadsheet
                    sheet.name
       assert_not_nil sheet.offset
     end
+    def test_bignum
+      smallnum = 0x500000
+      bignum = smallnum + 1
+      book = Spreadsheet::Workbook.new
+      sheet = book.create_worksheet
+      sheet[0,0] = bignum
+      sheet[1,0] = -bignum
+      sheet[0,1] = smallnum
+      sheet[1,1] = -smallnum
+      path = File.join @var, 'test_big-number.xls'
+      book.write path
+      assert_nothing_raised do
+        book = Spreadsheet.open path
+      end
+      assert_equal bignum, book.worksheet(0)[0,0]
+      assert_equal -bignum, book.worksheet(0)[1,0]
+      assert_equal smallnum, book.worksheet(0)[0,1]
+      assert_equal -smallnum, book.worksheet(0)[1,1]
+    end
   end
 end

data/test/worksheet.rb

@@ -4,12 +4,13 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'test/unit'
-require 'spreadsheet/worksheet'
+require 'spreadsheet'
 
 module Spreadsheet
   class TestWorksheet < Test::Unit::TestCase
     def setup
-      @sheet = Worksheet.new
+      @book = Workbook.new
+      @sheet = @book.create_worksheet
     end
     def test_cell_writer
       assert_nil @sheet[0,0]
@@ -58,5 +59,14 @@ module Spreadsheet
       @sheet.replace_row 3
       assert_equal 4, @sheet.row_count
     end
+    def test_modify_column
+      assert_equal 10, @sheet.column(0).width
+      @sheet.column(1).width = 20
+      assert_equal 10, @sheet.column(0).width
+      assert_equal 20, @sheet.column(1).width
+      @sheet.column(0).width = 30
+      assert_equal 30, @sheet.column(0).width
+      assert_equal 20, @sheet.column(1).width
+    end
   end
 end

metadata

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