paperclipftp 0.2.0 → 0.2.1

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/cdamian/paperclipftp"
     gem.authors = ["Damian Caruso"]
     gem.files = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
-    gem.add_dependency "paperclip", ">= 2.3.0"
     gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/paperclipftp.rb

@@ -12,8 +12,15 @@ module Paperclip
           @verify_size = !!@options[:ftp_verify_size_on_upload]
           @timeout = @options[:ftp_timeout] || 3600
         end
+        # it is better to share and keep ftp connection because otherwise some methods (like
+        # exists?, to_file etc) will open new connection each and every time without closing it - bad
+        unless base.class.respond_to? (:ftp_conn)
+          class << base.class; attr_accessor :ftp_conn; end
+        end
       end
 
+      #class << self; attr_accessor :ftp_conn; end
+
       def exists?(style = default_style)
         Timeout::timeout(@timeout, FtpTimeout) do
           file_size(ftp_path(style)) > 0
@@ -54,7 +61,7 @@ module Paperclip
               # 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
+              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
@@ -89,20 +96,34 @@ module Paperclip
       private
 
       def ftp
-        if @ftp.nil? || @ftp.closed?
+        if ftp_conn.nil? || ftp_conn.closed?
           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
+            first_try = true
+            begin
+              debug "Creating ftp connection"
+              self.class.ftp_conn = Net::FTP.new(@ftp_credentials[:host], @ftp_credentials[:username], @ftp_credentials[:password])
+              ftp_conn.debug_mode = @debug_mode
+              ftp_conn.passive = @passive_mode
+            rescue EOFError => e
+              debug "Caught EOFError (#{e.inspect})"
+              if first_try
+                sleep 1
+                first_try = false
+                retry
+              else
+                raise e
+              end
+            end
           end
         end
-        @ftp
+        ftp_conn
       end
 
       def close_ftp_connection
-        unless @ftp.nil? || @ftp.closed?
-          @ftp.close
-          @ftp = nil
+        unless ftp_conn.nil? || ftp_conn.closed?
+          debug "Closing ftp connection"
+          ftp_conn.close
+          self.class.ftp_conn = nil
         end
       end
 
@@ -137,6 +158,7 @@ module Paperclip
         #File not exists
         -1
       rescue Net::FTPReplyError => e
+        debug "Caught Net::FTPReplyError (#{e.inspect})"
         close_ftp_connection
         raise e
       end
@@ -159,7 +181,13 @@ module Paperclip
         end
       end
 
+      def ftp_conn
+        self.class.ftp_conn
+      end
 
+      def debug(text)
+        puts "PaperclipFTP: #{text}" if @debug_mode
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclipftp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Damian Caruso
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -04:00
+date: 2011-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: paperclip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,7 +31,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: Ftp storage support for paperclip file attachment
 email: damian.caruso@gmail.com
 executables: []
@@ -99,6 +83,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ftp storage support for paperclip file attachment
-test_files: 
-- test/paperclipftp_test.rb
-- test/test_helper.rb
+test_files: []
+