zipline 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dced1a62ccd13637dce8896c6809922661aa25d
-  data.tar.gz: 32b3a8cb4809dedd83248501f8ac2eb973482a39
+  metadata.gz: e29199e5ffa8970199f9586ea13025d68373594f
+  data.tar.gz: b155365912bf26cdedc37221d4061571fbe7c985
 SHA512:
-  metadata.gz: 89bf143bc7f27eddf9cba7064d2b43a248b594a35363643796ece7a51bdf96dcc1a61fa2f5fcd946f3b505b5afb2b1be8c5e189d107ddbfa44251f7b355bd414
-  data.tar.gz: 032abbeebc338a1959f95d35a3fd21e43d1a06190445bf2861387b53e5b2916f4b56d0157b299b9670f432f47e5983d6c28ed4655d0bdc19ba0e7f4cc3dd269e
+  metadata.gz: e9b51d097401fe6e7142ed4220b4c779b2f3cdc0e77f7665c85f0ad60daa62d33557b53c37e006bca87bd7584153d6a622d25e85e0366e5b32f4dbcbc604524d
+  data.tar.gz: 35b0a617645946e17306617b5e21f4f88f10c11a291b5c2079fe9d93c440eb68df71b600d30c305c76720c6359ee682d0782fefa236776b5c5cf804909ab5d90

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zipline.gemspec
 gemspec
+
+group :development, :test do
+  gem 'rspec', '~> 3.0.0.beta'
+  gem 'fog'
+  gem 'carrierwave'
+  gem 'paperclip'
+end

data/README.md

@@ -48,6 +48,5 @@ For directories, just give the files names like "directory/file".
 ## TODO (possible contributions?)
 
 * tests!
-* support rails 4.0 streaming
 * extract library for plain ruby streaming zips, which this will depend on.
 * get my changes to support streaming zips checked in to the rubyzip library.

data/lib/zipline/fake_stream.rb

@@ -29,7 +29,7 @@ module Zipline
     end
 
     def <<(x)
-      return if x.nil?
+      return if x.blank?
       throw "bad class #{x.class}" unless x.class == String
       @pos += x.bytesize
       @block.call(x.to_s)

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/zipline/zip_generator.rb

@@ -1,6 +1,5 @@
 # this class acts as a streaming body for rails
 # initialize it with an array of the files you want to zip
-# right now only carrierwave is supported with file storage or S3
 module Zipline
   class ZipGenerator
     # takes an array of pairs [[uploader, filename], ... ]
@@ -16,27 +15,29 @@ module Zipline
     def each(&block)
       output = new_output(&block)
       OutputStream.open(output) do |zip|
-        @files.each do |file, name|
-	  file = file.file if file.respond_to? :file
+        @files.each {|file, name| handle_file(zip, file, name) }
+      end
+    end
 
-          #normalize file
-          if file.class.to_s == 'CarrierWave::Storage::Fog::File'
-            file = file.send(:file)
-          end
-          if file.class.to_s == 'CarrierWave::SanitizedFile'
-            path = file.send(:file)
-            file = File.open(path)
-          end
-	  if file.class.to_s == 'Paperclip::Attachment'
-            path = file.send(:path)
-            file = File.open(path)
-	  end
-          throw "bad_file" unless %w{Fog::Storage::AWS::File File}.include? file.class.to_s
-
-          name = uniquify_name(name)
-          write_file(zip, file, name)
+    def handle_file(zip, file, name)
+      file = normalize(file)
+      name = uniquify_name(name)
+      write_file(zip, file, name)
+    end
+
+    def normalize(file)
+      unless is_io?(file)
+        if file.respond_to?(:url) && (!defined?(::Paperclip::Attachment) || !file.is_a?(::Paperclip::Attachment))
+          file = file
+        elsif file.respond_to? :file
+          file = File.open(file.file)
+        elsif file.respond_to? :path
+          file = File.open(file.path)
+        else
+          raise(ArgumentError, 'Bad File/Stream')
         end
       end
+      file
     end
 
     def new_output(&block)
@@ -45,10 +46,9 @@ module Zipline
 
     def write_file(zip, file, name)
       size = get_size(file)
-
       zip.put_next_entry name, size
 
-      if file.is_a? File
+      if is_io?(file)
         while buffer = file.read(2048)
           zip << buffer
         end
@@ -65,18 +65,22 @@ module Zipline
     end
 
     def get_size(file)
-      case file.class.to_s
-      when 'File'
+      if is_io?(file)
         file.size
-      when 'Fog::Storage::AWS::FILE'
+      elsif file.respond_to? :content_length
         file.content_length
+      else
+        throw 'cannot determine file size'
       end
     end
 
+    def is_io?(file)
+      file.is_a?(IO) || (defined?(StringIO) && file.is_a?(StringIO))
+    end
+
     def uniquify_name(name)
       @used_names ||= Set.new
 
-
       if @used_names.include?(name)
 
         #remove suffix e.g. ".foo"

data/spec/lib/zipline/zip_generator_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe Zipline::ZipGenerator do
+
+  before { Fog.mock! }
+  let(:file_attributes){ {
+    key: 'fog_file_tests',
+    body: 'some body',
+    public: true
+  }}
+  let(:directory_attributes){{
+    key: 'fog_directory'
+  }}
+  let(:storage_attributes){{
+    aws_access_key_id: 'fake_access_key_id',
+    aws_secret_access_key: 'fake_secret_access_key',
+    provider: 'AWS'
+  }}
+  let(:storage){ Fog::Storage.new(storage_attributes)}
+  let(:directory){ storage.directories.create(directory_attributes) }
+  let(:file){ directory.files.create(file_attributes) }
+
+  describe '.normalize' do
+    let(:generator){ Zipline::ZipGenerator.new([])}
+    context "CarrierWave" do
+      context "Remote" do
+        let(:file){ CarrierWave::Storage::Fog::File.new(nil,nil,nil) }
+        it "passes through" do
+          expect(File).not_to receive(:open)
+          expect(generator.normalize(file)).to be file
+        end
+      end
+      context "Local" do
+        let(:file){ CarrierWave::SanitizedFile.new(Tempfile.new('t')) }
+        it "creates a File" do
+          expect(generator.normalize(file)).to be_a File
+        end
+      end
+    end
+    context "Paperclip" do
+      let(:file){ Paperclip::Attachment.new(:name, :instance) }
+      it "creates a File" do
+        expect(File).to receive(:open).once
+        generator.normalize(file)
+      end
+    end
+    context "Fog" do
+      it "passes through" do
+        expect(File).not_to receive(:open)
+        expect(generator.normalize(file)).to be file
+      end
+    end
+    context "IOStream" do
+      let(:file){ StringIO.new('passthrough')}
+      it "passes through" do
+        expect(generator.normalize(file)).to be file
+      end
+    end
+    context "invalid" do
+      let(:file){ Thread.new{} }
+      it "raises error" do
+        expect{generator.normalize(file)}.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'rspec'
+require 'zipline'
+require 'paperclip'
+require 'fog'
+require 'carrierwave'
+
+Dir["#{File.expand_path('..', __FILE__)}/support/**/*.rb"].each { |f| require f }
+
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.order = :random
+  config.run_all_when_everything_filtered = true
+end

data/zipline.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Zipline::VERSION
 
   gem.add_dependency 'rubyzip', ['>= 1.0', '<= 1.1.2']
-  gem.add_dependency 'rails', '>= 3.2.1'
+  gem.add_dependency 'rails', ['>= 3.2.1', '< 4.3']
   gem.add_dependency 'curb'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ram Dobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -37,6 +37,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +81,8 @@ files:
 - lib/zipline/output_stream.rb
 - lib/zipline/version.rb
 - lib/zipline/zip_generator.rb
+- spec/lib/zipline/zip_generator_spec.rb
+- spec/spec_helper.rb
 - zipline.gemspec
 homepage: http://github.com/fringd/zipline
 licenses: []
@@ -99,4 +107,6 @@ rubygems_version: 2.0.0.rc.2
 signing_key: 
 specification_version: 4
 summary: stream zip files from rails
-test_files: []
+test_files:
+- spec/lib/zipline/zip_generator_spec.rb
+- spec/spec_helper.rb