paperclip-storage-ftp 1.0.0 → 1.0.1

data/README.md

@@ -19,7 +19,7 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Or install it manually:
 
     $ gem install paperclip-storage-ftp
 

data/lib/paperclip/storage/ftp/server.rb

@@ -42,17 +42,15 @@ module Paperclip
 
         def connection
           connection = @@connections["#{host}:#{port}"] ||= build_connection
-          if connection.closed?
-            connection.connect(host, port)
-            connection.login(user, password)
-          end
+          connection.close
+          connection.connect(host, port)
+          connection.login(user, password)
           connection
         end
 
         def build_connection
           connection = Net::FTP.new
           connection.connect(host, port)
-          connection.login(user, password)
           connection
         end
 

data/paperclip-storage-ftp.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "paperclip-storage-ftp"
   gem.require_paths = ["lib"]
-  gem.version       = "1.0.0"
+  gem.version       = "1.0.1"
 
   gem.add_dependency("paperclip")
 

data/spec/integration_spec.rb

@@ -29,4 +29,21 @@ describe "Integration", :integration => true do
 
     File.exists?(FtpServer::HOME_PATH + "/#{user.id}/original/avatar.jpg").should be_false
   end
+
+  it "survives temporarily closed ftp connections" do
+    user = User.new
+    user.avatar = file
+    user.save!
+
+    user.avatar = nil
+    user.save!
+
+    FtpServer.restart
+
+    user.avatar = file
+    user.save!
+    file.close
+
+    File.exists?(FtpServer::HOME_PATH + "/#{user.id}/original/avatar.jpg").should be_true
+  end
 end

data/spec/paperclip/storage/ftp/server_spec.rb

@@ -83,59 +83,23 @@ describe Paperclip::Storage::Ftp::Server do
     end
   end
 
-  context "#build_connection" do
-    it "returns the ftp connection for the given server" do
-      server.host     = "ftp.example.com"
-      server.user     = "user"
-      server.password = "password"
-
-      ftp = double("ftp")
-      Net::FTP.should_receive(:new).and_return(ftp)
-      ftp.should_receive(:connect).with(server.host, server.port)
-      ftp.should_receive(:login).with(server.user, server.password)
-      server.build_connection.should == ftp
+  context "#connection" do
+    it "returns the reconnected connection for the given server (to avoid closed socket errors)" do
+      connection = double("connection")
+      server.should_receive(:build_connection).once.and_return(connection)
+      connection.should_receive(:close).twice
+      connection.should_receive(:connect).with(server.host, server.port).twice
+      connection.should_receive(:login).with(server.user, server.password).twice
+      2.times { server.connection.should == connection }
     end
   end
 
-  context "#connection" do
-    it "returns the memoized ftp connection for the given server" do
-      connection = double("connection", :closed? => false)
-      server.should_receive(:build_connection).once.and_return(connection)
-      server.connection.should == connection
-
-      # same host, same port => memoize
-      same_server = Paperclip::Storage::Ftp::Server.new(
-        :host => server.host,
-        :port => server.port
-      )
-      same_server.should_receive(:build_connection).never
-      same_server.connection.should == connection
-
-      # different host => do not memoize
-      other_host_connection = double("other_host_connection", :closed? => false)
-      other_host_server = Paperclip::Storage::Ftp::Server.new(
-        :host => "other.#{server.host}",
-        :port => server.port
-      )
-      other_host_server.should_receive(:build_connection).once.and_return(other_host_connection)
-      other_host_server.connection.should == other_host_connection
-
-      # different port => do not memoize
-      other_port_connection = double("other_port_connection", :closed? => false)
-      other_port_server = Paperclip::Storage::Ftp::Server.new(
-        :host => server.host,
-        :port => server.port + 1
-      )
-      other_port_server.should_receive(:build_connection).once.and_return(other_port_connection)
-      other_port_server.connection.should == other_port_connection
-    end
-
-    it "reconnects if the connection is closed" do
-      connection = double("connection", :closed? => true)
-      server.stub(:build_connection) { connection }
+  context "#build_connection" do
+    it "returns an ftp connection for the given server" do
+      connection = double("connection")
+      Net::FTP.should_receive(:new).and_return(connection)
       connection.should_receive(:connect).with(server.host, server.port)
-      connection.should_receive(:login).with(server.user, server.password)
-      server.connection.should == connection
+      server.build_connection.should == connection
     end
   end
 

data/spec/support/integration/ftp_server.rb

@@ -9,6 +9,10 @@ class FtpServer
     daemon_controller.start unless daemon_controller.running?
   end
 
+  def self.restart
+    daemon_controller.restart
+  end
+
   def self.clear
     FileUtils.rm_r(Dir.glob(HOME_PATH + "/*"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -126,12 +126,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4104313546954494732
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4104313546954494732
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24