paperclip-storage-ftp 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac0615dacb3edb9fd6ed435afa757d631e96946
-  data.tar.gz: 78db92783d426bb615b9beef8133d2e717d69740
+  metadata.gz: 8ca9a1238f7b7f38cac421a942ccd513b637bd10
+  data.tar.gz: d48282fb301803804f7ae63f25eac3cb8f3f7555
 SHA512:
-  metadata.gz: f42bcf600a6cddde9324da644dfbed5de0d4af895318041cd357772bd48a59a15c38537579037701e8fecbccc5578474efd19130c6842875f08fac4757644461
-  data.tar.gz: ac45ef8e943368a069369c5c56d7645c740f1124d28b72e768205692653fda754bb323584baa5047fbfd1174fb0cffafcc9fe531193ba29cf5018a96734225bd
+  metadata.gz: 17a256d870d927dece3b64d96f00c9db3d2a020a7a399494d566d4c99300edd7ef9dae2feab33c4b697236fcf111efeb2a12ed867e837400ebc3ad751a37d8ca
+  data.tar.gz: 8f7fe427c147d1268b2d533be54c58a68c31b86bca1bbd3525d57ecdff0fed9b6ea43fc56211d896c9a6645224a837b26ec7dd6b5ab8d080e14165e959ebb7cf

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.coveralls.yml
 .yardoc
 Gemfile.lock
 gemfiles/Gemfile.*.lock

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby-19mode
   - rbx
 gemfile:

data/Gemfile

@@ -6,6 +6,8 @@ gemspec
 group :test do
   gem "sqlite3",                          :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
+
+  gem "coveralls", :require => false
 end
 
 platforms :rbx do

data/README.md

@@ -3,9 +3,11 @@
 Allow [Paperclip](https://github.com/thoughtbot/paperclip) attachments
 to be stored on FTP servers.
 
-## Build status
+## Status
 
 [![Build Status](https://secure.travis-ci.org/xing/paperclip-storage-ftp.png)](http://travis-ci.org/xing/paperclip-storage-ftp)
+[![Coverage Status](https://coveralls.io/repos/xing/paperclip-storage-ftp/badge.png?branch=master)](https://coveralls.io/r/xing/paperclip-storage-ftp?branch=master)
+[![Gem Version](https://badge.fury.io/rb/paperclip-storage-ftp.png)](http://badge.fury.io/rb/paperclip-storage-ftp)
 
 ## Installation
 
@@ -66,11 +68,14 @@ class User < ActiveRecord::Base
     ],
 
     # Optional socket connect timeout (in seconds).
-    # This only limits the connection phase, once connected this option is of no more use.
+    # This only limits the connection phase, once connected
+    # this option is of no more use.
     :ftp_connect_timeout => 5, # optional, nil by default (OS default timeout)
 
-    # If set to true and the connection to a particular server cannot be established,
-    # the connection error will be ignored and the files will not be uploaded to that server.
+    # Optional flag to skip dead servers.
+    # If set to true and the connection to a particular server cannot be
+    # established, the connection error will be ignored and the files will
+    # 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
@@ -79,6 +84,10 @@ end
 
 ## Changelog
 
+### 1.2.2
+
+* Remove empty parent directories after image deletion [#21](https://github.com/xing/paperclip-storage-ftp/pull/21)
+
 ### 1.2.1
 
 * Raise `Paperclip::Storage::Ftp::NoServerAvailable` error when using `:ftp_ignore_failing_connections => true` but all servers are down

data/gemfiles/Gemfile.paperclip-2.x

@@ -9,6 +9,8 @@ group :test do
 
   gem "sqlite3", :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+
+  gem "coveralls", :require => false
 end
 
 platforms :rbx do

data/gemfiles/Gemfile.paperclip-3.x

@@ -7,6 +7,8 @@ gem "paperclip", "~>3.0"
 group :test do
   gem "sqlite3", :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+
+  gem "coveralls", :require => false
 end
 
 platforms :rbx do

data/gemfiles/Gemfile.paperclip-4.x

@@ -7,6 +7,8 @@ gem "paperclip", "~>4.0"
 group :test do
   gem "sqlite3", :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+
+  gem "coveralls", :require => false
 end
 
 platforms :rbx do

data/lib/paperclip/storage/ftp.rb

@@ -59,6 +59,9 @@ module Paperclip
               @queued_for_delete.each do |path|
                 log("deleting ftp://#{server.user}@#{server.host}:#{path}")
                 server.delete_file(path)
+
+                log("deleting empty parent directories ftp://#{server.user}@#{server.host}:#{path}")
+                server.rmdir_p(File.dirname(path))
               end
             end
           end.each(&:join)

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

@@ -68,6 +68,15 @@ module Paperclip
           connection.delete(remote_file_path)
         end
 
+        def rmdir_p(dir_path)
+          while(true)
+            connection.rmdir(dir_path)
+            dir_path = File.dirname(dir_path)
+          end
+        rescue Net::FTPTempError, Net::FTPPermError
+          # Stop trying to remove parent directories
+        end
+
         def mkdir_p(dirname)
           pathname = Pathname.new(dirname)
           pathname.descend do |p|

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.1"
+  gem.version       = "1.2.2"
 
   gem.add_dependency("paperclip")
 

data/spec/integration_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "timeout"
+require "fileutils"
 
 describe "paperclip-storage-ftp", :integration => true do
 
@@ -23,16 +24,18 @@ describe "paperclip-storage-ftp", :integration => true do
   let(:uploaded_file_server2_medium)  { FtpServer::USER2_PATH + "/medium/avatar.jpg"   }
   let(:uploaded_file_server2_thumb)   { FtpServer::USER2_PATH + "/thumb/avatar.jpg"    }
 
+  let(:uploaded_file_server1_other)   { FtpServer::USER1_PATH + "/original/foo.txt" }
+
   it "stores the attachment on the ftp servers" do
     user.avatar = file
     user.save!
 
-    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.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)
@@ -44,12 +47,34 @@ describe "paperclip-storage-ftp", :integration => true do
 
     user.destroy
 
-    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
+    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 "removes empty parent directories after image deletion" do
+    user.avatar = file
+    user.save!
+
+    user.destroy
+
+    Dir.exists?(File.dirname(uploaded_file_server1)).should be false
+    Dir.exists?(File.dirname(uploaded_file_server2)).should be false
+  end
+
+  it "does not remove parent directories which are not empty" do
+    user.avatar = file
+    user.save!
+
+    FileUtils.touch(uploaded_file_server1_other)
+
+    user.destroy
+
+    File.exists?(uploaded_file_server1_other).should be true
   end
 
   it "survives temporarily closed ftp connections" do
@@ -64,8 +89,8 @@ describe "paperclip-storage-ftp", :integration => true do
     user.avatar = file
     user.save!
 
-    File.exists?(uploaded_file_server1).should be_true
-    File.exists?(uploaded_file_server2).should be_true
+    File.exists?(uploaded_file_server1).should be true
+    File.exists?(uploaded_file_server2).should be true
   end
 
   it "allows ignoring failed connections" do
@@ -73,12 +98,12 @@ describe "paperclip-storage-ftp", :integration => true do
     user.avatar = file
     expect{ user.save! }.to_not raise_error
 
-    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_false
-    File.exists?(uploaded_file_server2_medium).should be_false
-    File.exists?(uploaded_file_server2_thumb).should be_false
+    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 false
+    File.exists?(uploaded_file_server2_medium).should be false
+    File.exists?(uploaded_file_server2_thumb).should be false
   end
 
   it "raises a SystemCallError when not ignoring failed connections" do

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

@@ -30,22 +30,22 @@ describe Paperclip::Storage::Ftp::Server do
 
     it "returns true if the file exists on the server" do
       server.connection.should_receive(:nlst).with("/files/original").and_return(["foo.jpg"])
-      server.file_exists?("/files/original/foo.jpg").should be_true
+      server.file_exists?("/files/original/foo.jpg").should be true
     end
 
     it "recognizes complete file paths correctly" do
       server.connection.should_receive(:nlst).with("/files/original").and_return(["/files/original/foo.jpg"])
-      server.file_exists?("/files/original/foo.jpg").should be_true
+      server.file_exists?("/files/original/foo.jpg").should be true
     end
 
     it "returns false if the file does not exist on the server" do
       server.connection.should_receive(:nlst).with("/files/original").and_return([])
-      server.file_exists?("/files/original/foo.jpg").should be_false
+      server.file_exists?("/files/original/foo.jpg").should be false
     end
 
     it "returns false if the ftp server responds with a FTPTempError" do
       server.connection.should_receive(:nlst).with("/files/original").and_raise(Net::FTPTempError)
-      server.file_exists?("/files/original/foo.jpg").should be_false
+      server.file_exists?("/files/original/foo.jpg").should be false
     end
   end
 
@@ -83,6 +83,20 @@ describe Paperclip::Storage::Ftp::Server do
     end
   end
 
+  context "#rmdir_p" do
+    before do
+      server.stub(:connection).and_return(double("connection"))
+    end
+
+    it "deletes the directory and all parent directories" do
+      server.connection.should_receive(:rmdir).with("/files/foo/bar")
+      server.connection.should_receive(:rmdir).with("/files/foo")
+      server.connection.should_receive(:rmdir).with("/files"){ raise Net::FTPPermError }
+      server.connection.should_not_receive(:rmdir).with("/")
+      server.rmdir_p("/files/foo/bar")
+    end
+  end
+
   context "#establish_connection" do
     it "creates the ftp connection for the given server" do
       ftp = double("ftp")

data/spec/paperclip/storage/ftp_spec.rb

@@ -34,13 +34,13 @@ describe Paperclip::Storage::Ftp do
   context "#exists?" do
     it "returns false if original_filename not set" do
       attachment.stub(:original_filename).and_return(nil)
-      attachment.exists?.should be_false
+      attachment.exists?.should be false
     end
 
     it "returns true if the file exists on the primary server" do
       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
+      attachment.exists?.should be true
     end
 
     it "accepts an optional style_name parameter to build the correct file path" do
@@ -112,9 +112,13 @@ describe Paperclip::Storage::Ftp do
       ])
 
       first_server.should_receive(:delete_file).with("/files/original/foo.jpg")
+      first_server.should_receive(:rmdir_p).with("/files/original")
       first_server.should_receive(:delete_file).with("/files/thumb/foo.jpg")
+      first_server.should_receive(:rmdir_p).with("/files/thumb")
       second_server.should_receive(:delete_file).with("/files/original/foo.jpg")
+      second_server.should_receive(:rmdir_p).with("/files/original")
       second_server.should_receive(:delete_file).with("/files/thumb/foo.jpg")
+      second_server.should_receive(:rmdir_p).with("/files/thumb")
 
       attachment.should_receive(:with_ftp_servers).and_yield([first_server, second_server])
 

data/spec/spec_helper.rb

@@ -1,6 +1,21 @@
+require "simplecov"
+require "coveralls"
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter "spec"
+end
+
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
 end
 
 require "paperclip/storage/ftp"

data/spec/support/integration/user.rb

@@ -40,29 +40,27 @@ class UserBase < ActiveRecord::Base
     }
   end
 
-  # must be called after has_attached_file
-  def self.setup_validation
+  def self.setup_avatar_attachment(options = avatar_options)
+    has_attached_file :avatar, options
     validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
   end
 end
 
 class User < UserBase
-  has_attached_file :avatar, avatar_options
-  setup_validation
+  setup_avatar_attachment
 end
 
 class UserWithConnectTimeout < UserBase
   TIMEOUT = 0.1
 
-  has_attached_file :avatar, avatar_options.merge(
+  setup_avatar_attachment(avatar_options.merge(
     :ftp_servers => [
       {
         :host => "127.0.0.2" # should raise Errno::ETIMEDOUT
       }
     ],
     :ftp_connect_timeout => TIMEOUT
-  )
-  setup_validation
+  ))
 end
 
 class UserWithInvalidPort < UserBase
@@ -87,15 +85,13 @@ class UserWithInvalidPort < UserBase
 end
 
 class UserIgnoringFailingConnection < UserWithInvalidPort
-  has_attached_file :avatar, avatar_options.merge(
+  setup_avatar_attachment(avatar_options.merge(
     :ftp_ignore_failing_connections => true
-  )
-  setup_validation
+  ))
 end
 
 class UserNotIgnoringFailingConnection < UserWithInvalidPort
-  has_attached_file :avatar, avatar_options.merge(
+  setup_avatar_attachment(avatar_options.merge(
     :ftp_ignore_failing_connections => false
-  )
-  setup_validation
+  ))
 end

data/test-all.sh

@@ -14,7 +14,7 @@ else
   printf "ERROR: An RVM installation was not found.\n"
 fi
 
-for ruby in '1.9.3' '2.0.0' '2.1.0' 'jruby --1.9' 'rbx'
+for ruby in '1.9.3' '2.1' 'jruby --1.9' 'rbx'
 do
   rvm try_install $ruby
   rvm use $ruby

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: daemon_controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allow Paperclip attachments to be stored on FTP servers
 email:
 - sebastian.roebke@xing.com
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -147,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Allow Paperclip attachments to be stored on FTP servers