carrierwave-qiniu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43e7e5fdcf0da4e9de0d0925050ec9d7a459b27
-  data.tar.gz: e6453512b87881c5547619c17b6657c8ce54f1e8
+  metadata.gz: c31fa44d0fdafba5f24aba143952d5c5c33810d0
+  data.tar.gz: e7ad971651fedef17c05a662e90916ecb7c4cdb8
 SHA512:
-  metadata.gz: fa856dc9e7a97f5c2c080c1170a9d8126cce7868052a58892313799bb50c7fd922d5e0402c8a066ebe3e71eaf7e4be72917a0413b9a0c2c6a93b8cfef9b7facc
-  data.tar.gz: b15d06236154333a3e1ae389412db9e0c7c1ce5d5bdc1040b6c1260968d494318c15e957905e056e5f156af23dc7da120f50bbb42cd42dcdf6c8bb548ac8747e
+  metadata.gz: 742f03dc1b02fa9d4400175f6e3885fd4a21cb486d6d4dbe64c08f9bb6049ed7eb8e67f269fb4924b0318483f64ddd68df4011e7f539e732fc8acb41718048e2
+  data.tar.gz: e97243f33b257c4b754a9e881b9995fab0dccd26cd8ff4b340a494aa4c3084ce25e98edde0d097deed49c78b0b5e69a8151ff7755fe5c185d713cecff6b8a1f9

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 
 ## CHANGE LOG
 
+### v0.2.1
+
+https://github.com/huobazi/carrierwave-qiniu/pull/47
+
 ### v0.2.0
 
-- 升级七牛 SDK 至 6.5.2
+- 升级七牛 SDK 至 6.5.1
 
 ### v0.1.8.2
 

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?0.1.8.2)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?0.2.0)](http://badge.fury.io/rb/carrierwave-qiniu)
 
 This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 example: https://github.com/huobazi/carrierwave-qiniu-example
@@ -54,11 +54,14 @@ You can override configuration item in individual uploader like this:
 class AvatarUploader < CarrierWave::Uploader::Base
   storage :qiniu
 
-  self.qiniu_bucket = "avatars"
-  self.qiniu_bucket_domain = "avatars.files.example.com"
-  self.qiniu_protocal = 'http'
-  self.qiniu_can_overwrite = true
-  self.qiniu_bucket_private= true #default is false
+  self.qiniu_bucket                = "avatars"
+  self.qiniu_bucket_domain         = "avatars.files.example.com"
+  self.qiniu_protocal              = 'http'
+  self.qiniu_can_overwrite         = true
+  self.qiniu_bucket_private        = true #default is false
+  self.qiniu_callback_url          = "http://<ip1>/callback;http://<ip2>/callback"
+  self.qiniu_callback_body         = "key=$(key)&hash=$(etag)&w=$(imageInfo.width)&h=$(imageInfo.height)" # see http://developer.qiniu.com/docs/v6/api/overview/up/response/vars.html#magicvar
+  self.qiniu_persistent_notify_url = "http://<ip>/notify"
 
     # 指定预转数据处理命令
     # https://github.com/qiniu/ruby-sdk/issues/48

data/lib/carrierwave/qiniu/configuration.rb

@@ -13,6 +13,9 @@ module CarrierWave
         add_config :qiniu_block_size
         add_config :qiniu_protocol
         add_config :qiniu_async_ops
+        add_config :qiniu_persistent_notify_url
+        add_config :qiniu_callback_url
+        add_config :qiniu_callback_body
         add_config :qiniu_can_overwrite
         add_config :qiniu_expires_in
         add_config :qiniu_up_host

data/lib/carrierwave/storage/qiniu.rb

@@ -21,6 +21,9 @@ module CarrierWave
           @qiniu_expires_in    = options[:qiniu_expires_in] || options[:expires_in] || 3600
           @qiniu_up_host       = options[:qiniu_up_host]
           @qiniu_private_url_expires_in = options[:qiniu_private_url_expires_in] || 3600
+          @qiniu_callback_url  = options[:qiniu_callback_url] || ''
+          @qiniu_callback_body = options[:qiniu_callback_body] || ''
+          @qiniu_persistent_notify_url  = options[:qiniu_persistent_notify_url] || ''
           init
         end
 
@@ -35,6 +38,9 @@ module CarrierWave
             nil
           )
           put_policy.persistent_ops = @qiniu_async_ops
+          put_policy.callback_url = @qiniu_callback_url if @qiniu_callback_url.present?
+          put_policy.callback_body = @qiniu_callback_body if @qiniu_callback_body.present?
+          put_policy.persistent_notify_url = @qiniu_persistent_notify_url if @qiniu_persistent_notify_url.present?
 
           ::Qiniu::Storage.upload_with_put_policy(
             put_policy,
@@ -146,7 +152,10 @@ module CarrierWave
               :qiniu_protocol      => @uploader.qiniu_protocol,
               :qiniu_expires_in    => @uploader.qiniu_expires_in,
               :qiniu_up_host       => @uploader.qiniu_up_host,
-              :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in
+              :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in,
+              :qiniu_callback_url  => @uploader.qiniu_callback_url,
+              :qiniu_callback_body => @uploader.qiniu_callback_body,
+              :qiniu_persistent_notify_url  => @uploader.qiniu_persistent_notify_url
             }
 
             config[:qiniu_async_ops] = Array(@uploader.qiniu_async_ops).join(';') rescue ''

data/lib/carrierwave-qiniu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave