carrierwave-qiniu 0.0.2 → 0.0.3

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.
@@ -21,24 +21,10 @@ module CarrierWave
21
21
  @qiniu_bucket = options[:qiniu_bucket]
22
22
  @qiniu_access_key = options[:qiniu_access_key]
23
23
  @qiniu_secret_key = options[:qiniu_secret_key]
24
+ init
24
25
  end
25
26
 
26
27
  def store(file, key)
27
- init
28
-
29
- # API v2
30
- # remote_upload_url = ::Qiniu::RS.put_auth
31
- # opts = {
32
- # :url => remote_upload_url,
33
- # :file => file.path,
34
- # :key => key,
35
- # :bucket => @qiniu_bucket,
36
- # :mime_type => file.content_type,
37
- # :enable_crc32_check => true
38
- # }
39
-
40
- # ::Qiniu::RS.upload opts
41
-
42
28
  token_opts = {
43
29
  :scope => @qiniu_bucket, :expires_in => 3600 # https://github.com/qiniu/ruby-sdk/pull/15
44
30
  }
@@ -56,7 +42,6 @@ module CarrierWave
56
42
  end
57
43
 
58
44
  def delete(key)
59
- init
60
45
  begin
61
46
  Qiniu::RS.delete(@qiniu_bucket, key)
62
47
  rescue Exception => e
@@ -65,7 +50,6 @@ module CarrierWave
65
50
  end
66
51
 
67
52
  def get_public_url(key)
68
- init
69
53
  if @qiniu_bucket_domain and @qiniu_bucket_domain.size > 0
70
54
  "http://#{@qiniu_bucket_domain}/#{key}"
71
55
  else
@@ -109,7 +93,11 @@ module CarrierWave
109
93
  end
110
94
 
111
95
  def url
112
- qiniu_connection.get_public_url(@path)
96
+ if @uploader.qiniu_bucket_domain and @uploader.qiniu_bucket_domain.size > 0
97
+ "http://#{@uploader.qiniu_bucket_domain}/#{@path}"
98
+ else
99
+ qiniu_connection.get_public_url(@path)
100
+ end
113
101
  end
114
102
 
115
103
  def store(file)
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  module Carrierwave
3
3
  module Qiniu
4
- VERSION = "0.0.2"
4
+ VERSION = "0.0.3"
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave-qiniu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,40 +9,40 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-18 00:00:00.000000000 Z
12
+ date: 2012-12-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: carrierwave
16
+ prerelease: false
16
17
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
18
  requirements:
19
19
  - - ! '>='
20
20
  - !ruby/object:Gem::Version
21
21
  version: '0'
22
+ none: false
22
23
  type: :development
23
- prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
25
  requirements:
27
26
  - - ! '>='
28
27
  - !ruby/object:Gem::Version
29
28
  version: '0'
29
+ none: false
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: qiniu-rs
32
+ prerelease: false
32
33
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
37
  version: 3.0.3
38
+ none: false
38
39
  type: :development
39
- prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
41
  requirements:
43
42
  - - ~>
44
43
  - !ruby/object:Gem::Version
45
44
  version: 3.0.3
45
+ none: false
46
46
  description: Qiniu Storage support for CarrierWave
47
47
  email:
48
48
  - huobazi@gmail.com
@@ -70,17 +70,17 @@ rdoc_options: []
70
70
  require_paths:
71
71
  - lib
72
72
  required_ruby_version: !ruby/object:Gem::Requirement
73
- none: false
74
73
  requirements:
75
74
  - - ! '>='
76
75
  - !ruby/object:Gem::Version
77
76
  version: '0'
78
- required_rubygems_version: !ruby/object:Gem::Requirement
79
77
  none: false
78
+ required_rubygems_version: !ruby/object:Gem::Requirement
80
79
  requirements:
81
80
  - - ! '>='
82
81
  - !ruby/object:Gem::Version
83
82
  version: '0'
83
+ none: false
84
84
  requirements: []
85
85
  rubyforge_project:
86
86
  rubygems_version: 1.8.24