olek-paperclipftp 0.1.0.6 → 0.1.0.7

data/VERSION

@@ -1 +1 @@
-0.1.0.6
+0.1.0.7

data/lib/paperclipftp.rb

@@ -9,7 +9,8 @@ module Paperclip
           @ftp_credentials = parse_credentials(@options[:ftp_credentials])
           @passive_mode = !!@options[:ftp_passive_mode]
           @debug_mode = !!@options[:ftp_debug_mode]
-          @timeout = @options[:timeout] || 3600
+          @verify_size = !!@options[:ftp_verify_size_on_upload]
+          @timeout = @options[:ftp_timeout] || 3600
         end
       end
 
@@ -46,14 +47,26 @@ module Paperclip
         @queued_for_write.each do |style, file|
           Timeout::timeout(@timeout, FtpTimeout) do
             file.close
-            # avoiding those weird occasional 0 file sizes by not using instance method file.size
-            local_file_size = File.size(file.path)
             remote_path = ftp_path(style)
-            ensure_parent_folder_for(remote_path)
             log("uploading #{remote_path}")
-            ftp.putbinaryfile(file.path, remote_path)
-            remote_file_size = file_size(remote_path)
-            raise Net::FTPError.new "Uploaded #{remote_file_size} bytes instead of #{local_file_size} bytes" unless remote_file_size == local_file_size
+            first_try = true
+            begin
+              ftp.putbinaryfile(file.path, remote_path)
+            rescue Net::FTPPermError => e
+              if first_try
+                first_try = false
+                ensure_parent_folder_for(remote_path)
+                retry
+              else
+                raise e
+              end
+            end
+            if @verify_size
+              # avoiding those weird occasional 0 file sizes by not using instance method file.size
+              local_file_size = File.size(file.path)
+              remote_file_size = file_size(remote_path)
+              raise Net::FTPError.new "Uploaded #{remote_file_size} bytes instead of #{local_file_size} bytes" unless remote_file_size == local_file_size
+            end
           end
         end
         @queued_for_write = {}
@@ -88,28 +101,19 @@ module Paperclip
 
       def ensure_parent_folder_for(remote_path)
         dir_path = File.dirname(remote_path)
-        already_exists =
+        ftp.chdir("/")
+        dir_path.split(File::SEPARATOR).each do |rdir|
+          next if rdir.blank?
+          first_time = true
           begin
-            ftp.chdir(dir_path)
-            true
-          rescue Net::FTPPermError
-            false
-          end
-        unless already_exists
-          ftp.chdir("/")
-          dir_path.split(File::SEPARATOR).each do |rdir|
-            next if rdir.blank?
-            first_time = true
-            begin
-              ftp.chdir(rdir)
-            rescue Net::FTPPermError => e
-              if first_time
-                ftp.mkdir(rdir)
-                first_time = false
-                retry
-              else
-                raise e
-              end
+            ftp.chdir(rdir)
+          rescue Net::FTPPermError => e
+            if first_time
+              ftp.mkdir(rdir)
+              first_time = false
+              retry
+            else
+              raise e
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: olek-paperclipftp
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 1
   - 0
-  - 6
-  version: 0.1.0.6
+  - 7
+  version: 0.1.0.7
 platform: ruby
 authors: 
 - Damian Caruso