Merge pull request #280 from kuldeepaggarwal/code-nitpick

move `ERROR_VALUES` from Excelx::Cell::Number ~> Excelx
roo-rb · Dec 18, 2015 · 3383085 · 3383085
2 parents d9667fc + 5706739
commit 3383085
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb
@@ -6,8 +6,11 @@
 
 module Roo
   class Excelx < Roo::Base
+    require 'set'
     extend Forwardable
 
+    ERROR_VALUES = %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).to_set
+
     require 'roo/excelx/shared'
     require 'roo/excelx/workbook'
     require 'roo/excelx/shared_strings'

diff --git a/lib/roo/excelx/cell/number.rb b/lib/roo/excelx/cell/number.rb
@@ -2,8 +2,6 @@ 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)
@@ -16,7 +14,7 @@ def initialize(value, formula, excelx_type, style, link, coordinate)
         end
 
         def create_numeric(number)
-          return number if ERROR_VALUES.include?(number)
+          return number if Excelx::ERROR_VALUES.include?(number)
 
           case @format
           when /%/
@@ -29,7 +27,7 @@ def create_numeric(number)
         end
 
         def formatted_value
-          return @cell_value if ERROR_VALUES.include?(@cell_value)
+          return @cell_value if Excelx::ERROR_VALUES.include?(@cell_value)
 
           formatter = formats[@format]
           if formatter.is_a? Proc

diff --git a/spec/lib/roo/excelx_spec.rb b/spec/lib/roo/excelx_spec.rb
@@ -6,6 +6,18 @@
     Roo::Excelx.new(path)
   end
 
+  describe 'Constants' do
+    describe 'ERROR_VALUES' do
+      it 'returns all possible errorr values' do
+        expect(described_class::ERROR_VALUES).to eq(%w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).to_set)
+      end
+
+      it 'is a set' do
+        expect(described_class::ERROR_VALUES).to be_an_instance_of(Set)
+      end
+    end
+  end
+
   describe '.new' do
     let(:path) { 'test/files/numeric-link.xlsx' }
 

diff --git a/test/excelx/cell/test_number.rb b/test/excelx/cell/test_number.rb
@@ -35,7 +35,7 @@ def test_formats_with_negative_numbers
   end
 
   def test_numbers_with_cell_errors
-    %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).each do |error|
+    Excels::ERROR_VALUES.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