xlsxtream 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7ef18ac21a43cee29087458665fd3ff6511c62
-  data.tar.gz: 03bf65a93162886fbfcdebefb89191ea29a09744
+  metadata.gz: 0dff3af0eeb78824d009e7428de38a1a9647a8f7
+  data.tar.gz: 52367aa07b8878102cb082742238c1e0050910a1
 SHA512:
-  metadata.gz: '087c1ab2888d86144ce3872a5a74579b3d82eb07f672dd261b29c5513129a24eb81340b16fb0bb9f3e0843c39d7ae8d17e076bc2aff3b92ff569f617259e2351'
-  data.tar.gz: dbc340a4f04e01e975886d5e94c939e2a6879bc754a632bd334895545bf982944b0c6053014ab0ddd8d383ac36ee677c118046cdeff21dd090df68dbbdb0d547
+  metadata.gz: 0fd9e15c00d665312806e857df5b6dc7a89f09a39dd5498c6a289a2c68d420ac05242491c33954ddce4cf4446acba85b9c0a7dc4202e710c9661dc81200a765f
+  data.tar.gz: c5e8e898cde5b8556f8395b05604519cebd681759ba85cd9d40d07d29b78f5cd8ee3960aa5db5b099783abf8230d6f24ec69c5ac7b650bb4874d436566a67c18

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.0 (2017-10-30)
+
+- Drop rubyzip buffering workarounds, require rubyzip >= 1.2.0 (#17)
+- Drop Ruby 1.9.1 compatibility (rubyzip 1.2 requires ruby >= 1.9.2)
+- Refactor IO wrappers (#18)
+
 ## 1.2.0 (2017-10-30)
 
 - Add support for customizing default font (#17)

data/lib/xlsxtream/io/hash.rb

@@ -38,7 +38,7 @@ module Xlsxtream
       end
 
       def to_h
-        @hash.keys.map {|path| [path, fetch(path)] }.to_h
+        ::Hash[@hash.keys.map {|path| [path, fetch(path)] }]
       end
     end
   end

data/lib/xlsxtream/io/rubyzip.rb

@@ -1,12 +1,16 @@
 require "zip"
+require "xlsxtream/errors"
 
 module Xlsxtream
   module IO
     class RubyZip
-      def initialize(path_or_io)
-        @stream = path_or_io.respond_to? :reopen
-        path_or_io.binmode if path_or_io.respond_to? :binmode
-        @zos = UnbufferedZipOutputStream.new(path_or_io, @stream)
+      def initialize(io)
+        unless io.respond_to? :pos and io.respond_to? :pos=
+          raise Error, 'IO is not seekable'
+        end
+        io.binmode if io.respond_to? :binmode
+        stream = true
+        @zos = Zip::OutputStream.new(io, stream)
       end
 
       def <<(data)
@@ -20,48 +24,6 @@ module Xlsxtream
       def close
         os = @zos.close_buffer
         os.flush if os.respond_to? :flush
-        os.close if !@stream and os.respond_to? :close
-      end
-
-      # Extend get_compressor to hook our custom deflater.
-      class UnbufferedZipOutputStream < ::Zip::OutputStream
-        private
-        def get_compressor(entry, level)
-          case entry.compression_method
-          when ::Zip::Entry::DEFLATED then
-            StreamingDeflater.new(@output_stream, level, @encrypter)
-          else
-            super
-          end
-        end
-      end
-
-      # RubyZip's Deflater buffers to a StringIO until finish is called.
-      # This StreamingDeflater writes out chunks during compression.
-      class StreamingDeflater < ::Zip::Compressor
-        def initialize(output_stream, level = Zip.default_compression, encrypter = NullEncrypter.new)
-          super()
-          @output_stream = output_stream
-          @zlib_deflater = ::Zlib::Deflate.new(level, -::Zlib::MAX_WBITS)
-          @size          = 0
-          @crc           = ::Zlib.crc32
-          unless encrypter.is_a? ::Zip::NullEncrypter
-            raise ::Zip::Error, 'StreamingDeflater does not support encryption'
-          end
-        end
-
-        def <<(data)
-          val   = data.to_s
-          @crc  = Zlib.crc32(val, @crc)
-          @size += val.bytesize
-          @output_stream << @zlib_deflater.deflate(data)
-        end
-
-        def finish
-          @output_stream << @zlib_deflater.finish until @zlib_deflater.finished?
-        end
-
-        attr_reader :size, :crc
       end
     end
   end

data/lib/xlsxtream/version.rb

@@ -1,3 +1,3 @@
 module Xlsxtream
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/xlsxtream/workbook.rb

@@ -1,12 +1,9 @@
 # encoding: utf-8
-require "stringio"
 require "xlsxtream/errors"
 require "xlsxtream/xml"
 require "xlsxtream/shared_string_table"
 require "xlsxtream/workbook"
 require "xlsxtream/io/rubyzip"
-require "xlsxtream/io/directory"
-require "xlsxtream/io/stream"
 
 module Xlsxtream
   class Workbook
@@ -22,8 +19,8 @@ module Xlsxtream
 
     class << self
 
-      def open(data = nil, options = {})
-        workbook = new(data, options)
+      def open(output = nil, options = {})
+        workbook = new(output, options)
         if block_given?
           begin
             yield workbook
@@ -37,10 +34,16 @@ module Xlsxtream
 
     end
 
-    def initialize(data = nil, options = {})
+    def initialize(output = nil, options = {})
+      output ||= StringIO.new
       @options = options
       io_wrapper = options[:io_wrapper] || IO::RubyZip
-      @io = io_wrapper.new(data || StringIO.new)
+      if output.is_a?(String) || !output.respond_to?(:<<)
+        @file = File.open(output, 'wb')
+        @io = io_wrapper.new(@file)
+      else
+        @io = io_wrapper.new(output)
+      end
       @sst = SharedStringTable.new
       @worksheets = Hash.new { |hash, name| hash[name] = hash.size + 1 }
     end
@@ -74,6 +77,7 @@ module Xlsxtream
       write_root_rels
       write_content_types
       @io.close
+      @file.close if @file
       nil
     end
 

data/xlsxtream.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 1.9.1'
+  spec.required_ruby_version = '>= 1.9.2'
 
-  spec.add_dependency "rubyzip", ">= 1.0.0"
+  spec.add_dependency "rubyzip", ">= 1.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsxtream
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Felix Bünemann
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="