spreadsheet 0.6.1.2 → 0.6.1.3

data/History.txt

@@ -1,9 +1,19 @@
+=== 0.6.1.3 / 2008-10-21
+
+* 2 Bugfixes
+
+  * Renamed UTF8 to UTF-8 to support freebsd
+    (Thanks to Jacob Atzen for the Patch)
+  * Fixes a Bug where only the first Rowblock was read correctly if there were
+    no DBCELL records terminating the Rowblocks.
+    (Thanks to Bjørn Hjelle for the Bugreport)
+
 === 0.6.1.2 / 2008-10-20
 
 * 2 Bugfixes
 
   * Corrected the Font-Encoding values in Excel::Internals
-    (Thanks to Bjorn Hjelle for the Bugreport)
+    (Thanks to Bjørn Hjelle for the Bugreport)
   * Spreadsheet now skips Richtext-Formatting runs and Asian Phonetic 
     Settings when reading the SST, fixing a problem where the presence of
     Richtext could lead to an incomplete SST.

data/lib/spreadsheet/encodings.rb

@@ -14,9 +14,9 @@ module Spreadsheet
       end
     else
       require 'iconv'
-      @@utf8_utf16 = Iconv.new('UTF-16LE', 'UTF8')
+      @@utf8_utf16 = Iconv.new('UTF-16LE', 'UTF-8')
       @@utf16_ascii = Iconv.new('ASCII//TRANSLIT//IGNORE', 'UTF-16LE')
-      @@utf16_utf8 = Iconv.new('UTF8//TRANSLIT//IGNORE', 'UTF-16LE')
+      @@utf16_utf8 = Iconv.new('UTF-8//TRANSLIT//IGNORE', 'UTF-16LE')
       @@iconvs = {}
       def ascii string
         @@utf16_ascii.iconv string

data/lib/spreadsheet/excel/reader.rb

@@ -18,7 +18,7 @@ class Reader
   OPCODE_SIZE = 4
   ROW_BLOCK_OPS = [
     :blank, :boolerr, :dbcell, :formula, :label, :labelsst, :mulblank, :mulrk,
-    :number, :rk, :row, :rstring,
+    :number, :rk, :rstring,
   ]
   def initialize opts = {}
     @pos = 0
@@ -28,7 +28,7 @@ class Reader
     @opts = opts
     @current_row_block = {}
     @formats = {}
-    BUILTIN_FORMATS.each do |key, fmt| @formats.store key, client(fmt, 'UTF8') end
+    BUILTIN_FORMATS.each do |key, fmt| @formats.store key, client(fmt, 'UTF-8') end
   end
   def decode_rk work
     #  Bit  Mask        Contents
@@ -75,8 +75,12 @@ class Reader
       name
     end
   end
-  def in_row_block? op
-    ROW_BLOCK_OPS.include?(op)
+  def in_row_block? op, previous
+    if op == :row
+      previous == op
+    else
+      ROW_BLOCK_OPS.include?(op)
+    end
   end
   def memoize?
     @opts[:memoization]
@@ -584,9 +588,10 @@ class Reader
   end
   def read_worksheet worksheet, offset
     @pos = offset
+    previous = nil
     while tuple = get_next_chunk
       pos, op, len, work = tuple
-      if((offset = @current_row_block_offset) && !in_row_block?(op))
+      if((offset = @current_row_block_offset) && !in_row_block?(op, previous))
         @current_row_block_offset = nil
         offset[1] = pos - offset[0]
       end
@@ -611,6 +616,7 @@ class Reader
                        # ●  ROW ➜ 6.83
         set_row_address worksheet, work, pos, len
       end
+      previous = op
     end
   end
   def read_style work, pos, len
@@ -652,7 +658,7 @@ class Reader
       id, level = work.unpack 'x2C2'
       if name = BUILTIN_STYLES[id]
         name.sub '_lv', "_#{level.to_s}"
-        xf.name = client name, 'UTF8'
+        xf.name = client name, 'UTF-8'
       end
     end
   end

data/lib/spreadsheet/excel/workbook.rb

@@ -69,7 +69,7 @@ class Workbook < Spreadsheet::Workbook
     super.push '@sst', '@offsets', '@changes'
   end
   def version_string
-    client VERSION_STRINGS.fetch(@version, "Unknown"), 'UTF8'
+    client VERSION_STRINGS.fetch(@version, "Unknown"), 'UTF-8'
   end
 end
   end

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

@@ -326,10 +326,10 @@ class Workbook < Spreadsheet::Writer
     # The first user-defined format starts at 164 (0xa4).
     formats = @number_formats[workbook] = {}
     BUILTIN_FORMATS.each do |idx, str|
-      formats.store client(str, 'UTF8'), idx
+      formats.store client(str, 'UTF-8'), idx
     end
     ## Ensure at least a 'GENERAL' format is written
-    formats.delete client('GENERAL', 'UTF8')
+    formats.delete client('GENERAL', 'UTF-8')
     idx = 0xa4
     workbook.formats.each do |fmt|
       str = fmt.number_format

data/lib/spreadsheet/format.rb

@@ -72,8 +72,8 @@ module Spreadsheet
     # Text rotation
     attr_reader :rotation
     def initialize opts={}
-      @font             = Font.new client("Arial", 'UTF8'), :family => :swiss
-      @number_format    = client 'GENERAL', 'UTF8'
+      @font             = Font.new client("Arial", 'UTF-8'), :family => :swiss
+      @number_format    = client 'GENERAL', 'UTF-8'
       @rotation         = 0
       @pattern          = 0
       @bottom_color     = :builtin_black

data/lib/spreadsheet/workbook.rb

@@ -52,7 +52,7 @@ module Spreadsheet
     # Use the option <em>:name => 'My pretty Name'</em> to override this
     # behavior.
     def create_worksheet opts = {}
-      opts[:name] ||= client("Worksheet#{@worksheets.size.next}", 'UTF8')
+      opts[:name] ||= client("Worksheet#{@worksheets.size.next}", 'UTF-8')
       add_worksheet Worksheet.new(opts)
     end
     ##

data/lib/spreadsheet/worksheet.rb

@@ -214,10 +214,10 @@ module Spreadsheet
           case value
           when Date
             format = @workbook.formats.find do |fmt| fmt.date? end
-            format ||= Format.new :number_format => client('M/D/YY', 'UTF8')
+            format ||= Format.new :number_format => client('M/D/YY', 'UTF-8')
           when DateTime, Time
             format = @workbook.formats.find do |fmt| fmt.datetime? end
-            format ||= Format.new :number_format => client('M/D/YY h:mm', 'UTF8')
+            format ||= Format.new :number_format => client('M/D/YY h:mm', 'UTF-8')
           end
           if format
             row.formats[idx] = format

data/lib/spreadsheet.rb

@@ -42,13 +42,13 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.1.2'
+  VERSION = '0.6.1.3'
 
   ##
   # Default client Encoding. Change this value if your application uses a
   # different Encoding:
   # Spreadsheet.client_encoding = 'ISO-LATIN-1//TRANSLIT//IGNORE'
-  @client_encoding = 'UTF8'
+  @client_encoding = 'UTF-8'
 
   class << self
 

data/test/integration.rb

@@ -9,7 +9,7 @@ require 'fileutils'
 
 module Spreadsheet
   class TestIntegration < Test::Unit::TestCase
-    @@iconv = Iconv.new('UTF-16LE', 'UTF8')
+    @@iconv = Iconv.new('UTF-16LE', 'UTF-8')
     def setup
       @var = File.expand_path 'var', File.dirname(__FILE__)
       FileUtils.mkdir_p @var
@@ -17,7 +17,7 @@ module Spreadsheet
       FileUtils.mkdir_p @data
     end
     def teardown
-      Spreadsheet.client_encoding = 'UTF8'
+      Spreadsheet.client_encoding = 'UTF-8'
       FileUtils.rm_r @var
     end
     def test_copy__identical__file_paths
@@ -928,7 +928,7 @@ module Spreadsheet
       sheet1.update_row 7, nil, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0
       sheet2 = book.create_worksheet :name => "m\0y\0 \0n\0a\0m\0e\0"
       book.write path
-      Spreadsheet.client_encoding = 'UTF8'
+      Spreadsheet.client_encoding = 'UTF-8'
       str1 = 'Shared String'
       str2 = 'Another Shared String'
       str3 = '1234567890 ' * 1000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.2
+  version: 0.6.1.3
 platform: ruby
 authors: 
 - Hannes Wyss