Fixed handling of booleans in ods, xls.

simonoff · Jan 30, 2009 · c28ba46 · c28ba46
1 parent a100556
commit c28ba46
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/lib/roo/excel.rb b/lib/roo/excel.rb
@@ -344,7 +344,11 @@ def read_cells(sheet=nil)
               v = cell.to_f
             when :text
               vt = :string
-              str_v = cell.to_s('utf-8')
+              if cell.to_s.downcase == 'true'
+                str_v = cell.to_s
+              else
+                str_v = cell.to_s('utf-8')
+              end       
             when :date
               if cell.to_s.to_f < 1.0
                 vt = :time

diff --git a/lib/roo/openoffice.rb b/lib/roo/openoffice.rb
@@ -324,6 +324,7 @@ def read_cells(sheet=nil)
                             elsif vt == 'float'
                               #
                             elsif vt == 'boolean'
+                              v = tr.attributes['boolean-value']
                               #
                             else
                               # raise "unknown type #{vt}"

diff --git a/test/boolean.ods b/test/boolean.ods
diff --git a/test/boolean.xls b/test/boolean.xls
diff --git a/test/test_roo.rb b/test/test_roo.rb
@@ -4843,4 +4843,23 @@ def test_cell_openoffice_html_escape
       # test_openoffice_zipped catches the &quot;
      end  
   end    
+
+  def test_cell_excel_boolean
+    if EXCEL
+      oo = Excel.new(File.join("test","boolean.xls"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal "TRUE", oo.cell(1,1)
+      assert_equal "FALSE", oo.cell(2,1)
+       end  
+     if OPENOFFICE
+       oo = Openoffice.new(File.join("test","boolean.ods"))
+       oo.default_sheet = oo.sheets.first
+       assert_equal "true", oo.cell(1,1)
+       assert_equal "false", oo.cell(2,1)
+     end  
+     if EXCELX
+       # TODO. need a source file to test with
+     end
+  end
+
 end # class