roo 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b79f7270fb925c4aa402c0bd1bcccfc422ac92
-  data.tar.gz: f5ed3e4155c09890a710265c3a31e308ec4660fa
+  metadata.gz: cd058c382f97cefc8605bb1fdf40a2900312d6bc
+  data.tar.gz: 4a62144cc33be58fbab07eababe5d6e8a6205c30
 SHA512:
-  metadata.gz: bb21c71a0343bcce335b4ddc7b5b0caec8ba69d5059e09868e76a7494338fd11bd8d6dae0c0697dbc2ccef4564f7fa19ae56cc09b1c6bca22a6670b7ee1ada6c
-  data.tar.gz: 4563b478a1a0c71fbd7087097917b4eacc0a744d8f3d806ce02f8836b767f34a16c40e3207695180ff1a9882f74a6c9c6b354f84547fee5e91a0bf08959ff04a
+  metadata.gz: 626854d9aea329f2f2113a1fba53d9981d09ccb520c5ffec06936f996f786874a2b437e3fb1125151f4c3c2248006f3b6ca4fc1e6ddb758e96b36c4ebcbe08d1
+  data.tar.gz: 1432ebdeef169aad8eb64982c612da9cff907743a2512b594ded3ebff2823428a10e9ec1a326561ab6e0c68d9bdb39b1abe15655e797304df51dde68e89e437b

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1
-  - 2.2.0
+  - 2.1.8
+  - 2.2.4
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.3.1] - 2015-01-08
+### Fixed
+- Properly parse sci-notation number like 1E-3 [#288](https://github.com/roo-rb/roo/pull/288)
+- Include all tests in default rake run [#283](https://github.com/roo-rb/roo/pull/283)
+- Fix zero-padded numbers for Excelx [#282](https://github.com/roo-rb/roo/pull/282)
+
+### Changed
+- Moved `ERROR_VALUES` from Excelx::Cell::Number ~> Excelx. [#280](https://github.com/roo-rb/roo/pull/280)
+
 ## [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)

data/README.md

@@ -189,6 +189,9 @@ xlsx.cell(3, 'C')
 # => 600000383.0
 
 xlsx.excelx_value(row,col)
+# => '600000383'
+
+xlsx.formatted_value(row,col)
 # => '0600000383'
 ```
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'coveralls/rake/task'
 # Test unit
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['test/test*.rb']
+  t.test_files = FileList['test/**/test*.rb']
   t.verbose = true
 end
 

data/lib/roo/excelx.rb

@@ -6,8 +6,11 @@ require 'forwardable'
 
 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'
@@ -194,6 +197,13 @@ module Roo
       safe_send(sheet_for(sheet).cells[key], :cell_value)
     end
 
+    # returns the internal value of an excelx cell
+    # Note: this is only available within the Excelx class
+    def formatted_value(row, col, sheet = nil)
+      key = normalize(row, col)
+      safe_send(sheet_for(sheet).cells[key], :formatted_value)
+    end
+
     # returns the internal format of an excel cell
     def excelx_format(row, col, sheet = nil)
       key = normalize(row, col)

data/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,24 +14,25 @@ module Roo
         end
 
         def create_numeric(number)
-          return number if ERROR_VALUES.include?(number)
-
+          return number if Excelx::ERROR_VALUES.include?(number)
           case @format
           when /%/
             Float(number)
           when /\.0/
             Float(number)
           else
-            number.include?('.') ? Float(number) : Integer(number)
+            (number.include?('.') || (/\A\d+E[-+]\d+\z/i =~ number)) ? Float(number) : Integer(number)
           end
         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
             formatter.call(@cell_value)
+          elsif zero_padded_number?
+            "%0#{@format.size}d"% @cell_value
           else
             Kernel.format(formatter, @cell_value)
           end
@@ -80,6 +79,12 @@ module Roo
             '@' => proc { |number| number }
           }
         end
+
+        private
+
+        def zero_padded_number?
+          @format[/0+/] == @format
+        end
       end
     end
   end

data/lib/roo/version.rb

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

data/spec/lib/roo/excelx_spec.rb

@@ -6,6 +6,18 @@ describe Roo::Excelx do
     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' }
 
@@ -283,6 +295,16 @@ describe Roo::Excelx do
     end
   end
 
+  describe '#formatted_value' do
+    context 'contains zero-padded numbers' do
+      let(:path) { 'test/files/zero-padded-number.xlsx' }
+
+      it 'returns a zero-padded number' do
+        expect(subject.formatted_value(4, 1)).to eq '05010'
+      end
+    end
+  end
+
   describe '#excelx_format' do
     let(:path) { 'test/files/style.xlsx' }
 

data/test/excelx/cell/test_base.rb

@@ -1,5 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellBase < Minitest::Test
   def base

data/test/excelx/cell/test_boolean.rb

@@ -1,6 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/boolean'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellNumber < Minitest::Test
   def boolean

data/test/excelx/cell/test_date.rb

@@ -1,9 +1,4 @@
-require 'date'
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/datetime'
-require 'roo/excelx/cell/date'
-require 'roo/link'
-require 'pry'
+require 'test_helper'
 
 class TestRooExcelxCellDate < Minitest::Test
   def date_cell

data/test/excelx/cell/test_datetime.rb

@@ -1,7 +1,4 @@
-require 'date'
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/datetime'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellDateTime < Minitest::Test
   def test_cell_value_is_datetime

data/test/excelx/cell/test_empty.rb

@@ -1,5 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/empty'
+require 'test_helper'
 
 class TestRooExcelxCellEmpty < Minitest::Test
   def empty

data/test/excelx/cell/test_number.rb

@@ -1,6 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/number'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellNumber < Minitest::Test
   def number
@@ -17,6 +15,16 @@ class TestRooExcelxCellNumber < Minitest::Test
     assert_kind_of(Integer, cell.value)
   end
 
+  def test_scientific_notation
+    cell = Roo::Excelx::Cell::Number.new '1.2E-3', nil, ['0'], nil, nil, nil
+    assert_kind_of(Float, cell.value)
+  end
+
+  def test_simple_scientific_notation
+    cell = Roo::Excelx::Cell::Number.new '1E-3', nil, ['0'], nil, nil, nil
+    assert_kind_of(Float, cell.value)
+  end
+
   def test_percent
     cell = Roo::Excelx::Cell::Number.new '42.1', nil, ['0.00%'], nil, nil, nil
     assert_kind_of(Float, cell.value)
@@ -35,7 +43,7 @@ class TestRooExcelxCellNumber < Minitest::Test
   end
 
   def test_numbers_with_cell_errors
-    %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).each do |error|
+    Roo::Excelx::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

data/test/excelx/cell/test_string.rb

@@ -1,6 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/string'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellString < Minitest::Test
   def string

data/test/excelx/cell/test_time.rb

@@ -1,7 +1,4 @@
-require 'roo/excelx/cell/base'
-require 'roo/excelx/cell/datetime'
-require 'roo/excelx/cell/time'
-require 'roo/link'
+require 'test_helper'
 
 class TestRooExcelxCellTime < Minitest::Test
   def time

metadata

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