spreadsheet 0.6.1.4 → 0.6.1.5

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.6.1.4 / 2008-10-24
+
+* 2 Bugfixes
+
+  * Removed obsolete code which triggered Iconv::InvalidEncoding
+    on Systems with non-gnu Iconv:
+    http://rubyforge.org/tracker/index.php?func=detail&aid=22541&group_id=678&atid=2677
+  * Handle empty Worksheets
+    (Thanks to Charles Lowe for the Patches)
+
 === 0.6.1.4 / 2008-10-23
 
 * 1 Bugfix

data/Manifest.txt

@@ -38,6 +38,7 @@ lib/spreadsheet/workbook.rb
 lib/spreadsheet/worksheet.rb
 lib/spreadsheet/writer.rb
 test/data/test_copy.xls
+test/data/test_empty.xls
 test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
 test/data/test_version_excel97.xls

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/encodings.rb

@@ -3,9 +3,6 @@ module Spreadsheet
   # Methods for Encoding-conversions. You should not need to use any of these.
   module Encodings
     if RUBY_VERSION >= '1.9'
-      def ascii string
-        string.encode 'ASCII//TRANSLIT//IGNORE'
-      end
       def client string, internal='UTF-16LE'
         string.encode Spreadsheet.client_encoding
       end
@@ -14,15 +11,7 @@ module Spreadsheet
       end
     else
       require 'iconv'
-      @@utf8_utf16 = Iconv.new('UTF-16LE', 'UTF-8')
-      @@utf16_ascii = Iconv.new('ASCII//TRANSLIT//IGNORE', 'UTF-16LE')
-      @@utf16_utf8 = Iconv.new('UTF-8//TRANSLIT//IGNORE', 'UTF-16LE')
       @@iconvs = {}
-      def ascii string
-        @@utf16_ascii.iconv string
-      rescue
-        string.gsub /[^\x20-\x7e]+/, ''
-      end
       def client string, internal='UTF-16LE'
         key = [Spreadsheet.client_encoding, internal]
         iconv = @@iconvs[key] ||= Iconv.new(Spreadsheet.client_encoding, internal)
@@ -36,9 +25,6 @@ module Spreadsheet
     end
   rescue LoadError
     warn "You don't have Iconv support compiled in your Ruby. Spreadsheet may not work as expected"
-    def ascii string
-      string.gsub /[^\x20-\x7e]+/, ''
-    end
     def client string, internal='UTF-16LE'
       string.delete "\0"
     end

data/lib/spreadsheet/excel/worksheet.rb

@@ -78,17 +78,17 @@ class Worksheet < Spreadsheet::Worksheet
     shorten @rows
     @dimensions = []
     @dimensions[0] = [ index_of_first(@rows),
-                       index_of_first(@row_addresses) ].compact.min
-    @dimensions[1] = [ @rows.size, @row_addresses.size ].compact.max
+                       index_of_first(@row_addresses) ].compact.min || 0
+    @dimensions[1] = [ @rows.size, @row_addresses.size ].compact.max || 0
     compact = @rows.compact
     first_rows = compact.collect do |row| index_of_first row end.compact.min
     first_addrs = @row_addresses.compact.collect do |addr|
       addr[:first_used] end.min
-    @dimensions[2] = [ first_rows, first_addrs ].compact.min
+    @dimensions[2] = [ first_rows, first_addrs ].compact.min || 0
     last_rows = compact.collect do |row| row.size end.max
     last_addrs = @row_addresses.compact.collect do |addr|
       addr[:first_unused] end.max
-    @dimensions[3] = [last_rows, last_addrs].compact.max
+    @dimensions[3] = [last_rows, last_addrs].compact.max || 0
     @dimensions
   end
 end

data/lib/spreadsheet/worksheet.rb

@@ -242,11 +242,11 @@ module Spreadsheet
     def recalculate_dimensions # :nodoc:
       shorten @rows
       @dimensions = []
-      @dimensions[0] = index_of_first @rows
+      @dimensions[0] = index_of_first(@rows) || 0
       @dimensions[1] = @rows.size
       compact = @rows.compact
-      @dimensions[2] = compact.collect do |row| index_of_first row end.compact.min
-      @dimensions[3] = compact.collect do |row| row.size end.max
+      @dimensions[2] = compact.collect do |row| index_of_first row end.compact.min || 0
+      @dimensions[3] = compact.collect do |row| row.size end.max || 0
       @dimensions
     end
     def shorten ary # :nodoc:

data/test/integration.rb

@@ -30,6 +30,25 @@ module Spreadsheet
     ensure
       File.delete copy if File.exist? copy
     end
+    def test_empty_workbook
+      path = File.join @data, 'test_empty.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      assert_equal 8, book.biff_version
+      assert_equal 'Microsoft Excel 97/2000/XP', book.version_string
+      enc = 'UTF-16LE'
+      if defined? Encoding
+        enc = Encoding.find enc
+      end
+      assert_equal enc, book.encoding
+      assert_equal 21, book.formats.size
+      assert_equal 4, book.fonts.size
+      assert_equal 0, book.sst.size
+      sheet = book.worksheet 0
+      assert_equal 0, sheet.row_count
+      assert_equal 0, sheet.column_count
+      assert_nothing_raised do sheet.inspect end
+    end
     def test_version_excel97__ooffice__utf16
       Spreadsheet.client_encoding = 'UTF-16LE'
       assert_equal 'UTF-16LE', Spreadsheet.client_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.4
+  version: 0.6.1.5
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-23 00:00:00 +02:00
+date: 2008-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - lib/spreadsheet/worksheet.rb
 - lib/spreadsheet/writer.rb
 - test/data/test_copy.xls
+- test/data/test_empty.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls