active_storage-send_zip 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5dbef1dda4a5236e3290d9cd38a23de7e296b5e404356bf222dfbeb0c75197b
-  data.tar.gz: d2558817de8b496c48606c1e3af71df086480eede14b55186ea4a5e7206bfe5c
+  metadata.gz: 5a822b74744d8bda686b1c1e357ca747ba60e3642b2fa8c746ae31daeff56e0f
+  data.tar.gz: 6f8ead51a8f379a0d742b95705c8b8737850fe124d64a0bde67e3a5ecacc351d
 SHA512:
-  metadata.gz: 49f3758cc21c8a66dce8f69fe231c679f0802ad8374a222f8a178557ac668b5c2cf3ce7ea4a4f1d0c1e40dcb701a65c200de7bea3e82089cc56a3e20d9495e5f
-  data.tar.gz: 8830d24a60774f277e4576614243a077f661d08313259aaa501692ca5f58cb5bb13ef8975e6659432433d366195211e5f3c38c8bd25e2312feee1352908bf7a6
+  metadata.gz: 1beee83a8165c020a8bedd6cd4427288e54f9fe0fe177f2dbb4f4aaf7adbd2ebac773ebce315e6319406768ee56bb66f91549e7871932154a5ead4bc87004568
+  data.tar.gz: 4dc79d8813340c86c33c0ded3f2c092d5f94d47f5cecb58c9692a3cd2f7d53a2d651b222790e62b0c5d38c38b84becd2597451d9b237abd90436253eafdcc737

data/CHANGELOG.yml

@@ -1,3 +1,5 @@
+0.3.0:
+  - correct subfolders creation (and break some methods signature)
 0.2.0:
   - move some methods to avoid to polute controller methods
     - `ActiveStorage::SendZip#save_files_on_server` become `ActiveStorage::SendZipHelperSendZip#save_files_on_server`

data/lib/active_storage/send_zip/version.rb

@@ -1,6 +1,6 @@
 module ActiveStorage
   module SendZip
     # The version of this gem
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/active_storage/send_zip_helper.rb

@@ -10,23 +10,26 @@ module ActiveStorage
     # Download active storage files on server in a temporary folder
     #
     # @param files [ActiveStorage::Attached::Many] files to save
-    # @return [Array<String>] files paths of saved files
+    # @return [String] folder path of saved files
     def self.save_files_on_server(files)
       require 'zip'
       # get a temporary folder and create it
       temp_folder = Dir.mktmpdir 'active_storage-send_zip'
 
       if files.is_a? Array
-        return files.map { |file| save_file_on_server(file, temp_folder) }
+        files.each { |file| save_file_on_server(file, temp_folder) }
       elsif files.is_a? Hash
         filepaths = []
 
         files.each do |subfolder, filesHash|
-          filesHash.each { |f| filepaths << save_file_on_server(f, temp_folder, subfolder: subfolder) }
+          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
-
-        return filepaths
       end
+
+      temp_folder
     end
 
     # Save the given file on the server
@@ -59,10 +62,13 @@ module ActiveStorage
 
     # Create a temporary zip file & return the content as bytes
     #
-    # @param filepaths [Array<String>] files paths
+    # @param folderpath [String] folder path
     # @return [String] as content of zip
-    def self.create_temporary_zip_file(filepaths)
+    def self.create_temporary_zip_file(folderpath)
       temp_file = Tempfile.new('user.zip')
+      folderpath_glob = File.join folderpath, '**', '*'
+
+      files = Dir.glob(folderpath_glob).reject { |e| File.directory? e }
 
       begin
         # Initialize the temp file as a zip file
@@ -70,19 +76,18 @@ module ActiveStorage
 
         # open the zip
         Zip::File.open(temp_file.path, Zip::File::CREATE) do |zip|
-          filepaths.each do |filepath|
-            filename = File.basename filepath
-            # add file into the zip
-            zip.add filename, filepath
+          files.each do |filepath|
+            filepath_zip = filepath.sub(folderpath, '').sub(File::SEPARATOR, '')
+            zip.add filepath_zip, filepath
           end
         end
 
         return File.read(temp_file.path)
       ensure
         # close all ressources & remove temporary files
-        temp_file.close
-        temp_file.unlink
-        filepaths.each { |filepath| FileUtils.rm(filepath) }
+        # temp_file.close
+        # temp_file.unlink
+        # FileUtils.rm_rf(folderpath)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_storage-send_zip
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexandre Rousseau