carrierwave-grandcloud 0.1.0 → 0.1.1

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.
Files changed (5) hide show
  1. data/README.md +3 -0
  2. data/carrierwave-grandcloud.gemspec +1 -1
  3. data/lib/carrierwave/grandcloud/configuration.rb +1 -0
  4. data/lib/carrierwave/storage/grandcloud.rb +8 -4
  5. metadata +10 -10
data/README.md CHANGED
@@ -22,5 +22,8 @@ CarrierWave.configure do |config|
22
22
  config.grandcloud_access_key = 'xxxxxx'
23
23
  # you need create this bucket first!
24
24
  config.grandcloud_bucket = "simple"
25
+
26
+ # add this line if your bucket is private
27
+ config.grandcloud_bucket_private = true
25
28
  end
26
29
  ```
data/carrierwave-grandcloud.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "carrierwave-grandcloud"
6
- s.version = "0.1.0"
6
+ s.version = "0.1.1"
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Hui"]
9
9
  s.email = ["hui@networking.io"]
data/lib/carrierwave/grandcloud/configuration.rb CHANGED
@@ -6,6 +6,7 @@ module CarrierWave
6
6
  add_config :grandcloud_access_id
7
7
  add_config :grandcloud_access_key
8
8
  add_config :grandcloud_bucket
9
+ add_config :grandcloud_bucket_private
9
10
  add_config :grandcloud_location
10
11
  end
11
12
  end
data/lib/carrierwave/storage/grandcloud.rb CHANGED
@@ -52,11 +52,15 @@ module CarrierWave
52
52
  end
53
53
 
54
54
  def url(expires_at = Time.now + 3000)
55
- object = bucket.objects.find(@path)
56
- if bucket.policy == "Allow"
57
- object.url
55
+ unless @uploader.grandcloud_bucket_private
56
+ "http://#{Sndacs::REGION_CONTENT_HOST % @uploader.grandcloud_location}/#{@uploader.grandcloud_bucket}/#{path}"
58
57
  else
59
- object.temporary_url(expires_at)
58
+ object = bucket.objects.find(@path)
59
+ if bucket.policy == "Allow"
60
+ object.url
61
+ else
62
+ object.temporary_url(expires_at)
63
+ end
60
64
  end
61
65
  end
62
66
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave-grandcloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-24 00:00:00.000000000 Z
12
+ date: 2012-08-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: carrierwave
16
- requirement: &70286843901740 !ruby/object:Gem::Requirement
16
+ requirement: &70359035662180 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.5.7
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70286843901740
24
+ version_requirements: *70359035662180
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sndacs
27
- requirement: &70286843901240 !ruby/object:Gem::Requirement
27
+ requirement: &70359035661680 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.1.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70286843901240
35
+ version_requirements: *70359035661680
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &70286843900760 !ruby/object:Gem::Requirement
38
+ requirement: &70359035661200 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '2.6'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70286843900760
46
+ version_requirements: *70359035661200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &70286846513760 !ruby/object:Gem::Requirement
49
+ requirement: &70359035660720 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0.9'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70286846513760
57
+ version_requirements: *70359035660720
58
58
  description: SNDA Cloud Storage support for Carrierwave
59
59
  email:
60
60
  - hui@networking.io