saxlsx 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc32c3edddd79931a9aa2c524b797621542ab84
-  data.tar.gz: 741e327689fe7525f0c2613c191c3c9e75a45d7a
+  metadata.gz: 5bc6b0c27db86c92575ab6d76e938718f987062b
+  data.tar.gz: d64e2b1bf4fad6173b4e6a6fdcc9f52af0b67be7
 SHA512:
-  metadata.gz: 2f12ad7f5636ac9bf9a48f2d1b8d22f05e77ab2e40a44ebb314ced6f7d0390be7189ba774c2402c3ec278036ca9efd4489934fbea7a1c0d8d28817e2bd0be174
-  data.tar.gz: ba0525a308e673c1ab5570545d9698349fab4324c1342c679b6ec8395940cf4ec7da09d2d4331450a486c712f377264bbc89514b551af2c1274bc2fef8fcac22
+  metadata.gz: d06a5f4ea511da6bc470d3ab7129dd63d0876de0f1470a8f0ef9ced9c4611dd9f0d0d6c2d6b8ff07e20ecb4d7e918bd2849ce4ccff3c854e001748cbcf51f691
+  data.tar.gz: c2e9c81ddc0ce05477f60d720eba7bf5b23f9afb37c9b75f69e779d9e4f1f185ac46b2da579fe3cb29d879eb3f6d8b9060d0539357238cbd2873dbad4f63a737

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in saxlsx.gemspec
 gemspec
 
-gem 'axlsx', '~> 2.1.0.pre'
-gem 'rubyXL'
-gem 'simple_xlsx_reader'
-gem 'creek'
-gem 'oxcelix'
-gem 'roo'
-gem 'dullard'
+gem 'axlsx', github: 'randym/axlsx'
+gem 'rubyXL', github: 'weshatheleopard/rubyXL'
+gem 'simple_xlsx_reader', github: 'woahdae/simple_xlsx_reader'
+gem 'creek', github: 'pythonicrubyist/creek'
+gem 'oxcelix', github: 'gbiczo/oxcelix'
+gem 'roo', github: 'roo-rb/roo'
+gem 'dullard', github: 'thirtyseven/dullard'

data/README.md

@@ -52,30 +52,30 @@ using `auto_format: false`.
 $ rake bench
 ```
 
-ruby 2.2.1 on OS X 10.10
+ruby 2.4.1 on OS X 10.12
 
 ```
 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                  2.310000   0.040000   2.350000 (  2.414795)
+dullard                1.660000   0.050000   1.710000 (  1.753160)
+oxcelix                1.100000   0.060000   1.160000 (  1.169371)
+roo                    2.770000   0.120000   2.890000 (  2.943509)
+rubyXL                 3.570000   0.090000   3.660000 (  3.716661)
+saxlsx                 0.620000   0.040000   0.660000 (  0.665471)
+simple_xlsx_reader     1.590000   0.030000   1.620000 (  1.643398)
 
 Inline Strings
 
                            user     system      total        real
-creek                  2.960000   0.260000   3.220000 (  3.304050)
-dullard                2.380000   0.220000   2.600000 (  2.639881)
+creek                  2.840000   0.200000   3.040000 (  3.335055)
+dullard                2.200000   0.250000   2.450000 (  2.613793)
 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)
+roo                    3.550000   0.160000   3.710000 (  3.749528)
+rubyXL                 3.890000   0.390000   4.280000 (  4.340749)
+saxlsx                 0.930000   0.240000   1.170000 (  1.173783)
+simple_xlsx_reader     1.760000   0.040000   1.800000 (  1.818311)
 ```
 
 ## 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
 

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,3 +1,4 @@
+# frozen_string_literal: true
 module Saxlsx
   class SaxParser
 
@@ -8,4 +9,4 @@ module Saxlsx
     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
 
@@ -26,8 +27,8 @@ module Saxlsx
     end
 
     def text(value)
-      @current_string << CGI.unescapeHTML(value) if @current_string
+      @current_string = CGI.unescapeHTML(value) if @current_string
     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)
@@ -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.7.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)
@@ -11,7 +12,7 @@ module Saxlsx
         workbook = self.new(*args)
         yield workbook
       ensure
-        workbook.close
+        workbook.close if workbook
       end
     end
 
@@ -50,4 +51,4 @@ module Saxlsx
     end
 
   end
-end
+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'
 

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require 'saxlsx'
 
 include Saxlsx
 
 RSpec.configure do |config|
   config.color_enabled = true
-end
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saxlsx
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Edgars Beigarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fast xlsx reader on top of Ox SAX parser