paperclip-storage-ftp 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e3386fa9770427df597a7fd756116877d00ca3
-  data.tar.gz: 50bf907a483309e1ac65ad24156a21b146386346
+  metadata.gz: 06f6f8ed2f5e20bde0739d480b35b1db12b02181
+  data.tar.gz: 151088832a19d13b6d8d2747f072c61867d7eba4
 SHA512:
-  metadata.gz: 509041e1f67837bb53ea17dfca8c19a169053a5535b3d8f2d599221bb8a1bc2798d83e6dd68efe7b37764c1c8e515cf84d93e6855b777ee3a4fcf2c0a870494f
-  data.tar.gz: 03a61d1b2f6a9e0bacf287902174f641adb74a353c55125a71d6977c5fa8b2d7ab0ec3aea039e8c3190edd6afbe7256e9e9067fd1fe51f9e3af98dee3584d1cd
+  metadata.gz: 2ed88432200631ef634da8f80bc881f1926fcd00a833b8c034d639821da686f2bd5688f7283c38216fa6db1921ee2e37504a2a7ee5c15f5ab4cc3ba885bab852
+  data.tar.gz: 1bb9d03ff4bcc716cac6b28714d704f837e7c7cf4daab10005acec4b2fcb2eb9fde861a0b5f21a1cd024e54c7cdb649e7557932ee7e71db74f3ccbdf6a5cf40b

data/README.md

@@ -84,6 +84,10 @@ end
 
 ## Changelog
 
+### 1.2.5
+
+* Ignore ftp error when deleting an non-existing file [#29](https://github.com/xing/paperclip-storage-ftp/pull/29)
+
 ### 1.2.4
 
 * Avoid unnecessary connection to server(s) when there are no files to be written or deleted [#26](https://github.com/xing/paperclip-storage-ftp/pull/26)

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

@@ -66,6 +66,8 @@ module Paperclip
 
         def delete_file(remote_file_path)
           connection.delete(remote_file_path)
+        rescue Net::FTPPermError
+          # This happens if the file is already deleted
         end
 
         def rmdir_p(dir_path)

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

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

@@ -86,6 +86,12 @@ describe Paperclip::Storage::Ftp::Server do
       server.connection.should_receive(:delete).with("/files/original.jpg")
       server.delete_file("/files/original.jpg")
     end
+
+    it 'rescues from Net::FTPPermError' do
+      server.connection.should_receive(:delete).with('/files/original.jpg')
+        .and_raise Net::FTPPermError
+      expect { server.delete_file('/files/original.jpg') }.to_not raise_error
+    end
   end
 
   context "#rmdir_p" do

data/spec/support/integration/user.rb

@@ -1,5 +1,7 @@
 require "active_record"
 
+ActiveRecord::Base.raise_in_transactional_callbacks = true
+
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",
   :database => ":memory:"
@@ -14,6 +16,8 @@ ActiveRecord::Schema.define do
   add_column :users, :avatar_updated_at, :datetime
 end
 
+
+
 class UserBase < ActiveRecord::Base
   include Paperclip::Glue
   self.table_name = "users"

data/test-all.sh

@@ -14,9 +14,8 @@ else
   printf "ERROR: An RVM installation was not found.\n"
 fi
 
-for ruby in '2.1' '2.2' 'jruby --1.9'
+for ruby in '2.1' '2.2' 'jruby'
 do
-  rvm try_install $ruby
   rvm use $ruby
   gem install bundler --conservative --no-rdoc --no-ri
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Allow Paperclip attachments to be stored on FTP servers