paperclip-storage-ftp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a15c30e1b75f999126536007200110375d2005
-  data.tar.gz: c402de4d71aa7749219617cd3c9a07636b45e979
+  metadata.gz: 7ac0615dacb3edb9fd6ed435afa757d631e96946
+  data.tar.gz: 78db92783d426bb615b9beef8133d2e717d69740
 SHA512:
-  metadata.gz: 558948f893a8728ea1bf72506a6991357a2c685524919707e818df3b1cc7d1ff68df0e6cb475756b8e8dbdeb7b0f4a9620ead026f1cbc57846def429f769335e
-  data.tar.gz: a2ef9e53c6f7150ee4f19f9e12d7646ffced3dfd09ce497eb7f7b74d95a5502c95286b7170a13cbe33b294daf20d9276bf4d40df9eb95efd294b891bc4503fa2
+  metadata.gz: f42bcf600a6cddde9324da644dfbed5de0d4af895318041cd357772bd48a59a15c38537579037701e8fecbccc5578474efd19130c6842875f08fac4757644461
+  data.tar.gz: ac45ef8e943368a069369c5c56d7645c740f1124d28b72e768205692653fda754bb323584baa5047fbfd1174fb0cffafcc9fe531193ba29cf5018a96734225bd

data/.travis.yml

@@ -9,3 +9,7 @@ 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

@@ -79,6 +79,11 @@ end
 
 ## Changelog
 
+### 1.2.1
+
+* Raise `Paperclip::Storage::Ftp::NoServerAvailable` error when using `:ftp_ignore_failing_connections => true` but all servers are down
+* Avoid connecting to all servers for operations that just need one
+
 ### 1.2.0
 
 * New options `:ftp_connect_timeout` and `:ftp_ignore_failing_connections`. See usage example above.

data/lib/paperclip/storage/ftp.rb

@@ -7,6 +7,9 @@ require "paperclip/storage/ftp/server"
 module Paperclip
   module Storage
     module Ftp
+
+      class NoServerAvailable < StandardError; end
+
       def exists?(style_name = default_style)
         return false unless original_filename
         with_primary_ftp_server do |server|
@@ -80,7 +83,11 @@ module Paperclip
       end
 
       def primary_ftp_server
-        ftp_servers.first
+        @options[:ftp_servers].each do |server_options|
+          server = build_and_connect_server(server_options)
+          return server if server.connected?
+        end
+        raise NoServerAvailable
       end
 
       def with_ftp_servers(&blk)
@@ -93,15 +100,21 @@ module Paperclip
       end
 
       def ftp_servers
-        ftp_servers = @options[:ftp_servers].map do |server_options|
-          server = Server.new(server_options.merge(
-            :connect_timeout       => @options[:ftp_connect_timeout],
-            :ignore_connect_errors => @options[:ftp_ignore_failing_connections]
-          ))
-          server.establish_connection
-          server
+        servers = @options[:ftp_servers].map do |server_options|
+          build_and_connect_server(server_options)
         end
-        ftp_servers.select{|s| s.connected? }
+        available_servers = servers.select{|s| s.connected? }
+        raise NoServerAvailable if available_servers.empty?
+        available_servers
+      end
+
+      def build_and_connect_server(server_options)
+        server = Server.new(server_options.merge(
+          :connect_timeout       => @options[:ftp_connect_timeout],
+          :ignore_connect_errors => @options[:ftp_ignore_failing_connections]
+        ))
+        server.establish_connection
+        server
       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.0"
+  gem.version       = "1.2.1"
 
   gem.add_dependency("paperclip")
 

data/spec/paperclip/storage/ftp_spec.rb

@@ -149,9 +149,24 @@ describe Paperclip::Storage::Ftp do
   end
 
   context "#primary_ftp_server" do
-    it "returns the first server in the list" do
-      attachment.stub(:ftp_servers).and_return([first_server, second_server])
-      attachment.primary_ftp_server.should == attachment.ftp_servers.first
+    it "returns the first configured server" do
+      first_server.stub(:connected? => true)
+      attachment.stub(:build_and_connect_server).and_return(first_server)
+      attachment.primary_ftp_server.should == first_server
+    end
+
+    it "returns the second server if first server is down" do
+      first_server.stub(:connected? => false)
+      second_server.stub(:connected? => true)
+      attachment.stub(:build_and_connect_server).and_return(first_server, second_server)
+      attachment.primary_ftp_server.should == second_server
+    end
+
+    it "raises NoServerAvailable error if all servers are down" do
+      first_server.stub(:connected? => false)
+      second_server.stub(:connected? => false)
+      attachment.stub(:build_and_connect_server).and_return(first_server, second_server)
+      expect { attachment.primary_ftp_server }.to raise_error(Paperclip::Storage::Ftp::NoServerAvailable)
     end
   end
 
@@ -166,21 +181,31 @@ describe Paperclip::Storage::Ftp do
 
   context "#ftp_servers" do
     it "returns the configured ftp servers" do
-      Paperclip::Storage::Ftp::Server.any_instance.stub(:establish_connection)
-      Paperclip::Storage::Ftp::Server.any_instance.stub(:connected?).and_return(true)
-
-      attachment.ftp_servers.first.host.should                   == "ftp1.example.com"
-      attachment.ftp_servers.first.user.should                   == "user1"
-      attachment.ftp_servers.first.password.should               == "password1"
-      attachment.ftp_servers.first.port.should                   == 2121
-      attachment.ftp_servers.first.connect_timeout.should        == 5
-      attachment.ftp_servers.first.ignore_connect_errors.should  == true
-      attachment.ftp_servers.second.host.should                  == "ftp2.example.com"
-      attachment.ftp_servers.second.user.should                  == "user2"
-      attachment.ftp_servers.second.password.should              == "password2"
-      attachment.ftp_servers.second.passive.should               == true
-      attachment.ftp_servers.second.connect_timeout.should       == 5
-      attachment.ftp_servers.second.ignore_connect_errors.should == true
+      first_server.stub(:connected? => true)
+      second_server.stub(:connected? => true)
+      attachment.stub(:build_and_connect_server).and_return(first_server, second_server)
+      attachment.ftp_servers.should == [first_server, second_server]
+    end
+
+    it "raises NoServerAvailable error if all servers are down" do
+      first_server.stub(:connected? => false)
+      second_server.stub(:connected? => false)
+      attachment.stub(:build_and_connect_server).and_return(first_server, second_server)
+      expect { attachment.ftp_servers }.to raise_error(Paperclip::Storage::Ftp::NoServerAvailable)
+    end
+  end
+
+  context "#build_and_connect_server" do
+    it "returns a connected server instance based on the given options" do
+      Paperclip::Storage::Ftp::Server.stub(:new).and_call_original
+
+      expected_options = attachment.options[:ftp_servers].first.merge(
+        :connect_timeout       => attachment.options[:ftp_connect_timeout],
+        :ignore_connect_errors => attachment.options[:ftp_ignore_failing_connections]
+      )
+      expect(first_server).to receive(:establish_connection)
+      Paperclip::Storage::Ftp::Server.stub(:new).with(expected_options).and_return(first_server)
+      attachment.build_and_connect_server(attachment.options[:ftp_servers].first).should == first_server
     end
   end
 end

data/spec/support/integration/ftp_server.rb

@@ -23,12 +23,13 @@ class FtpServer
 
   def self.daemon_controller
     @daemon_controller ||= DaemonController.new(
-      :identifier     => "Apache FtpServer",
-      :start_command  => "cd #{INSTALL_PATH}; ./bin/ftpd.sh res/conf/ftpd-typical.xml",
-      :ping_command   => [:tcp, '127.0.0.1', 2121],
-      :pid_file       => INSTALL_PATH + "/res/ftpd.pid",
-      :log_file       => INSTALL_PATH + "/res/log/ftpd.log",
-      :start_timeout  => ENV['TRAVIS'] ? 120 : 10
+      :identifier                => "Apache FtpServer",
+      :start_command             => "cd #{INSTALL_PATH}; ./bin/ftpd.sh res/conf/ftpd-typical.xml",
+      :ping_command              => [:tcp, '127.0.0.1', 2121],
+      :pid_file                  => INSTALL_PATH + "/res/ftpd.pid",
+      :log_file                  => INSTALL_PATH + "/res/log/ftpd.log",
+      :start_timeout             => ENV['TRAVIS'] ? 120 : 10,
+      :log_file_activity_timeout => ENV['TRAVIS'] ? 120 : 10
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement