paperclip-storage-ftp 1.0.3 → 1.0.4

data/.gitignore

@@ -17,6 +17,8 @@ test/version_tmp
 tmp
 .rspec
 .rvmrc
+.ruby-version
+.ruby-gemset
 vendor/apache-ftpserver/res/ftpd.pid*
 vendor/apache-ftpserver/res/home/*
 vendor/apache-ftpserver/res/log/*

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/README.md

@@ -53,16 +53,15 @@ class User < ActiveRecord::Base
       {
         :host     => "ftp1.example.com",
         :user     => "foo",
-        :password => "bar",
-        :port     => 21, # optional
+        :password => "bar"
       },
       # Add more servers if needed
       {
         :host     => "ftp2.example.com",
         :user     => "foo",
         :password => "bar",
-        :port     => 2121,
-        :passive  => true # false by default
+        :port     => 2121, # optional, 21 by default
+        :passive  => true  # optional, false by default
       }
     ]
 end

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

@@ -23,7 +23,9 @@ module Paperclip
 
         def file_exists?(path)
           pathname = Pathname.new(path)
-          connection.nlst(pathname.dirname.to_s).map { |f| File.basename f }.include?(pathname.basename.to_s)
+          connection.nlst(pathname.dirname.to_s).map{|f| File.basename f }.include?(pathname.basename.to_s)
+        rescue Net::FTPTempError
+          false
         end
 
         def get_file(remote_file_path, local_file_path)

data/lib/paperclip/storage/ftp.rb

@@ -8,17 +8,13 @@ module Paperclip
   module Storage
     module Ftp
       def exists?(style_name = default_style)
-        if original_filename
-          primary_ftp_server.file_exists?(path(style_name))
-        else
-          false
-        end
+        original_filename && primary_ftp_server.file_exists?(path(style_name))
       end
 
       def to_file(style_name = default_style)
-        if @queued_for_write[style_name]
-          @queued_for_write[style_name].rewind
-          @queued_for_write[style_name]
+        if file = @queued_for_write[style_name]
+          file.rewind
+          file
         else
           filename = path(style_name)
           extname  = File.extname(filename)
@@ -30,7 +26,7 @@ module Paperclip
         end
       end
 
-      def flush_writes #:nodoc:
+      def flush_writes
         @queued_for_write.each do |style_name, file|
           file.close
           ftp_servers.each do |server|

data/paperclip-storage-ftp.gemspec

@@ -11,7 +11,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.0.3"
+  gem.version       = "1.0.4"
 
   gem.add_dependency("paperclip")
 

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

@@ -49,6 +49,11 @@ describe Paperclip::Storage::Ftp::Server do
       server.connection.should_receive(:nlst).with("/files/original").and_return([])
       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
+    end
   end
 
   context "#get_file" do

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
   prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: daemon_controller
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: Allow Paperclip attachments to be stored on FTP servers
 email:
 - sebastian.roebke@xing.com
@@ -153,23 +153,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1988300321926789163
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -3461514716041370557
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1988300321926789163
+      hash: -3461514716041370557
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25