carrierwave-qiniu 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0bea8f3675df09f0acfa6ea59724970b162bac
-  data.tar.gz: 011c55dbe3ba635428736b3db7b678ef4b53c154
+  metadata.gz: 7d812f4e98f061b35e69d329669a7c4a6b71478a
+  data.tar.gz: 68b8748a2b0b398ea9678fc05260318378612e52
 SHA512:
-  metadata.gz: 7ad5482ab45762fbe170783bc0bcc23b2bb963332cd8f8a678c783eb635010c3075a7eb6eb8bd2e931670441e88fb9a11d0d40c66109aaf04e0703cfbfaa7053
-  data.tar.gz: d95400468ddb647036dce94d355f3f49033b415c6eb68fa4f2fdd8d07b13269644812e5d6f71c86c3e7440b78f6f4cd5b795f5aa4cf57f683ec94d0734d0675e
+  metadata.gz: f0f96ce497102cf27c2edef4d8134662dbd29992f2f5d300df50ce46c8455d12f1c91ed683f6cab3377d686f46fc775b36e8cb1f5dafddf8aa0804a97d34abb5
+  data.tar.gz: 58284c3f68b787b14db4e79838eb08e588e08317a91e293aaa964fb5fef66de4a7df96494ee5e4cb0e31bc05a1a027628a714390ec589cafa8b941accb564072

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 
 ## CHANGE LOG
 
+### v1.1.2
+
+Fix:
+https://github.com/huobazi/carrierwave-qiniu/pull/79
+
 ### v1.1.1
 
 https://github.com/huobazi/carrierwave-qiniu/pull/78

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.1.1)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.1.2)](http://badge.fury.io/rb/carrierwave-qiniu)
 
 This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 
@@ -10,7 +10,7 @@ example: https://github.com/huobazi/carrierwave-qiniu-example
 
 Add the following to your application's Gemfile:
 
-    gem 'carrierwave-qiniu', '~> 1.1.1'
+    gem 'carrierwave-qiniu', '~> 1.1.2'
     # If you need to use locales other than English
     gem 'carrierwave-i18n'
 
@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install carrierwave-qiniu -v 1.1.1
+    $ gem install carrierwave-qiniu -v 1.1.2
 
 ## Usage
 
@@ -67,15 +67,13 @@ class AvatarUploader < CarrierWave::Uploader::Base
   self.qiniu_persistent_notify_url = "http://<ip>/notify"
 
     # 指定预转数据处理命令
-    # https://github.com/qiniu/ruby-sdk/issues/48
-    # http://docs.qiniu.com/api/put.html#uploadToken
-    # http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps
-    # http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-persistent-ops-explanation
-    def qiniu_async_ops
+    # https://developer.qiniu.com/kodo/manual/1206/put-policy#2
+    def qiniu_persistent_ops
       commands = []
-      %W(small little middle large).each do |style|
-        commands << "http://#{self.qiniu_bucket_domain}/#{self.store_dir}/#{self.filename}/#{style}"
-      end
+
+      commands << "avthumb/mp4"
+      commands << "avthumb/m3u8/noDomain/1/segtime/15/vb/440k"
+
       commands
     end
 

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave/storage/qiniu.rb

@@ -16,15 +16,17 @@ module CarrierWave
           @qiniu_secret_key             = options[:qiniu_secret_key]
           @qiniu_block_size             = options[:qiniu_block_size] || 1024*1024*4
           @qiniu_protocol               = options[:qiniu_protocol] || "http"
-          @qiniu_async_ops              = options[:qiniu_async_ops] || ''
+          @qiniu_persistent_ops         = options[:qiniu_persistent_ops] || options[:qiniu_async_ops] || ''
+          @qiniu_persistent_pipeline    = options[:qiniu_persistent_pipeline] || ''
+          @qiniu_persistent_notify_url  = options[:qiniu_persistent_notify_url] || ''
           @qiniu_can_overwrite          = options[:qiniu_can_overwrite] || false
           @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] || ''
           @qiniu_style_separator        = options[:qiniu_style_separator] || '-'
+          @qiniu_delete_after_days      = options[:qiniu_delete_after_days]
           init
         end
 
@@ -38,10 +40,12 @@ module CarrierWave
             @qiniu_expires_in,
             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_ops        = @qiniu_persistent_ops || @qiniu_async_ops
           put_policy.persistent_notify_url = @qiniu_persistent_notify_url if @qiniu_persistent_notify_url.present?
+          put_policy.persistent_pipeline   = @persistent_pipeline
 
           resp_code, resp_body, resp_headers =
             ::Qiniu::Storage.upload_with_put_policy(
@@ -50,11 +54,11 @@ module CarrierWave
               key,
               nil,
               bucket: @qiniu_bucket
-            )
+          )
 
-          if resp_code < 200 or resp_code >= 300
-            raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
-          end
+            if resp_code < 200 or resp_code >= 300
+              raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
+            end
         end
 
         #
@@ -185,28 +189,29 @@ module CarrierWave
 
         def qiniu_connection
           @qiniu_connection ||= begin
-            config = {
-              :qiniu_access_key    => @uploader.qiniu_access_key,
-              :qiniu_secret_key    => @uploader.qiniu_secret_key,
-              :qiniu_bucket        => @uploader.qiniu_bucket,
-              :qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
-              :qiniu_bucket_private=> @uploader.qiniu_bucket_private,
-              :qiniu_block_size    => @uploader.qiniu_block_size,
-              :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_callback_url  => @uploader.qiniu_callback_url,
-              :qiniu_callback_body => @uploader.qiniu_callback_body,
-              :qiniu_persistent_notify_url  => @uploader.qiniu_persistent_notify_url,
-              :qiniu_style_separator => @uploader.qiniu_style_separator
-            }
-
-            config[:qiniu_async_ops] = Array(@uploader.qiniu_async_ops).join(';') rescue ''
-            config[:qiniu_can_overwrite] = @uploader.try :qiniu_can_overwrite rescue false
-
-            Connection.new config
-          end
+                                  config = {
+                                    :qiniu_access_key             => @uploader.qiniu_access_key,
+                                    :qiniu_secret_key             => @uploader.qiniu_secret_key,
+                                    :qiniu_bucket                 => @uploader.qiniu_bucket,
+                                    :qiniu_bucket_domain          => @uploader.qiniu_bucket_domain,
+                                    :qiniu_bucket_private         => @uploader.qiniu_bucket_private,
+                                    :qiniu_block_size             => @uploader.qiniu_block_size,
+                                    :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_callback_url           => @uploader.qiniu_callback_url,
+                                    :qiniu_callback_body          => @uploader.qiniu_callback_body,
+                                    :qiniu_persistent_notify_url  => @uploader.qiniu_persistent_notify_url,
+                                    :qiniu_persistent_pipeline    => @uploader.qiniu_persistent_pipeline,
+                                    :qiniu_style_separator        => @uploader.qiniu_style_separator
+                                  }
+
+                                  config[:qiniu_persistent_ops] = Array(@uploader.qiniu_persistent_ops || @uploader.qiniu_async_ops).join(';') rescue ''
+                                  config[:qiniu_can_overwrite]  = @uploader.try :qiniu_can_overwrite rescue false
+
+                                  Connection.new config
+                                end
         end
 
         def file_info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave