spreadsheet-excel 0.3.5 → 0.3.5.1

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.3.5.1 - 8-Feb-2007
+* Fixed a bug reported by Kirk Haines where string-inputs were sliced into
+  oblivion by Worksheet#write. This only concerns gem-installations of
+  Spreadsheet::Excel. Stupid, stupid maintainers should create gems from a
+  clean export, not a working directory containing highly experimental code!
+
 == 0.3.5 - 18-Aug-2006
 * Instead of making OLEWriter inherit from IO, just have it delegate
   the IO method calls to an IO object reference in an instance variable. That

data/lib/spreadsheet/excel.rb

@@ -8,6 +8,6 @@ require "format"
 
 module Spreadsheet
    class Excel < Workbook
-      VERSION = "0.3.5"
+      VERSION = "0.3.5.1"
    end
 end

data/lib/spreadsheet/worksheet.rb

@@ -6,7 +6,6 @@ class Worksheet < BIFFWriter
    ColMax = 256
    StrMax = 255
    Buffer = 4096
-   ContMax = 2080
 
    attr_reader :name, :xf_index
    attr_accessor :index, :colinfo, :selection, :offset
@@ -273,9 +272,12 @@ class Worksheet < BIFFWriter
 
    def write_string(row, col, str, format)
       record = 0x0204
+      length = 0x0008 + str.length
 
       xf_index = XF(row, col, format)
 
+      strlen = str.length
+
       raise MaxSizeError if row >= RowMax
       raise MaxSizeError if col >= ColMax
 
@@ -284,20 +286,17 @@ class Worksheet < BIFFWriter
       @dim_colmin = col if col < @dim_colmin
       @dim_colmax = col if col > @dim_colmax
 
-      strlen = str.size
-      pstr = str.slice!(0,StrMax)
-      length = 0x0008 + pstr.size
+      # Truncate strings over 255 characters
+      if strlen > StrMax
+         str    = str[0..StrMax-1]
+         length = 0x0008 + StrMax
+         strlen = StrMax
+      end
+
       header = [record, length].pack("vv")
       data   = [row, col, xf_index, strlen].pack("vvvv")
-      append(header, data, pstr)
-
-      record = 0x003C
-      until(str.empty?)
-        pstr = str.slice!(0,ContMax)
-        header = [record, pstr.size].pack("vv")
-        append(header, pstr)
-      end
 
+      append(header, data, str)
    end
 
    # Write a blank cell to the specified row and column (zero indexed).

data/test/tc_excel.rb

@@ -21,6 +21,6 @@ require "ftools"
 
 class TC_Excel < Test::Unit::TestCase
    def test_version
-      assert_equal("0.3.5", Spreadsheet::Excel::VERSION)
+      assert_equal("0.3.5.1", Spreadsheet::Excel::VERSION)
    end
 end

data/test/tc_workbook.rb

@@ -68,19 +68,10 @@ class TC_Workbook < Test::Unit::TestCase
       assert_equal(3,@wb.formats.length,"Bad number of formats")
    end
 
-   def test_write_string_continued
-      ws = @wb.add_worksheet 
-      txt = ''
-      0.upto(256) { |num|
-        txt << "." << num.to_s
-      }
-      ws.write(0,0,txt)
-   end
-
    def teardown
       @wb.close
       @wb = nil
-      #File.delete("test.xls") if File.exists?("test.xls")
+      File.delete("test.xls") if File.exists?("test.xls")
    end
 
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: spreadsheet-excel
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2006-08-23 00:00:00 +02:00
+  version: 0.3.5.1
+date: 2007-02-08 00:00:00 +01:00
 summary: Creates Excel documents on any platform
 require_paths: 
 - lib
@@ -25,60 +25,32 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Hannes Wyss
 files: 
-- CVS/Root
-- CVS/Repository
-- CVS/Entries
-- doc/CVS
 - doc/format.txt
 - doc/spreadsheet.txt
-- doc/CVS/Root
-- doc/CVS/Repository
-- doc/CVS/Entries
-- examples/CVS
-- examples/example_basic.rb
-- examples/example_format.rb
-- examples/CVS/Root
-- examples/CVS/Repository
-- examples/CVS/Entries
-- lib/CVS
 - lib/spreadsheet
-- lib/CVS/Root
-- lib/CVS/Repository
-- lib/CVS/Entries
-- lib/spreadsheet/CVS
 - lib/spreadsheet/biffwriter.rb
-- lib/spreadsheet/worksheet.rb
+- lib/spreadsheet/excel.rb
 - lib/spreadsheet/format.rb
-- lib/spreadsheet/olewriter.rb.orig
-- lib/spreadsheet/olewriter.rb.rej
-- lib/spreadsheet/workbook.rb
 - lib/spreadsheet/olewriter.rb
-- lib/spreadsheet/excel.rb
-- lib/spreadsheet/CVS/Root
-- lib/spreadsheet/CVS/Repository
-- lib/spreadsheet/CVS/Entries
-- test/CVS
+- lib/spreadsheet/workbook.rb
+- lib/spreadsheet/worksheet.rb
+- examples/example_basic.rb
+- examples/example_format.rb
+- test/perl_output
 - test/tc_all.rb
 - test/tc_biff.rb
-- test/tc_ole.rb
-- test/ts_all.rb
-- test/perl_output
-- test/foo.ole
+- test/tc_excel.rb
 - test/tc_format.rb
-- test/delete_this
-- test/test.xls
+- test/tc_ole.rb
 - test/tc_workbook.rb
 - test/tc_worksheet.rb
-- test/tc_excel.rb
-- test/CVS/Root
-- test/CVS/Repository
-- test/CVS/Entries
-- test/perl_output/CVS
-- test/perl_output/README
+- test/ts_all.rb
 - test/perl_output/f_font_biff
+- test/perl_output/README
 - test/perl_output/f_font_key
 - test/perl_output/f_xf_biff
 - test/perl_output/ole_write_header
@@ -86,9 +58,6 @@ files:
 - test/perl_output/ws_store_dimensions
 - test/perl_output/ws_store_selection
 - test/perl_output/ws_store_window2
-- test/perl_output/CVS/Root
-- test/perl_output/CVS/Repository
-- test/perl_output/CVS/Entries
 - README
 - CHANGES
 test_files: 

data/CVS/Entries

@@ -1,10 +0,0 @@
-/.project/1.2/Tue Oct 11 14:08:38 2005//
-/MANIFEST/1.10/Mon Dec  5 02:05:39 2005/-kb/
-/install.rb/1.8/Mon Dec  5 02:13:14 2005/-ko/
-D/doc////
-D/examples////
-D/lib////
-D/test////
-/CHANGES/1.15/Fri Aug 18 13:42:05 2006/-kb/
-/README/1.6/Fri Aug 18 13:38:31 2006/-kb/
-/spreadsheet-excel.gemspec/1.8/Fri Aug 18 13:38:59 2006/-kb/

data/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet

data/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/doc/CVS/Entries

@@ -1,3 +0,0 @@
-/format.txt/1.4/Mon Oct 10 22:39:01 2005//
-/spreadsheet.txt/1.10/Fri Feb 17 03:43:30 2006/-ko/
-D

data/doc/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/doc

data/doc/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/examples/CVS/Entries

@@ -1,3 +0,0 @@
-/example_basic.rb/1.2/Wed Oct 12 21:05:44 2005//
-/example_format.rb/1.2/Wed Oct 12 21:11:40 2005//
-D

data/examples/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/examples

data/examples/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/lib/CVS/Entries

@@ -1 +0,0 @@
-D/spreadsheet////

data/lib/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/lib

data/lib/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/lib/spreadsheet/CVS/Entries

@@ -1,7 +0,0 @@
-/biffwriter.rb/1.1/Tue Oct 11 17:09:08 2005//
-/excel.rb/1.4/Fri Feb 17 03:34:00 2006//
-/worksheet.rb/1.2/Fri Feb 17 03:33:24 2006//
-/format.rb/1.2/Fri Aug 18 13:15:05 2006//
-/olewriter.rb/1.4/Fri Aug 18 13:20:26 2006//
-/workbook.rb/1.5/Fri Aug 18 13:20:13 2006//
-D

data/lib/spreadsheet/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/lib/spreadsheet

data/lib/spreadsheet/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/lib/spreadsheet/olewriter.rb.orig

@@ -1,196 +0,0 @@
-# olewriter.rb
-#
-# This class should never be instantiated directly. The entire class, and all
-# its methods should be considered private.
-
-class MaxSizeError < StandardError; end
-
-class OLEWriter
-
-   # Not meant for public consumption
-   MaxSize    = 7087104
-   BlockSize  = 4096
-   BlockDiv   = 512
-   ListBlocks = 127
-
-   attr_reader :biff_size, :book_size, :big_blocks, :list_blocks
-   attr_reader :root_start, :size_allowed
-
-   # Accept an IO or IO-like object or a filename (as a String)
-   def initialize(arg)
-      if arg.kind_of?(String)
-        @io = File.open(arg, "w")
-      else
-        @io = arg
-      end
-      @io.binmode
-
-      @biff_only     = false
-      @size_allowed  = true
-      @biff_size     = 0
-      @book_size     = 0
-      @big_blocks    = 0
-      @list_blocks   = 0
-      @root_start    = 0
-      @block_count   = 4
-   end
-
-   # Imitate IO.open behavior
-   def self.open(arg)
-     if block_given?
-       ole = self.new(arg)
-       result = yield(ole)
-       ole.close
-       result
-     else
-       self.new(arg)
-     end
-   end
-
-   # Delegate 'write' and 'print' to the internal IO object.
-   def write(*args, &block)
-     @io.write(*args, &block)
-   end
-   def print(*args, &block)
-     @io.print(*args, &block)
-   end
-
-   # Set the size of the data to be written to the OLE stream
-   #
-   # @big_blocks = (109 depot block x (128 -1 marker word)
-   # - (1 x end words)) = 13842
-   #
-   # MaxSize = @big_blocks * 512 bytes = 7087104
-   def set_size(size = BlockSize)
-      raise MaxSizeError if size > MaxSize
-
-      @biff_size = size
-
-      if biff_size > BlockSize
-         @book_size = size
-      else
-         @book_size = BlockSize
-      end
-
-      @size_allowed = true
-   end
-
-   # Calculate various sizes needed for the OLE stream
-   def calculate_sizes
-      @big_blocks  = (@book_size.to_f/BlockDiv.to_f).ceil
-      @list_blocks = (@big_blocks / ListBlocks) + 1
-      @root_start  = @big_blocks
-   end
-
-   # Write root entry, big block list and close the filehandle.
-   def close
-      if @size_allowed == true
-         write_padding
-         write_property_storage
-         write_big_block_depot
-      end
-      @io.close
-   end 
-
-   # Write the OLE header block
-   def write_header
-      return if @biff_only == true
-      calculate_sizes
-      root_start = @root_start
-
-      write([0xD0CF11E0, 0xA1B11AE1].pack("NN"))
-      write([0x00, 0x00, 0x00, 0x00].pack("VVVV"))
-      write([0x3E, 0x03, -2, 0x09].pack("vvvv"))
-      write([0x06, 0x00, 0x00].pack("VVV"))
-      write([@list_blocks, root_start].pack("VV"))
-      write([0x00, 0x1000,-2].pack("VVV"))
-      write([0x00, -2 ,0x00].pack("VVV"))
-
-      unused = [-1].pack("V")
-
-      1.upto(@list_blocks){
-         root_start += 1
-         write([root_start].pack("V"))
-      }
-
-      @list_blocks.upto(108){
-         write(unused)
-      }
-   end
-
-   # Write a big block depot
-   def write_big_block_depot
-      total_blocks = @list_blocks * 128
-      used_blocks  = @big_blocks + @list_blocks + 2
-      
-      marker = [-3].pack("V")
-      eoc    = [-2].pack("V")
-      unused = [-1].pack("V")
-
-      num_blocks = @big_blocks - 1
-
-      1.upto(num_blocks){|n|
-         write([n].pack("V"))
-      }
-
-      write eoc
-      write eoc
-
-      1.upto(@list_blocks){ write(marker) }
-
-      used_blocks.upto(total_blocks){ write(unused) }
-      
-   end
-
-   # Write property storage
-   def write_property_storage
-      write_pps('Root Entry', 0x05,  1,   -2, 0x00)
-      write_pps('Book',       0x02, -1, 0x00, @book_size)
-      write_pps("",           0x00, -1, 0x00, 0x0000)
-      write_pps("",           0x00, -1, 0x00, 0x0000)
-   end
-
-   # Write property sheet in property storage
-   def write_pps(name, type, dir, start, size)
-      length = 0
-      ord_name = []
-      unless name.empty? 
-         name += "\0"
-         ord_name = name.unpack("c*")
-         length = name.length * 2
-      end
-
-      zero = [0].pack("C")
-      unknown = [0].pack("V")
-      
-      write(ord_name.pack("v*"))
-
-      for n in 1..64-length
-         write(zero)
-      end
-
-      write([length,type,-1,-1,dir].pack("vvVVV"))
-
-      for n in 1..5
-         write(unknown)
-      end
-      
-      for n in 1..4
-         write([0].pack("V"))
-      end
-
-      write([start,size].pack("VV"))
-      write(unknown)
-   end
-
-   # Pad the end of the file
-   def write_padding
-      min_size = 512
-      min_size = BlockSize if @biff_size < BlockSize
-
-      if @biff_size % min_size != 0
-         padding = min_size - (@biff_size % min_size)
-         write("\0" * padding)
-      end
-   end
-end

data/lib/spreadsheet/olewriter.rb.rej

@@ -1,32 +0,0 @@
-***************
-*** 83,97 ****
-     end
-  
-     # Write root entry, big block list and close the filehandle.
-     def close
--       return if @io.closed?
-        if @size_allowed == true
-           write_padding
-           write_property_storage
-           write_big_block_depot
-        end
--       @io.close
-     end 
-  
-     # Write the OLE header block
-     def write_header
---- 65,78 ----
-     end
-  
-     # Write root entry, big block list and close the filehandle.
-     def close
-        if @size_allowed == true
-           write_padding
-           write_property_storage
-           write_big_block_depot
-        end
-+       super
-     end 
-  
-     # Write the OLE header block
-     def write_header

data/test/CVS/Entries

@@ -1,9 +0,0 @@
-/tc_all.rb/1.1/Sun Nov 23 03:46:55 2003//
-/tc_biff.rb/1.3/Wed Oct 12 21:33:36 2005//
-/tc_excel.rb/1.7/Fri Feb 17 03:36:41 2006//
-/tc_ole.rb/1.4/Wed Oct 12 21:33:05 2005//
-/tc_worksheet.rb/1.3/Wed Oct 12 21:35:11 2005//
-/ts_all.rb/1.2/Wed Oct 12 21:35:30 2005//
-D/perl_output////
-/tc_format.rb/1.5/Fri Aug 18 13:15:13 2006//
-/tc_workbook.rb/1.3/Fri Aug 18 13:05:40 2006//

data/test/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/test

data/test/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet

data/test/perl_output/CVS/Entries

@@ -1,10 +0,0 @@
-/README/1.5/Mon Oct 10 22:50:37 2005/-kb/
-/f_font_biff/1.1/Wed Dec  4 00:15:06 2002/-kb/
-/f_font_key/1.1/Wed Dec  4 00:14:48 2002/-kb/
-/f_xf_biff/1.1/Wed Dec  4 00:14:31 2002/-kb/
-/ole_write_header/1.1/Mon Oct 10 22:51:03 2005/-kb/
-/ws_colinfo/1.1/Thu Nov 28 04:52:55 2002/-kb/
-/ws_store_dimensions/1.1/Thu Nov 28 04:53:19 2002/-kb/
-/ws_store_selection/1.1/Thu Nov 28 04:53:19 2002/-kb/
-/ws_store_window2/1.1/Thu Nov 28 04:53:19 2002/-kb/
-D

data/test/perl_output/CVS/Repository

@@ -1 +0,0 @@
-RubySpreadsheet/test/perl_output

data/test/perl_output/CVS/Root

@@ -1 +0,0 @@
-:ext:hwyss@rubyspreadsheet.cvs.sourceforge.net:/cvsroot/rubyspreadsheet