paperclip-storage-ftp 1.0.2 → 1.0.3

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in paperclip-multistorage.gemspec
+# Specify your gem's dependencies in paperclip-storage-ftp.gemspec
 gemspec
 
 group :test do

data/README.md

@@ -61,7 +61,8 @@ class User < ActiveRecord::Base
         :host     => "ftp2.example.com",
         :user     => "foo",
         :password => "bar",
-        :port     => 2121
+        :port     => 2121,
+        :passive  => true # false by default
       }
     ]
 end

data/lib/paperclip/storage/ftp.rb

@@ -60,19 +60,7 @@ module Paperclip
       end
 
       def ftp_servers
-        @ftp_servers ||= begin
-          ftp_servers = []
-          @options[:ftp_servers].each do |config|
-            server = Server.new(
-              :host     => config[:host],
-              :user     => config[:user],
-              :password => config[:password],
-              :port     => config[:port]
-            )
-            ftp_servers << server
-          end
-          ftp_servers
-        end
+        @ftp_servers ||= @options[:ftp_servers].map{|config| Server.new(config) }
       end
 
       def primary_ftp_server

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

@@ -12,7 +12,7 @@ module Paperclip
           @@connections.clear
         end
 
-        attr_accessor :host, :user, :password
+        attr_accessor :host, :user, :password, :passive
         attr_writer   :port
 
         def initialize(options = {})
@@ -50,6 +50,7 @@ module Paperclip
 
         def build_connection
           connection = Net::FTP.new
+          connection.passive = passive
           connection.connect(host, port)
           connection
         end

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

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

@@ -13,17 +13,19 @@ describe Paperclip::Storage::Ftp::Server do
         :host     => "ftp.example.com",
         :user     => "user",
         :password => "password",
-        :port     => 2121
+        :port     => 2121,
+        :passive  => true
       }
       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]
     end
 
     it "sets a default port" do
-      server = Paperclip::Storage::Ftp::Server.new(:port => nil)
+      server = Paperclip::Storage::Ftp::Server.new
       server.port.should == Net::FTP::FTP_PORT
     end
   end
@@ -98,6 +100,7 @@ describe Paperclip::Storage::Ftp::Server do
     it "returns an ftp connection for the given server" do
       connection = double("connection")
       Net::FTP.should_receive(:new).and_return(connection)
+      connection.should_receive(:passive=).with(server.passive)
       connection.should_receive(:connect).with(server.host, server.port)
       server.build_connection.should == connection
     end

data/spec/paperclip/storage/ftp_spec.rb

@@ -13,12 +13,14 @@ describe Paperclip::Storage::Ftp do
         {
           :host     => "ftp1.example.com",
           :user     => "user1",
-          :password => "password1"
+          :password => "password1",
+          :port     => 2121
         },
         {
           :host     => "ftp2.example.com",
           :user     => "user2",
-          :password => "password2"
+          :password => "password2",
+          :passive  => true
         }
       ]
     })
@@ -126,9 +128,11 @@ describe Paperclip::Storage::Ftp 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
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-ftp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -158,15 +158,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1988300321926789163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1988300321926789163
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Allow Paperclip attachments to be stored on FTP servers