simple_xlsx_reader 0.9.3 → 0.9.4

data/lib/simple_xlsx_reader.rb

@@ -122,20 +122,19 @@ module SimpleXlsxReader
             colname ? colname.next! : colname = 'A'
             colnum += 1
 
-            xcell = xrow.xpath(
-              %(xmlns:c[@r="#{colname + (rownum + 1).to_s}"])).first
+            xcell = xrow.at_xpath(
+              %(xmlns:c[@r="#{colname + (rownum + 1).to_s}"]))
 
             # empty 'General' columns might not be in the xml
             next cells << nil if xcell.nil?
 
-            type = xcell.attributes['t'] &&
-                   xcell.attributes['t'].value
-            # If not the above, attempt to determine from a custom style
-            type ||= xcell.attributes['s'] &&
-                     style_types[xcell.attributes['s'].value.to_i]
+            type  = xcell.attributes['t'] &&
+                    xcell.attributes['t'].value
+            style = xcell.attributes['s'] &&
+                    style_types[xcell.attributes['s'].value.to_i]
 
             cells << begin
-              self.class.cast(xcell.text.strip, type, :shared_strings => shared_strings)
+              self.class.cast(xcell.at_xpath('xmlns:v').text.strip, type, style, :shared_strings => shared_strings)
             rescue => e
               if !SimpleXlsxReader.configuration.catch_cell_load_errors
                 error = CellLoadError.new(
@@ -166,14 +165,13 @@ module SimpleXlsxReader
       # the most robust strategy, but it likely fits 99% of use cases
       # considering it's not a problem with actual excel docs.
       def last_column(xsheet)
-        dimension = xsheet.xpath('/xmlns:worksheet/xmlns:dimension').first
+        dimension = xsheet.at_xpath('/xmlns:worksheet/xmlns:dimension')
         if dimension
-          dimension.attributes['ref'].value.
-            match(/:([A-Z]*)[1-9]*/).captures.first
+          col = dimension.attributes['ref'].value.match(/:([A-Z]*)[1-9]*/)
+          col ? col.captures.first : 'A'
         else
-          xsheet.at_xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row/xmlns:c[last()]").
-            attributes['r'].value.
-            match(/([A-Z]*)[1-9]*/).captures.first
+          last = xsheet.at_xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row/xmlns:c[last()]")
+          last ? last.attributes['r'].value.match(/([A-Z]*)[1-9]*/).captures.first : 'A'
         end
       end
 
@@ -204,15 +202,15 @@ module SimpleXlsxReader
         return nil if id.nil?
 
         id = id.to_i
-        if id > 164 # custom style, arg!
+        if id >= 164 # custom style, arg!
           custom_style_types[id]
         else # we should know this one
           NumFmtMap[id]
         end
       end
 
-      # Map of (numFmtId > 164) (custom styles) to our best guess at the type
-      # ex. {165 => :date_time}
+      # Map of (numFmtId >= 164) (custom styles) to our best guess at the type
+      # ex. {164 => :date_time}
       def custom_style_types
         @custom_style_types ||=
           xml.styles.xpath('/xmlns:styleSheet/xmlns:numFmts/xmlns:numFmt').
@@ -258,9 +256,15 @@ module SimpleXlsxReader
       #
       # options:
       # - shared_strings: needed for 's' (shared string) type
-      def self.cast(value, type, options = {})
+      def self.cast(value, type, style, options = {})
         return nil if value.nil? || value.empty?
 
+        # Sometimes the type is dictated by the style alone
+        if type.nil? ||
+          (type == 'n' && [:date, :time, :date_time].include?(style))
+          type = style
+        end
+
         case type
 
         ##
@@ -371,7 +375,7 @@ module SimpleXlsxReader
           if xml.shared_strings
             xml.shared_strings.xpath('/xmlns:sst/xmlns:si').map do |xsst|
               # a shared string can be a single value...
-              sst = xsst.xpath('xmlns:t/text()').first
+              sst = xsst.at_xpath('xmlns:t/text()')
               sst = sst.text if sst
               # ... or a composite of seperately styled words/characters
               sst ||= xsst.xpath('xmlns:r/xmlns:t/text()').map(&:text).join

data/lib/simple_xlsx_reader/version.rb

@@ -1,3 +1,3 @@
 module SimpleXlsxReader
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/test/simple_xlsx_reader_test.rb

@@ -17,7 +17,8 @@ describe SimpleXlsxReader do
         "Posts"=>
           [["Author Name", "Title", "Body", "Created At", "Comment Count"],
            ["Big Bird", "The Number 1", "The Greatest", Time.parse("2002-01-01 11:00:00 UTC"), 1],
-           ["Big Bird", "The Number 2", "Second Best", Time.parse("2002-01-02 14:00:00 UTC"), 2]]
+           ["Big Bird", "The Number 2", "Second Best", Time.parse("2002-01-02 14:00:00 UTC"), 2],
+           ["Big Bird", "Formula Dates", "Tricky tricky", Time.parse("2002-01-03 14:00:00 UTC"), 0]]
       })
     end
   end
