carrierwave-grandcloud 0.1.0 → 0.1.1

data/README.md

@@ -22,5 +22,8 @@ CarrierWave.configure do |config|
   config.grandcloud_access_key = 'xxxxxx'
   # you need create this bucket first!
   config.grandcloud_bucket = "simple"
+
+  # add this line if your bucket is private
+  config.grandcloud_bucket_private = true
 end
 ```

data/carrierwave-grandcloud.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-grandcloud"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Hui"]
   s.email       = ["hui@networking.io"]

data/lib/carrierwave/grandcloud/configuration.rb

@@ -6,6 +6,7 @@ module CarrierWave
         add_config :grandcloud_access_id
         add_config :grandcloud_access_key
         add_config :grandcloud_bucket
+        add_config :grandcloud_bucket_private
         add_config :grandcloud_location
       end
     end

data/lib/carrierwave/storage/grandcloud.rb

@@ -52,11 +52,15 @@ module CarrierWave
         end
 
         def url(expires_at = Time.now + 3000)
-          object = bucket.objects.find(@path)
-          if bucket.policy == "Allow"
-            object.url
+          unless @uploader.grandcloud_bucket_private
+            "http://#{Sndacs::REGION_CONTENT_HOST % @uploader.grandcloud_location}/#{@uploader.grandcloud_bucket}/#{path}"
           else
-            object.temporary_url(expires_at)
+            object = bucket.objects.find(@path)
+            if bucket.policy == "Allow"
+              object.url
+            else
+              object.temporary_url(expires_at)
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-grandcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70286843901740 !ruby/object:Gem::Requirement
+  requirement: &70359035662180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *70286843901740
+  version_requirements: *70359035662180
 - !ruby/object:Gem::Dependency
   name: sndacs
-  requirement: &70286843901240 !ruby/object:Gem::Requirement
+  requirement: &70359035661680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286843901240
+  version_requirements: *70359035661680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70286843900760 !ruby/object:Gem::Requirement
+  requirement: &70359035661200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70286843900760
+  version_requirements: *70359035661200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70286846513760 !ruby/object:Gem::Requirement
+  requirement: &70359035660720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70286846513760
+  version_requirements: *70359035660720
 description: SNDA Cloud Storage support for Carrierwave
 email:
 - hui@networking.io