zipline 0.0.13 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4432974ae414c5818803a87592a48724c6529cf4
-  data.tar.gz: 49d506143661ddcee1d31bd0bcf01552cf69f330
+  metadata.gz: 37872610106cddacac2c39bb862c2dcc1527bd12
+  data.tar.gz: b17dacf33ec5aa463613ac8cb855582a2fb3b3df
 SHA512:
-  metadata.gz: 6542c37c2b31036c03a7df68cd986dc68a62a823fcbe92ff08892c2f68b31aae8f405445d05f3ce4ac36605fd4ab3d535fdce38538e4c1e14e746f3ec9d28398
-  data.tar.gz: 1897313e5748f76d89fbffd238327cbf8058b615f97f0af24f7379476b8e1740958cdaf4ffdd53683f05f3d1e2f1cdd1c16d820473cc2fba8f4c1c5155090296
+  metadata.gz: bd8f4f222e763ee9429f693f861be3b18ba41040e43b0a89757538078f211ab9081a0573e4f5fc7ba90993750776e9135545ca6a45adad8cdfce7a744a5d7f18
+  data.tar.gz: 27fcb8575dd90c3c692fdab296a3a1e4824c8ccf1771f31456677a3644bc93e0f9f5e74661fa7cb48bd30357cdd2876798c0d7fa53656143b85ae7d4a854ac09

data/Gemfile

@@ -7,6 +7,9 @@ group :development, :test do
   gem 'rubyzip', '~> 1.2'
   gem 'rspec', '~> 3'
   gem 'fog'
+  gem 'fog-aws'
+  gem 'activesupport'
+  gem 'aws-sdk'
   gem 'carrierwave'
   gem 'paperclip'
 end

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "0.0.13"
+  VERSION = "1.0.0"
 end

data/lib/zipline/zip_generator.rb

@@ -24,26 +24,41 @@ module Zipline
       write_file(streamer, file, name)
     end
 
+    # This extracts either a url or a local file from the provided file.
+    # Currently support carrierwave and paperclip local and remote storage.
+    # returns a hash of the form {url: aUrl} or {file: anIoObject}
     def normalize(file)
-      unless is_io?(file)
-        if file.respond_to?(:url) || file.respond_to?(:expiring_url)
-          file = file
-        elsif file.respond_to? :file
-          file = File.open(file.file)
-        elsif file.respond_to? :path
-          file = File.open(file.path)
+      if defined?(CarrierWave::Uploader::Base) && file.is_a?(CarrierWave::Uploader::Base)
+        file = file.file
+      end
+
+      if defined?(Paperclip) && file.is_a?(Paperclip::Attachment)
+        if file.options[:storage] == :filesystem
+          {file: File.open(file.path)}
         else
-          raise(ArgumentError, 'Bad File/Stream')
+          {url: file.expiring_url}
         end
+      elsif defined?(CarrierWave::Storage::Fog::File) && file.is_a?(CarrierWave::Storage::Fog::File)
+        {url: file.url}
+      elsif defined?(CarrierWave::SanitizedFile) && file.is_a?(CarrierWave::SanitizedFile)
+        {file: File.open(file.path)}
+      elsif is_io?(file)
+        {file: file}
+      elsif file.respond_to? :url
+        {url: file.url}
+      elsif file.respond_to? :path
+        {file: File.open(file.path)}
+      elsif file.respond_to? :file
+        {file: File.open(file.file)}
+      else
+        raise(ArgumentError, 'Bad File/Stream')
       end
-      file
     end
 
     def write_file(streamer, file, name)
       streamer.write_deflated_file(name) do |writer_for_file|
-        if file.respond_to?(:url) || file.respond_to?(:expiring_url)
-          # expiring_url seems needed for paperclip to work
-          the_remote_url = file.respond_to?(:expiring_url) ? file.expiring_url : file.url
+        if file[:url]
+          the_remote_url = file[:url]
           c = Curl::Easy.new(the_remote_url) do |curl|
             curl.on_body do |data|
               writer_for_file << data
@@ -51,8 +66,8 @@ module Zipline
             end
           end
           c.perform
-        elsif is_io?(file)
-          IO.copy_stream(file, writer_for_file)
+        elsif file[:file]
+          IO.copy_stream(file[:file], writer_for_file)
         else
           raise(ArgumentError, 'Bad File/Stream')
         end

data/lib/zipline.rb

@@ -19,6 +19,6 @@ module Zipline
     response.sending_file = true
     response.cache_control[:public] ||= false
     self.response_body = zip_generator
-    self.response.headers['Last-Modified'] = Time.now.to_s
+    self.response.headers['Last-Modified'] = Time.now.httpdate
   end
 end

data/spec/fakefile.txt

@@ -0,0 +1 @@
+hello world

data/spec/lib/zipline/zip_generator_spec.rb

@@ -26,35 +26,76 @@ describe Zipline::ZipGenerator do
     context "CarrierWave" do
       context "Remote" do
         let(:file){ CarrierWave::Storage::Fog::File.new(nil,nil,nil) }
-        it "passes through" do
+        it "extracts the url" do
+          allow(file).to receive(:url).and_return('fakeurl')
           expect(File).not_to receive(:open)
-          expect(generator.normalize(file)).to be file
+          expect(generator.normalize(file)).to eq({url: 'fakeurl'})
         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
+          allow(file).to receive(:path).and_return('spec/fakefile.txt')
+          normalized = generator.normalize(file)
+          expect(normalized.keys).to include(:file)
+          expect(normalized[:file]).to be_a File
+        end
+      end
+      context "CarrierWave::Uploader::Base" do
+        let(:uploader) { Class.new(CarrierWave::Uploader::Base).new }
+
+        context "Remote" do
+          let(:file){ CarrierWave::Storage::Fog::File.new(nil,nil,nil) }
+          it "extracts the url" 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'})
+          end
+        end
+
+        context "Local" do
+          let(:file){ CarrierWave::SanitizedFile.new(Tempfile.new('t')) }
+          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)
+            expect(normalized.keys).to include(:file)
+            expect(normalized[:file]).to be_a File
+          end
         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)
+      context "Local" 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)
+          expect(normalized.keys).to include(:file)
+          expect(normalized[:file]).to be_a File
+        end
+      end
+      context "Remote" do 
+        let(:file){ Paperclip::Attachment.new(:name, :instance, storage: :s3) }
+        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')
+        end
       end
     end
     context "Fog" do
-      it "passes through" do
+      it "extracts url" do
+        allow(file).to receive(:url).and_return('fakeurl')
         expect(File).not_to receive(:open)
-        expect(generator.normalize(file)).to be file
+        expect(generator.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 be file
+        expect(generator.normalize(file)).to eq(file: file)
       end
     end
     context "invalid" do

data/spec/spec_helper.rb

@@ -1,11 +1,27 @@
 require 'rspec'
+require 'active_support'
+require 'active_support/core_ext'
 require 'zipline'
+require 'aws-sdk'
 require 'paperclip'
 require 'fog'
+require 'fog-aws'
 require 'carrierwave'
 
 Dir["#{File.expand_path('..', __FILE__)}/support/**/*.rb"].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',
+	}
+
+end
+
+
 
 RSpec.configure do |config|
   config.color = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 1.0.0
 platform: ruby
 authors:
 - Ram Dobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip_tricks
@@ -84,6 +84,7 @@ files:
 - lib/zipline.rb
 - lib/zipline/version.rb
 - lib/zipline/zip_generator.rb
+- spec/fakefile.txt
 - spec/lib/zipline/zip_generator_spec.rb
 - spec/spec_helper.rb
 - zipline.gemspec
@@ -106,10 +107,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: stream zip files from rails
 test_files:
+- spec/fakefile.txt
 - spec/lib/zipline/zip_generator_spec.rb
 - spec/spec_helper.rb