zipline 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d870d86f6be0fe78deb3549c7037808bcb91551d
-  data.tar.gz: fe5c5fac16ca3d02ac37c1fd8981e8eda1052ad6
+  metadata.gz: 9f78131919f81ca6a316cb1f1c7173515a230cee
+  data.tar.gz: 5143037d6d038adf9af45b269f8653f4dd9c1d47
 SHA512:
-  metadata.gz: 1622bf22aecbe54887642408a64b2cafa40559d6b17cb7b2f3ec3e42275dca4af77675237145f09537cf64c35cc909d8842fcedc1c632268e76f3d860acb600b
-  data.tar.gz: fa212e4a62d7c44508b2374b2619b07a97b8db35565f9b6b07541f26306d308f8612ae31bc6d7145fe584c1bbe913f205c5746e5f046a000dd8b6e12df0f861e
+  metadata.gz: 641f00ccfa244d4a5d7e25cb99aaac1356069e9ed1bdf1ea52da7437f613ebf6cc0a31ba0c707777bf0772c899f24d556e657ee29a39a3672a8841ff5d7ef7d7
+  data.tar.gz: bf7592dc54f890f4aadd6628d814048958308c8f20ea51ff3a34088312f497bc4b882b1b4a6fb8e8728dd03b130130cbb4c72617adc86484a738d9af810d22f6

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.4
+  

data/Gemfile

@@ -4,7 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubyzip', '~> 1.2'
   gem 'rspec', '~> 3'
   gem 'fog'
   gem 'fog-aws'
@@ -12,4 +11,6 @@ group :development, :test do
   gem 'aws-sdk'
   gem 'carrierwave'
   gem 'paperclip'
+  gem 'rake'
+  gem 'rake-rspec'
 end

data/README.md

@@ -19,11 +19,12 @@ And then execute:
 
 ## Usage
 
-Set up some models with [carrierwave](https://github.com/jnicklas/carrierwave), [paperclip](https://github.com/thoughtbot/paperclip), or [shrine](https://github.com/janko-m/shrine).  Right now only plain
-file storage and S3 are supported in the case of
-[carrierwave](https://github.com/jnicklas/carrierwave) and only plain file
-storage and S3 are supported in the case of
-[paperclip](https://github.com/thoughtbot/paperclip). [Mutiple file storages](http://shrinerb.com/#external) are supported with [shrine](https://github.com/janko-m/shrine).
+Set up some models with [ActiveStorage](http://edgeguides.rubyonrails.org/active_storage_overview.html)
+[carrierwave](https://github.com/jnicklas/carrierwave), [paperclip](https://github.com/thoughtbot/paperclip), or
+[shrine](https://github.com/janko-m/shrine). Right now only plain file storage and S3 are supported in the case of
+[carrierwave](https://github.com/jnicklas/carrierwave) and only plain file storage and S3 are supported in the case of
+[paperclip](https://github.com/thoughtbot/paperclip). [Mutiple file storages](http://shrinerb.com/#external) are
+supported with [shrine](https://github.com/janko-m/shrine).
 
 You'll need to be using puma or some other server that supports streaming output.
 

data/Rakefile

@@ -1,2 +1,4 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rake/rspec"
+task :default => :spec

data/lib/zipline/version.rb

@@ -1,3 +1,3 @@
 module Zipline
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/zipline/zip_generator.rb

@@ -44,6 +44,8 @@ module Zipline
         {file: File.open(file.path)}
       elsif is_io?(file)
         {file: file}
+      elsif defined?(ActiveStorage::Blob) && file.is_a?(ActiveStorage::Blob)
+        {url: file.service_url}
       elsif file.respond_to? :url
         {url: file.url}
       elsif file.respond_to? :path

data/spec/lib/zipline/zip_generator_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'tempfile'
 
 describe Zipline::ZipGenerator do
-
   before { Fog.mock! }
   let(:file_attributes){ {
     key: 'fog_file_tests',
@@ -67,7 +66,7 @@ describe Zipline::ZipGenerator do
       end
     end
     context "Paperclip" do
-      context "Local" do 
+      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')
@@ -76,7 +75,7 @@ describe Zipline::ZipGenerator do
           expect(normalized[:file]).to be_a File
         end
       end
-      context "Remote" do 
+      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')
@@ -85,6 +84,31 @@ describe Zipline::ZipGenerator do
         end
       end
     end
+    context "ActiveStorage::Blob" do
+      module ActiveStorage
+        class Filename; end
+        class Blob; end
+      end
+
+      let(:tempfile){ Tempfile.new('t').read }
+      let(:filename) do
+        fn = ActiveStorage::Filename.new()
+        allow(fn).to receive(:to_s).and_return('spec/fakefile.txt')
+        fn
+      end
+      let(:file) do
+        f = ActiveStorage::Blob.new()
+        allow(f).to receive(:filename).and_return(filename)
+        allow(f).to receive(:service_url).and_return('fakeurl')
+        f
+      end
+      it "creates a File" do
+        allow_any_instance_of(Object).to receive(:defined?).and_return(true)
+        normalized = generator.normalize(file)
+        expect(normalized.keys).to include(:url)
+        expect(normalized[:url]).to eq('fakeurl')
+      end
+    end
     context "Fog" do
       it "extracts url" do
         allow(file).to receive(:url).and_return('fakeurl')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zipline
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ram Dobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip_tricks
@@ -77,6 +77,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md