paperclip-storage-ftp 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 18a15c30e1b75f999126536007200110375d2005
+  data.tar.gz: c402de4d71aa7749219617cd3c9a07636b45e979
+SHA512:
+  metadata.gz: 558948f893a8728ea1bf72506a6991357a2c685524919707e818df3b1cc7d1ff68df0e6cb475756b8e8dbdeb7b0f4a9620ead026f1cbc57846def429f769335e
+  data.tar.gz: a2ef9e53c6f7150ee4f19f9e12d7646ffced3dfd09ce497eb7f7b74d95a5502c95286b7170a13cbe33b294daf20d9276bf4d40df9eb95efd294b891bc4503fa2

data/.travis.yml

@@ -2,8 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx
 gemfile:
   - gemfiles/Gemfile.paperclip-2.x
   - gemfiles/Gemfile.paperclip-3.x
+  - gemfiles/Gemfile.paperclip-4.x

data/Gemfile

@@ -7,3 +7,8 @@ group :test do
   gem "sqlite3",                          :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
 end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 XING AG
+Copyright (c) 2014 XING AG
 
 MIT License
 

data/README.md

@@ -63,12 +63,26 @@ class User < ActiveRecord::Base
         :port     => 2121, # optional, 21 by default
         :passive  => true  # optional, false by default
       }
-    ]
+    ],
+
+    # Optional socket connect timeout (in seconds).
+    # 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.
+    # 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.0
+
+* New options `:ftp_connect_timeout` and `:ftp_ignore_failing_connections`. See usage example above.
+
 ### 1.1.0
 
 Mostly performance enhancements
@@ -92,7 +106,7 @@ Mostly performance enhancements
 
 You can find out more about our work on our [dev blog](http://devblog.xing.com).
 
-Copyright (c) 2013 [XING AG](http://www.xing.com)
+Copyright (c) 2014 [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-2.x

@@ -7,6 +7,11 @@ gem "paperclip", "~>2.0"
 group :test do
   gem "activerecord", "~>3.0"
 
-  gem "sqlite3",                          :platforms => :ruby
+  gem "sqlite3", :platforms => :ruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json'
+end

data/gemfiles/Gemfile.paperclip-3.x

@@ -5,6 +5,11 @@ gemspec :path => '..'
 gem "paperclip", "~>3.0"
 
 group :test do
-  gem "sqlite3",                          :platforms => :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "1.3.0.beta2", :platforms => :jruby
+  gem "sqlite3", :platforms => :ruby
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json'
 end

data/gemfiles/Gemfile.paperclip-4.x

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

data/lib/paperclip/storage/ftp.rb

@@ -71,10 +71,12 @@ module Paperclip
       end
 
       def with_primary_ftp_server(&blk)
-        primary_ftp_server.establish_connection
-        yield primary_ftp_server
-      ensure
-        primary_ftp_server.close_connection
+        server = primary_ftp_server
+        begin
+          yield server
+        ensure
+          server.close_connection
+        end
       end
 
       def primary_ftp_server
@@ -82,14 +84,24 @@ module Paperclip
       end
 
       def with_ftp_servers(&blk)
-        ftp_servers.each(&:establish_connection)
-        yield ftp_servers
-      ensure
-        ftp_servers.each(&:close_connection)
+        servers = ftp_servers
+        begin
+          yield servers
+        ensure
+          servers.each(&:close_connection)
+        end
       end
 
       def ftp_servers
-        @ftp_servers ||= @options[:ftp_servers].map{|config| Server.new(config) }
+        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
+        end
+        ftp_servers.select{|s| s.connected? }
       end
     end
   end

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

@@ -1,12 +1,15 @@
 require "pathname"
 require "net/ftp"
+require "timeout"
 
 module Paperclip
   module Storage
     module Ftp
       class Server
 
-        attr_accessor :host, :user, :password, :port, :passive
+        attr_accessor :host, :user, :password, :port, :passive,
+                      :connect_timeout, :ignore_connect_errors
+
         attr_reader   :connection
 
         def initialize(options = {})
@@ -20,12 +23,28 @@ module Paperclip
         def establish_connection
           @connection = Net::FTP.new
           @connection.passive = passive
-          @connection.connect(host, port)
+
+          if ignore_connect_errors
+            begin
+              connect
+            rescue SystemCallError => e
+              Paperclip.log("could not connect to ftp://#{user}@#{host}:#{port} (#{e})")
+              @connection = nil
+              return
+            end
+          else
+            connect
+          end
+
           @connection.login(user, password)
         end
 
         def close_connection
-          connection.close if connection && !connection.closed?
+          connection.close if connected?
+        end
+
+        def connected?
+          connection && !connection.closed?
         end
 
         def file_exists?(path)
@@ -60,6 +79,18 @@ module Paperclip
             end
           end
         end
+
+        private
+
+        def connect
+          if connect_timeout
+            Timeout.timeout(connect_timeout, Errno::ETIMEDOUT) do
+              @connection.connect(host, port)
+            end
+          else
+            @connection.connect(host, port)
+          end
+        end
       end
     end
   end

data/paperclip-storage-ftp.gemspec

@@ -5,13 +5,14 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Allow Paperclip attachments to be stored on FTP servers}
   gem.summary       = %q{Allow Paperclip attachments to be stored on FTP servers}
   gem.homepage      = "https://github.com/xing/paperclip-storage-ftp"
+  gem.license       = "MIT"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "paperclip-storage-ftp"
   gem.require_paths = ["lib"]
-  gem.version       = "1.1.0"
+  gem.version       = "1.2.0"
 
   gem.add_dependency("paperclip")
 

data/spec/integration_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "timeout"
 
 describe "paperclip-storage-ftp", :integration => true do
 
@@ -15,12 +16,12 @@ describe "paperclip-storage-ftp", :integration => true do
   let(:file) { File.new(File.expand_path("../support/integration/avatar.jpg", __FILE__), "rb") }
   let(:user) { User.new }
 
-  let(:uploaded_file_server1)         { FtpServer::USER1_PATH + "/#{user.id}/original/avatar.jpg" }
-  let(:uploaded_file_server1_medium)  { FtpServer::USER1_PATH + "/#{user.id}/medium/avatar.jpg"   }
-  let(:uploaded_file_server1_thumb)   { FtpServer::USER1_PATH + "/#{user.id}/thumb/avatar.jpg"    }
-  let(:uploaded_file_server2)         { FtpServer::USER2_PATH + "/#{user.id}/original/avatar.jpg" }
-  let(:uploaded_file_server2_medium)  { FtpServer::USER2_PATH + "/#{user.id}/medium/avatar.jpg"   }
-  let(:uploaded_file_server2_thumb)   { FtpServer::USER2_PATH + "/#{user.id}/thumb/avatar.jpg"    }
+  let(:uploaded_file_server1)         { FtpServer::USER1_PATH + "/original/avatar.jpg" }
+  let(:uploaded_file_server1_medium)  { FtpServer::USER1_PATH + "/medium/avatar.jpg"   }
+  let(:uploaded_file_server1_thumb)   { FtpServer::USER1_PATH + "/thumb/avatar.jpg"    }
+  let(:uploaded_file_server2)         { FtpServer::USER2_PATH + "/original/avatar.jpg" }
+  let(:uploaded_file_server2_medium)  { FtpServer::USER2_PATH + "/medium/avatar.jpg"   }
+  let(:uploaded_file_server2_thumb)   { FtpServer::USER2_PATH + "/thumb/avatar.jpg"    }
 
   it "stores the attachment on the ftp servers" do
     user.avatar = file
@@ -66,4 +67,38 @@ describe "paperclip-storage-ftp", :integration => true do
     File.exists?(uploaded_file_server1).should be_true
     File.exists?(uploaded_file_server2).should be_true
   end
+
+  it "allows ignoring failed connections" do
+    user = UserIgnoringFailingConnection.new
+    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
+  end
+
+  it "raises a SystemCallError when not ignoring failed connections" do
+    user = UserNotIgnoringFailingConnection.new
+    user.avatar = file
+    expect{ user.save! }.to raise_error(SystemCallError)
+  end
+
+  unless ENV['TRAVIS']
+    it "allows setting a connect timeout" do
+      user = UserWithConnectTimeout.new
+      user.avatar = file
+
+      # Wrap the expectation in a timeout block to make
+      # sure we don't accidentally get a passing test by waiting
+      # for the Errno::ETIMEDOUT raised by the OS (usually in the
+      # seconds or minutes range)
+      Timeout.timeout(UserWithConnectTimeout::TIMEOUT + 1) do
+        expect { user.save! }.to raise_error(Errno::ETIMEDOUT)
+      end
+    end
+  end
 end

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

@@ -6,18 +6,15 @@ describe Paperclip::Storage::Ftp::Server do
   context "initialize" do
     it "accepts options to initialize attributes" do
       options = {
-        :host     => "ftp.example.com",
-        :user     => "user",
-        :password => "password",
-        :port     => 2121,
-        :passive  => true
+        :host            => "ftp.example.com",
+        :user            => "user",
+        :password        => "password",
+        :port            => 2121,
+        :passive         => true,
+        :connect_timeout => 2
       }
       server = Paperclip::Storage::Ftp::Server.new(options)
-      server.host.should     == options[:host]
-      server.user.should     == options[:user]
-      server.password.should == options[:password]
-      server.port.should     == options[:port]
-      server.passive.should  == options[:passive]
+      options.each{|k,v| server.send(k).should == v }
     end
 
     it "sets a default port" do

data/spec/paperclip/storage/ftp_spec.rb

@@ -22,7 +22,9 @@ describe Paperclip::Storage::Ftp do
           :password => "password2",
           :passive  => true
         }
-      ]
+      ],
+      :ftp_connect_timeout => 5,
+      :ftp_ignore_failing_connections => true
     })
   end
 
@@ -139,9 +141,8 @@ describe Paperclip::Storage::Ftp do
   end
 
   context "#with_primary_ftp_server" do
-    it "yields the connected primary ftp server, closes the connection afterwards" do
+    it "yields the primary ftp server, closes the connection afterwards" do
       attachment.stub(:primary_ftp_server).and_return(first_server)
-      first_server.should_receive(:establish_connection).ordered
       first_server.should_receive(:close_connection).ordered
       expect { |b| attachment.with_primary_ftp_server(&b) }.to yield_with_args(first_server)
     end
@@ -149,15 +150,14 @@ describe Paperclip::Storage::Ftp do
 
   context "#primary_ftp_server" do
     it "returns the first server in the list" do
-      attachment.primary_ftp_server.should equal(attachment.ftp_servers.first)
+      attachment.stub(:ftp_servers).and_return([first_server, second_server])
+      attachment.primary_ftp_server.should == attachment.ftp_servers.first
     end
   end
 
   context "#with_ftp_servers" do
-    it "yields the connected ftp servers, closes the connections afterwards" do
+    it "yields the ftp servers, closes the connections afterwards" do
       attachment.stub(:ftp_servers).and_return([first_server, second_server])
-      first_server.should_receive(:establish_connection).ordered
-      second_server.should_receive(:establish_connection).ordered
       first_server.should_receive(:close_connection).ordered
       second_server.should_receive(:close_connection).ordered
       expect { |b| attachment.with_ftp_servers(&b) }.to yield_with_args([first_server, second_server])
@@ -166,14 +166,21 @@ describe Paperclip::Storage::Ftp do
 
   context "#ftp_servers" do
     it "returns the configured ftp servers" do
-      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.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
+      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
     end
   end
 end

data/spec/support/integration/ftp_server.rb

@@ -27,7 +27,8 @@ class 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"
+      :log_file       => INSTALL_PATH + "/res/log/ftpd.log",
+      :start_timeout  => ENV['TRAVIS'] ? 120 : 10
     )
   end
 end

data/spec/support/integration/user.rb

@@ -14,25 +14,88 @@ ActiveRecord::Schema.define do
   add_column :users, :avatar_updated_at, :datetime
 end
 
-class User < ActiveRecord::Base
+class UserBase < ActiveRecord::Base
   include Paperclip::Glue
+  self.table_name = "users"
 
