olek-paperclipftp 0.1.0.5 → 0.1.0.6

data/VERSION

@@ -1 +1 @@
-0.1.0.5
+0.1.0.6

data/lib/paperclipftp.rb

@@ -1,48 +1,60 @@
 module Paperclip
   module Storage
     module Ftp
+      class FtpTimeout < Timeout::Error; end
+
       def self.extended base
         require 'net/ftp'
         base.instance_eval do
           @ftp_credentials = parse_credentials(@options[:ftp_credentials])
           @passive_mode = !!@options[:ftp_passive_mode]
           @debug_mode = !!@options[:ftp_debug_mode]
+          @timeout = @options[:timeout] || 3600
         end
       end
 
       def ftp
         if @ftp.nil? || @ftp.closed?
-          @ftp = Net::FTP.new(@ftp_credentials[:host], @ftp_credentials[:username], @ftp_credentials[:password])
-          @ftp.passive = @passive_mode
-          @ftp.debug_mode = @debug_mode
+          Timeout::timeout(@timeout, FtpTimeout) do
+            @ftp = Net::FTP.new(@ftp_credentials[:host], @ftp_credentials[:username], @ftp_credentials[:password])
+            @ftp.debug_mode = @debug_mode
+            @ftp.passive = @passive_mode
+          end
         end
         @ftp
       end
 
       def exists?(style = default_style)
-        file_size(path(style)) > 0
+        Timeout::timeout(@timeout, FtpTimeout) do
+          file_size(ftp_path(style)) > 0
+        end
       end
 
       def to_file style = default_style
         return @queued_for_write[style] if @queued_for_write[style]
-        file = Tempfile.new(path(style))
-        ftp.getbinaryfile(path(style), file.path)
-        file.rewind
-        return file
+        Timeout::timeout(@timeout, FtpTimeout) do
+          file = Tempfile.new(ftp_path(style))
+          ftp.getbinaryfile(ftp_path(style), file.path)
+          file.rewind
+          return file
+        end
       end
 
       alias_method :to_io, :to_file
 
       def flush_writes
         @queued_for_write.each do |style, file|
-          local_file_size = file.size
-          file.close
-          remote_path = 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
+          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
+          end
         end
         @queued_for_write = {}
       rescue Net::FTPReplyError => e
@@ -55,10 +67,12 @@ module Paperclip
 
       def flush_deletes
         @queued_for_delete.each do |path|
-          begin
-            log("deleting #{path}")
-            ftp.delete(path)
-          rescue Net::FTPPermError, Net::FTPReplyError
+          Timeout::timeout(@timeout, FtpTimeout) do
+            begin
+              log("deleting #{path}")
+              ftp.delete('/' + path)
+            rescue Net::FTPPermError, Net::FTPReplyError
+            end
           end
         end
         @queued_for_delete = []
@@ -70,23 +84,40 @@ module Paperclip
         ftp.close
       end
 
+      private
+
       def ensure_parent_folder_for(remote_path)
         dir_path = File.dirname(remote_path)
-        ftp.chdir("/")
-        dir_path.split(File::SEPARATOR).each do |rdir|
-          rdir = rdir.strip
-          unless rdir.blank?
-            list = ftp.ls.collect { |f| f.split.last }
-            unless list.include?(rdir)
-             ftp.mkdir(rdir)
+        already_exists =
+          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
             end
-            ftp.chdir(rdir)
           end
         end
-        ftp.chdir("/")
       end
 
-      private
+      def ftp_path(style)
+        '/' + path(style)
+      end
 
       def file_size(remote_path)
         ftp.size(remote_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: olek-paperclipftp
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 75
   prerelease: 
   segments: 
   - 0
   - 1
   - 0
-  - 5
-  version: 0.1.0.5
+  - 6
+  version: 0.1.0.6
 platform: ruby
 authors: 
 - Damian Caruso
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -04:00
+date: 2011-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency