From 7782a99a37191bd7c23f53c1b5acd02b5f88aaac Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Tue, 26 Nov 2024 09:51:48 -0600
Subject: [PATCH] Upgrade zipline to 2.0

This is based on zip_kit, rather than zip_tricks, which is no longer maintained
---
 Gemfile                                    | 2 +-
 Gemfile.lock                               | 8 ++++----
 spec/controllers/object_controller_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2ab2b079..d3d5f369 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'http'
 gem 'cancancan'
 gem 'dalli'
 gem 'retries'
-gem 'zipline', '~> 1.2'
+gem 'zipline', '~> 2.0'
 gem 'jwt'
 gem 'redis'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c701ac4d..a8f26114 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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
@@ -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
diff --git a/spec/controllers/object_controller_spec.rb b/spec/controllers/object_controller_spec.rb
index 7aed97c8..670d315b 100644
--- a/spec/controllers/object_controller_spec.rb
+++ b/spec/controllers/object_controller_spec.rb
@@ -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
@@ -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