Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: [ "3.0", "3.1", "3.2", "3.3" ]
ruby-version: [ "3.3", "3.4", "4.0" ]

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion lib/openxml-package/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module OpenXmlPackage
VERSION = "0.3.5"
VERSION = "0.3.6"
end
12 changes: 1 addition & 11 deletions lib/openxml/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,7 @@ def open(path)

def from_stream(stream)
stream = StringIO.new(stream) if stream.is_a?(String)

# Hack: Zip::Entry.read_c_dir_entry initializes
# a new Zip::Entry by calling `io.path`. Zip::Entry
# uses this to open the original zipfile; but in
# this case, the StringIO _is_ the original.
def stream.path
self
end

zipfile = ::Zip::File.new("", true, true)
zipfile.read_from_stream(stream)
zipfile = ::Zip::File.new(stream, create: true, buffer: true)
new(zipfile)
end
end
Expand Down
5 changes: 4 additions & 1 deletion openxml-package.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "rubyzip", "~> 2.3"
spec.add_dependency "rubyzip", "~> 3.4"
spec.add_dependency "nokogiri"
spec.add_dependency "ox"
spec.add_dependency "bigdecimal"
spec.add_dependency "mutex_m"

spec.add_development_dependency "bundler"
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "minitest-mock"
spec.add_development_dependency "minitest-reporters"
spec.add_development_dependency "minitest-reporters-turn_reporter"
spec.add_development_dependency "pry"
Expand Down
1 change: 1 addition & 0 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
end

require "rr"
require "minitest/mock"

require "minitest/reporters/turn_reporter"
Minitest::Reporters.use! Minitest::Reporters::TurnReporter.new
Expand Down
Loading