zipline 1.2.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '086fee6aad082ec2df7dd4d365631b8294bfe750'
-  data.tar.gz: b5a29ee5c9f07f3308778e86d1e38bbab4e30c9c
+SHA256:
+  metadata.gz: 3b817672135a701f0f20b0fdfdb59404e7328eb20f2d7bc2177fedc02c23905e
+  data.tar.gz: 50cb1d70a9a08d9fad93e08283706419bd6c1b372eb65fc9820d5d30cf3eec07
 SHA512:
-  metadata.gz: c35318bba3cd50cdf646d554684a20e38370ac3a65cf95a00ff20b1cb126a89b6d817d0211f304bd82ed9c5c19b3581dd93f48e5983c546cf0340e189ae40606
-  data.tar.gz: 813606c2493ee439340063e98080668a4544b0a5bff5f319a570db43f2bb5dbc37e0595446155af7946d26daeef46928efbaad20dea6f9f1a5d2eb146ee4ad77
+  metadata.gz: 18943a6b1515d8747dbb7a748963645655c3fb260b6b45e387938eb4e3c7619a73afd0563fd695060d60986f2e8a7ae09b0195791be3354e5e5ad07a0acc4124
+  data.tar.gz: f27c6da446d0d0fe8ce3386a2a6bc53a23c5444c77fa3e2e64dadfada172b277af156719d6031774812573056e69b7bfa4133d11a3f7bcf46e73caa737afda6c

data/.travis.yml

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

data/Gemfile

@@ -5,12 +5,10 @@ gemspec
 
 group :development, :test do
   gem 'rspec', '~> 3'
-  gem 'fog'
   gem 'fog-aws'
   gem 'activesupport'
-  gem 'aws-sdk'
+  gem 'aws-sdk-s3'
   gem 'carrierwave'
   gem 'paperclip'
   gem 'rake'
-  gem 'rake-rspec'
 end

data/Rakefile

@@ -1,4 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-require "rake/rspec"
-task :default => :spec
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "1.2.0"
+  VERSION = "1.3.2"
 end

data/lib/zipline/zip_generator.rb

@@ -14,11 +14,27 @@ module Zipline
 
     def each(&block)
       fake_io_writer = ZipTricks::BlockWrite.new(&block)
-      ZipTricks::Streamer.open(fake_io_writer) do |streamer|
+      # 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) do |streamer|
         @files.each do |file, name, options = {}|
-          handle_file(streamer, 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)
@@ -64,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/spec/lib/zipline/zip_generator_spec.rb

@@ -1,6 +1,23 @@
 require 'spec_helper'
 require 'tempfile'
 
+module ActiveStorage
+  class Attached
+    class One < Attached
+    end
+  end
+  class Attachment; end
+  class Blob; end
+  class Filename
+    def initialize(name)
+      @name = name
+    end
+    def to_s
+      @name
+    end
+  end
+end
+
 describe Zipline::ZipGenerator do
   before { Fog.mock! }
   let(:file_attributes){ {
@@ -85,15 +102,6 @@ describe Zipline::ZipGenerator do
       end
     end
     context "ActiveStorage" do
-      module ActiveStorage
-        class Attached
-          class One < Attached
-          end
-        end
-        class Attachment; end
-        class Blob; end
-      end
-
       context "Attached::One" do
         it "get blob" do
           attached = create_attached_one
@@ -147,8 +155,15 @@ describe Zipline::ZipGenerator do
       def create_blob
         blob = ActiveStorage::Blob.new
         allow(blob).to receive(:service_url).and_return('fakeurl')
+        filename = create_filename
+        allow(blob).to receive(:filename).and_return(filename)
         blob
       end
+
+      def create_filename
+        # Rails wraps Blob#filname in this class since Rails 5.2
+        ActiveStorage::Filename.new('test')
+      end
     end
     context "Fog" do
       it "extracts url" do
@@ -171,6 +186,25 @@ describe Zipline::ZipGenerator do
     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') }
 
@@ -186,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)
@@ -205,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)
+        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, {})
+          .with(anything, modification_time: mtime)
         generator.each { |_| 'Test' }
       end
     end

data/spec/spec_helper.rb

@@ -2,9 +2,7 @@ require 'rspec'
 require 'active_support'
 require 'active_support/core_ext'
 require 'zipline'
-require 'aws-sdk'
 require 'paperclip'
-require 'fog'
 require 'fog-aws'
 require 'carrierwave'
 
@@ -21,8 +19,6 @@ CarrierWave.configure do |config|
 
 end
 
-
-
 RSpec.configure do |config|
   config.color = true
   config.order = :random

data/zipline.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Zipline::VERSION
   gem.licenses      = ['MIT']
 
-  gem.add_dependency 'zip_tricks', ['>= 4.2.1', '<= 5.1.0']
-  gem.add_dependency 'rails', ['>= 3.2.1', '< 6.1']
+  gem.add_dependency 'actionpack', ['>= 3.2.1', '< 8.0']
+  gem.add_dependency 'zip_tricks', ['>= 4.2.1', '< 6.0']
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Ram Dobson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zip_tricks
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
-    - - "<="
+        version: 3.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
-    - - "<="
+        version: 3.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: zip_tricks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 description: a module for streaming dynamically generated zip files
 email:
 - ram.dobson@solsystemscompany.com
@@ -73,7 +73,7 @@ homepage: http://github.com/fringd/zipline
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: stream zip files from rails
 test_files: