carrierwave-qiniu 1.1.1 → 1.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +9 -11
- data/lib/carrierwave-qiniu/version.rb +1 -1
- data/lib/carrierwave/storage/qiniu.rb +34 -29
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7d812f4e98f061b35e69d329669a7c4a6b71478a
|
|
4
|
+
data.tar.gz: 68b8748a2b0b398ea9678fc05260318378612e52
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f0f96ce497102cf27c2edef4d8134662dbd29992f2f5d300df50ce46c8455d12f1c91ed683f6cab3377d686f46fc775b36e8cb1f5dafddf8aa0804a97d34abb5
|
|
7
|
+
data.tar.gz: 58284c3f68b787b14db4e79838eb08e588e08317a91e293aaa964fb5fef66de4a7df96494ee5e4cb0e31bc05a1a027628a714390ec589cafa8b941accb564072
|
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Carrierwave::Qiniu
|
|
2
2
|
|
|
3
|
-
[](http://badge.fury.io/rb/carrierwave-qiniu)
|
|
4
4
|
|
|
5
5
|
This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
|
|
6
6
|
|
|
@@ -10,7 +10,7 @@ example: https://github.com/huobazi/carrierwave-qiniu-example
|
|
|
10
10
|
|
|
11
11
|
Add the following to your application's Gemfile:
|
|
12
12
|
|
|
13
|
-
gem 'carrierwave-qiniu', '~> 1.1.
|
|
13
|
+
gem 'carrierwave-qiniu', '~> 1.1.2'
|
|
14
14
|
# If you need to use locales other than English
|
|
15
15
|
gem 'carrierwave-i18n'
|
|
16
16
|
|
|
@@ -20,7 +20,7 @@ And then execute:
|
|
|
20
20
|
|
|
21
21
|
Or install it yourself as:
|
|
22
22
|
|
|
23
|
-
$ gem install carrierwave-qiniu -v 1.1.
|
|
23
|
+
$ gem install carrierwave-qiniu -v 1.1.2
|
|
24
24
|
|
|
25
25
|
## Usage
|
|
26
26
|
|
|
@@ -67,15 +67,13 @@ class AvatarUploader < CarrierWave::Uploader::Base
|
|
|
67
67
|
self.qiniu_persistent_notify_url = "http://<ip>/notify"
|
|
68
68
|
|
|
69
69
|
# 指定预转数据处理命令
|
|
70
|
-
# https://
|
|
71
|
-
|
|
72
|
-
# http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps
|
|
73
|
-
# http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-persistent-ops-explanation
|
|
74
|
-
def qiniu_async_ops
|
|
70
|
+
# https://developer.qiniu.com/kodo/manual/1206/put-policy#2
|
|
71
|
+
def qiniu_persistent_ops
|
|
75
72
|
commands = []
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
73
|
+
|
|
74
|
+
commands << "avthumb/mp4"
|
|
75
|
+
commands << "avthumb/m3u8/noDomain/1/segtime/15/vb/440k"
|
|
76
|
+
|
|
79
77
|
commands
|
|
80
78
|
end
|
|
81
79
|
|
|
@@ -16,15 +16,17 @@ module CarrierWave
|
|
|
16
16
|
@qiniu_secret_key = options[:qiniu_secret_key]
|
|
17
17
|
@qiniu_block_size = options[:qiniu_block_size] || 1024*1024*4
|
|
18
18
|
@qiniu_protocol = options[:qiniu_protocol] || "http"
|
|
19
|
-
@
|
|
19
|
+
@qiniu_persistent_ops = options[:qiniu_persistent_ops] || options[:qiniu_async_ops] || ''
|
|
20
|
+
@qiniu_persistent_pipeline = options[:qiniu_persistent_pipeline] || ''
|
|
21
|
+
@qiniu_persistent_notify_url = options[:qiniu_persistent_notify_url] || ''
|
|
20
22
|
@qiniu_can_overwrite = options[:qiniu_can_overwrite] || false
|
|
21
23
|
@qiniu_expires_in = options[:qiniu_expires_in] || options[:expires_in] || 3600
|
|
22
24
|
@qiniu_up_host = options[:qiniu_up_host]
|
|
23
25
|
@qiniu_private_url_expires_in = options[:qiniu_private_url_expires_in] || 3600
|
|
24
26
|
@qiniu_callback_url = options[:qiniu_callback_url] || ''
|
|
25
27
|
@qiniu_callback_body = options[:qiniu_callback_body] || ''
|
|
26
|
-
@qiniu_persistent_notify_url = options[:qiniu_persistent_notify_url] || ''
|
|
27
28
|
@qiniu_style_separator = options[:qiniu_style_separator] || '-'
|
|
29
|
+
@qiniu_delete_after_days = options[:qiniu_delete_after_days]
|
|
28
30
|
init
|
|
29
31
|
end
|
|
30
32
|
|
|
@@ -38,10 +40,12 @@ module CarrierWave
|
|
|
38
40
|
@qiniu_expires_in,
|
|
39
41
|
nil
|
|
40
42
|
)
|
|
41
|
-
|
|
43
|
+
|
|
42
44
|
put_policy.callback_url = @qiniu_callback_url if @qiniu_callback_url.present?
|
|
43
45
|
put_policy.callback_body = @qiniu_callback_body if @qiniu_callback_body.present?
|
|
46
|
+
put_policy.persistent_ops = @qiniu_persistent_ops || @qiniu_async_ops
|
|
44
47
|
put_policy.persistent_notify_url = @qiniu_persistent_notify_url if @qiniu_persistent_notify_url.present?
|
|
48
|
+
put_policy.persistent_pipeline = @persistent_pipeline
|
|
45
49
|
|
|
46
50
|
resp_code, resp_body, resp_headers =
|
|
47
51
|
::Qiniu::Storage.upload_with_put_policy(
|
|
@@ -50,11 +54,11 @@ module CarrierWave
|
|
|
50
54
|
key,
|
|
51
55
|
nil,
|
|
52
56
|
bucket: @qiniu_bucket
|
|
53
|
-
|
|
57
|
+
)
|
|
54
58
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
59
|
+
if resp_code < 200 or resp_code >= 300
|
|
60
|
+
raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
|
|
61
|
+
end
|
|
58
62
|
end
|
|
59
63
|
|
|
60
64
|
#
|
|
@@ -185,28 +189,29 @@ module CarrierWave
|
|
|
185
189
|
|
|
186
190
|
def qiniu_connection
|
|
187
191
|
@qiniu_connection ||= begin
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
192
|
+
config = {
|
|
193
|
+
:qiniu_access_key => @uploader.qiniu_access_key,
|
|
194
|
+
:qiniu_secret_key => @uploader.qiniu_secret_key,
|
|
195
|
+
:qiniu_bucket => @uploader.qiniu_bucket,
|
|
196
|
+
:qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
|
|
197
|
+
:qiniu_bucket_private => @uploader.qiniu_bucket_private,
|
|
198
|
+
:qiniu_block_size => @uploader.qiniu_block_size,
|
|
199
|
+
:qiniu_protocol => @uploader.qiniu_protocol,
|
|
200
|
+
:qiniu_expires_in => @uploader.qiniu_expires_in,
|
|
201
|
+
:qiniu_up_host => @uploader.qiniu_up_host,
|
|
202
|
+
:qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in,
|
|
203
|
+
:qiniu_callback_url => @uploader.qiniu_callback_url,
|
|
204
|
+
:qiniu_callback_body => @uploader.qiniu_callback_body,
|
|
205
|
+
:qiniu_persistent_notify_url => @uploader.qiniu_persistent_notify_url,
|
|
206
|
+
:qiniu_persistent_pipeline => @uploader.qiniu_persistent_pipeline,
|
|
207
|
+
:qiniu_style_separator => @uploader.qiniu_style_separator
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
config[:qiniu_persistent_ops] = Array(@uploader.qiniu_persistent_ops || @uploader.qiniu_async_ops).join(';') rescue ''
|
|
211
|
+
config[:qiniu_can_overwrite] = @uploader.try :qiniu_can_overwrite rescue false
|
|
212
|
+
|
|
213
|
+
Connection.new config
|
|
214
|
+
end
|
|
210
215
|
end
|
|
211
216
|
|
|
212
217
|
def file_info
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: carrierwave-qiniu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Marble Wu
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-08-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: carrierwave
|