carrierwave-qiniu 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8f66a9de516d766326b6b71a4458118c1c7a65efb8d658db6a1d3461211afa
-  data.tar.gz: 287a017867010ed5c08e090716b5b42c22d46e74f90deb0365d523c982f0cd0a
+  metadata.gz: 8cbd13740c5daba706d4ec42e685f737a24d943ef4174e4e1b2cc8655f38bbc8
+  data.tar.gz: 2ed7b2ff0a935b405a37146dc702a8878c8da3ccd908a471976b9d1b46b67261
 SHA512:
-  metadata.gz: '08df3bb2b5aaeecc01e642da1626d43b915850403550573af8e0a5f9c722ad93da768e77a011c260fe84b7f5d79f6d1e1ef6554ba4b5db22434d3114452acdd2'
-  data.tar.gz: b9231fd84b073877b26deffc7fe495386510af8aac24e945153f481831aa90c6aeae571215e5bd6e6f6470c842fde2d3b4535745fb6cf541337431508e54c239
+  metadata.gz: 33bc0e6f25857c631f5e2ac59894495d75a0c0ba4015fbc86f3875e00e179631ca1425336e3ce92a07cfe7a70a3e2f98766a281b0a56f3efd4751e87e9f9bbaf
+  data.tar.gz: b13d6fe48838cd66a2366699290ddd936a5453cf013a5e9de7d6be4e6fb89dfbf5896a0458c71f466aee9212f22391b4504de1018d3513d50871c67401b3f26a

data/.env.sample

@@ -0,0 +1,4 @@
+qiniu_access_key=your-qiniu_access_key
+qiniu_secret_key=your-qiniu_secret_key
+qiniu_bucket=your-qiniu_bucket_name
+qiniu_bucket_domain=your-qiniu_bucket_domain

data/.gitignore

@@ -5,6 +5,7 @@
 .yardoc
 .env
 .env.*
+!.env.sample
 InstalledFiles
 _yardoc
 coverage

data/.rspec_status

@@ -0,0 +1,21 @@
+example_id                                | status | run_time        |
+----------------------------------------- | ------ | --------------- |
+./spec/carrierwave_qiniu_spec.rb[1:1]     | passed | 0.00122 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:2:1]   | passed | 1.09 seconds    |
+./spec/carrierwave_qiniu_spec.rb[1:2:2]   | passed | 2.6 seconds     |
+./spec/carrierwave_qiniu_spec.rb[1:2:3]   | passed | 1.25 seconds    |
+./spec/carrierwave_qiniu_spec.rb[1:2:4]   | passed | 2.5 seconds     |
+./spec/carrierwave_qiniu_spec.rb[1:2:5]   | passed | 1.77 seconds    |
+./spec/carrierwave_qiniu_spec.rb[1:2:6:1] | passed | 0.51601 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:2:6:2] | passed | 0.46774 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:2:6:3] | passed | 0.45134 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:1:1] | passed | 0.36893 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:1:2] | passed | 0.40568 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:2:1] | passed | 0.38115 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:2:2] | passed | 0.38565 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:2:3] | passed | 0.36964 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:3:1] | passed | 0.41991 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:4:1] | passed | 0.41857 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:4:2] | passed | 0.37235 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:4:3] | passed | 0.38322 seconds |
+./spec/carrierwave_qiniu_spec.rb[1:3:4:4] | passed | 0.37941 seconds |

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 ## CHANGE LOG
 
+### v1.2.2
+
+- 重构
+
 ### v1.2.1
 
 - Implement of cache* method for carrierwave 2.0

data/Gemfile

@@ -4,13 +4,15 @@ source "https://gems.ruby-china.com"
 # Specify your gem's dependencies in carrierwave-qiniu.gemspec
 gemspec
 
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+
 group :test do
   gem "rails", "~> 6.0.0"
   gem "sqlite3"
   gem "carrierwave", ">= 1"
   gem "mini_magick"
   gem "qiniu", "~> 6.9"
-  gem "rspec"
   gem "mocha"
   gem "dotenv"
 end

data/Gemfile.lock

@@ -1,71 +1,71 @@
 PATH
   remote: .
   specs:
-    carrierwave-qiniu (1.2.0)
+    carrierwave-qiniu (1.2.2)
       carrierwave (>= 1)
       qiniu (~> 6.9, >= 6.9.0)
 
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    builder (3.2.3)
+    builder (3.2.4)
     carrierwave (2.0.2)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -74,12 +74,12 @@ GEM
       mimemagic (>= 0.3.0)
       mini_mime (>= 0.1.3)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.6)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
