simple_xlsx_reader 0.9.8 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592fa09e1f66127581441dcee23a2ec10481a08f
-  data.tar.gz: 2165196985a70b2f594828e43523c237600f7c08
+  metadata.gz: 4d24749c8713f2f57e47d33a363801333130c5df
+  data.tar.gz: 0b26df686d579163845fd6e06936bff930c52c33
 SHA512:
-  metadata.gz: 4ef8fe7df99b9bea2742c49663aa899421e5d4b6a145c62ee15afef9a8938ba1bfe0c5bf4b9d0999e2cffc6189436fd4f3b1a59af8a796a05c1dc4d6d9f7de77
-  data.tar.gz: d1a2cb30e2dce280b529f6b877745cfbfa1f7cc8bbcacd506b268ca624da74d637e9e47bff8602f53d0c33ebd38055750c6eda88bbeaedd34d8eeb5e891e8b2e
+  metadata.gz: 523248f26fdf45c2978716836a2d81c5d3a4877bb74f29d7bfa51be1965e1ef61d1e67c83ec98bcac83f7b8e39ac08f666f6d31341428a5d0afa993e149ed7cd
+  data.tar.gz: 710789e5c5dd70d9d360e3a776662dc64138965b54984772cac9785018e2c9605a2b9ea3a2b889ec171183c64610901da527ae91989e9ea149d9016dc8497c71

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.0.0.pre
+
+* Handle files with blank rows [Brian Hoffman]
+* Preserve seconds when casting datetimes [Rob Newbould]
+* Preserve empty rows (previously would be ommitted)
+* Speed up parsing by ~55%
+
 ### 0.9.8
 
 * Rubyzip 1.0 compatability

data/README.md

