saxlsx 1.6.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7dc32c3edddd79931a9aa2c524b797621542ab84
-  data.tar.gz: 741e327689fe7525f0c2613c191c3c9e75a45d7a
+SHA256:
+  metadata.gz: dbf7deaac6c1374b387a2a4bd3ec2afe156a653d7fea428c7aaf7c03750d4467
+  data.tar.gz: 8f6438c71ac90906eb744cd6088aa9d068a6af50f4a4c10385ec58340c016c34
 SHA512:
-  metadata.gz: 2f12ad7f5636ac9bf9a48f2d1b8d22f05e77ab2e40a44ebb314ced6f7d0390be7189ba774c2402c3ec278036ca9efd4489934fbea7a1c0d8d28817e2bd0be174
-  data.tar.gz: ba0525a308e673c1ab5570545d9698349fab4324c1342c679b6ec8395940cf4ec7da09d2d4331450a486c712f377264bbc89514b551af2c1274bc2fef8fcac22
+  metadata.gz: 71f9a9d1a87543144bd80c6478dcc4b2ab48cf6a22b25bbf617564f2bf2538fff0889c9fff0db4f7821d8929213a48f42fe56fad8e209a296d0b77274bb83c75
+  data.tar.gz: e40bbc6c0d587f913a88ce588bdf5c90ac3e7d4b60ca134d1f1c65e5fcd21bfbef0d7707fa83d1d5e12141479484523fbf1b2ac85811dfc6dcb5feec77284f67

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in saxlsx.gemspec
 gemspec
 
-gem 'axlsx', '~> 2.1.0.pre'
+gem 'caxlsx'
 gem 'rubyXL'
 gem 'simple_xlsx_reader'
 gem 'creek'

data/README.md

