simple_xlsx_reader 0.9.1 → 0.9.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.9.2
+
+* Support reading files written by ex. simple_xlsx_writer that don't
+  specify sheet dimensions explicitly (which Excel does).
+
 ### 0.9.1
 
 * Fixed an important parse bug that ignored empty 'Generic' cells

data/lib/simple_xlsx_reader/version.rb

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

data/lib/simple_xlsx_reader.rb

@@ -109,9 +109,7 @@ 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
-
+        last_column = last_column(xsheet)
         rownum = -1
         sheet.rows =
           xsheet.xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row").map do |xrow|
@@ -158,6 +156,28 @@ module SimpleXlsxReader
         sheet
       end
 
+      ##
+      # Returns the last column name, ex. 'E'
+      #
+      # Note that excel writes a '/worksheet/dimension' node we can get the
+      # last cell from, but some libs (ex. simple_xlsx_writer) don't record
+      # this. In that case, we assume the data is of uniform column length
+      # and check the column name of the last header row. Obviously this isn't
+      # 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
+        if dimension
+          dimension.attributes['ref'].value.
+            match(/:([A-Z]*)[1-9]*/).captures.first
+        else
+          xsheet.at_xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row/xmlns:c[last()]").
+            attributes['r'].value.
+            match(/([A-Z]*)[1-9]*/).captures.first
+        end
+      end
+
+
       # Excel doesn't record types for some cells, only its display style, so
       # we have to back out the type from that style.
       #

data/test/simple_xlsx_reader_test.rb

@@ -56,6 +56,64 @@ describe SimpleXlsxReader do
       end
     end
 
+    describe '#last_column' do
+
+      let(:generic_style) do
+          Nokogiri::XML(
+            <<-XML
+            <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+              <cellXfs count="1">
+                <xf numFmtId="0" />
+              </cellXfs>
+            </styleSheet>
+            XML
+          )
+      end
+
+      # Note, this is not a valid sheet, since the last cell is actually D1 but
+      # the dimension specifies C1. This is just for testing.
+      let(:sheet) do
+        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>
+                <c r='D1' s='0'>
+                  <v>Cell D</v>
+                </c>
+              </row>
+            </sheetData>
+          </worksheet>
+          XML
+        )
+      end
+
+      let(:xml) do
+        SimpleXlsxReader::Document::Xml.new.tap do |xml|
+          xml.sheets = [sheet]
+          xml.styles = generic_style
+        end
+      end
+
+      subject { described_class.new(xml) }
+
+      it 'uses /worksheet/dimension if available' do
+        subject.last_column(sheet).must_equal 'C'
+      end
+
+      it 'uses the last header cell if /worksheet/dimension is missing' do
+        sheet.xpath('/xmlns:worksheet/xmlns:dimension').remove
+        subject.last_column(sheet).must_equal 'D'
+      end
+    end
+
     describe "parse errors" do
       after do
         SimpleXlsxReader.configuration.catch_cell_load_errors = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors: