carrierwave-ftp 0.1.1 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/carrierwave/storage/ftp.rb +3 -0
- data/lib/carrierwave/storage/ftp/version.rb +1 -1
- data/spec/ftp_spec.rb +4 -0
- metadata +4 -4
|
@@ -78,6 +78,7 @@ module CarrierWave
|
|
|
78
78
|
|
|
79
79
|
def connection
|
|
80
80
|
ftp = ExFTP.open(@uploader.ftp_host, @uploader.ftp_user, @uploader.ftp_passwd, @uploader.ftp_port)
|
|
81
|
+
ftp.passive = @uploader.ftp_passive
|
|
81
82
|
yield ftp
|
|
82
83
|
ftp.close
|
|
83
84
|
end
|
|
@@ -95,6 +96,7 @@ class CarrierWave::Uploader::Base
|
|
|
95
96
|
add_config :ftp_passwd
|
|
96
97
|
add_config :ftp_folder
|
|
97
98
|
add_config :ftp_url
|
|
99
|
+
add_config :ftp_passive
|
|
98
100
|
|
|
99
101
|
configure do |config|
|
|
100
102
|
config.storage_engines[:ftp] = "CarrierWave::Storage::FTP"
|
|
@@ -104,5 +106,6 @@ class CarrierWave::Uploader::Base
|
|
|
104
106
|
config.ftp_passwd = ""
|
|
105
107
|
config.ftp_folder = "/"
|
|
106
108
|
config.ftp_url = "http://localhost"
|
|
109
|
+
config.ftp_passive = false
|
|
107
110
|
end
|
|
108
111
|
end
|
data/spec/ftp_spec.rb
CHANGED
|
@@ -14,6 +14,7 @@ describe CarrierWave::Storage::FTP do
|
|
|
14
14
|
config.ftp_passwd = 'test_passwd'
|
|
15
15
|
config.ftp_folder = '~/public_html'
|
|
16
16
|
config.ftp_url = 'http://testcarrierwave.dev'
|
|
17
|
+
config.ftp_passive = true
|
|
17
18
|
end
|
|
18
19
|
|
|
19
20
|
@file = CarrierWave::SanitizedFile.new(file_path('test.jpg'))
|
|
@@ -31,6 +32,7 @@ describe CarrierWave::Storage::FTP do
|
|
|
31
32
|
]
|
|
32
33
|
|
|
33
34
|
Net::FTP.should_receive(:open).with(*ftp_params).and_return(ftp)
|
|
35
|
+
ftp.should_receive(:passive=).with(true)
|
|
34
36
|
ftp.should_receive(:mkdir_p).with('~/public_html/uploads')
|
|
35
37
|
ftp.should_receive(:chdir).with('~/public_html/uploads')
|
|
36
38
|
ftp.should_receive(:put).with(@file.path, 'test.jpg')
|
|
@@ -42,6 +44,7 @@ describe CarrierWave::Storage::FTP do
|
|
|
42
44
|
before do
|
|
43
45
|
ftp = double(:ftp_connection)
|
|
44
46
|
Net::FTP.stub(:open).and_return(ftp)
|
|
47
|
+
ftp.stub(:passive=)
|
|
45
48
|
ftp.stub(:mkdir_p)
|
|
46
49
|
ftp.stub(:chdir)
|
|
47
50
|
ftp.stub(:put)
|
|
@@ -62,6 +65,7 @@ describe CarrierWave::Storage::FTP do
|
|
|
62
65
|
before do
|
|
63
66
|
@ftp = double(:ftp_connection)
|
|
64
67
|
Net::FTP.stub(:open).and_return(@ftp)
|
|
68
|
+
@ftp.stub(:passive=)
|
|
65
69
|
@ftp.stub(:mkdir_p)
|
|
66
70
|
@ftp.stub(:chdir)
|
|
67
71
|
@ftp.stub(:put)
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: carrierwave-ftp
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-08-
|
|
12
|
+
date: 2012-08-22 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: carrierwave
|
|
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
91
91
|
version: '0'
|
|
92
92
|
segments:
|
|
93
93
|
- 0
|
|
94
|
-
hash:
|
|
94
|
+
hash: 518558825603707499
|
|
95
95
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
96
96
|
none: false
|
|
97
97
|
requirements:
|
|
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
100
100
|
version: '0'
|
|
101
101
|
segments:
|
|
102
102
|
- 0
|
|
103
|
-
hash:
|
|
103
|
+
hash: 518558825603707499
|
|
104
104
|
requirements: []
|
|
105
105
|
rubyforge_project: carrierwave-mongoid
|
|
106
106
|
rubygems_version: 1.8.23
|