@@ -2,8 +2,6 @@
 
 [![Join the chat at https://gitter.im/mak-it/saxlsx](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mak-it/saxlsx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://travis-ci.org/mak-it/saxlsx.svg?branch=master)](https://travis-ci.org/mak-it/saxlsx)
-
 **Fast** and memory efficient XLSX reader on top of Ox SAX parser.
 
 It reads row by row and doesn't store the whole sheet in memory, so this
@@ -52,30 +50,30 @@ using `auto_format: false`.
 $ rake bench
 ```
 
-ruby 2.2.1 on OS X 10.10
+ruby 2.7 on OS X
 
 ```
 Shared Strings
 
                            user     system      total        real
-creek                  3.000000   0.070000   3.070000 (  3.254653)
-dullard                2.070000   0.030000   2.100000 (  2.109380)
-oxcelix                1.100000   0.020000   1.120000 (  1.128109)
-roo                   11.980000   0.350000  12.330000 ( 12.473732)
-rubyXL                 3.560000   0.070000   3.630000 (  3.641981)
-saxlsx                 0.660000   0.040000   0.700000 (  0.693199)
-simple_xlsx_reader     1.650000   0.030000   1.680000 (  1.686309)
+creek                  1.296539   0.029374   1.325913 (  1.340820)
+dullard                1.178981   0.025073   1.204054 (  1.221381)
+oxcelix                0.985258   0.025028   1.010286 (  1.023730)
+roo                    0.971155   0.029964   1.001119 (  1.016452)
+rubyXL                 2.979334   0.055708   3.035042 (  3.079301)
+saxlsx                 0.473398   0.011342   0.484740 (  0.490247)
+simple_xlsx_reader     1.209074   0.024579   1.233653 (  1.249957)
 
 Inline Strings
 
                            user     system      total        real
-creek                  2.960000   0.260000   3.220000 (  3.304050)
-dullard                2.380000   0.220000   2.600000 (  2.639881)
-oxcelix                   ERROR
-roo                   11.620000   0.260000  11.880000 ( 12.136643)
-rubyXL                 4.060000   0.480000   4.540000 (  4.612416)
-saxlsx                 0.870000   0.210000   1.080000 (  1.091133)
-simple_xlsx_reader     1.910000   0.040000   1.950000 (  1.961555)
+creek                  1.471115   0.075182   1.546297 (  1.567045)
+dullard                1.338499   0.085116   1.423615 (  1.443386)
+oxcelix                ERROR
+roo                    1.133878   0.052834   1.186712 (  1.208369)
+rubyXL                 3.213630   0.070255   3.283885 (  3.324428)
+saxlsx                 0.667601   0.024265   0.691866 (  0.696603)
+simple_xlsx_reader     1.350298   0.028411   1.378709 (  1.396583)
 ```
 
 ## Contributing

data/Rakefile

@@ -5,7 +5,6 @@ Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-
 task :bench do
   require './spec/benchmarks.rb'
   Saxlsx::Benchmarks.new.run

data/lib/saxlsx.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bigdecimal'
 require 'rational'
 require 'zip'

data/lib/saxlsx/boolean_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class BooleanParser
 
@@ -8,4 +9,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/column_name_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class ColumnNameGenerator
     FIRST = 'A'
@@ -14,4 +15,4 @@ module Saxlsx
       end
     end
   end
-end
+end

data/lib/saxlsx/file_system.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 module Saxlsx
   class FileSystem
+    IO_METHODS = [:tell, :seek, :read, :close]
 
     def self.open(filename)
       begin
@@ -11,11 +13,16 @@ module Saxlsx
     end
 
     def initialize(filename)
-      @zip = Zip::File.open filename
+      if IO_METHODS.map { |method| filename.respond_to?(method) }.all?
+        @zip = Zip::File.open_buffer filename
+        @io = true
+      else
+        @zip = Zip::File.open filename
+      end
     end
 
     def close
-      @zip.close
+      @zip.close unless @io
     end
 
     def workbook
@@ -36,4 +43,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/rows_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class RowsCollection
 
@@ -15,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/rows_collection_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class RowsCollectionParser < Ox::Sax
     SECONDS_IN_DAY = 86400

data/lib/saxlsx/sax_parser.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module Saxlsx
   class SaxParser
 
     def self.parse(handler, xml)
-      Ox.sax_parse(handler, xml)
+      Ox.sax_parse(handler, xml, skip: :skip_return)
     ensure
       xml.rewind
     end
 
   end
-end
+end

data/lib/saxlsx/shared_string_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class SharedStringCollection
 
@@ -12,4 +13,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/shared_string_collection_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class SharedStringCollectionParser < Ox::Sax
 
@@ -15,7 +16,7 @@ module Saxlsx
     end
 
     def start_element(name)
-      @current_string = '' if name == :si
+      @current_string = String.new if name == :si
     end
 
     def end_element(name)
@@ -30,4 +31,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/sheet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class Sheet
 
@@ -24,4 +25,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/sheet_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class SheetCollection
 
@@ -13,4 +14,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/sheet_collection_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class SheetCollectionParser < Ox::Sax
 
@@ -55,4 +56,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/style_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class StyleCollection
 
@@ -12,4 +13,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/lib/saxlsx/style_collection_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class StyleCollectionParser < Ox::Sax
     def self.parse(file_system, &block)
@@ -32,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
@@ -49,4 +50,4 @@ module Saxlsx
       end
     end
   end
-end
+end

data/lib/saxlsx/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
-  VERSION = '1.6.1'
+  VERSION = '1.10.0'
 end

data/lib/saxlsx/workbook.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class Workbook
     DATE_SYSTEM_1900 = DateTime.new(1899, 12, 30)
@@ -6,12 +7,12 @@ module Saxlsx
     attr_accessor :date1904
     attr_reader :auto_format
 
-    def self.open(*args)
+    def self.open(filename, **kw_args)
       begin
-        workbook = self.new(*args)
+        workbook = new(filename, **kw_args)
         yield workbook
       ensure
-        workbook.close
+        workbook.close if workbook
       end
     end
 
@@ -50,4 +51,4 @@ module Saxlsx
     end
 
   end
-end
+end

data/saxlsx.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_dependency 'rubyzip', '~> 1.0'
   spec.add_dependency 'ox', '~> 2.1'
 
-  spec.add_development_dependency 'bundler', "~> 1.5"
-  spec.add_development_dependency 'rake', '~> 10.1'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'bundler', ">= 1.5"
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rspec-collection_matchers'
   spec.add_development_dependency 'simplecov', '~> 0.8'
 end

data/spec/benchmarks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'benchmark'
 require 'axlsx'
 require 'saxlsx'

data/spec/column_name_generator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ColumnNameGenerator do
@@ -21,4 +22,4 @@ describe ColumnNameGenerator do
     end
   end
 
-end
+end

data/spec/sheet_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'spec_helper'
 
@@ -35,7 +36,7 @@ describe Sheet do
           3,
           DateTime.new(2013, 12, 13, 8, 0, 58),
           DateTime.new(1970, 1, 1),
-          BigDecimal.new('3.4028236692093801E+38'),
+          BigDecimal('3.4028236692093801E+38'),
           DateTime.new(2015, 2, 13, 12, 40, 5)
         ]
         s.rows[1].should eq [
@@ -92,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" }
 
@@ -107,6 +121,34 @@ describe Sheet do
     end
   end
 
+  context 'with mutliline strings (
)' do
+    let(:filename) { "#{File.dirname(__FILE__)}/data/SpecMultiline10.xlsx" }
+
+    it 'should return multiline cells' do
+      Workbook.open filename do |w|
+        w.sheets[0].tap do |s|
+          s.rows[0].should eq [
+            "Test\nTest1\nTest3"
+          ]
+        end
+      end
+    end
+  end
+
+  context 'with mutliline strings (\n)' do
+    let(:filename) { "#{File.dirname(__FILE__)}/data/SpecMultilineN.xlsx" }
+
+    it 'should return multiline cells' do
+      Workbook.open filename do |w|
+        w.sheets[0].tap do |s|
+          s.rows[0].should eq [
+            "Test\nTest1\nTest3"
+          ]
+        end
+      end
+    end
+  end
+
   context 'with inline strings' do
     let(:filename) { "#{File.dirname(__FILE__)}/data/SpecInlineStrings.xlsx" }
 
@@ -133,7 +175,7 @@ describe Sheet do
       ["Time",       DateTime.new(2015, 2, 13, 12, 40, 5)],
       ["Percentage", 0.9999],
       ["Fraction",   0.5],
-      ["Scientific", BigDecimal.new('3.4028236692093801E+38')],
+      ["Scientific", BigDecimal('3.4028236692093801E+38')],
       ["Custom",     123.0],
     ].each.with_index do |row, i|
       name, value = row
@@ -160,7 +202,7 @@ describe Sheet do
       ["Time",       DateTime.new(2015, 2, 13, 12, 40, 5)],
       ["Percentage", 0.9999],
       ["Fraction",   0.5],
-      ["Scientific", BigDecimal.new('3.4028236692093801E+38')],
+      ["Scientific", BigDecimal('3.4028236692093801E+38')],
       ["Custom",     123.0],
     ].each.with_index do |row, i|
       name, value = row

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+require 'rspec/collection_matchers'
 require 'saxlsx'
 
 include Saxlsx
 
 RSpec.configure do |config|
-  config.color_enabled = true
-end
+  config.color = true
+end

data/spec/workbook_spec.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Workbook do
 
   let(:filename) { "#{File.dirname(__FILE__)}/data/Spec.xlsx" }
 
+  it 'Reads from StringIO' do
+    io = StringIO.new File.read(filename)
+    Workbook.open io do |w|
+      w.should have(5).sheets
+    end
+  end
+
   it 'Sheets count' do
     Workbook.open filename do |w|
       w.should have(5).sheets
@@ -39,8 +47,8 @@ describe Workbook do
   it 'Shared strings' do
     Workbook.open filename do |w|
       w.should have(56).shared_strings
-      w.shared_strings[0].should eq 'LevenshteinDistance'
-      w.shared_strings[55].should eq 'TST_ModMan_Insulto_SU_Normal'
+      w.shared_strings.should include 'LevenshteinDistance'
+      w.shared_strings.should include 'TST_ModMan_Insulto_SU_Normal'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxlsx
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Edgars Beigarts
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -42,14 +42,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -58,28 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -102,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -114,6 +128,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
@@ -131,7 +146,10 @@ files:
 - spec/data/Spec.xlsx
 - spec/data/Spec1904.xlsx
 - spec/data/SpecInlineStrings.xlsx
+- spec/data/SpecMultiline10.xlsx
+- spec/data/SpecMultilineN.xlsx
 - spec/data/SpecNumberFormat.xlsx
+- spec/data/SpecSloppy.xlsx
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - spec/workbook_spec.rb
@@ -139,7 +157,7 @@ homepage: https://github.com/mak-it/saxlsx
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,16 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Fast xlsx reader on top of Ox SAX parser
 test_files:
@@ -165,7 +182,10 @@ test_files:
 - spec/data/Spec.xlsx
 - spec/data/Spec1904.xlsx
 - spec/data/SpecInlineStrings.xlsx
+- spec/data/SpecMultiline10.xlsx
+- spec/data/SpecMultilineN.xlsx
 - spec/data/SpecNumberFormat.xlsx
+- spec/data/SpecSloppy.xlsx
 - spec/sheet_spec.rb
 - spec/spec_helper.rb
 - spec/workbook_spec.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4.0
-  - ruby-head