saxlsx 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54925b1ff0a1cf772d1b5c26c1eee0c6f2d777ba
-  data.tar.gz: 1bbb66a26a5f095b0d11338d91da3024a93258d0
+  metadata.gz: f695e5e0a2470321d739c99840624c0e0e52808b
+  data.tar.gz: eb92f3e6bec02f95a642274511dc4d4b1abf052a
 SHA512:
-  metadata.gz: 27af434e8a16a6a779ed938a68c1b0e0deea8a1c80a272f99b96c17cf3923fb15567c378fef3e3eeb3826726ae2cb21f22d19b08e00d2007713654bb955f8cef
-  data.tar.gz: fe50048d93f025e557f5aba24dc107865f8438a8d840197e8a55cdc83e52211db6e5f6e29eeb9cc11de3b01ce11af5941d3e63b863d23ce9a4dd90f94703678e
+  metadata.gz: 484bab7c1138454a5a6bcd6cd60e021bb0b2fc58bac5489af6e369b6733ca8804f1c53dce1d95a3c12693b86355c032cdcf73ece0b04167c36a82fc3b24a2845
+  data.tar.gz: 26ba631f53a1d194ff8dbc7c2baedfb366387d66ebc68940f49bb4ca7acc8adf0569c3be6114d710d6850b5882b3a4ac829114063e2a5c52f7ff03d8593e2109

data/lib/saxlsx/rows_collection.rb

@@ -16,21 +16,7 @@ module Saxlsx
     end
 
     def count
-      unless defined?(@count)
-        @count = 0
-        begin
-          @sheet.each_line('>') do |line|
-            matches = line.match(/<dimension ref="[^:]+:[A-Z]*(\d+)"/)
-            if matches
-              @count = matches[1].to_i
-              break if @count
-            end
-          end
-        ensure
-          @sheet.rewind
-        end
-      end
-      @count
+      @count ||= RowsCollectionCountParser.count @sheet
     end
 
     alias :size :count

data/lib/saxlsx/rows_collection_count_parser.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module Saxlsx
+  class RowsCollectionCountParser < Ox::Sax
+    def self.count(data, &block)
+      parser = new
+      catch :abort do
+        SaxParser.parse parser, data
+      end
+      parser.count
+    end
+
+    attr_reader :count
+
+    def initialize
+      @count = 0
+    end
+
+    def start_element(name)
+      @current_element = name
+      if name == :row
+        @count += 1
+      end
+    end
+
+    def attr(name, value)
+      if @current_element == :dimension
+        if name == :ref && value
+          matches = value.match(/[^:]+:[A-Z]*(\d+)/)
+          if matches
+            @count = matches[1].to_i
+            throw :abort
+          end
+        end
+      end
+    end
+  end
+end

data/lib/saxlsx/style_collection_parser.rb

@@ -33,7 +33,7 @@ module Saxlsx
           if custom_num_fmt_code
             @block.call custom_num_fmt_code
           else
-            @block.call @num_fmt_id
+            @block.call @num_fmt_id.to_i
           end
         end
       when :numFmt

data/lib/saxlsx/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Saxlsx
-  VERSION = '1.7.1'
+  VERSION = '1.8.0'
 end

data/spec/sheet_spec.rb

@@ -93,6 +93,19 @@ describe Sheet do
     end
   end
 
+  it 'Handle missing fonts and dimension tags' do
+    filename = "#{File.dirname(__FILE__)}/data/SpecSloppy.xlsx"
+
+    Workbook.open filename do |w|
+      w.sheets[0].rows.count.should eq 85
+      headers = w.sheets[0].rows.first
+      headers.count.should eq 52
+      headers.each do |str|
+        str.should eq "X"
+      end
+    end
+  end
+
   context 'with 1904 date system' do
     let(:filename) { "#{File.dirname(__FILE__)}/data/Spec1904.xlsx" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxlsx
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Edgars Beigarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -114,6 +114,7 @@ files:
 - lib/saxlsx/column_name_generator.rb
 - lib/saxlsx/file_system.rb
 - lib/saxlsx/rows_collection.rb
+- lib/saxlsx/rows_collection_count_parser.rb
 - lib/saxlsx/rows_collection_parser.rb
 - lib/saxlsx/sax_parser.rb
 - lib/saxlsx/shared_string_collection.rb
@@ -132,6 +133,7 @@ files:
 - spec/data/Spec1904.xlsx
 - spec/data/SpecInlineStrings.xlsx
 - spec/data/SpecNumberFormat.xlsx
+- spec/data/SpecSloppy.xlsx
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - spec/workbook_spec.rb
@@ -166,6 +168,7 @@ test_files:
 - spec/data/Spec1904.xlsx
 - spec/data/SpecInlineStrings.xlsx
 - spec/data/SpecNumberFormat.xlsx
+- spec/data/SpecSloppy.xlsx
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - spec/workbook_spec.rb