active_storage-send_zip 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a759d725f127cfcc104cb260006573890883f6ab47b8791090b438d0d71508b9
-  data.tar.gz: 3199a753f48fdc3b4ff8664fae7572dd51676d01dba59803be2d623671491821
+  metadata.gz: dc98380d75e0dea755962244b39c4f71eef7ab10e287bde9a8eb9069e72938b5
+  data.tar.gz: 991f72af92ec9d212bfe0ce70c1ac05657de73ce569863f42a9522c70a8028a3
 SHA512:
-  metadata.gz: e832a1d02d78d6cab4014b5ab2bf4c736dc5c9f77c91fefbc1cd0db1c4d678d494fb261acad9fce16e8d9af59b339fd2988805c8a8f6110f92323e018e755e93
-  data.tar.gz: 61484fd7cda8f6599658a6aaaafff6e64a349ee57c9fa3a21863e3043557e1b22582050a2cf2436e05cb257ff93d8b3168a043e52dddd553eeeb92a05600f5da
+  metadata.gz: 485893e2b20b30be9586e6b33852baf7b25ba01a788e722c65e46290484055823c7f0abb04b88e1cabac9f82ec10722345c2af604c67ca66a573e0c24fa1818e
+  data.tar.gz: 2e34ff1b3a2fa5eef2137479b23fcbf3968a9702435f4cee6b8d2d09a881ef86459df9601194aeeb02dd922049dd91550976db0a58fe6921e5a94b6de52a999a

data/Gemfile.lock

@@ -1,64 +1,77 @@
 PATH
   remote: .
   specs:
-    active_storage-send_zip (0.3.2)
+    active_storage-send_zip (0.3.3)
       rails (> 5.2)
-      rubyzip (~> 1.2)
+      rubyzip (< 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
-    erubi (1.8.0)
+      zeitwerk (~> 2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.3)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -66,56 +79,59 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
+    minitest (5.14.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (10.5.0)
-    rubyzip (1.2.2)
-    sprockets (3.7.2)
+    rubyzip (2.2.0)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -61,7 +61,10 @@ class HolidaysController < ApplicationController
   def zip
     send_zip {
       'Holidays in Lyon <3' => Holidays.where(place: 'lyon').first.pictures,
-      'Holidays in Paris' => Holidays.where(place: 'paris').first.pictures,
+      'Holidays in Paris' => [
+        'Eiffle Tower' => Holidays.where(place: 'eiffle_tower').first.pictures,
+        Holidays.where(place: 'paris').first.pictures
+      ]
     }
   end
 end
@@ -75,6 +78,10 @@ Will produce a `.zip` archive like this:
 │   ├── b.png
 │   └── c.gif
 └── Holidays in Paris
+    ├── Eiffle Tower
+        ├── d.jpg
+        ├── e.jpg
+        ├── f.jpg
     ├── a.jpg
     ├── b.png
     └── c.gif

data/active_storage-send_zip.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_storage/send_zip/version'
@@ -38,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_dependency "rails", "> 5.2"
-  spec.add_dependency "rubyzip", "~> 1.2"
+  spec.add_dependency 'rails', '> 5.2'
+  spec.add_dependency 'rubyzip', '< 3.0'
 end

data/lib/active_storage/send_zip/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module ActiveStorage
   module SendZip
     # The version of this gem
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'
   end
 end

data/lib/active_storage/send_zip_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'zip'
 require 'tempfile'
@@ -17,14 +19,7 @@ module ActiveStorage
       temp_folder = Dir.mktmpdir 'active_storage-send_zip'
 
       if files.is_a? Hash
-        filepaths = []
-
-        files.each do |subfolder, filesHash|
-          filesHash = [filesHash] unless filesHash.is_a? Array
-          filesHash.each do |f|
-            filepaths << save_file_on_server(f, temp_folder, subfolder: subfolder.to_s)
-          end
-        end
+        filepaths = construct_with_hash(files, temp_folder)
       elsif files.respond_to? :each
         files.each { |file| save_file_on_server(file, temp_folder) }
       else
@@ -34,6 +29,34 @@ module ActiveStorage
       temp_folder
     end
 
+    # Parses hash to build out directories where folders are key names
+    #
+    # @param files [ActiveStorage::Attached::One|ActiveStorage::Attached::Many|Array|Hash] file(s) to save
+    # @return [String] folder path of saved files
+    def self.construct_with_hash(files, temp_folder)
+      filepaths = []
+
+      files.each do |subfolder, filesHash|
+        filesHash = [filesHash] unless filesHash.is_a? Array
+
+        filesHash.each do |f|
+          # Build directory strucutre recursively for hashes
+          if f.is_a? Hash
+            # Build folder for hash entry
+            folder = File.join(temp_folder, subfolder.to_s)
+            Dir.mkdir(folder) unless Dir.exist?(folder)
+
+            filepaths += construct_with_hash(f, folder)
+          # Save attachement
+          else
+            filepaths << save_file_on_server(f, temp_folder, subfolder: subfolder.to_s)
+          end
+        end
+      end
+
+      filepaths
+    end
+
     # Save the given file on the server
     #
     # @param file [ActiveStorage::Attached] files to save
@@ -84,7 +107,7 @@ module ActiveStorage
           end
         end
 
-        return File.read(temp_file.path)
+        File.read(temp_file.path)
       ensure
         # close all ressources & remove temporary files
         # temp_file.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage-send_zip
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Alexandre Rousseau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.0'
 description: Add a `send_zip` method in your Rails controller to send a `.zip` file
   containing one (or many) ActiveStorage object(s)
 email:
@@ -125,7 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Create a zip from one or more Active Storage objects