@@ -97,7 +97,18 @@ This project follows [semantic versioning 1.0](http://semver.org/spec/v1.0.0.htm
 
 ## Contributing
 
-1. Fork it
+Remember to write tests, think about edge cases, and run the existing
+suite.
+
+Note that as of commit 665cbafdde, the most extreme end of the
+linear-time performance test, which is 10,000 rows (12 columns), runs in
+~4 seconds on Ruby 2.1 on a 2012 MBP. If the linear time assertion fails
+or you're way off that, there is probably a performance regression in
+your code.
+
+Then, the standard stuff:
+
+1. Fork this project
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/simple_xlsx_reader.rb

@@ -74,13 +74,13 @@ module SimpleXlsxReader
       def self.load(file_path)
         self.new.tap do |xml|
           SimpleXlsxReader::Zip.open(file_path) do |zip|
-            xml.workbook       = Nokogiri::XML(zip.read('xl/workbook.xml'))
-            xml.styles         = Nokogiri::XML(zip.read('xl/styles.xml'))
+            xml.workbook = Nokogiri::XML(zip.read('xl/workbook.xml')).remove_namespaces!
+            xml.styles   = Nokogiri::XML(zip.read('xl/styles.xml')).remove_namespaces!
 
             # optional feature used by excel, but not often used by xlsx
             # generation libraries
             if zip.file.file?('xl/sharedStrings.xml')
-              xml.shared_strings = Nokogiri::XML(zip.read('xl/sharedStrings.xml'))
+              xml.shared_strings = Nokogiri::XML(zip.read('xl/sharedStrings.xml')).remove_namespaces!
             end
 
             xml.sheets = []
@@ -90,7 +90,7 @@ module SimpleXlsxReader
               break if !zip.file.file?("xl/worksheets/sheet#{i}.xml")
 
               xml.sheets <<
-                Nokogiri::XML(zip.read("xl/worksheets/sheet#{i}.xml"))
+                Nokogiri::XML(zip.read("xl/worksheets/sheet#{i}.xml")).remove_namespaces!
             end
           end
         end
@@ -101,14 +101,14 @@ module SimpleXlsxReader
     # For internal use; translates source xml to Sheet objects.
     class Mapper < Struct.new(:xml)
       def load_sheets
-        sheet_toc.each_with_index.map do |(sheet_name, sheet_number), i|
+        sheet_toc.each_with_index.map do |(sheet_name, _sheet_number), i|
           parse_sheet(sheet_name, xml.sheets[i])  # sheet_number is *not* the index into xml.sheets
         end
       end
 
       # Table of contents for the sheets, ex. {'Authors' => 0, ...}
       def sheet_toc
-        xml.workbook.xpath('/xmlns:workbook/xmlns:sheets/xmlns:sheet').
+        xml.workbook.xpath('/workbook/sheets/sheet').
           inject({}) do |acc, sheet|
 
           acc[sheet.attributes['name'].value] =
@@ -120,52 +120,55 @@ module SimpleXlsxReader
 
       def parse_sheet(sheet_name, xsheet)
         sheet = Sheet.new(sheet_name)
-
-        last_column = last_column(xsheet)
-        rownum = -1
-        sheet.rows =
-          xsheet.xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row").map do |xrow|
-          rownum += 1
-
-          colname = nil
-          colnum  = -1
-          cells   = []
-          while(colname != last_column) do
-            colname ? colname.next! : colname = 'A'
-            colnum += 1
-
-            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
-            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(xvalue && xvalue.text.strip, type, style,
-                              :shared_strings => shared_strings)
-            rescue => e
-              if !SimpleXlsxReader.configuration.catch_cell_load_errors
-                error = CellLoadError.new(
-                  "Row #{rownum}, Col #{colnum}: #{e.message}")
-                error.set_backtrace(e.backtrace)
-                raise error
-              else
-                sheet.load_errors[[rownum, colnum]] = e.message
-
-                xcell.text.strip
-              end
+        sheet_width, sheet_height = *sheet_dimensions(xsheet)
+
+        sheet.rows = Array.new(sheet_height) { Array.new(sheet_width) }
+        xsheet.xpath("/worksheet/sheetData/row/c").each do |xcell|
+          column, row = *xcell.attr('r').match(/([A-Z]+)([0-9]+)/).captures
+          col_idx = column_letter_to_number(column) - 1
+          row_idx = row.to_i - 1
+
+          type  = xcell.attributes['t'] &&
+                  xcell.attributes['t'].value
+          style = xcell.attributes['s'] &&
+                  style_types[xcell.attributes['s'].value.to_i]
+
+          # This is the main performance bottleneck. Using just 'xcell.text'
+          # would be ideal, and makes parsing super-fast. However, there's
+          # other junk in the cell, formula references in particular,
+          # so we really do have to look for specific value nodes.
+          # Maybe there is a really clever way to use xcell.text and parse out
+          # the correct value, but I can't think of one, or an alternative
+          # strategy.
+          #
+          # And yes, this really is faster than using xcell.at_xpath(...),
+          # by about 60%. Odd.
+          xvalue = type == 'inlineStr' ?
+            (xis = xcell.children.find {|c| c.name == 'is'}) && xis.children.find {|c| c.name == 't'} :
+            xcell.children.find {|c| c.name == 'v'}
+
+          cell = begin
+            self.class.cast(xvalue && xvalue.text.strip, type, style,
+                            :shared_strings => shared_strings)
+          rescue => e
+            if !SimpleXlsxReader.configuration.catch_cell_load_errors
+              error = CellLoadError.new(
+                "Row #{row_idx}, Col #{col_idx}: #{e.message}")
+              error.set_backtrace(e.backtrace)
+              raise error
+            else
+              sheet.load_errors[[row_idx, col_idx]] = e.message
+
+              xcell.text.strip
             end
           end
 
-          cells
+          # This shouldn't be necessary, but just in case, we'll create
+          # the row so we don't blow up. This means any null rows in between
+          # will be null instead of [null, null, ...]
+          sheet.rows[row_idx] ||= Array.new(sheet_width)
+
+          sheet.rows[row_idx][col_idx] = cell
         end
 
         sheet
@@ -180,17 +183,43 @@ module SimpleXlsxReader
       # 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.at_xpath('/xmlns:worksheet/xmlns:dimension')
+      def last_cell_label(xsheet)
+        dimension = xsheet.at_xpath('/worksheet/dimension')
         if dimension
-          col = dimension.attributes['ref'].value.match(/:([A-Z]*)[1-9]*/)
-          col ? col.captures.first : 'A'
+          col = dimension.attributes['ref'].value.match(/:([A-Z]+[0-9]+)/)
+          col ? col.captures.first : 'A1'
         else
-          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'
+          last = xsheet.at_xpath("/worksheet/sheetData/row[last()]/c[last()]")
+          last ? last.attributes['r'].value.match(/([A-Z]+[0-9]+)/).captures.first : 'A1'
         end
       end
 
+      # Returns dimensions (1-indexed)
+      def sheet_dimensions(xsheet)
+        column, row = *last_cell_label(xsheet).match(/([A-Z]+)([0-9]+)/).captures
+        [column_letter_to_number(column), row.to_i]
+      end
+
+      # formula fits an exponential factorial function of the form:
+      # 'A'   = 1
+      # 'B'   = 2
+      # 'Z'   = 26
+      # 'AA'  = 26 * 1  + 1
+      # 'AZ'  = 26 * 1  + 26
+      # 'BA'  = 26 * 2  + 1
+      # 'ZA'  = 26 * 26 + 1
+      # 'ZZ'  = 26 * 26 + 26
+      # 'AAA' = 26 * 26 * 1 + 26 * 1  + 1
+      # 'AAZ' = 26 * 26 * 1 + 26 * 1  + 26
+      # 'ABA' = 26 * 26 * 1 + 26 * 2  + 1
+      # 'BZA' = 26 * 26 * 2 + 26 * 26 + 1
+      def column_letter_to_number(column_letter)
+        pow = -1
+        column_letter.codepoints.reverse.inject(0) do |acc, charcode|
+          pow += 1
+          acc + 26**pow * (charcode - 64)
+        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.
@@ -208,7 +237,7 @@ module SimpleXlsxReader
       # type.
       def style_types
         @style_types ||=
-          xml.styles.xpath('/xmlns:styleSheet/xmlns:cellXfs/xmlns:xf').map {|xstyle|
+          xml.styles.xpath('/styleSheet/cellXfs/xf').map {|xstyle|
             style_type_by_num_fmt_id(xstyle.attributes['numFmtId'].value)}
       end
 
@@ -229,7 +258,7 @@ module SimpleXlsxReader
       # ex. {164 => :date_time}
       def custom_style_types
         @custom_style_types ||=
-          xml.styles.xpath('/xmlns:styleSheet/xmlns:numFmts/xmlns:numFmt').
+          xml.styles.xpath('/styleSheet/numFmts/numFmt').
           inject({}) do |acc, xstyle|
 
           acc[xstyle.attributes['numFmtId'].value.to_i] =
@@ -321,11 +350,9 @@ module SimpleXlsxReader
 
           if fraction_of_24 # there is a time associated
             fraction_of_24 = "0.#{fraction_of_24}".to_f
-            military       = fraction_of_24 * 24
-            hour           = military.truncate
-            minute         = ((military % 1) * 60).truncate
+            seconds        = (fraction_of_24 * 86400).round
 
-            return Time.utc(date.year, date.month, date.day, hour, minute)
+            return Time.utc(date.year, date.month, date.day) + seconds
           else
             return date
           end
@@ -389,12 +416,12 @@ module SimpleXlsxReader
       def shared_strings
         @shared_strings ||= begin
           if xml.shared_strings
-            xml.shared_strings.xpath('/xmlns:sst/xmlns:si').map do |xsst|
+            xml.shared_strings.xpath('/sst/si').map do |xsst|
               # a shared string can be a single value...
-              sst = xsst.at_xpath('xmlns:t/text()')
+              sst = xsst.at_xpath('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
+              sst ||= xsst.xpath('r/t/text()').map(&:text).join
             end
           else
             []

data/lib/simple_xlsx_reader/version.rb

@@ -1,3 +1,3 @@
 module SimpleXlsxReader
-  VERSION = "0.9.8"
+  VERSION = "1.0.0.pre"
 end

data/simple_xlsx_reader.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'rubyzip'
 
-  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'minitest', '>= 5.0'
   gem.add_development_dependency 'pry'
 
   gem.files         = `git ls-files`.split($/)

data/test/datetime_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+describe SimpleXlsxReader do
+  let(:datetimes_file) { File.join(File.dirname(__FILE__),
+                                   'datetimes.xlsx') }
+
+  let(:subject) { SimpleXlsxReader::Document.new(datetimes_file) }
+
+  it 'converts date_times with the correct precision' do
+    subject.to_hash.must_equal({
+      "Datetimes" =>
+        [[Time.parse("2013-08-19 18:29:59 UTC")],
+         [Time.parse("2013-08-19 18:30:00 UTC")],
+         [Time.parse("2013-08-19 18:30:01 UTC")]]
+    })
+  end
+
+end

data/test/performance_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'minitest/benchmark'
 
-describe SimpleXlsxReader do
+describe 'SimpleXlsxReader Benchmark' do
 
   # n is 0-indexed for us, then converted to 1-indexed for excel
   def build_row(n)
@@ -58,8 +58,8 @@ describe SimpleXlsxReader do
           </sheetData>
         </worksheet>
       XML
-    )
-    base.at_xpath("/xmlns:worksheet/xmlns:sheetData").add_child(build_row(0))
+    ).remove_namespaces!
+    base.at_xpath("/worksheet/sheetData").add_child(build_row(0))
 
     @xml = SimpleXlsxReader::Document::Xml.new.tap do |xml|
       xml.sheets = [base]
@@ -76,7 +76,7 @@ describe SimpleXlsxReader do
             </cellXfs>
           </styleSheet>
         XML
-      )
+      ).remove_namespaces!
     end
 
     # Every new sheet has one more row
