paperclip-storage-ftp 1.0.4 → 1.1.0.rc1

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/Gemfile.*.lock
 InstalledFiles
 _yardoc
 coverage
@@ -21,5 +22,7 @@ tmp
 .ruby-gemset
 vendor/apache-ftpserver/res/ftpd.pid*
 vendor/apache-ftpserver/res/home/*
+vendor/apache-ftpserver/res/user1/*
+vendor/apache-ftpserver/res/user2/*
 vendor/apache-ftpserver/res/log/*
 .jrubyrc

data/.travis.yml

@@ -1,21 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode
 gemfile:
   - gemfiles/Gemfile.paperclip-2.x
   - gemfiles/Gemfile.paperclip-3.x
-matrix:
-  exclude:
-  - rvm: 1.8.7
-    gemfile: gemfiles/Gemfile.paperclip-3.x
-  - rvm: jruby-18mode
-    gemfile: gemfiles/Gemfile.paperclip-3.x
-  - rvm: rbx-18mode
-    gemfile: gemfiles/Gemfile.paperclip-3.x

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 group :test do
   gem "sqlite3",                          :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
 end

data/README.md

@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
         :user     => "foo",
         :password => "bar",
         :port     => 2121, # optional, 21 by default
-        :passive  => true  # optional, false by default
+        :passive  => false # optional, true by default
       }
     ]
 end
@@ -82,7 +82,7 @@ end
 
 You can find out more about our work on our [dev blog](http://devblog.xing.com).
 
-Copyright (c) 2012 [XING AG](http://www.xing.com)
+Copyright (c) 2013 [XING AG](http://www.xing.com)
 
 Released under the MIT license. For full details see [LICENSE](https://github.com/xing/paperclip-storage-ftp/blob/master/LICENSE)
 included in this distribution.

data/gemfiles/Gemfile.paperclip-2.x

@@ -5,6 +5,8 @@ gemspec :path => '..'
 gem "paperclip", "~>2.0"
 
 group :test do
+  gem "activerecord", "~>3.0"
+
   gem "sqlite3",                          :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 end

data/gemfiles/Gemfile.paperclip-3.x

@@ -6,5 +6,5 @@ gem "paperclip", "~>3.0"
 
 group :test do
   gem "sqlite3",                          :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
 end

data/lib/paperclip/storage/ftp.rb

@@ -8,7 +8,10 @@ module Paperclip
   module Storage
     module Ftp
       def exists?(style_name = default_style)
-        original_filename && primary_ftp_server.file_exists?(path(style_name))
+        return false unless original_filename
+        with_primary_ftp_server do |server|
+          server.file_exists?(path(style_name))
+        end
       end
 
       def to_file(style_name = default_style)
@@ -20,20 +23,25 @@ module Paperclip
           extname  = File.extname(filename)
           basename = File.basename(filename, extname)
           file     = Tempfile.new([basename, extname])
-          primary_ftp_server.get_file(filename, file.path)
+          with_primary_ftp_server do |server|
+            server.get_file(filename, file.path)
+          end
           file.rewind
           file
         end
       end
 
       def flush_writes
-        @queued_for_write.each do |style_name, file|
-          file.close
-          ftp_servers.each do |server|
-            remote_path = path(style_name)
-            log("saving ftp://#{server.user}@#{server.host}:#{remote_path}")
-            server.put_file(file.path, remote_path)
-          end
+        with_ftp_servers do |servers|
+          servers.map do |server|
+            Thread.new do
+              @queued_for_write.each do |style_name, file|
+                remote_path = path(style_name)
+                log("saving ftp://#{server.user}@#{server.host}:#{remote_path}")
+                server.put_file(file.path, remote_path)
+              end
+            end
+          end.each(&:join)
         end
 
         after_flush_writes # allows attachment to clean up temp files
@@ -42,26 +50,47 @@ module Paperclip
       end
 
       def flush_deletes
-        @queued_for_delete.each do |path|
-          ftp_servers.each do |server|
-            log("deleting ftp://#{server.user}@#{server.host}:#{path}")
-            server.delete_file(path)
-          end
+        with_ftp_servers do |servers|
+          servers.map do |server|
+            Thread.new do
+              @queued_for_delete.each do |path|
+                log("deleting ftp://#{server.user}@#{server.host}:#{path}")
+                server.delete_file(path)
+              end
+            end
+          end.each(&:join)
         end
+
         @queued_for_delete = []
       end
 
       def copy_to_local_file(style, destination_path)
-        primary_ftp_server.get_file(path(style), destination_path)
+        with_primary_ftp_server do |server|
+          server.get_file(path(style), destination_path)
+        end
       end
 
-      def ftp_servers
-        @ftp_servers ||= @options[:ftp_servers].map{|config| Server.new(config) }
+      def with_primary_ftp_server(&blk)
+        primary_ftp_server.establish_connection
+        yield primary_ftp_server
+      ensure
+        primary_ftp_server.close_connection
       end
 
       def primary_ftp_server
         ftp_servers.first
       end
+
+      def with_ftp_servers(&blk)
+        ftp_servers.each(&:establish_connection)
+        yield ftp_servers
+      ensure
+        ftp_servers.each(&:close_connection)
+      end
+
+      def ftp_servers
+        @ftp_servers ||= @options[:ftp_servers].map{|config| Server.new(config) }
+      end
     end
   end
 end

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

@@ -6,19 +6,27 @@ module Paperclip
     module Ftp
       class Server
 
-        @@connections = {}
-
-        def self.clear_connections
-          @@connections.clear
-        end
-
-        attr_accessor :host, :user, :password, :passive
-        attr_writer   :port
+        attr_accessor :host, :user, :password, :port, :passive
+        attr_reader :connection
 
         def initialize(options = {})
           options.each do |k,v|
             send("#{k}=", v)
           end
+
+          @port    = Net::FTP::FTP_PORT if @port.nil?
+          @passive = true if @passive.nil?
+        end
+
+        def establish_connection
+          @connection = Net::FTP.new
+          @connection.passive = passive
+          @connection.connect(host, port)
+          @connection.login(user, password)
+        end
+
+        def close_connection
+          connection.close if connection && !connection.closed?
         end
 
         def file_exists?(path)
@@ -42,25 +50,6 @@ module Paperclip
           connection.delete(remote_file_path)
         end
 
-        def connection
-          connection = @@connections["#{host}:#{port}"] ||= build_connection
-          connection.close
-          connection.connect(host, port)
-          connection.login(user, password)
-          connection
-        end
-
-        def build_connection
-          connection = Net::FTP.new
-          connection.passive = passive
-          connection.connect(host, port)
-          connection
-        end
-
-        def port
-          @port || Net::FTP::FTP_PORT
-        end
-
         def mkdir_p(dirname)
           pathname = Pathname.new(dirname)
           pathname.descend do |p|

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.4"
+  gem.version       = "1.1.0.rc1"
 
   gem.add_dependency("paperclip")
 

data/spec/integration_spec.rb

@@ -1,37 +1,57 @@
 require "spec_helper"
 
-describe "Integration", :integration => true do
-  before do
+describe "paperclip-storage-ftp", :integration => true do
+
+  before(:all) do
     require "support/integration/ftp_server"
     require "support/integration/user"
-    FtpServer.clear
     FtpServer.start
   end
 
+  before(:each) do
+    FtpServer.clear
+  end
+
   let(:file) { File.new(File.expand_path("../support/integration/avatar.jpg", __FILE__), "rb") }
+  let(:user) { User.new }
+
+  let(:uploaded_file_server1)         { FtpServer::USER1_PATH + "/#{user.id}/original/avatar.jpg" }
+  let(:uploaded_file_server1_medium)  { FtpServer::USER1_PATH + "/#{user.id}/medium/avatar.jpg"   }
+  let(:uploaded_file_server1_thumb)   { FtpServer::USER1_PATH + "/#{user.id}/thumb/avatar.jpg"    }
+  let(:uploaded_file_server2)         { FtpServer::USER2_PATH + "/#{user.id}/original/avatar.jpg" }
+  let(:uploaded_file_server2_medium)  { FtpServer::USER2_PATH + "/#{user.id}/medium/avatar.jpg"   }
+  let(:uploaded_file_server2_thumb)   { FtpServer::USER2_PATH + "/#{user.id}/thumb/avatar.jpg"    }
 
   it "stores the attachment on the ftp servers" do
-    user = User.new
     user.avatar = file
     user.save!
-    file.close
 
-    File.exists?(FtpServer::HOME_PATH + "/#{user.id}/original/avatar.jpg").should be_true
+    File.exists?(uploaded_file_server1).should be_true
+    File.exists?(uploaded_file_server1_medium).should be_true
+    File.exists?(uploaded_file_server1_thumb).should be_true
+    File.exists?(uploaded_file_server2).should be_true
+    File.exists?(uploaded_file_server2_medium).should be_true
+    File.exists?(uploaded_file_server2_thumb).should be_true
+
+    file.size.should == File.size(uploaded_file_server1)
+    file.size.should == File.size(uploaded_file_server2)
   end
 
   it "deletes an attachment from the ftp servers" do
-    user = User.new
     user.avatar = file
     user.save!
-    file.close
 
     user.destroy
 
-    File.exists?(FtpServer::HOME_PATH + "/#{user.id}/original/avatar.jpg").should be_false
+    File.exists?(uploaded_file_server1).should be_false
+    File.exists?(uploaded_file_server1_medium).should be_false
+    File.exists?(uploaded_file_server1_thumb).should be_false
+    File.exists?(uploaded_file_server2).should be_false
+    File.exists?(uploaded_file_server2_medium).should be_false
+    File.exists?(uploaded_file_server2_thumb).should be_false
   end
 
   it "survives temporarily closed ftp connections" do
-    user = User.new
     user.avatar = file
     user.save!
 
@@ -42,8 +62,8 @@ describe "Integration", :integration => true do
 
     user.avatar = file
     user.save!
-    file.close
 
-    File.exists?(FtpServer::HOME_PATH + "/#{user.id}/original/avatar.jpg").should be_true
+    File.exists?(uploaded_file_server1).should be_true
+    File.exists?(uploaded_file_server2).should be_true
   end
 end

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

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 describe Paperclip::Storage::Ftp::Server do
-  before(:each) do
-    Paperclip::Storage::Ftp::Server.clear_connections
-  end
-
   let(:server) { Paperclip::Storage::Ftp::Server.new }
 
   context "initialize" do
@@ -14,7 +10,7 @@ describe Paperclip::Storage::Ftp::Server do
         :user     => "user",
         :password => "password",
         :port     => 2121,
-        :passive  => true
+        :passive  => false
       }
       server = Paperclip::Storage::Ftp::Server.new(options)
       server.host.should     == options[:host]
@@ -28,6 +24,11 @@ describe Paperclip::Storage::Ftp::Server do
       server = Paperclip::Storage::Ftp::Server.new
       server.port.should == Net::FTP::FTP_PORT
     end
+
+    it "sets passive to true by default" do
+      server = Paperclip::Storage::Ftp::Server.new
+      server.passive.should be_true
+    end
   end
 
   context "#file_exists?" do
@@ -90,24 +91,15 @@ describe Paperclip::Storage::Ftp::Server do
     end
   end
 
-  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 "#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(:passive=).with(server.passive)
-      connection.should_receive(:connect).with(server.host, server.port)
-      server.build_connection.should == connection
+  context "#establish_connection" do
+    it "creates the ftp connection for the given server" do
+      ftp = double("ftp")
+      Net::FTP.should_receive(:new).and_return(ftp)
+      ftp.should_receive(:passive=).with(server.passive)
+      ftp.should_receive(:connect).with(server.host, server.port)
+      ftp.should_receive(:login).with(server.user, server.password)
+      server.establish_connection
+      server.connection.should == ftp
     end
   end
 

data/spec/paperclip/storage/ftp_spec.rb

@@ -26,6 +26,9 @@ describe Paperclip::Storage::Ftp do
     })
   end
 
+  let(:first_server)  { Paperclip::Storage::Ftp::Server.new }
+  let(:second_server) { Paperclip::Storage::Ftp::Server.new }
+
   context "#exists?" do
     it "returns false if original_filename not set" do
       attachment.stub(:original_filename).and_return(nil)
@@ -33,12 +36,14 @@ describe Paperclip::Storage::Ftp do
     end
 
     it "returns true if the file exists on the primary server" do
-      attachment.primary_ftp_server.should_receive(:file_exists?).with("/files/original/foo.jpg").and_return(true)
+      first_server.should_receive(:file_exists?).with("/files/original/foo.jpg").and_return(true)
+      attachment.should_receive(:with_primary_ftp_server).and_yield(first_server)
       attachment.exists?.should be_true
     end
 
     it "accepts an optional style_name parameter to build the correct file path" do
-      attachment.primary_ftp_server.should_receive(:file_exists?).with("/files/thumb/foo.jpg").and_return(true)
+      first_server.should_receive(:file_exists?).with("/files/thumb/foo.jpg").and_return(true)
+      attachment.should_receive(:with_primary_ftp_server).and_yield(first_server)
       attachment.exists?(:thumb)
     end
   end
@@ -49,7 +54,8 @@ describe Paperclip::Storage::Ftp do
       tempfile.should_receive(:path).and_return("/tmp/foo")
       tempfile.should_receive(:rewind).with(no_args)
       Tempfile.should_receive(:new).with(["foo", ".jpg"]).and_return(tempfile)
-      attachment.primary_ftp_server.should_receive(:get_file).with("/files/original/foo.jpg", "/tmp/foo").and_return(:foo)
+      first_server.should_receive(:get_file).with("/files/original/foo.jpg", "/tmp/foo").and_return(:foo)
+      attachment.should_receive(:with_primary_ftp_server).and_yield(first_server)
       attachment.to_file.should == tempfile
     end
 
@@ -58,7 +64,8 @@ describe Paperclip::Storage::Ftp do
       tempfile.should_receive(:path).and_return("/tmp/foo")
       tempfile.should_receive(:rewind).with(no_args)
       Tempfile.should_receive(:new).with(["foo", ".jpg"]).and_return(tempfile)
-      attachment.primary_ftp_server.should_receive(:get_file).with("/files/thumb/foo.jpg", anything)
+      first_server.should_receive(:get_file).with("/files/thumb/foo.jpg", anything)
+      attachment.should_receive(:with_primary_ftp_server).and_yield(first_server)
       attachment.to_file(:thumb)
     end
 
@@ -80,12 +87,13 @@ describe Paperclip::Storage::Ftp do
         :thumb    => thumb_file
       })
 
-      thumb_file.should_receive(:close).with(no_args)
-      original_file.should_receive(:close).with(no_args)
-      attachment.ftp_servers.first.should_receive(:put_file).with("/tmp/original/foo.jpg", "/files/original/foo.jpg")
-      attachment.ftp_servers.first.should_receive(:put_file).with("/tmp/thumb/foo.jpg", "/files/thumb/foo.jpg")
-      attachment.ftp_servers.second.should_receive(:put_file).with("/tmp/original/foo.jpg", "/files/original/foo.jpg")
-      attachment.ftp_servers.second.should_receive(:put_file).with("/tmp/thumb/foo.jpg", "/files/thumb/foo.jpg")
+      first_server.should_receive(:put_file).with("/tmp/original/foo.jpg", "/files/original/foo.jpg")
+      first_server.should_receive(:put_file).with("/tmp/thumb/foo.jpg", "/files/thumb/foo.jpg")
+      second_server.should_receive(:put_file).with("/tmp/original/foo.jpg", "/files/original/foo.jpg")
+      second_server.should_receive(:put_file).with("/tmp/thumb/foo.jpg", "/files/thumb/foo.jpg")
+
+      attachment.should_receive(:with_ftp_servers).and_yield([first_server, second_server])
+
       attachment.should_receive(:after_flush_writes).with(no_args)
 
       attachment.flush_writes
@@ -100,10 +108,13 @@ describe Paperclip::Storage::Ftp do
         "/files/original/foo.jpg",
         "/files/thumb/foo.jpg"
       ])
-      attachment.ftp_servers.first.should_receive(:delete_file).with("/files/original/foo.jpg")
-      attachment.ftp_servers.first.should_receive(:delete_file).with("/files/thumb/foo.jpg")
-      attachment.ftp_servers.second.should_receive(:delete_file).with("/files/original/foo.jpg")
-      attachment.ftp_servers.second.should_receive(:delete_file).with("/files/thumb/foo.jpg")
+
+      first_server.should_receive(:delete_file).with("/files/original/foo.jpg")
+      first_server.should_receive(:delete_file).with("/files/thumb/foo.jpg")
+      second_server.should_receive(:delete_file).with("/files/original/foo.jpg")
+      second_server.should_receive(:delete_file).with("/files/thumb/foo.jpg")
+
+      attachment.should_receive(:with_ftp_servers).and_yield([first_server, second_server])
 
       attachment.flush_deletes
 
@@ -112,17 +123,47 @@ describe Paperclip::Storage::Ftp do
   end
 
   context "#copy_to_local_file" do
+    before do
+      attachment.should_receive(:with_primary_ftp_server).and_yield(first_server)
+    end
+
     it "returns the file from the primary server and stores it in the path specified" do
-      attachment.primary_ftp_server.should_receive(:get_file).with("/files/original/foo.jpg", "/local/foo").and_return(:foo)
-      attachment.copy_to_local_file(:original, "/local/foo")
+      first_server.should_receive(:get_file).with("/files/original/foo.jpg", "/local/foo").and_return(:foo)
+      attachment.copy_to_local_file(:original, "/local/foo").should == :foo
     end
 
     it "accepts the style parameter to build the correct path" do
-      attachment.primary_ftp_server.should_receive(:get_file).with("/files/thumb/foo.jpg", "/local/thumb/foo").and_return(:foo)
+      first_server.should_receive(:get_file).with("/files/thumb/foo.jpg", "/local/thumb/foo")
       attachment.copy_to_local_file(:thumb, "/local/thumb/foo")
     end
   end
 
+  context "#with_primary_ftp_server" do
+    it "yields the connected primary ftp server, closes the connection afterwards" do
+      attachment.stub(:primary_ftp_server).and_return(first_server)
+      first_server.should_receive(:establish_connection).ordered
+      first_server.should_receive(:close_connection).ordered
+      expect { |b| attachment.with_primary_ftp_server(&b) }.to yield_with_args(first_server)
+    end
+  end
+
+  context "#primary_ftp_server" do
+    it "returns the first server in the list" do
+      attachment.primary_ftp_server.should equal(attachment.ftp_servers.first)
+    end
+  end
+
+  context "#with_ftp_servers" do
+    it "yields the connected ftp servers, closes the connections afterwards" do
+      attachment.stub(:ftp_servers).and_return([first_server, second_server])
+      first_server.should_receive(:establish_connection).ordered
+      second_server.should_receive(:establish_connection).ordered
+      first_server.should_receive(:close_connection).ordered
+      second_server.should_receive(:close_connection).ordered
+      expect { |b| attachment.with_ftp_servers(&b) }.to yield_with_args([first_server, second_server])
+    end
+  end
+
   context "#ftp_servers" do
     it "returns the configured ftp servers" do
       attachment.ftp_servers.first.host.should      == "ftp1.example.com"
@@ -135,10 +176,4 @@ describe Paperclip::Storage::Ftp do
       attachment.ftp_servers.second.passive.should  == true
     end
   end
-
-  context "#primary_ftp_server" do
-    it "returns the first server in the list" do
-      attachment.primary_ftp_server.should == attachment.ftp_servers.first
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,6 @@ end
 require "paperclip/storage/ftp"
 
 Paperclip.options[:log] = false
+
+# https://github.com/thoughtbot/cocaine#jruby-caveat
+Cocaine::CommandLine.runner = Cocaine::CommandLine::BackticksRunner.new

data/spec/support/integration/ftp_server.rb

@@ -3,7 +3,8 @@ require "daemon_controller"
 class FtpServer
 
   INSTALL_PATH = File.expand_path("../../../../vendor/apache-ftpserver", __FILE__)
-  HOME_PATH    = INSTALL_PATH + "/res/home"
+  USER1_PATH   = INSTALL_PATH + "/res/user1"
+  USER2_PATH   = INSTALL_PATH + "/res/user2"
 
   def self.start
     daemon_controller.start unless daemon_controller.running?
@@ -14,7 +15,8 @@ class FtpServer
   end
 
   def self.clear
-    FileUtils.rm_r(Dir.glob(HOME_PATH + "/*"))
+    FileUtils.rm_r(Dir.glob(USER1_PATH + "/*"))
+    FileUtils.rm_r(Dir.glob(USER2_PATH + "/*"))
   end
 
   private

data/spec/support/integration/user.rb

@@ -19,12 +19,19 @@ class User < ActiveRecord::Base
 
   has_attached_file :avatar,
     :storage  => :ftp,
+    :styles   => { :medium => "50x50>", :thumb => "10x10>" },
     :path     => "/:id/:style/:filename",
     :ftp_servers => [
       {
         :host     => "127.0.0.1",
-        :user     => "admin",
-        :password => "admin",
+        :user     => "user1",
+        :password => "secret1",
+        :port     => 2121
+      },
+      {
+        :host     => "127.0.0.1",
+        :user     => "user2",
+        :password => "secret2",
         :port     => 2121
       }
     ]

data/vendor/apache-ftpserver/res/conf/users.properties

@@ -15,23 +15,24 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Password is "admin"
-ftpserver.user.admin.userpassword=21232F297A57A5A743894A0E4A801FC3
-ftpserver.user.admin.homedirectory=./res/home
-ftpserver.user.admin.enableflag=true
-ftpserver.user.admin.writepermission=true
-ftpserver.user.admin.maxloginnumber=0
-ftpserver.user.admin.maxloginperip=0
-ftpserver.user.admin.idletime=0
-ftpserver.user.admin.uploadrate=0
-ftpserver.user.admin.downloadrate=0
+# Password is "secret1"
+ftpserver.user.user1.userpassword=E52D98C459819A11775936D8DFBB7929
+ftpserver.user.user1.homedirectory=./res/user1
+ftpserver.user.user1.enableflag=true
+ftpserver.user.user1.writepermission=true
+ftpserver.user.user1.maxloginnumber=0
+ftpserver.user.user1.maxloginperip=0
+ftpserver.user.user1.idletime=0
+ftpserver.user.user1.uploadrate=0
+ftpserver.user.user1.downloadrate=0
 
-ftpserver.user.anonymous.userpassword=
-ftpserver.user.anonymous.homedirectory=./res/home
-ftpserver.user.anonymous.enableflag=true
-ftpserver.user.anonymous.writepermission=false
-ftpserver.user.anonymous.maxloginnumber=20
-ftpserver.user.anonymous.maxloginperip=2
-ftpserver.user.anonymous.idletime=300
-ftpserver.user.anonymous.uploadrate=4800
-ftpserver.user.anonymous.downloadrate=4800
+# Password is "secret2"
+ftpserver.user.user2.userpassword=E54CFB3714F76CEDD4B27889E1F6A174
+ftpserver.user.user2.homedirectory=./res/user2
+ftpserver.user.user2.enableflag=true
+ftpserver.user.user2.writepermission=true
+ftpserver.user.user2.maxloginnumber=0
+ftpserver.user.user2.maxloginperip=0
+ftpserver.user.user2.idletime=0
+ftpserver.user.user2.uploadrate=0
+ftpserver.user.user2.downloadrate=0

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.4
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -29,13 +29,13 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -45,13 +45,13 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -61,13 +61,13 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency
   name: daemon_controller
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
     none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -77,13 +77,13 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency
   name: activerecord
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -158,17 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3461514716041370557
+      hash: -1768079343982146071
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -3461514716041370557
-      version: '0'
+      version: 1.3.1
   none: false
 requirements: []
 rubyforge_project: