roo 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a61e2a1f190d2a30554f2bed45557c31573761e
-  data.tar.gz: 3bebd2370044ab8c20911368291932337201bb73
+  metadata.gz: f9b79f7270fb925c4aa402c0bd1bcccfc422ac92
+  data.tar.gz: f5ed3e4155c09890a710265c3a31e308ec4660fa
 SHA512:
-  metadata.gz: e57f90c7aad4b738399b3b3ff0e00b06cbe5fd9fd7ae68c8540f6086521d925db17a8219cacceb656012c3e2f10d814218d95a7ac2c188958c83c4c9425e5f4b
-  data.tar.gz: f1fe2348405fcd5097465d761ba60b321cfd52d45957eef61fecf8d6a43a7afd59afeb11e873318f6188dd0b117219b93b87e9ec3d99e9421a2f9defbb195cb2
+  metadata.gz: bb21c71a0343bcce335b4ddc7b5b0caec8ba69d5059e09868e76a7494338fd11bd8d6dae0c0697dbc2ccef4564f7fa19ae56cc09b1c6bca22a6670b7ee1ada6c
+  data.tar.gz: 4563b478a1a0c71fbd7087097917b4eacc0a744d8f3d806ce02f8836b767f34a16c40e3207695180ff1a9882f74a6c9c6b354f84547fee5e91a0bf08959ff04a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.3.0] - 2015-12-10
+### Changed
+- Excelx::Cell::Number will return a String instead of an Integer or Float if the cell has an error like #DIV/0, etc. [#273](https://github.com/roo-rb/roo/pull/273)
+
+### Fixed
+- Excelx::Cell::Number now handles cell errors. [#273](https://github.com/roo-rb/roo/pull/273)
+
 ## [2.2.0] - 2015-10-31
 ### Added
 - Added support for returning Integers values to Roo::OpenOffice [#258](https://github.com/roo-rb/roo/pull/258)

data/lib/roo/excelx/cell/number.rb

@@ -2,6 +2,8 @@ module Roo
   class Excelx
     class Cell
       class Number < Cell::Base
+        ERROR_VALUES = %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!)
+
         attr_reader :value, :formula, :format, :cell_value, :link, :coordinate
 
         def initialize(value, formula, excelx_type, style, link, coordinate)
@@ -14,6 +16,8 @@ module Roo
         end
 
         def create_numeric(number)
+          return number if ERROR_VALUES.include?(number)
+
           case @format
           when /%/
             Float(number)
@@ -25,6 +29,8 @@ module Roo
         end
 
         def formatted_value
+          return @cell_value if ERROR_VALUES.include?(@cell_value)
+
           formatter = formats[@format]
           if formatter.is_a? Proc
             formatter.call(@cell_value)

data/lib/roo/version.rb

@@ -1,3 +1,3 @@
 module Roo
-  VERSION = "2.2.0"
+  VERSION = '2.3.0'
 end

data/test/excelx/cell/test_number.rb

@@ -34,6 +34,14 @@ class TestRooExcelxCellNumber < Minitest::Test
     end
   end
 
+  def test_numbers_with_cell_errors
+    %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).each do |error|
+      cell = Roo::Excelx::Cell::Number.new error, nil, ['General'], nil, nil, nil
+      assert_equal error, cell.value
+      assert_equal error, cell.formatted_value
+    end
+  end
+
   def test_formats
     [
       ['General', '1042'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri