simple_xlsx_reader 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+### 0.9.1
+
+* Fixed an important parse bug that ignored empty 'Generic' cells
+
+### 0.9.0
+
+* Initial release. 0.9 version number is meant to reflect the near-stable
+  public api, yet still prerelease status of the project.

data/README.md

@@ -91,6 +91,10 @@ Or install it yourself as:
 
     $ gem install simple_xlsx_reader
 
+## Versioning
+
+This project follows [semantic versioning 1.0](http://semver.org/spec/v1.0.0.html)
+
 ## Contributing
 
 1. Fork it

data/lib/simple_xlsx_reader.rb

@@ -109,23 +109,35 @@ module SimpleXlsxReader
       def parse_sheet(sheet_name, xsheet)
         sheet = Sheet.new(sheet_name)
 
+        last_column = xsheet.xpath('/xmlns:worksheet/xmlns:dimension').first.
+          attributes['ref'].value.match(/:([A-Z]*)[1-9]*/).captures.first
+
         rownum = -1
         sheet.rows =
           xsheet.xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row").map do |xrow|
           rownum += 1
 
-          colnum = -1
-          xrow.xpath('xmlns:c').map do |xcell|
+          colname = nil
+          colnum  = -1
+          cells   = []
+          while(colname != last_column) do
+            colname ? colname.next! : colname = 'A'
             colnum += 1
 
+            xcell = xrow.xpath(
+              %(xmlns:c[@r="#{colname + (rownum + 1).to_s}"])).first
+
+            # 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]
 
-            begin
-              self.class.cast(xcell.text, type, shared_strings: shared_strings)
+            cells << begin
+              self.class.cast(xcell.text.strip, type, shared_strings: shared_strings)
             rescue => e
               if !SimpleXlsxReader.configuration.catch_cell_load_errors
                 error = CellLoadError.new(
@@ -135,10 +147,12 @@ module SimpleXlsxReader
               else
                 sheet.load_errors[[rownum, colnum]] = e.message
 
-                xcell.text
+                xcell.text.strip
               end
             end
           end
+
+          cells
         end
 
         sheet

data/lib/simple_xlsx_reader/version.rb

@@ -1,3 +1,3 @@
 module SimpleXlsxReader
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/test/simple_xlsx_reader_test.rb

@@ -66,9 +66,10 @@ describe SimpleXlsxReader do
           xml.sheets = [Nokogiri::XML(
             <<-XML
             <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+              <dimension ref="A1:A1" />
               <sheetData>
                 <row>
-                  <c s='0'>
+                  <c r='A1' s='0'>
                     <v>14 is a date style; this is not a date</v>
                   </c>
                 </row>
@@ -104,5 +105,46 @@ describe SimpleXlsxReader do
         sheet.load_errors[[0,0]].must_include 'invalid value for Integer'
       end
     end
+
+    describe 'empty "Generic" cells' 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>
+            XML
+          )]
+
+          # s='0' above refers to the value of numFmtId at cellXfs index 0,
+          # 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>
+            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']]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md