@@ -84,8 +84,8 @@ describe SimpleXlsxReader do
       sheet = base.clone
 
       range.times do |n|
-        sheet.xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row").last.
-          add_next_sibling(build_row(n))
+        sheet.xpath("/worksheet/sheetData/row").last.
+          add_next_sibling(build_row(n+1))
       end
 
       @xml.sheets[range] = sheet
@@ -93,19 +93,19 @@ describe SimpleXlsxReader do
   end
 
   def self.bench_range
-    bench_exp(1,1000)
+    bench_exp(1,10000)
   end
 
   bench_performance_linear 'parses sheets in linear time', 0.9999 do |n|
 
-    raise "not enough sample data; asked for #{n}, only have #{@xml.sheets.count}"\
+    raise "not enough sample data; asked for #{n}, only have #{@xml.sheets.size}"\
       if @xml.sheets[n].nil?
 
     sheet = SimpleXlsxReader::Document::Mapper.new(@xml).
       parse_sheet('test', @xml.sheets[n])
 
-    raise "sheet didn't parse correctly; expected #{n + 1} rows, got #{sheet.rows.count}"\
-      if sheet.rows.count != n + 1
+    raise "sheet didn't parse correctly; expected #{n + 1} rows, got #{sheet.rows.size}"\
+      if sheet.rows.size != n + 1
   end
 
 end

data/test/simple_xlsx_reader_test.rb

@@ -44,12 +44,12 @@ describe SimpleXlsxReader do
       end
 
       it 'reads time styles' do
-        described_class.cast('41505.77084', nil, :time).
+        described_class.cast('41505.77083', 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).
+        described_class.cast('41505.77083', nil, :date_time).
           must_equal Time.parse('2013-08-19 18:30 UTC')
       end
 
@@ -59,12 +59,12 @@ describe SimpleXlsxReader do
       end
 
       it 'reads number types styled as times' do
-        described_class.cast('41505.77084', 'n', :time).
+        described_class.cast('41505.77083', '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).
+        described_class.cast('41505.77083', 'n', :date_time).
           must_equal Time.parse('2013-08-19 18:30 UTC')
       end
     end
@@ -73,7 +73,7 @@ describe SimpleXlsxReader do
       let(:xml) do
         SimpleXlsxReader::Document::Xml.new.tap do |xml|
           xml.shared_strings = Nokogiri::XML(File.read(
-            File.join(File.dirname(__FILE__), 'shared_strings.xml') ))
+            File.join(File.dirname(__FILE__), 'shared_strings.xml') )).remove_namespaces!
         end
       end
 
@@ -92,7 +92,7 @@ describe SimpleXlsxReader do
       let(:xml) do
         SimpleXlsxReader::Document::Xml.new.tap do |xml|
           xml.styles = Nokogiri::XML(File.read(
-            File.join(File.dirname(__FILE__), 'styles.xml') ))
+            File.join(File.dirname(__FILE__), 'styles.xml') )).remove_namespaces!
         end
       end
 
@@ -105,7 +105,7 @@ describe SimpleXlsxReader do
       end
     end
 
-    describe '#last_column' do
+    describe '#last_cell_label' do
 
       let(:generic_style) do
           Nokogiri::XML(
@@ -116,7 +116,7 @@ describe SimpleXlsxReader do
               </cellXfs>
             </styleSheet>
             XML
-          )
+          ).remove_namespaces!
       end
 
       # Note, this is not a valid sheet, since the last cell is actually D1 but
@@ -141,7 +141,7 @@ describe SimpleXlsxReader do
             </sheetData>
           </worksheet>
           XML
-        )
+        ).remove_namespaces!
       end
 
       let(:empty_sheet) do
@@ -153,7 +153,7 @@ describe SimpleXlsxReader do
             </sheetData>
           </worksheet>
           XML
-        )
+        ).remove_namespaces!
       end
 
       let(:xml) do
@@ -166,21 +166,45 @@ describe SimpleXlsxReader do
       subject { described_class.new(xml) }
 
       it 'uses /worksheet/dimension if available' do
-        subject.last_column(sheet).must_equal 'C'
+        subject.last_cell_label(sheet).must_equal 'C1'
       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'
+        sheet.xpath('/worksheet/dimension').remove
+        subject.last_cell_label(sheet).must_equal 'D1'
       end
 
-      it 'returns "A" if the dimension is just one cell' do
-        subject.last_column(empty_sheet).must_equal 'A'
+      it 'returns "A1" if the dimension is just one cell' do
+        subject.last_cell_label(empty_sheet).must_equal 'A1'
       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'
+      it 'returns "A1" if the sheet is just one cell, but /worksheet/dimension is missing' do
+        sheet.at_xpath('/worksheet/dimension').remove
+        subject.last_cell_label(empty_sheet).must_equal 'A1'
+      end
+    end
+
+    describe '#column_letter_to_number' do
+      let(:subject) { described_class.new }
+
+      [ ['A',   1    ],
+        ['B',   2    ],
+        ['Z',   26   ],
+        ['AA',  27   ],
+        ['AB',  28   ],
+        ['AZ',  52   ],
+        ['BA',  53   ],
+        ['BZ',  78   ],
+        ['ZZ',  702  ],
+        ['AAA', 703  ],
+        ['AAZ', 728  ],
+        ['ABA', 729  ],
+        ['ABZ', 754  ],
+        ['AZZ', 1378 ],
+        ['ZZZ', 18278] ].each do |(letter, number)|
+        it "converts #{letter} to #{number}" do
+          subject.column_letter_to_number(letter).must_equal number
+        end
       end
     end
 
@@ -204,7 +228,7 @@ describe SimpleXlsxReader do
               </sheetData>
             </worksheet>
             XML
-          )]
+          ).remove_namespaces!]
 
           # s='0' above refers to the value of numFmtId at cellXfs index 0
           xml.styles = Nokogiri::XML(
@@ -215,7 +239,7 @@ describe SimpleXlsxReader do
               </cellXfs>
             </styleSheet>
             XML
-          )
+          ).remove_namespaces!
         end
       end
 
@@ -264,7 +288,7 @@ describe SimpleXlsxReader do
                 </sheetData>
               </worksheet>
             XML
-          )]
+          ).remove_namespaces!]
 
           # s='0' above refers to the value of numFmtId at cellXfs index 0,
           # which is in this case 'General' type
@@ -278,7 +302,7 @@ describe SimpleXlsxReader do
                 </cellXfs>
               </styleSheet>
             XML
-          )
+          ).remove_namespaces!
         end
       end
 
@@ -318,5 +342,68 @@ describe SimpleXlsxReader do
         @row[6].must_equal 'Cell G1'
       end
     end
+
+    describe 'parsing documents with blank rows' 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:D7" />
+                <sheetData>
+                <row r="2" spans="1:1">
+                  <c r="A2" s="0">
+                    <v>0</v>
+                  </c>
+                </row>
+                <row r="4" spans="1:1">
+                  <c r="B4" s="0">
+                    <v>1</v>
+                  </c>
+                </row>
+                <row r="5" spans="1:1">
+                  <c r="C5" s="0">
+                    <v>2</v>
+                  </c>
+                </row>
+                <row r="7" spans="1:1">
+                  <c r="D7" s="0">
+                    <v>3</v>
+                  </c>
+                </row>
+                </sheetData>
+              </worksheet>
+            XML
+          ).remove_namespaces!]
+
+          xml.styles = Nokogiri::XML(
+            <<-XML
+              <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+                <cellXfs count="1">
+                  <xf numFmtId="0" />
+                </cellXfs>
+              </styleSheet>
+            XML
+          ).remove_namespaces!
+        end
+      end
+
+      before do
+        @rows = described_class.new(xml).parse_sheet('test', xml.sheets.first).rows
+      end
+
+      it "reads row data despite gaps in row numbering" do
+        @rows.must_equal [
+          [nil,nil,nil,nil],
+          ["0",nil,nil,nil],
+          [nil,nil,nil,nil],
+          [nil,"1",nil,nil],
+          [nil,nil,"2",nil],
+          [nil,nil,nil,nil],
+          [nil,nil,nil,"3"]
+        ]
+      end
+    end
+
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 gem 'minitest'
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require 'pry'
 
 $:.unshift File.expand_path("lib")

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Woody Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Read xlsx data the Ruby way
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -82,6 +82,8 @@ files:
 - lib/simple_xlsx_reader.rb
 - lib/simple_xlsx_reader/version.rb
 - simple_xlsx_reader.gemspec
+- test/datetime_test.rb
+- test/datetimes.xlsx
 - test/performance_test.rb
 - test/sesame_street_blog.xlsx
 - test/shared_strings.xml
@@ -97,21 +99,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Read xlsx data the Ruby way
 test_files:
+- test/datetime_test.rb
+- test/datetimes.xlsx
 - test/performance_test.rb
 - test/sesame_street_blog.xlsx
 - test/shared_strings.xml