simple_xlsx_reader 0.9.4 → 0.9.5

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 0.9.5
+
+* Fix inlineStr support (broken by formula support commit)
+
+### 0.9.4
+
+* Formula support. Formulas used to cause things to blow up, now they don't!
+* Support number types styled as dates. Previously, the type was honored
+  above the style, which is incorrect for dates; date-numbers now parse as
+  dates.
+* Error-free parsing of empty sheets
+* Fix custom styles w/ numFmtId == 164. Custom style types are delineated
+  starting *at* numFmtId 164, not greater than 164.
+
 ### 0.9.3
 
 * Support 1.8.7 (tests pass). Ongoing support will depend on ease.

data/lib/simple_xlsx_reader.rb

@@ -133,8 +133,11 @@ module SimpleXlsxReader
             style = xcell.attributes['s'] &&
                     style_types[xcell.attributes['s'].value.to_i]
 
+            xvalue = type == 'inlineStr' ?
+              xcell.at_xpath('xmlns:is/xmlns:t') : xcell.at_xpath('xmlns:v')
+
             cells << begin
-              self.class.cast(xcell.at_xpath('xmlns:v').text.strip, type, style, :shared_strings => shared_strings)
+              self.class.cast(xvalue.text.strip, type, style, :shared_strings => shared_strings)
             rescue => e
               if !SimpleXlsxReader.configuration.catch_cell_load_errors
                 error = CellLoadError.new(

data/lib/simple_xlsx_reader/version.rb

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

data/test/simple_xlsx_reader_test.rb

@@ -33,8 +33,8 @@ describe SimpleXlsxReader do
       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, nil, 'inlineStr').must_equal 'the value'
+        described_class.cast('the value', nil, 'inlineStr').
+          must_equal 'the value'
       end
 
       it 'reads date styles' do
@@ -154,6 +154,7 @@ describe SimpleXlsxReader do
           XML
         )
       end
+
       let(:xml) do
         SimpleXlsxReader::Document::Xml.new.tap do |xml|
           xml.sheets = [sheet]
@@ -217,14 +218,14 @@ describe SimpleXlsxReader do
         end
       end
 
-      it 'raises if configuration.raise_on_parse_error' do
+      it 'raises if configuration.catch_cell_load_errors' do
         SimpleXlsxReader.configuration.catch_cell_load_errors = false
 
         lambda { described_class.new(xml).parse_sheet('test', xml.sheets.first) }.
           must_raise(SimpleXlsxReader::CellLoadError)
       end
 
-      it 'records a load error if not configuration.raise_on_parse_error' do
+      it 'records a load error if not configuration.catch_cell_load_errors' do
         SimpleXlsxReader.configuration.catch_cell_load_errors = true
 
         sheet = described_class.new(xml).parse_sheet('test', xml.sheets.first)
@@ -232,24 +233,30 @@ describe SimpleXlsxReader do
       end
     end
 
-    describe 'empty "Generic" cells' do
+    describe 'parsing types' do
       let(:xml) do
         SimpleXlsxReader::Document::Xml.new.tap do |xml|
           xml.sheets = [Nokogiri::XML(
             <<-XML
-            <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
-              <dimension ref="A1:C1" />
-              <sheetData>
-                <row>
-                  <c r='A1' s='0'>
-                    <v>Cell A</v>
-                  </c>
-                  <c r='C1' s='0'>
-                    <v>Cell C</v>
-                  </c>
-                </row>
-              </sheetData>
-            </worksheet>
+              <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+                <dimension ref="A1:C1" />
+                <sheetData>
+                  <row>
+                    <c r='A1' s='0'>
+                      <v>Cell A1</v>
+                    </c>
+                    <c r='C1' s='1'>
+                      <v>2.4</v>
+                    </c>
+                    <c r='D1' s='14'>
+                      <v>01-06-84</v>
+                    </c>
+                    <c r='E1' t='inlineStr' s='0'>
+                      <is><t>Cell E1</t></is>
+                    </c>
+                  </row>
+                </sheetData>
+              </worksheet>
             XML
           )]
 
@@ -257,19 +264,44 @@ describe SimpleXlsxReader do
           # which is in this case 'General' type
           xml.styles = Nokogiri::XML(
             <<-XML
-            <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
-              <cellXfs count="1">
-                <xf numFmtId="0" />
-              </cellXfs>
-            </styleSheet>
+              <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+                <cellXfs count="1">
+                  <xf numFmtId="0" />
+                  <xf numFmtId="2" />
+                  <xf numFmtId="14" />
+                </cellXfs>
+              </styleSheet>
             XML
           )
         end
-      end
 
-      it 'get parsed as nil' do
-        described_class.new(xml).parse_sheet('test', xml.sheets.first).
-          rows.must_equal [['Cell A', nil, 'Cell C']]
+        before do
+          @rows = described_class.new(xml).parse_sheet('test', xml.sheets.first).rows
+        end
+
+        it "reads 'Generic' cells as strings" do
+          @rows[0].must_equal "Cell A1"
+        end
+
+        it "reads empty 'Generic' cells as nil" do
+          @rows[1].must_equal nil
+        end
+
+        # We could expand on these type tests, but really just a couple
+        # demonstrate that it's wired together. Type-specific tests should go
+        # on #cast
+
+        it "reads floats" do
+          @rows[2].must_equal 2.4
+        end
+
+        it "reads dates" do
+          @rows[3].must_equal Date.parse('Jan 6, 1984')
+        end
+
+        it "reads strings formatted as inlineStr" do
+          @rows[4].must_equal 'Cell E1'
+        end
       end
     end
   end

metadata

@@ -2,14 +2,14 @@
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Woody Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri