paperclip_archive_processor 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/paperclip_archive_processor/zip_util.rb

@@ -19,26 +19,15 @@ module PaperclipArchiveProcessor
       end
     end
 
-    # Unpack an archive to a directory on disk
+    # Unpack an archive with all its subdirectories to a directory on disk
     def self.unpack(archive, destination)
       Zip::ZipFile.open(archive) do |zip|
-        unpack_file(zip, destination)
-      end
-    end
-
-    def self.unpack_file(zip, destination, path='')
-      if(zip.file.file?(path))
-        FileUtils.mkdir_p(destination)
-        File.open(File.join(destination, path), 'w') do |dest|
-          zip.file.open(path) do |src|
-            dest.write src.read
-          end
-        end
-      else
-        dir = File.join(destination, path)
-        Dir.mkdir(dir) rescue puts("Directory Exists #{dir}")
-        zip.dir.foreach(path) do |dir|
-          unpack_file(zip, destination, File.join(path, dir))
+        zip.each do |file|
+          file_path = File.join destination, file.name
+          FileUtils.mkdir_p File.dirname(file_path)
+          # remove existing files
+          FileUtils.rm file_path if File.exist?(file_path) && File.file?(file_path)
+          zip.extract file, file_path
         end
       end
     end

data/paperclip_archive_processor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paperclip_archive_processor}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["sleistner"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-02-17}
   s.description = %q{
     Extract paperclip archive attachments to file or S3.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip_archive_processor
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - sleistner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency