zipline 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8735b5a6429dcffa8672a1a970cc37145eadfd5e5ff13e2cb5b3f08166895d14
-  data.tar.gz: a4555919f140b0661cb12fd0e6f92900e419319ebf7ec7c376ce19034dffd9a9
+  metadata.gz: 954c769aaf6aa7780a8770fcc9991a1beea5b326f1920b6bfdcc921dcef1a34d
+  data.tar.gz: 7e40d818c5b4e7da8c8167f42e9318d0d7cfee2384657a84fa3ee294184f9819
 SHA512:
-  metadata.gz: 758292743ee475bc2a276bd00d953fa4f0b1cb1c4ccd2ceae7b2c7dbeced0e1a901a609d183a68c6eeaa898693045f3d5f4ee23bfece0c35b379fb7ce170cdc2
-  data.tar.gz: 7383e439111008fa964a2d762f6855351d3a0372df973d453e0b205aee57f53d9fc8aea54e4f7efed6719b3b8318768f8d125e314ad277f2855bac29fa63c5e2
+  metadata.gz: 5a39143123fc75b44b94d88ca0e8d31a41e2b63f9368ff70692c502c21171baf406e4eb8bb7a9f9ef0885d2883d8c5e5d40995499068a2a0a9a9906c9135bc68
+  data.tar.gz: 84c7b320023d7195f619638b87acaa14121852a643a727a9ba5c1d848ed3d4bc045832347586ca3b454dfb753ad189f2bfe96d5e97bd6140065a1fa0ef4675b8

data/Gemfile

@@ -2,14 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zipline.gemspec
 gemspec
-
-group :development, :test do
-  gem 'rspec', '~> 3'
-  gem 'fog-aws'
-  gem 'activesupport'
-  gem 'actionpack'
-  gem 'aws-sdk-s3'
-  gem 'carrierwave'
-  gem 'paperclip'
-  gem 'rake'
-end

data/README.md

@@ -7,7 +7,7 @@ A gem to stream dynamically generated zip files from a rails application. Unlike
 - Removes need for large disk space or memory allocation to generate zips, even huge zips. So it works on Heroku.
 - The user begins downloading immediately, which decreaceses latency, download time, and timeouts on Heroku.
 
-Zipline now depends on [zip tricks](https://github.com/WeTransfer/zip_tricks), and you might want to just use that directly if you have more advanced use cases.
+Zipline now depends on [zip_kit](https://github.com/julik/zip_kit), and you might want to just use that directly if you have more advanced use cases.
 
 ## Installation
 
@@ -43,7 +43,7 @@ class MyController < ApplicationController
     files = users.map{ |user| [user.avatar, "#{user.username}.png", modification_time: 1.day.ago] }
 
     # we can force duplicate file names to be renamed, or raise an error
-    # we can also pass in our own writer if required to conform with the Delegated [ZipTricks::Streamer object](https://github.com/WeTransfer/zip_tricks/blob/main/lib/zip_tricks/streamer.rb#L147) object.
+    # we can also pass in our own writer if required to conform with the delegated [ZipKit::Streamer object](https://github.com/julik/zip_kit/blob/main/lib/zip_kit/streamer.rb#L147) object.
     zipline(files, 'avatars.zip', auto_rename_duplicate_filenames: true) 
   end
 end
@@ -93,7 +93,7 @@ For directories, just give the files names like "directory/file".
 
 ```Ruby
 avatars = [
-  # remote_url                          zip_path             zip_tricks_options
+  # remote_url                          zip_path             write_file options for Streamer
   [ 'http://www.example.com/user1.png', 'avatars/user1.png', modification_time: Time.now.utc ]
   [ 'http://www.example.com/user2.png', 'avatars/user2.png', modification_time: 1.day.ago ]
   [ 'http://www.example.com/user3.png', 'avatars/user3.png' ]

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "1.5.0"
+  VERSION = "2.0.0"
 end

data/lib/zipline/{zip_generator.rb → zip_handler.rb}

@@ -1,46 +1,21 @@
-# this class acts as a streaming body for rails
-# initialize it with an array of the files you want to zip
 module Zipline
-  class ZipGenerator
+  class ZipHandler
     # takes an array of pairs [[uploader, filename], ... ]
-    def initialize(files,  **kwargs_for_new)
-      @files = files
-      @kwargs_for_new = kwargs_for_new
+    def initialize(streamer, logger)
+      @streamer = streamer
+      @logger = logger
     end
 
-    #this is supposed to be streamed!
-    def to_s
-      throw "stop!"
-    end
-
-    def each(&block)
-      fake_io_writer = ZipTricks::BlockWrite.new(&block)
-      # ZipTricks outputs lots of strings in rapid succession, and with
-      # servers it can be beneficial to avoid doing too many tiny writes so that
-      # the number of syscalls is minimized. See https://github.com/WeTransfer/zip_tricks/issues/78
-      # There is a built-in facility for this in ZipTricks which can be used to implement
-      # some cheap buffering here (it exists both in version 4 and version 5). The buffer is really
-      # tiny and roughly equal to the medium Linux socket buffer size (16 KB). Although output
-      # will be not so immediate with this buffering the overall performance will be better,
-      # especially with multiple clients being serviced at the same time.
-      # Note that the WriteBuffer writes the same, retained String object - but the contents
-      # of that object changes between calls. This should work fine with servers where the
-      # contents of the string gets written to a socket immediately before the execution inside
-      # the WriteBuffer resumes), but if the strings get retained somewhere - like in an Array -
-      # this might pose a problem. Unlikely that it will be an issue here though.
-      write_buffer_size = 16 * 1024
-      write_buffer = ZipTricks::WriteBuffer.new(fake_io_writer, write_buffer_size)
-      ZipTricks::Streamer.open(write_buffer, **@kwargs_for_new) do |streamer|
-        @files.each do |file, name, options = {}|
-          handle_file(streamer, file, name.to_s, options)
-        end
-      end
-      write_buffer.flush! # for any remaining writes
-    end
-
-    def handle_file(streamer, file, name, options)
-      file = normalize(file)
-      write_file(streamer, file, name, options)
+    def handle_file(file, name, options)
+      normalized_file = normalize(file)
+      write_file(normalized_file, name, options)
+    rescue => e
+      # Since most APM packages do not trace errors occurring within streaming
+      # Rack bodies, it can be helpful to print the error to the Rails log at least
+      error_message = "zipline: an exception (#{e.inspect}) was raised  when serving the ZIP body."
+      error_message += " The error occurred when handling file #{name.inspect}"
+      @logger.error(error_message) if @logger
+      raise
     end
 
     # This extracts either a url or a local file from the provided file.
@@ -80,8 +55,8 @@ module Zipline
       end
     end
 
-    def write_file(streamer, file, name, options)
-      streamer.write_deflated_file(name, **options.slice(:modification_time)) do |writer_for_file|
+    def write_file(file, name, options)
+      @streamer.write_file(name, **options.slice(:modification_time)) do |writer_for_file|
         if file[:url]
           the_remote_uri = URI(file[:url])
 
@@ -101,12 +76,12 @@ module Zipline
       end
     end
 
+    private
+
     def is_io?(io_ish)
       io_ish.respond_to? :read
     end
 
-    private
-
     def is_active_storage_attachment?(file)
       defined?(ActiveStorage::Attachment) && file.is_a?(ActiveStorage::Attachment)
     end

data/lib/zipline.rb

@@ -1,7 +1,7 @@
 require 'content_disposition'
-require "zipline/version"
-require 'zip_tricks'
-require "zipline/zip_generator"
+require 'zip_kit'
+require 'zipline/version'
+require 'zipline/zip_handler'
 
 # class MyController < ApplicationController
 #   include Zipline
@@ -12,13 +12,17 @@ require "zipline/zip_generator"
 #   end
 # end
 module Zipline
-  def zipline(files, zipname = 'zipline.zip', **kwargs_for_new)
-    zip_generator = ZipGenerator.new(files, **kwargs_for_new)
-    headers['Content-Disposition'] = ContentDisposition.format(disposition: 'attachment', filename: zipname)
-    headers['Content-Type'] = Mime::Type.lookup_by_extension('zip').to_s
-    response.sending_file = true
-    response.cache_control[:public] ||= false
-    self.response_body = zip_generator
-    self.response.headers['Last-Modified'] = Time.now.httpdate
+  def self.included(into_controller)
+    into_controller.include(ZipKit::RailsStreaming)
+    super
+  end
+
+  def zipline(files, zipname = 'zipline.zip', **kwargs_for_zip_kit_stream)
+    zip_kit_stream(filename: zipname, **kwargs_for_zip_kit_stream) do |zip_kit_streamer|
+      handler = Zipline::ZipHandler.new(zip_kit_streamer, logger)
+      files.each do |file, name, options = {}|
+        handler.handle_file(file, name.to_s, options)
+      end
+    end
   end
 end

data/spec/lib/zipline/{zip_generator_spec.rb → zip_handler_spec.rb}

@@ -18,7 +18,7 @@ module ActiveStorage
   end
 end
 
-describe Zipline::ZipGenerator do
+describe Zipline::ZipHandler do
   before { Fog.mock! }
   let(:file_attributes){ {
     key: 'fog_file_tests',
@@ -38,21 +38,21 @@ describe Zipline::ZipGenerator do
   let(:file){ directory.files.create(file_attributes) }
 
   describe '.normalize' do
-    let(:generator){ Zipline::ZipGenerator.new([])}
+    let(:handler){ Zipline::ZipHandler.new(_streamer = double(), _logger = nil)}
     context "CarrierWave" do
       context "Remote" do
         let(:file){ CarrierWave::Storage::Fog::File.new(nil,nil,nil) }
         it "extracts the url" do
           allow(file).to receive(:url).and_return('fakeurl')
           expect(File).not_to receive(:open)
-          expect(generator.normalize(file)).to eq({url: 'fakeurl'})
+          expect(handler.normalize(file)).to eq({url: 'fakeurl'})
         end
       end
       context "Local" do
         let(:file){ CarrierWave::SanitizedFile.new(Tempfile.new('t')) }
         it "creates a File" do
           allow(file).to receive(:path).and_return('spec/fakefile.txt')
-          normalized = generator.normalize(file)
+          normalized = handler.normalize(file)
           expect(normalized.keys).to include(:file)
           expect(normalized[:file]).to be_a File
         end
@@ -66,7 +66,7 @@ describe Zipline::ZipGenerator do
             allow(uploader).to receive(:file).and_return(file)
             allow(file).to receive(:url).and_return('fakeurl')
             expect(File).not_to receive(:open)
-            expect(generator.normalize(uploader)).to eq({url: 'fakeurl'})
+            expect(handler.normalize(uploader)).to eq({url: 'fakeurl'})
           end
         end
 
@@ -75,7 +75,7 @@ describe Zipline::ZipGenerator do
           it "creates a File" do
             allow(uploader).to receive(:file).and_return(file)
             allow(file).to receive(:path).and_return('spec/fakefile.txt')
-            normalized = generator.normalize(uploader)
+            normalized = handler.normalize(uploader)
             expect(normalized.keys).to include(:file)
             expect(normalized[:file]).to be_a File
           end
@@ -87,7 +87,7 @@ describe Zipline::ZipGenerator do
         let(:file){ Paperclip::Attachment.new(:name, :instance) }
         it "creates a File" do
           allow(file).to receive(:path).and_return('spec/fakefile.txt')
-          normalized = generator.normalize(file)
+          normalized = handler.normalize(file)
           expect(normalized.keys).to include(:file)
           expect(normalized[:file]).to be_a File
         end
@@ -97,7 +97,7 @@ describe Zipline::ZipGenerator do
         it "creates a URL" do
           allow(file).to receive(:expiring_url).and_return('fakeurl')
           expect(File).to_not receive(:open)
-          expect(generator.normalize(file)).to include(url: 'fakeurl')
+          expect(handler.normalize(file)).to include(url: 'fakeurl')
         end
       end
     end
@@ -107,7 +107,7 @@ describe Zipline::ZipGenerator do
           attached = create_attached_one
           allow_any_instance_of(Object).to receive(:defined?).and_return(true)
 
-          normalized = generator.normalize(attached)
+          normalized = handler.normalize(attached)
 
           expect(normalized.keys).to include(:blob)
           expect(normalized[:blob]).to be_a(ActiveStorage::Blob)
@@ -119,7 +119,7 @@ describe Zipline::ZipGenerator do
           attachment = create_attachment
           allow_any_instance_of(Object).to receive(:defined?).and_return(true)
 
-          normalized = generator.normalize(attachment)
+          normalized = handler.normalize(attachment)
 
           expect(normalized.keys).to include(:blob)
           expect(normalized[:blob]).to be_a(ActiveStorage::Blob)
@@ -131,7 +131,7 @@ describe Zipline::ZipGenerator do
           blob = create_blob
           allow_any_instance_of(Object).to receive(:defined?).and_return(true)
 
-          normalized = generator.normalize(blob)
+          normalized = handler.normalize(blob)
 
           expect(normalized.keys).to include(:blob)
           expect(normalized[:blob]).to be_a(ActiveStorage::Blob)
@@ -169,107 +169,20 @@ describe Zipline::ZipGenerator do
       it "extracts url" do
         allow(file).to receive(:url).and_return('fakeurl')
         expect(File).not_to receive(:open)
-        expect(generator.normalize(file)).to eq(url:  'fakeurl')
+        expect(handler.normalize(file)).to eq(url:  'fakeurl')
       end
     end
     context "IOStream" do
       let(:file){ StringIO.new('passthrough')}
       it "passes through" do
-        expect(generator.normalize(file)).to eq(file: file)
+        expect(handler.normalize(file)).to eq(file: file)
       end
     end
     context "invalid" do
       let(:file){ Thread.new{} }
       it "raises error" do
-        expect{generator.normalize(file)}.to raise_error(ArgumentError)
+        expect{handler.normalize(file)}.to raise_error(ArgumentError)
       end
     end
   end
-
-  describe '.write_file' do
-    let(:file) { StringIO.new('passthrough') }
-
-    context 'when passing an ActiveStorage::Filename object as filename' do
-      let(:filename) { ActiveStorage::Filename.new('test') }
-
-      let(:generator) do
-        Zipline::ZipGenerator.new([[file, filename]])
-      end
-
-      it 'passes a string as filename to ZipTricks' do
-        allow(file).to receive(:url).and_return('fakeurl')
-        expect_any_instance_of(ZipTricks::Streamer).to receive(:write_deflated_file)
-          .with('test')
-        generator.each { |_| 'Test' }
-      end
-    end
-  end
-
-  describe 'passing an options hash' do
-    let(:file) { StringIO.new('passthrough') }
-
-    context 'with optional arguments' do
-      let(:mtime) { 1.day.ago }
-      let(:generator) do
-        Zipline::ZipGenerator.new([[file, 'test', modification_time: mtime]])
-      end
-
-      it 'passes the options hash through handle_file' do
-        expect(generator).to receive(:handle_file)
-          .with(anything, anything, anything, { modification_time: mtime })
-        generator.each { |_| 'Test' }
-      end
-
-      it 'passes the options hash to ZipTricks as kwargs' do
-        allow(file).to receive(:url).and_return('fakeurl')
-        expect_any_instance_of(ZipTricks::Streamer).to receive(:write_deflated_file)
-          .with(anything, modification_time: mtime)
-        generator.each { |_| 'Test' }
-      end
-    end
-
-    context 'without optional arguments' do
-      let(:generator) do
-        Zipline::ZipGenerator.new([[file, 'test']])
-      end
-
-      it 'passes the options hash through handle_file' do
-        expect(generator).to receive(:handle_file)
-          .with(anything, anything, anything, {})
-        generator.each { |_| 'Test' }
-      end
-
-      it 'passes the options hash to ZipTricks as kwargs' do
-        allow(file).to receive(:url).and_return('fakeurl')
-        expect_any_instance_of(ZipTricks::Streamer).to receive(:write_deflated_file)
-          .with(anything)
-        generator.each { |_| 'Test' }
-      end
-    end
-
-    context 'with extra invalid options' do
-      let(:mtime) { 1.day.ago }
-      let(:generator) do
-        Zipline::ZipGenerator.new([[file, 'test', modification_time: mtime, extra: 'invalid']])
-      end
-
-      it 'passes the whole options hash through handle_file' do
-        expect(generator).to receive(:handle_file)
-          .with(anything, anything, anything, { modification_time: mtime, extra: 'invalid' })
-        generator.each { |_| 'Test' }
-      end
-
-      it 'only passes the kwargs to ZipTricks that it expects (i.e., :modification_time)' do
-        allow(file).to receive(:url).and_return('fakeurl')
-        expect_any_instance_of(ZipTricks::Streamer).to receive(:write_deflated_file)
-          .with(anything, modification_time: mtime)
-        generator.each { |_| 'Test' }
-      end
-    end
-  end
-  it 'passes along constructor options to ZipTricks streamer' do
-    expect(ZipTricks::Streamer).to receive(:open).with(anything, { :some => 'options' })
-    generator = Zipline::ZipGenerator.new([file, 'somefile'], :some => 'options')
-    generator.each { |_| 'Test' }
-  end
 end

data/spec/lib/zipline/zipline_spec.rb

@@ -1,29 +1,73 @@
 require 'spec_helper'
-require 'ostruct'
+require 'action_controller'
 
 describe Zipline do
-  before { Fog.mock! }
+  before do
+    Fog.mock!
+    FakeController.logger = nil
+  end
 
-  let (:undertest) {
-    class TestZipline
+  class FakeController < ActionController::Base
+    include Zipline
+    def download_zip
+      files = [
+        [StringIO.new("File content goes here"), "one.txt"],
+        [StringIO.new("Some other content goes here"), "two.txt"]
+      ]
+      zipline(files, 'myfiles.zip', auto_rename_duplicate_filenames: false)
+    end
 
-      attr_accessor :headers
-      attr_accessor :response
-      attr_accessor :response_body
-      def initialize 
-        @headers = {}
-        @response = OpenStruct.new(:cache_control => {}, :headers => {} )
+    class FailingIO < StringIO
+      def read(*)
+        raise "Something wonky"
       end
-      include Zipline
-    end 
-    return TestZipline.new()
-  }
+    end
+
+    def download_zip_with_error_during_streaming
+      files = [
+        [StringIO.new("File content goes here"), "one.txt"],
+        [FailingIO.new("This will fail half-way"), "two.txt"]
+      ]
+      zipline(files, 'myfiles.zip', auto_rename_duplicate_filenames: false)
+    end
+  end
+
+  it 'passes keyword parameters to ZipKit::OutputEnumerator' do
+    fake_rack_env = {
+      "HTTP_VERSION" => "HTTP/1.0",
+      "REQUEST_METHOD" => "GET",
+      "SCRIPT_NAME" => "",
+      "PATH_INFO" => "/download",
+      "QUERY_STRING" => "",
+      "SERVER_NAME" => "host.example",
+      "rack.input" => StringIO.new,
+    }
+    expect(ZipKit::OutputEnumerator).to receive(:new).with(auto_rename_duplicate_filenames: false).and_call_original
+
+    status, headers, body = FakeController.action(:download_zip).call(fake_rack_env)
+
+    expect(headers['Content-Disposition']).to eq("attachment; filename=\"myfiles.zip\"; filename*=UTF-8''myfiles.zip")
+  end
+
+  it 'sends the exception raised in the streaming body to the Rails logger' do
+    fake_rack_env = {
+      "HTTP_VERSION" => "HTTP/1.0",
+      "REQUEST_METHOD" => "GET",
+      "SCRIPT_NAME" => "",
+      "PATH_INFO" => "/download",
+      "QUERY_STRING" => "",
+      "SERVER_NAME" => "host.example",
+      "rack.input" => StringIO.new,
+    }
+    fake_logger = double()
+    allow(fake_logger).to receive(:warn)
+    expect(fake_logger).to receive(:error).with(a_string_matching(/when serving the ZIP/))
 
+    FakeController.logger = fake_logger
 
-  it 'passes arguments along' do
-    expect(Zipline::ZipGenerator).to receive(:new)
-          .with(['some', 'fake', 'files'], { some: 'options' })
-    undertest.zipline(['some', 'fake', 'files'], 'myfiles.zip', some: 'options')
-    expect(undertest.headers['Content-Disposition']).to eq("attachment; filename=\"myfiles.zip\"; filename*=UTF-8''myfiles.zip")
+    expect {
+      status, headers, body = FakeController.action(:download_zip_with_error_during_streaming).call(fake_rack_env)
+      body.each { }
+    }.to raise_error(/Something wonky/)
   end
 end

data/spec/spec_helper.rb

@@ -8,17 +8,16 @@ require 'paperclip'
 require 'fog-aws'
 require 'carrierwave'
 
-Dir["#{File.expand_path('..', __FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.expand_path('..', __FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 CarrierWave.configure do |config|
   config.fog_provider = 'fog/aws'
   config.fog_credentials = {
-		provider:              'AWS',
-		aws_access_key_id:     'dummy',
-		aws_secret_access_key: 'data',
-		region:                'us-west-2',
-	}
-
+    provider:              'AWS',
+    aws_access_key_id:     'dummy',
+    aws_secret_access_key: 'data',
+    region:                'us-west-2',
+  }
 end
 
 RSpec.configure do |config|

data/zipline.gemspec

@@ -20,8 +20,15 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'actionpack', ['>= 6.0', '< 8.0']
   gem.add_dependency 'content_disposition', '~> 1.0'
-  gem.add_dependency 'zip_tricks', ['>= 4.2.1', '< 6.0']
+  gem.add_dependency 'zip_kit', ['~> 6', '>= 6.2.0', '< 7']
+
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'fog-aws'
+  gem.add_development_dependency 'aws-sdk-s3'
+  gem.add_development_dependency 'carrierwave'
+  gem.add_development_dependency 'paperclip'
+  gem.add_development_dependency 'rake'
 
   # https://github.com/rspec/rspec-mocks/issues/1457
-  gem.add_development_dependency 'rspec-mocks', '3.10.2'
+  gem.add_development_dependency 'rspec-mocks', '~> 3.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ram Dobson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -45,39 +45,129 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: zip_tricks
+  name: zip_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 6.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 6.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: '3.12'
 description: a module for streaming dynamically generated zip files
 email:
 - ram.dobson@solsystemscompany.com
@@ -92,9 +182,9 @@ files:
 - Rakefile
 - lib/zipline.rb
 - lib/zipline/version.rb
-- lib/zipline/zip_generator.rb
+- lib/zipline/zip_handler.rb
 - spec/fakefile.txt
-- spec/lib/zipline/zip_generator_spec.rb
+- spec/lib/zipline/zip_handler_spec.rb
 - spec/lib/zipline/zipline_spec.rb
 - spec/spec_helper.rb
 - zipline.gemspec
@@ -117,12 +207,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: stream zip files from rails
 test_files:
 - spec/fakefile.txt
-- spec/lib/zipline/zip_generator_spec.rb
+- spec/lib/zipline/zip_handler_spec.rb
 - spec/lib/zipline/zipline_spec.rb
 - spec/spec_helper.rb