carrierwave-qiniu 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c272cbb1f559ce37b71d551214d92b9577feacde
-  data.tar.gz: 7d42e3e2fcd3d5823905bc4b52e5c6fd08b9f400
+  metadata.gz: 7466c24b8bbad340cb158313bce99c1649c0ccb4
+  data.tar.gz: 6d5152971794c5b28e3306ccfa01c4db5e56a46e
 SHA512:
-  metadata.gz: 82624d7b48bf59f56a8a1a4f9c6a8146e4fbe1c0fb24d6fb2d78662906672c23807fb1f271cb59eee282eabe08f06e55afe7128e45152c69b0c509aa7585ccba
-  data.tar.gz: c1598b1d389d187147eb0dd102237d3daa52ee08e2d4c43b0d7acb3a4fd9321606f24f2e46b58bbd12fccb0078874bffddb91f91cb958fa0a9ea9631cc18fced
+  metadata.gz: 88bd1de7f76d7c9bf7126a0918ed63deb2211b71498841da479584877274bb202183fe73668dc93bf013e713d2b943644067bc30fad56717abae10cbb9e667ec
+  data.tar.gz: e9120ad9050bb2dd1bbfc163c1ff2e22838307b0e7ec9e575828a3b77463653df4e0377ea8bcf04399a23f190974944c371be8c2a4d313d20944d715755e10c2

data/lib/carrierwave/storage/qiniu.rb

@@ -25,7 +25,7 @@ module CarrierWave
           @qiniu_protocal = options[:qiniu_protocal] || "http"
           init
         end
-        
+
         def store(file, key)
           token_opts = {
             :scope => @qiniu_bucket, :expires_in => 3600 # https://github.com/qiniu/ruby-sdk/pull/15
@@ -53,14 +53,14 @@ module CarrierWave
 
         def get_public_url(key)
           if @qiniu_bucket_domain and @qiniu_bucket_domain.size > 0
-            "#{@qiniu_protocal}://#{@qiniu_bucket_domain}/#{key}"            
+            "#{@qiniu_protocal}://#{@qiniu_bucket_domain}/#{key}"
           else
             res = ::Qiniu::RS.get(@qiniu_bucket, key)
             if res
               res["url"]
             else
               nil
-            end             
+            end
           end
         end
 
@@ -70,17 +70,17 @@ module CarrierWave
           setup_publish_bucket_and_domain
         end
 
-        def init_qiniu_rs_connection          
+        def init_qiniu_rs_connection
           return if @qiniu_rs_connection_inited
           ::Qiniu::RS.establish_connection! :access_key => @qiniu_access_key,
                                             :secret_key => @qiniu_secret_key,
                                             :block_size => @qiniu_block_size
-          
+
           @qiniu_rs_connection_inited = true
         end
 
         def setup_publish_bucket_and_domain
-          ::Qiniu::RS.publish(@qiniu_bucket_domain, @qiniu_bucket)        
+          ::Qiniu::RS.publish(@qiniu_bucket_domain, @qiniu_bucket)
         end
 
       end
@@ -97,9 +97,9 @@ module CarrierWave
 
         def url
           if @uploader.qiniu_bucket_domain and @uploader.qiniu_bucket_domain.size > 0
-            "#{@uploader.qiniu_protocal}://#{@uploader.qiniu_bucket_domain}/#{@path}"
+            "#{@uploader.qiniu_protocal || 'http'}://#{@uploader.qiniu_bucket_domain}/#{@path}"
           else
-            qiniu_connection.get_public_url(@path)               
+            qiniu_connection.get_public_url(@path)
           end
         end
 

data/lib/carrierwave-qiniu/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Carrierwave
   module Qiniu
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - huobazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave