Skip to content

Commit

Permalink
Upgrade zipline to 2.0
Browse files Browse the repository at this point in the history
This is based on zip_kit, rather than zip_tricks, which is no longer maintained
  • Loading branch information
jcoyne committed Nov 26, 2024
1 parent ee6f168 commit 7782a99
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ gem 'http'
gem 'cancancan'
gem 'dalli'
gem 'retries'
gem 'zipline', '~> 1.2'
gem 'zipline', '~> 2.0'
gem 'jwt'
gem 'redis'

Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,11 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.7.1)
zip_tricks (5.6.0)
zipline (1.5.0)
zip_kit (6.3.1)
zipline (2.0.0)
actionpack (>= 6.0, < 8.0)
content_disposition (~> 1.0)
zip_tricks (>= 4.2.1, < 6.0)
zip_kit (~> 6, >= 6.2.0, < 7)

PLATFORMS
arm64-darwin-23
Expand Down Expand Up @@ -446,7 +446,7 @@ DEPENDENCIES
web-console (>= 4.1.0)
webdrivers
webmock (~> 3.0)
zipline (~> 1.2)
zipline (~> 2.0)

BUNDLED WITH
2.5.14
4 changes: 2 additions & 2 deletions spec/controllers/object_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

it 'creates a zip' do
get :show, params: { id: 'fd063dh3727' }
entries = ZipTricks::FileReader.new.read_zip_structure(io: StringIO.new(response.body))
entries = ZipKit::FileReader.new.read_zip_structure(io: StringIO.new(response.body))
expect(entries.length).to eq 6
end
end
Expand Down Expand Up @@ -218,7 +218,7 @@

it 'creates a zip' do
get :show, params: { id: 'bb142ws0723' }
entries = ZipTricks::FileReader.new.read_zip_structure(io: StringIO.new(response.body))
entries = ZipKit::FileReader.new.read_zip_structure(io: StringIO.new(response.body))
expect(entries.length).to eq 3
end
end
Expand Down

0 comments on commit 7782a99

Please sign in to comment.