paperclip-storage-ftp 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965bee3a7fee8dede0c34063a0a209287b9fb0f2
-  data.tar.gz: f4bd05757450dc18aa71d08f3fbe32b2ca46017c
+  metadata.gz: 83e3386fa9770427df597a7fd756116877d00ca3
+  data.tar.gz: 50bf907a483309e1ac65ad24156a21b146386346
 SHA512:
-  metadata.gz: daa7c2734901f9c1ecc5868aac8d6640634a2c6744becf55b5ac60b2c2a0fb855c4b6c9019c9cea3ffa57e15b978533b2826494e5840acdf5b3e26247c75a87f
-  data.tar.gz: 38e7d597fe488f31e53217f1572e4e594caf46c639b6799853659276ad5b75212ecab6aea8e0681f76fe5b767c62b7ef4e8048c9e2db3bac5138bb15d64be4ca
+  metadata.gz: 509041e1f67837bb53ea17dfca8c19a169053a5535b3d8f2d599221bb8a1bc2798d83e6dd68efe7b37764c1c8e515cf84d93e6855b777ee3a4fcf2c0a870494f
+  data.tar.gz: 03a61d1b2f6a9e0bacf287902174f641adb74a353c55125a71d6977c5fa8b2d7ab0ec3aea039e8c3190edd6afbe7256e9e9067fd1fe51f9e3af98dee3584d1cd

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.1
+  - 2.2
   - jruby-19mode
-  - rbx
 gemfile:
-  - gemfiles/Gemfile.paperclip-2.x
-  - gemfiles/Gemfile.paperclip-3.x
   - gemfiles/Gemfile.paperclip-4.x
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx

data/README.md

@@ -37,8 +37,7 @@ In your model:
 
 ```ruby
 class User < ActiveRecord::Base
-  has_attached_file :avatar,
-
+  has_attached_file :avatar, {
     # Choose the FTP storage backend
     :storage => :ftp,
 
@@ -79,11 +78,16 @@ class User < ActiveRecord::Base
     # 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
+  }
 end
 ```
 
 ## Changelog
 
+### 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)
+
 ### 1.2.3
 
 * Rescue FTPPermError exception during `file_exists?` [#22](https://github.com/xing/paperclip-storage-ftp/pull/22)
@@ -124,7 +128,7 @@ Mostly performance enhancements
 
 You can find out more about our work on our [dev blog](http://devblog.xing.com).
 
-Copyright (c) 2014 [XING AG](http://www.xing.com)
+Copyright (c) 2015 [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-4.x

@@ -8,10 +8,5 @@ group :test do
   gem "sqlite3", :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 
-  gem "coveralls", :require => false
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'json'
+  gem "coveralls", :require => false, :platforms => :ruby
 end

data/lib/paperclip/storage/ftp.rb

@@ -35,16 +35,18 @@ module Paperclip
       end
 
       def flush_writes
-        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)
+        unless @queued_for_write.empty?
+          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
-          end.each(&:join)
+            end.each(&:join)
+          end
         end
 
         after_flush_writes # allows attachment to clean up temp files
@@ -53,18 +55,20 @@ module Paperclip
       end
 
       def flush_deletes
-        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)
-
-                log("deleting empty parent directories ftp://#{server.user}@#{server.host}:#{path}")
-                server.rmdir_p(File.dirname(path))
+        unless @queued_for_delete.empty?
+          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)
+
+                  log("deleting empty parent directories ftp://#{server.user}@#{server.host}:#{path}")
+                  server.rmdir_p(File.dirname(path))
+                end
               end
-            end
-          end.each(&:join)
+            end.each(&:join)
+          end
         end
 
         @queued_for_delete = []

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

data/spec/integration_spec.rb

@@ -30,12 +30,12 @@ describe "paperclip-storage-ftp", :integration => true 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.exist?(uploaded_file_server1).should be true
+    File.exist?(uploaded_file_server1_medium).should be true
+    File.exist?(uploaded_file_server1_thumb).should be true
+    File.exist?(uploaded_file_server2).should be true
+    File.exist?(uploaded_file_server2_medium).should be true
+    File.exist?(uploaded_file_server2_thumb).should be true
 
     file.size.should == File.size(uploaded_file_server1)
     file.size.should == File.size(uploaded_file_server2)
@@ -47,13 +47,13 @@ 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.exist?(uploaded_file_server1).should be false
+    File.exist?(uploaded_file_server1_medium).should be false
+    File.exist?(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.exist?(uploaded_file_server2).should be false
+    File.exist?(uploaded_file_server2_medium).should be false
+    File.exist?(uploaded_file_server2_thumb).should be false
   end
 
   it "removes empty parent directories after image deletion" do
@@ -62,8 +62,8 @@ describe "paperclip-storage-ftp", :integration => true do
 
     user.destroy
 
-    Dir.exists?(File.dirname(uploaded_file_server1)).should be false
-    Dir.exists?(File.dirname(uploaded_file_server2)).should be false
+    Dir.exist?(File.dirname(uploaded_file_server1)).should be false
+    Dir.exist?(File.dirname(uploaded_file_server2)).should be false
   end
 
   it "does not remove parent directories which are not empty" do
@@ -74,7 +74,7 @@ describe "paperclip-storage-ftp", :integration => true do
 
     user.destroy
 
-    File.exists?(uploaded_file_server1_other).should be true
+    File.exist?(uploaded_file_server1_other).should be true
   end
 
   it "survives temporarily closed ftp connections" do
@@ -89,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.exist?(uploaded_file_server1).should be true
+    File.exist?(uploaded_file_server2).should be true
   end
 
   it "allows ignoring failed connections" do
@@ -98,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.exist?(uploaded_file_server1).should be true
+    File.exist?(uploaded_file_server1_medium).should be true
+    File.exist?(uploaded_file_server1_thumb).should be true
+    File.exist?(uploaded_file_server2).should be false
+    File.exist?(uploaded_file_server2_medium).should be false
+    File.exist?(uploaded_file_server2_thumb).should be false
   end
 
   it "raises a SystemCallError when not ignoring failed connections" do

data/spec/paperclip/storage/ftp_spec.rb

@@ -80,6 +80,17 @@ describe Paperclip::Storage::Ftp do
   end
 
   context "#flush_writes" do
+    it "doesn't connect to the servers if there is nothing to write" do
+      attachment.instance_variable_set(:@queued_for_write, {})
+
+      attachment.should_not_receive(:with_ftp_servers)
+      attachment.should_receive(:after_flush_writes).with(no_args)
+
+      attachment.flush_writes
+
+      attachment.queued_for_write.should == {}
+    end
+
     it "stores the files on every server" do
       original_file = double("original_file", :path => "/tmp/original/foo.jpg")
       thumb_file    = double("thumb_file",    :path => "/tmp/thumb/foo.jpg")
@@ -105,6 +116,16 @@ describe Paperclip::Storage::Ftp do
   end
 
   context "#flush_deletes" do
+    it "doesn't connect to the servers if there is nothing to delete" do
+      attachment.instance_variable_set(:@queued_for_delete, [])
+
+      attachment.should_not_receive(:with_ftp_servers)
+
+      attachment.flush_deletes
+
+      attachment.instance_variable_get(:@queued_for_delete).should == []
+    end
+
     it "deletes the files on every server" do
       attachment.instance_variable_set(:@queued_for_delete, [
         "/files/original/foo.jpg",

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-require "simplecov"
-require "coveralls"
-
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter "spec"
+begin
+  require "coveralls"
+  Coveralls.wear!
+rescue LoadError
 end
 
 RSpec.configure do |config|
@@ -22,5 +20,5 @@ require "paperclip/storage/ftp"
 
 Paperclip.options[:log] = false
 
-# https://github.com/thoughtbot/cocaine#jruby-caveat
+# https://github.com/thoughtbot/cocaine#caveat
 Cocaine::CommandLine.runner = Cocaine::CommandLine::BackticksRunner.new

data/test-all.sh

@@ -14,13 +14,13 @@ else
   printf "ERROR: An RVM installation was not found.\n"
 fi
 
-for ruby in '1.9.3' '2.1' 'jruby --1.9' 'rbx'
+for ruby in '2.1' '2.2' 'jruby --1.9'
 do
   rvm try_install $ruby
   rvm use $ruby
   gem install bundler --conservative --no-rdoc --no-ri
 
-  for paperclip_version in 2 3 4
+  for paperclip_version in 4
   do
     gemfile="gemfiles/Gemfile.paperclip-${paperclip_version}.x"
     bundle install --gemfile=$gemfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -93,8 +93,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.paperclip-2.x
-- gemfiles/Gemfile.paperclip-3.x
 - gemfiles/Gemfile.paperclip-4.x
 - lib/paperclip/storage/ftp.rb
 - lib/paperclip/storage/ftp/server.rb
@@ -157,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Allow Paperclip attachments to be stored on FTP servers

data/gemfiles/Gemfile.paperclip-2.x

@@ -1,19 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '..'
-
-gem "paperclip", "~>2.0"
-
-group :test do
-  gem "activerecord", "~>3.0"
-
-  gem "sqlite3", :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-  gem "coveralls", :require => false
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'json'
-end

data/gemfiles/Gemfile.paperclip-3.x

@@ -1,17 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '..'
-
-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
-  gem 'rubysl', '~> 2.0'
-  gem 'json'
-end