jruby-poi 0.5.1 → 0.5.2

data/README.markdown

@@ -1,4 +1,4 @@
-jruby-poi
+[jruby-poi](http://github.com/sdeming/jruby-poi)
 =========
 
 This little gem provides an alternative interface to the Apache POI java library, for JRuby. For now the API is targeted at wrapping spreadsheets. We may expand this in the future.

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/jruby-poi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-poi}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Deming", "Jason Rogers"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-01}
   s.description = %q{A rubyesque library for manipulating spreadsheets and other document types for jruby, using Apache POI.}
   s.email = ["sdeming@makefile.com", "jacaetevha@gmail.com"]
   s.extra_rdoc_files = [

data/lib/poi/workbook/cell.rb

@@ -35,6 +35,10 @@ module POI
       @cell = cell
     end
     
+    def error_value
+      @error_value
+    end
+    
     def value
       return nil if @cell.nil?
       value_of(cell_value_for_type(@cell.getCellType))
@@ -81,16 +85,19 @@ module POI
       end
       
       def cell_value_for_type(cell_type)
-        case cell_type
-        when CELL_TYPE_BLANK: nil
-        when CELL_TYPE_BOOLEAN: CELL_VALUE.valueOf(@cell.getBooleanCellValue)
-        when CELL_TYPE_FORMULA
-          formula_evaluator = Java::org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator.new @cell.sheet.workbook
-          formula_evaluator.evaluate @cell
-        when CELL_TYPE_STRING: CELL_VALUE.new(@cell.getStringCellValue)
-        when CELL_TYPE_ERROR, CELL_TYPE_NUMERIC: CELL_VALUE.new(@cell.getNumericCellValue)
-        else
-          raise "unhandled cell type[#{@cell.getCellType}]"
+        begin
+          case cell_type
+          when CELL_TYPE_BLANK: nil
+          when CELL_TYPE_BOOLEAN: CELL_VALUE.valueOf(@cell.getBooleanCellValue)
+          when CELL_TYPE_FORMULA: cell_value_for_type(@cell.getCachedFormulaResultType)
+          when CELL_TYPE_STRING: CELL_VALUE.new(@cell.getStringCellValue)
+          when CELL_TYPE_ERROR, CELL_TYPE_NUMERIC: CELL_VALUE.new(@cell.getNumericCellValue)
+          else
+            raise "unhandled cell type[#{@cell.getCellType}]"
+          end
+        rescue
+          @error_value = $!
+          nil
         end
       end
   end

data/specs/workbook_spec.rb

@@ -150,25 +150,41 @@ describe POI::Cells do
     sheet = book.worksheets["bools & errors"]
     rows = sheet.rows
 
-    rows[6][0].value.should == '~CIRCULAR~REF~'
-    rows[7][0].value.should == '#DIV/0!'
-    rows[8][0].value.should == '#N/A'
-    rows[9][0].value.should == '#NAME?'
-    rows[10][0].value.should == '#NULL!'
-    rows[11][0].value.should == '#NUM!'
-    rows[12][0].value.should == '#REF!'
-    rows[13][0].value.should == '#VALUE!'
-    lambda{ rows[14][0].value }.should raise_error(Java::java.lang.RuntimeException)
+    rows[6][0].value.should == 0.0 #'~CIRCULAR~REF~'
+    rows[6][0].error_value.should be_nil
+
+    rows[7][0].value.should be_nil #'#DIV/0!'
+    rows[7][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[8][0].value.should be_nil #'#N/A'
+    rows[8][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[9][0].value.should be_nil #'#NAME?'
+    rows[9][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[10][0].value.should be_nil #'#NULL!'
+    rows[10][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[11][0].value.should be_nil #'#NUM!'
+    rows[11][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[12][0].value.should be_nil #'#REF!'
+    rows[12][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    rows[13][0].value.should be_nil #'#VALUE!'
+    rows[13][0].error_value.should == 'java.lang.NumberFormatException: For input string: "#N/A"'
+
+    lambda{ rows[14][0].value }.should_not raise_error(Java::java.lang.RuntimeException)
     
-    rows[6][0].to_s.should == '~CIRCULAR~REF~'
-    rows[7][0].to_s.should == '#DIV/0!'
-    rows[8][0].to_s.should == '#N/A'
-    rows[9][0].to_s.should == '#NAME?'
-    rows[10][0].to_s.should == '#NULL!'
-    rows[11][0].to_s.should == '#NUM!'
-    rows[12][0].to_s.should == '#REF!'
-    rows[13][0].to_s.should == '#VALUE!'
-    lambda{ rows[14][0].to_s }.should raise_error(Java::java.lang.RuntimeException)
+    rows[6][0].to_s.should == '0.0' #'~CIRCULAR~REF~'
+    rows[7][0].to_s.should == '' #'#DIV/0!'
+    rows[8][0].to_s.should == '' #'#N/A'
+    rows[9][0].to_s.should == '' #'#NAME?'
+    rows[10][0].to_s.should == '' #'#NULL!'
+    rows[11][0].to_s.should == '' #'#NUM!'
+    rows[12][0].to_s.should == '' #'#REF!'
+    rows[13][0].to_s.should == '' #'#VALUE!'
+    rows[14][0].to_s.should == ''
   end
 
   it "should provide booleans for boolean cells" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 5
-    - 1
-  version: 0.5.1
+    - 2
+  version: 0.5.2
 platform: ruby
 authors: 
   - Scott Deming
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: []