diff options
| author | Jurriaan Pruis <[email protected]> | 2014-03-17 13:33:43 +0100 |
|---|---|---|
| committer | Jurriaan Pruis <[email protected]> | 2014-03-17 13:33:43 +0100 |
| commit | c649ee7d5ac699d0fc5a36550f502216f9b7318f (patch) | |
| tree | 99727c50a1ac13a0b2f7a17f8069968de0cac65e | |
| parent | dcea412145c194d851f1077897810229ac828264 (diff) | |
| parent | 836984daad9f29916bb60fed7f8d8dfbcec82258 (diff) | |
| download | caxlsx-c649ee7d5ac699d0fc5a36550f502216f9b7318f.tar.gz caxlsx-c649ee7d5ac699d0fc5a36550f502216f9b7318f.zip | |
Merge pull request #304 from jurriaan/rubyzip-update
Update to RubyZip 1.1.1
| -rw-r--r-- | axlsx.gemspec | 2 | ||||
| -rw-r--r-- | lib/axlsx/package.rb | 2 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/rich_text.rb | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/axlsx.gemspec b/axlsx.gemspec index 2835dacc..7d4ab2b6 100644 --- a/axlsx.gemspec +++ b/axlsx.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = Dir.glob("{test/**/*}") s.add_runtime_dependency 'nokogiri', '>= 1.4.1' - s.add_runtime_dependency 'rubyzip', '~> 1.1.0' + s.add_runtime_dependency 'rubyzip', '~> 1.1.1' s.add_runtime_dependency "htmlentities", "~> 4.3.1" s.add_development_dependency 'yard' diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb index bbc15db3..cd03a173 100644 --- a/lib/axlsx/package.rb +++ b/lib/axlsx/package.rb @@ -114,7 +114,7 @@ module Axlsx def to_stream(confirm_valid=false) return false unless !confirm_valid || self.validate.empty? Relationship.clear_cached_instances - zip = write_parts(Zip::OutputStream.new("streamed", true)) + zip = write_parts(Zip::OutputStream.new(StringIO.new, true)) stream = zip.close_buffer stream.rewind stream diff --git a/lib/axlsx/workbook/worksheet/rich_text.rb b/lib/axlsx/workbook/worksheet/rich_text.rb index 43f18299..9124dfbe 100644 --- a/lib/axlsx/workbook/worksheet/rich_text.rb +++ b/lib/axlsx/workbook/worksheet/rich_text.rb @@ -6,7 +6,6 @@ module Axlsx yield self if block_given? end - attr_reader :runs attr_reader :cell def cell=(cell) |