-    erubi (1.8.0)
+    erubi (1.9.0)
     ffi (1.12.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -91,59 +91,57 @@ GEM
     image_processing (1.10.3)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    metaclass (0.0.4)
     method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mimemagic (0.3.3)
-    mini_magick (4.9.5)
+    mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
+    mocha (1.11.2)
     netrc (0.11.0)
-    nio4r (2.5.1)
-    nokogiri (1.10.4)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.3)
     qiniu (6.9.0)
       mime-types (~> 3.1)
       rest-client (~> 2.0)
-    rack (2.0.7)
+    rack (2.1.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.0)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -153,30 +151,30 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     ruby-vips (2.0.17)
       ffi (~> 1.9)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
@@ -199,7 +197,8 @@ DEPENDENCIES
   mocha
   qiniu (~> 6.9)
   rails (~> 6.0.0)
-  rspec
+  rake (~> 12.0)
+  rspec (~> 3.0)
   sqlite3
 
 BUNDLED WITH

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 Marble Wu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.2.1)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.2.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.2.1'
+    gem 'carrierwave-qiniu', '~> 1.2.2'
     gem 'carrierwave-i18n' # If you need to use locales other than English
 
 And then execute:
@@ -19,7 +19,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install carrierwave-qiniu -v 1.2.1
+    $ gem install carrierwave-qiniu -v 1.2.2
 
 ## Usage
 
@@ -64,18 +64,42 @@ class AvatarUploader < CarrierWave::Uploader::Base
   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://developer.qiniu.com/kodo/manual/1206/put-policy#2
-    def qiniu_persistent_ops
-      commands = []
-
-      commands << "avthumb/mp4"
-      commands << "avthumb/m3u8/noDomain/1/segtime/15/vb/440k"
-
-      commands
-    end
-
+  
+  # 使用的队列名称,不设置代表不使用私有队列，使用公有队列
+  # 可以自己创建私有队列 see: https://portal.qiniu.com/dora/mps/new
+  self.qiniu_persistent_pipeline = "marble_persistent"
+    
+  # 指定预转数据处理命令,返回由每条命令组成的数组
+  # See
+  # https://developer.qiniu.com/dora/api/1291/persistent-data-processing-pfop#
+  # https://developer.qiniu.com/dora/api/3686/pfop-directions-for-use
+  # https://developer.qiniu.com/kodo/manual/1206/put-policy#persistentOps
+  def qiniu_persistent_ops
+    commands = []
+    
+    # 以预转持久化形式，将mp4视频转换为flv格式。
+    # https://developer.qiniu.com/dora/api/1248/audio-and-video-transcoding-avthumb
+    fops1 = "avthumb/flv"
+    saveas_key1 = ::Qiniu::Utils.urlsafe_base64_encode("#{self.qiniu_bucket}:#{store_dir}/#{self.filename}_flv.flv")
+    fops1 = fops1 + '|saveas/' + saveas_key1
+    commands << fops1
+    
+    # 以预转持久化形式，将mp4视频转换为avi格式。
+    # https://developer.qiniu.com/dora/api/1248/audio-and-video-transcoding-avthumb
+    fops2 = "avthumb/avi"
+    saveas_key2 = ::Qiniu::Utils.urlsafe_base64_encode("#{self.qiniu_bucket}:#{store_dir}/#{self.filename}_avi.avi")
+    fops2 = fops2 + '|saveas/' + saveas_key2
+    commands << fops2
+    
+    # 要进行视频截图操作。
+    # https://developer.qiniu.com/dora/api/1313/video-frame-thumbnails-vframe
+    fops3 = "vframe/jpg/offset/3/w/1280/h/720/rotate/auto"
+    saveas_key3 = ::Qiniu::Utils.urlsafe_base64_encode("#{self.qiniu_bucket}:#{store_dir}/#{self.filename}_screenshot.jpg")
+    fops3 = fops3 + '|saveas/' + saveas_key3
+    commands << fops3
+    
+    commands
+  end
 end
 ```
 
@@ -126,7 +150,6 @@ end
 
 class AvatarUploader < CarrierWave::Uploader::Base
   storage :qiniu
-
   use_qiniu_styles
 end
 
@@ -160,7 +183,11 @@ $ rake carrierwave:qiniu:sync_styles
 ```
 You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-example
 
-or see the spec test on https://github.com/huobazi/carrierwave-qiniu/blob/master/spec/upload_spec.rb
+or see the spec test on https://github.com/huobazi/carrierwave-qiniu/blob/master/spec/carrierwave-qiniu_spec.rb
+
+## LICENSE
+
+See the [LICENSE](https://github.com/huobazi/carrierwave-qiniu/blob/master/LICENSE.txt).
 
 ## Contributing