spreadsheet 0.6.1.6 → 0.6.1.7

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.6.1.7 / 2008-10-30
+
+* 1 Bugfix
+
+  * Fixes a bug where all Formulas were ignored.
+    (Thanks to Bjørn Hjelle for the report)
+
+* 1 minor enhancement
+
+  * Allow the substitution of an IO object with a StringIO.
+    (Thanks to luxor for the report)
+
 === 0.6.1.6 / 2008-10-28
 
 * 2 Bugfixes

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.1.6'
+  VERSION = '0.6.1.7'
 
   ##
   # Default client Encoding. Change this value if your application uses a
@@ -58,7 +58,7 @@ module Spreadsheet
     # Parses a Spreadsheet Document and returns a Workbook object. At present,
     # only Excel-Documents can be read.
     def open io_or_path, mode="rb+", &block
-      if io_or_path.is_a? IO
+      if io_or_path.respond_to? :seek
         Excel::Workbook.open(io_or_path)
       elsif block
         File.open(io_or_path, mode) do |fh|

data/lib/spreadsheet/excel/reader.rb

@@ -300,7 +300,7 @@ class Reader
     value = read_string work[2..-1], 2
     @formats.store idx, client(value, @workbook.encoding)
   end
-  def read_formula worksheet, work, pos, len
+  def read_formula worksheet, addr, work
     # Offset  Size  Contents
     #      0     2  Index to row
     #      2     2  Index to column
@@ -383,6 +383,7 @@ class Reader
     else
       # leave the Formula value blank
     end
+    set_cell worksheet, row, column, xf, formula
   end
   def read_hlink worksheet, work, pos, len
     # 6.53.1 Common Record Contents
@@ -661,6 +662,9 @@ class Reader
         when 0x0002    # INTEGER ➜ 6.56 (BIFF2 only)
           found = true
           # TODO: implement for BIFF2 support
+        when :formula  # FORMULA ➜ 6.46
+          found = true
+          read_formula worksheet, addr, work
         when :label    # LABEL ➜ 6.59 (BIFF2-BIFF7)
           found = true
           read_label worksheet, addr, work

data/lib/spreadsheet/writer.rb

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

metadata

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