@@ -27,13 +28,43 @@ describe SimpleXlsxReader do
 
     describe '::cast' do
       it 'reads type s as a shared string' do
-        described_class.cast('1', 's', :shared_strings => ['a', 'b', 'c']).
+        described_class.cast('1', 's', nil, :shared_strings => ['a', 'b', 'c']).
           must_equal 'b'
       end
 
       it 'reads type inlineStr as a string' do
         xml = Nokogiri::XML(%( <c t="inlineStr"><is><t>the value</t></is></c> ))
-        described_class.cast(xml.text, 'inlineStr').must_equal 'the value'
+        described_class.cast(xml.text, nil, 'inlineStr').must_equal 'the value'
+      end
+
+      it 'reads date styles' do
+        described_class.cast('41505', nil, :date).
+          must_equal Date.parse('2013-08-19')
+      end
+
+      it 'reads time styles' do
+        described_class.cast('41505.77084', nil, :time).
+          must_equal Time.parse('2013-08-19 18:30 UTC')
+      end
+
+      it 'reads date_time styles' do
+        described_class.cast('41505.77084', nil, :date_time).
+          must_equal Time.parse('2013-08-19 18:30 UTC')
+      end
+
+      it 'reads number types styled as dates' do
+        described_class.cast('41505', 'n', :date).
+          must_equal Date.parse('2013-08-19')
+      end
+
+      it 'reads number types styled as times' do
+        described_class.cast('41505.77084', 'n', :time).
+          must_equal Time.parse('2013-08-19 18:30 UTC')
+      end
+
+      it 'reads number types styled as date_times' do
+        described_class.cast('41505.77084', 'n', :date_time).
+          must_equal Time.parse('2013-08-19 18:30 UTC')
       end
     end
 
@@ -56,6 +87,23 @@ describe SimpleXlsxReader do
       end
     end
 
+    describe '#style_types' do
+      let(:xml) do
+        SimpleXlsxReader::Document::Xml.new.tap do |xml|
+          xml.styles = Nokogiri::XML(File.read(
+            File.join(File.dirname(__FILE__), 'styles.xml') ))
+        end
+      end
+
+      let(:mapper) do
+        SimpleXlsxReader::Document::Mapper.new(xml)
+      end
+
+      it 'reads custom formatted styles (numFmtId >= 164)' do
+        mapper.style_types[1].must_equal :date_time
+      end
+    end
+
     describe '#last_column' do
 
       let(:generic_style) do
@@ -95,6 +143,17 @@ describe SimpleXlsxReader do
         )
       end
 
+      let(:empty_sheet) do
+        Nokogiri::XML(
+          <<-XML
+          <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+            <dimension ref="A1" />
+            <sheetData>
+            </sheetData>
+          </worksheet>
+          XML
+        )
+      end
       let(:xml) do
         SimpleXlsxReader::Document::Xml.new.tap do |xml|
           xml.sheets = [sheet]
@@ -112,6 +171,15 @@ describe SimpleXlsxReader do
         sheet.xpath('/xmlns:worksheet/xmlns:dimension').remove
         subject.last_column(sheet).must_equal 'D'
       end
+
+      it 'returns "A" if the dimension is just one cell' do
+        subject.last_column(empty_sheet).must_equal 'A'
+      end
+
+      it 'returns "A" if the sheet is just one cell, but /worksheet/dimension is missing' do
+        sheet.at_xpath('/xmlns:worksheet/xmlns:dimension').remove
+        subject.last_column(empty_sheet).must_equal 'A'
+      end
     end
 
     describe "parse errors" do

data/test/styles.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" mc:Ignorable="x14ac">
+  <numFmts count="1">
+    <numFmt numFmtId="164" formatCode="[$-409]m/d/yy\ h:mm\ AM/PM;@"/>
+  </numFmts>
+  <fonts count="3" x14ac:knownFonts="1">
+    <font>
+      <sz val="12"/>
+      <color theme="1"/>
+      <name val="Calibri"/>
+      <family val="2"/>
+      <scheme val="minor"/>
+    </font>
+    <font>
+      <u/>
+      <sz val="12"/>
+      <color theme="10"/>
+      <name val="Calibri"/>
+      <family val="2"/>
+      <scheme val="minor"/>
+    </font>
+    <font>
+      <u/>
+      <sz val="12"/>
+      <color theme="11"/>
+      <name val="Calibri"/>
+      <family val="2"/>
+      <scheme val="minor"/>
+    </font>
+  </fonts>
+  <fills count="2">
+    <fill>
+      <patternFill patternType="none"/>
+    </fill>
+    <fill>
+      <patternFill patternType="gray125"/>
+    </fill>
+  </fills>
+  <borders count="1">
+    <border>
+      <left/>
+      <right/>
+      <top/>
+      <bottom/>
+      <diagonal/>
+    </border>
+  </borders>
+  <cellStyleXfs count="3">
+    <xf numFmtId="0" fontId="0" fillId="0" borderId="0"/>
+    <xf numFmtId="0" fontId="1" fillId="0" borderId="0" applyNumberFormat="0" applyFill="0" applyBorder="0" applyAlignment="0" applyProtection="0"/>
+    <xf numFmtId="0" fontId="2" fillId="0" borderId="0" applyNumberFormat="0" applyFill="0" applyBorder="0" applyAlignment="0" applyProtection="0"/>
+  </cellStyleXfs>
+  <cellXfs count="3">
+    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
+    <xf numFmtId="164" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+    <xf numFmtId="1" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+  </cellXfs>
+  <cellStyles count="3">
+    <cellStyle name="Followed Hyperlink" xfId="2" builtinId="9" hidden="1"/>
+    <cellStyle name="Hyperlink" xfId="1" builtinId="8" hidden="1"/>
+    <cellStyle name="Normal" xfId="0" builtinId="0"/>
+  </cellStyles>
+  <dxfs count="0"/>
+  <tableStyles count="0" defaultTableStyle="TableStyleMedium9" defaultPivotStyle="PivotStyleMedium4"/>
+</styleSheet>

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 0.9.3
   prerelease: 
+  version: 0.9.4
 platform: ruby
 authors:
 - Woody Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -29,13 +29,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -45,13 +45,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -61,13 +61,13 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -94,6 +94,7 @@ files:
 - test/sesame_street_blog.xlsx
 - test/shared_strings.xml
 - test/simple_xlsx_reader_test.rb
+- test/styles.xml
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -123,4 +124,6 @@ test_files:
 - test/sesame_street_blog.xlsx
 - test/shared_strings.xml
 - test/simple_xlsx_reader_test.rb
+- test/styles.xml
 - test/test_helper.rb
+has_rdoc: