zipline 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de63c7a8518461b8fdbb249ce857b3f06ffc2bf3a7de69d6d5d6c5111f75015
-  data.tar.gz: edfc26eed9a1d52987a4d47330a015d2ebb0e3129f2c0791199a51b3b5abec70
+  metadata.gz: b56c703c9733a9c781d4d81eb83826a8de4a647238a83d9ade835fa034c8a84c
+  data.tar.gz: 0f1cd2b80086cb0a3fcd572aa18d03f03228820870f93b8ec9da7cb6591c165c
 SHA512:
-  metadata.gz: cc54e592ebd7c24cad03669786938a3662430389e81322ceef258898ec5d8e9949db956a7433ab7c4d139b4671100772c062c525f8d20b6782f3a221b80ea9f3
-  data.tar.gz: 2482828adb931c9630c209b7a9a06c913b43d577232dea8d877b88acb1fa3b60834c35a92175608610da0d7e80ad36d6a1f8cd2379b9af5a249ce2b1f7456990
+  metadata.gz: 0b97a0e674b144d21eeacf5ed955dcf1e62639479f63e73c988d405d3ed707c8d45e64f33bf3bb98eeebc4fabeacf991f2e60c5c23367152a677e2a9e616e43c
+  data.tar.gz: e54fb0c40ad64959b1c1965a45312aafa5fe0fa6547d626f54795dab8027c0208a4550589fb933266620c0e00d98eb1685daede1b3395539da81f2bf24887a85

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test (${{ matrix.ruby-version }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - head
+          - '3.1'
+          - '3.0'
+          - '2.7'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,5 +1,5 @@
 # Zipline
-[![Build Status](https://travis-ci.org/fringd/zipline.svg?branch=master)](https://travis-ci.org/fringd/zipline)
+[![Tests](https://github.com/fringd/zipline/actions/workflows/ci.yml/badge.svg)](https://github.com/fringd/zipline/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/zipline.svg)](https://badge.fury.io/rb/zipline)
 
 A gem to stream dynamically generated zip files from a rails application. Unlike other solutions that generate zips for user download, zipline does not wait for the entire zip file to be created (or even for the entire input file in the cloud to be downloaded) before it begins sending the zip file to the user. It does this by never seeking backwards during zip creation, and streaming the zip file over http as it is constructed. The advantages of this are:

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "1.3.0"
+  VERSION = "1.4.1"
 end

data/lib/zipline/zip_generator.rb

@@ -80,7 +80,7 @@ module Zipline
     end
 
     def write_file(streamer, file, name, options)
-      streamer.write_deflated_file(name, options) do |writer_for_file|
+      streamer.write_deflated_file(name, **options.slice(:modification_time)) do |writer_for_file|
         if file[:url]
           the_remote_uri = URI(file[:url])
 

data/lib/zipline.rb

@@ -1,3 +1,4 @@
+require 'content_disposition'
 require "zipline/version"
 require 'zip_tricks'
 require "zipline/zip_generator"
@@ -13,7 +14,7 @@ require "zipline/zip_generator"
 module Zipline
   def zipline(files, zipname = 'zipline.zip')
     zip_generator = ZipGenerator.new(files)
-    headers['Content-Disposition'] = "attachment; filename=\"#{zipname.gsub '"', '\"'}\""
+    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

data/spec/lib/zipline/zip_generator_spec.rb

@@ -199,7 +199,7 @@ describe Zipline::ZipGenerator do
       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', {})
+          .with('test')
         generator.each { |_| 'Test' }
       end
     end
@@ -220,7 +220,7 @@ describe Zipline::ZipGenerator do
         generator.each { |_| 'Test' }
       end
 
-      it 'passes the options hash to ZipTricks' do
+      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)
@@ -239,10 +239,30 @@ describe Zipline::ZipGenerator do
         generator.each { |_| 'Test' }
       end
 
-      it 'passes the options hash to ZipTricks' do
+      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, {})
+          .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

data/zipline.gemspec

@@ -16,6 +16,12 @@ Gem::Specification.new do |gem|
   gem.version       = Zipline::VERSION
   gem.licenses      = ['MIT']
 
-  gem.add_dependency 'actionpack', ['>= 3.2.1', '< 7.0']
+  gem.required_ruby_version = ">= 2.7"
+
+  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']
+
+  # https://github.com/rspec/rspec-mocks/issues/1457
+  gem.add_development_dependency 'rspec-mocks', ['~> 3.10', '!= 3.10.3']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ram Dobson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,20 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
+- !ruby/object:Gem::Dependency
+  name: content_disposition
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: zip_tricks
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +64,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.10.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.10.3
 description: a module for streaming dynamically generated zip files
 email:
 - ram.dobson@solsystemscompany.com
@@ -57,7 +91,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/ci.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -81,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0