-  has_attached_file :avatar,
-    :storage  => :ftp,
-    :styles   => { :medium => "50x50>", :thumb => "10x10>" },
-    :path     => "/:id/:style/:filename",
+  def self.avatar_options
+    {
+      :storage  => :ftp,
+      :styles   => { :medium => "50x50>", :thumb => "10x10>" },
+      :path     => "/:style/:filename",
+      :ftp_servers => [
+        {
+          :host     => "127.0.0.1",
+          :user     => "user1",
+          :password => "secret1",
+          :port     => 2121
+        },
+        {
+          :host     => "127.0.0.1",
+          :user     => "user2",
+          :password => "secret2",
+          :port     => 2121
+        }
+      ]
+    }
+  end
+
+  # must be called after has_attached_file
+  def self.setup_validation
+    validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/
+  end
+end
+
+class User < UserBase
+  has_attached_file :avatar, avatar_options
+  setup_validation
+end
+
+class UserWithConnectTimeout < UserBase
+  TIMEOUT = 0.1
+
+  has_attached_file :avatar, avatar_options.merge(
     :ftp_servers => [
       {
-        :host     => "127.0.0.1",
-        :user     => "user1",
-        :password => "secret1",
-        :port     => 2121
-      },
-      {
-        :host     => "127.0.0.1",
-        :user     => "user2",
-        :password => "secret2",
-        :port     => 2121
+        :host => "127.0.0.2" # should raise Errno::ETIMEDOUT
       }
-    ]
+    ],
+    :ftp_connect_timeout => TIMEOUT
+  )
+  setup_validation
+end
+
+class UserWithInvalidPort < UserBase
+  def self.avatar_options
+    super.merge(
+      :ftp_servers => [
+        {
+          :host     => "127.0.0.1",
+          :user     => "user1",
+          :password => "secret1",
+          :port     => 2121
+        },
+        {
+          :host     => "127.0.0.1",
+          :user     => "user2",
+          :password => "secret2",
+          :port     => 2122 # should raise Errno::ECONNREFUSED
+        }
+      ]
+    )
+  end
+end
+
+class UserIgnoringFailingConnection < UserWithInvalidPort
+  has_attached_file :avatar, avatar_options.merge(
+    :ftp_ignore_failing_connections => true
+  )
+  setup_validation
+end
+
+class UserNotIgnoringFailingConnection < UserWithInvalidPort
+  has_attached_file :avatar, avatar_options.merge(
+    :ftp_ignore_failing_connections => false
+  )
+  setup_validation
 end

data/test-all.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Run specs against all supported ruby and paperclip versions
+# using RVM (http://rvm.io/)
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+  # First try to load from a user install
+  source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+  # Then try to load from a root install
+  source "/usr/local/rvm/scripts/rvm"
+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'
+do
+  rvm try_install $ruby
+  rvm use $ruby
+  gem install bundler --conservative --no-rdoc --no-ri
+
+  for paperclip_version in 2 3 4
+  do
+    gemfile="gemfiles/Gemfile.paperclip-${paperclip_version}.x"
+    bundle install --gemfile=$gemfile
+    BUNDLE_GEMFILE=$gemfile bundle exec rake
+  done
+done

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sebastian Röbke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2014-02-05 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
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
-- !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
-- !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.1.0
   prerelease: false
-- !ruby/object:Gem::Dependency
   name: daemon_controller
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-    none: false
+        version: '0'
   prerelease: false
-- !ruby/object:Gem::Dependency
   name: activerecord
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+  type: :development
 description: Allow Paperclip attachments to be stored on FTP servers
 email:
 - sebastian.roebke@xing.com
@@ -106,6 +95,7 @@ files:
 - 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
 - paperclip-storage-ftp.gemspec
@@ -116,6 +106,7 @@ files:
 - spec/support/integration/avatar.jpg
 - spec/support/integration/ftp_server.rb
 - spec/support/integration/user.rb
+- test-all.sh
 - vendor/apache-ftpserver/LICENSE
 - vendor/apache-ftpserver/LICENSE.slf4j.txt
 - vendor/apache-ftpserver/LICENSE.springframework.txt
@@ -147,34 +138,28 @@ files:
 - vendor/apache-ftpserver/res/ftp-db.sql
 - vendor/apache-ftpserver/res/ftpserver.jks
 homepage: https://github.com/xing/paperclip-storage-ftp
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 197284226891016539
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 197284226891016539
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Allow Paperclip attachments to be stored on FTP servers
 test_files:
 - spec/integration_spec.rb