paperclip-storage-ftp 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f6f8ed2f5e20bde0739d480b35b1db12b02181
-  data.tar.gz: 151088832a19d13b6d8d2747f072c61867d7eba4
+  metadata.gz: 52dd89bd22677f466873efbf00464db5185f89e7
+  data.tar.gz: cc7bf20e77a50e009cf45b2feca86c311d3451aa
 SHA512:
-  metadata.gz: 2ed88432200631ef634da8f80bc881f1926fcd00a833b8c034d639821da686f2bd5688f7283c38216fa6db1921ee2e37504a2a7ee5c15f5ab4cc3ba885bab852
-  data.tar.gz: 1bb9d03ff4bcc716cac6b28714d704f837e7c7cf4daab10005acec4b2fcb2eb9fde861a0b5f21a1cd024e54c7cdb649e7557932ee7e71db74f3ccbdf6a5cf40b
+  metadata.gz: 854d6376410b4c7e7dbed7d0ad0ecc35aa349c2974618aeef3340c4795e0bcc1a237c68dd4dae433a559cfd69b85860afdd63618dd8cf459c91355dbe9d57eb5
+  data.tar.gz: 7463b456f29a1bc116a4ff64ae34626a90c9682e043f6c3046c613ad7e8d8c6053c833eaee6c466330873e64cc593fccc9beda548a225b052505be4fcb48af5a

data/README.md

@@ -77,13 +77,21 @@ class User < ActiveRecord::Base
     # not be uploaded to that server.
     # If set to false and the connection to a particular server cannot be established,
     # a SystemCallError will be raised (Errno::ETIMEDOUT, Errno::ENETUNREACH, etc.).
-    :ftp_ignore_failing_connections => true # optional, false by default
+    :ftp_ignore_failing_connections => true, # optional, false by default
+
+    # Optional flag to keep empty parent directories when deleting files.
+    :ftp_keep_empty_directories => true # optional, false by default
   }
 end
 ```
 
 ## Changelog
 
+### 1.2.6
+
+* New option `:ftp_keep_empty_directories` to disable the removal of empty parent directories when deleting files (introduced in 1.2.2). See usage example above.
+* Fix missing log lines in logjam. This only affects apps that use [logjam_agent](https://github.com/skaes/logjam_agent).
+
 ### 1.2.5
 
 * Ignore ftp error when deleting an non-existing file [#29](https://github.com/xing/paperclip-storage-ftp/pull/29)

data/lib/paperclip/storage/ftp.rb

@@ -38,7 +38,7 @@ module Paperclip
         unless @queued_for_write.empty?
           with_ftp_servers do |servers|
             servers.map do |server|
-              Thread.new do
+              run_thread do
                 @queued_for_write.each do |style_name, file|
                   remote_path = path(style_name)
                   log("saving ftp://#{server.user}@#{server.host}:#{remote_path}")
@@ -58,11 +58,11 @@ module Paperclip
         unless @queued_for_delete.empty?
           with_ftp_servers do |servers|
             servers.map do |server|
-              Thread.new do
+              run_thread do
                 @queued_for_delete.each do |path|
                   log("deleting ftp://#{server.user}@#{server.host}:#{path}")
                   server.delete_file(path)
-
+                  next if @options[:ftp_keep_empty_directories]
                   log("deleting empty parent directories ftp://#{server.user}@#{server.host}:#{path}")
                   server.rmdir_p(File.dirname(path))
                 end
@@ -123,6 +123,22 @@ module Paperclip
         server.establish_connection
         server
       end
+
+      private
+
+      if defined?(LogjamAgent)
+        def run_thread(&blk)
+          request = LogjamAgent.request
+          Thread.new do
+            LogjamAgent.request = request
+            blk.call
+          end
+        end
+      else
+        def run_thread(&blk)
+          Thread.new(&blk)
+        end
+      end
     end
   end
 end

data/paperclip-storage-ftp.gemspec

@@ -12,7 +12,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.2.5"
+  gem.version       = "1.2.6"
 
   gem.add_dependency("paperclip")
 

data/spec/integration_spec.rb

@@ -66,6 +66,17 @@ describe "paperclip-storage-ftp", :integration => true do
     Dir.exist?(File.dirname(uploaded_file_server2)).should be false
   end
 
+  it "does not remove empty parent directories if disabled" do
+    user = UserDisablingEmptyDirectoryRemoval.new
+    user.avatar = file
+    user.save!
+
+    user.destroy
+
+    Dir.exist?(File.dirname(uploaded_file_server1)).should be true
+    Dir.exist?(File.dirname(uploaded_file_server2)).should be true
+  end
+
   it "does not remove parent directories which are not empty" do
     user.avatar = file
     user.save!

data/spec/support/integration/user.rb

@@ -99,3 +99,9 @@ class UserNotIgnoringFailingConnection < UserWithInvalidPort
     :ftp_ignore_failing_connections => false
   ))
 end
+
+class UserDisablingEmptyDirectoryRemoval < User
+  setup_avatar_attachment(avatar_options.merge(
+    :ftp_keep_empty_directories => true
+  ))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip