qiniu 6.8.0 → 6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7295d2117d781da3393be2970a1fe47fc805e7
-  data.tar.gz: effdc4eeb3869a3cac362d6f23196f3b6a22f20a
+  metadata.gz: 82f51989fb126863f36c204186a0d3065d9d240e
+  data.tar.gz: d691e53432a0b3cdffc3407cbc4b1f0798b9f194
 SHA512:
-  metadata.gz: d6ffe81579309aa77188ead19e97d422176496b1ecb8b32c4d4455d5dbe0b175a7a55ce73112f8fbb0e2338ee6caa3b25a68ae2e3e038f9a1c23fc945cb6e125
-  data.tar.gz: 302e9930d19d6ecf33d69a8a77adc457b16cbcb08e0f6a641efe80405f61a3c6fac674c3e76b7702f1574fd475b96976f6d1f39da40a01ab36f2b87359bfa438
+  metadata.gz: 6457dd9d80b710e52fb52610af683f990460842f131937b477827791ffd202685361097d1126aa15382423d32e7b3037e622e3fb4db0efc2bf131a103dd1efae
+  data.tar.gz: bda38a85d3b1dd1f199018bc4c78baf40431027c850faff7e6330238487fa5360a20234d9d61e61a348caf05bc58936c4474394613158301dc2b5919191a6947

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.8.1
+
+- 增加delafterdays 策略。[https://github.com/qiniu/ruby-sdk/pull/162](https://github.com/qiniu/ruby-sdk/pull/162)
+
+- 调整依赖。[https://github.com/qiniu/ruby-sdk/pull/167](https://github.com/qiniu/ruby-sdk/pull/167)
+
 ### v6.8.0
 
 - 支持多存储区域，部分 API 需要额外的 bucket 参数。[https://github.com/qiniu/ruby-sdk/pull/161](https://github.com/qiniu/ruby-sdk/pull/161)

data/examples/fops.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'qiniu'
+require 'qiniu/utils'
+
+# 构建鉴权对象
+Qiniu.establish_connection! :access_key => 'AK',
+                            :secret_key => 'SK'
+
+#要转码的文件所在的空间和文件名。
+bucket = 'Bucket_Name'
+key = '1.mp4'
+
+#转码所使用的队列名称。 
+pipeline = 'abc'
+
+#要进行转码的转码操作。   
+fops = "avthumb/mp4/s/640x360/vb/1.25m"
+
+
+#可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当间。
+saveas_key = Qiniu::Utils.urlsafe_base64_encode(目标Bucket_Name:自定义文件key)
+fops = fops+'|saveas/'+saveas_key
+
+pfops  = Qiniu::Fop::Persistance::PfopPolicy.new(
+    bucket,      # 存储空间
+    key,   # 最终资源名，可省略，即缺省为“创建”语义
+    fops,
+    'www.baidu.com'
+)
+pfops.pipeline=pipeline
+
+code, result, response_headers = Qiniu::Fop::Persistance.pfop(pfops)
+puts code
+puts result
+puts response_headers

data/examples/pfop_vframe.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'qiniu'
+require 'qiniu/utils'
+
+# 构建鉴权对象
+Qiniu.establish_connection! :access_key => 'AK',
+                            :secret_key => 'SK'
+
+#要转码的文件所在的空间和文件名。
+bucket = 'Bucket_Name'
+key = '1.mp4'
+
+#转码所使用的队列名称。 
+pipeline = 'abc'
+
+#要进行视频截图操作。   
+fops = "vframe/jpg/offset/1/w/480/h/360/rotate/90"
+
+
+#可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当间。
+saveas_key = Qiniu::Utils.urlsafe_base64_encode(目标Bucket_Name:自定义文件key)
+fops = fops+'|saveas/'+saveas_key
+
+pfops  = Qiniu::Fop::Persistance::PfopPolicy.new(
+    bucket,      # 存储空间
+    key,   # 最终资源名，可省略，即缺省为“创建”语义
+    fops,
+    'www.baidu.com'
+)
+pfops.pipeline=pipeline
+
+code, result, response_headers = Qiniu::Fop::Persistance.pfop(pfops)
+puts code
+puts result
+puts response_headers

data/examples/pfop_watermark.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'qiniu'
+require 'qiniu/utils'
+
+# 构建鉴权对象
+Qiniu.establish_connection! :access_key => 'AK',
+                            :secret_key => 'SK'
+
+#要转码的文件所在的空间和文件名。
+bucket = 'Bucket_Name'
+key = '1.mp4'
+
+#转码所使用的队列名称。 
+pipeline = 'abc'
+
+#需要添加水印的图片UrlSafeBase64,可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html 
+base64URL = Qiniu::Utils.urlsafe_base64_encode('http://developer.qiniu.com/resource/logo-2.jpg')  
+
+#水印参数
+fops = "avthumb/mp4/wmImage"+base64URL
+
+#可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当间。
+saveas_key = Qiniu::Utils.urlsafe_base64_encode(目标Bucket_Name:自定义文件key)
+fops = fops+'|saveas/'+saveas_key
+
+pfops  = Qiniu::Fop::Persistance::PfopPolicy.new(
+    bucket,      # 存储空间
+    key,   # 最终资源名，可省略，即缺省为“创建”语义
+    fops,
+    'www.baidu.com'
+)
+pfops.pipeline=pipeline
+
+code, result, response_headers = Qiniu::Fop::Persistance.pfop(pfops)
+puts code
+puts result
+puts response_headers

data/lib/qiniu/auth.rb

@@ -76,7 +76,8 @@ module Qiniu
           :detect_mime            => "detectMime"          ,
           :mime_limit             => "mimeLimit"           ,
           :uphosts                => "uphosts"             ,
-          :global                 => "global"
+          :global                 => "global"              ,
+          :delete_after_days      => "deleteAfterDays"
         } # PARAMS
 
         public

data/lib/qiniu/tokens/upload_token.rb

@@ -11,7 +11,7 @@ module Qiniu
 
         include Utils
 
-        attr_accessor :scope, :expires_in, :callback_url, :callback_body, :callback_body_type, :customer, :escape, :async_options, :return_body, :return_url
+        attr_accessor :scope, :expires_in, :callback_url, :callback_body, :callback_body_type, :customer, :escape, :async_options, :return_body, :return_url, :delete_after_days
 
         def initialize(opts = {})
           @scope = opts[:scope]
@@ -26,6 +26,7 @@ module Qiniu
           @persistent_pipeline = opts[:persistent_pipeline]
           @return_body = opts[:return_body]
           @return_url = opts[:return_url]
+          @delete_after_days = opts[:delete_after_days]
         end
 
         def generate_signature
@@ -41,6 +42,7 @@ module Qiniu
           params[:persistentOps] = @persistent_ops if !@persistent_ops.nil? && !@persistent_ops.empty?
           params[:persistentNotifyUrl] = @persistent_notify_url if !@persistent_notify_url.nil? && !@persistent_notify_url.empty?
           params[:persistentPipeline] = @persistent_pipeline if !@persistent_pipeline.nil? && !@persistent_pipeline.empty?
+          params[:deleteAfterDays] = @delete_after_days if !@delete_after_days.nil? && !@delete_after_days.empty?
 
           Utils.urlsafe_base64_encode(params.to_json)
         end

data/lib/qiniu/version.rb

@@ -4,7 +4,7 @@ module Qiniu
     module Version
       MAJOR = 6
       MINOR = 8
-      PATCH = 0
+      PATCH = 1
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

data/qiniu.gemspec

@@ -3,27 +3,27 @@
 require File.expand_path('../lib/qiniu/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["why404","BluntBlade"]
-  gem.email         = ["sdk@qiniu.com"]
+  gem.authors       = ['why404','BluntBlade']
+  gem.email         = ['sdk@qiniu.com']
   gem.description   = %q{Qiniu Resource (Cloud) Storage SDK for Ruby. See: http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html}
   gem.summary       = %q{Qiniu Resource (Cloud) Storage SDK for Ruby}
-  gem.homepage      = "https://github.com/qiniu/ruby-sdk"
+  gem.homepage      = 'https://github.com/qiniu/ruby-sdk'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "qiniu"
-  gem.require_paths = ["lib"]
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features|examples)/})
+  gem.name          = 'qiniu'
+  gem.require_paths = ['lib']
   gem.version       = Qiniu::Version.to_s
-  gem.license       = "MIT"
+  gem.license       = 'MIT'
 
   # specify any dependencies here; for example:
-  gem.add_development_dependency "rake", ">= 0.9"
-  gem.add_development_dependency "rspec", ">= 2.11"
-  gem.add_development_dependency "fakeweb", "~> 1.3"
-  gem.add_runtime_dependency "json", "~> 1.8"
-  gem.add_runtime_dependency "rest-client", "~> 1.8.0"
-  gem.add_runtime_dependency "mime-types", ">= 2.4.0"
-  gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
-  gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
+  gem.add_development_dependency 'rake', '~> 0.9'
+  gem.add_development_dependency 'rspec', '~> 2.11'
+  gem.add_development_dependency 'fakeweb', '~> 1.3'
+  gem.add_runtime_dependency 'json', '~> 1.8'
+  gem.add_runtime_dependency 'rest-client', '~> 2.0', '>= 2.0.0'
+  gem.add_runtime_dependency 'mime-types', '~> 2.4', '>= 2.4.0'
+  gem.add_runtime_dependency 'ruby-hmac', '~> 0.4'
+  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7' if RUBY_PLATFORM == 'java'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.1
 platform: ruby
 authors:
 - why404
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
@@ -73,18 +73,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
@@ -92,6 +101,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
@@ -132,6 +144,8 @@ files:
 - examples/fops.rb
 - examples/list.rb
 - examples/move.rb
+- examples/pfop_vframe.rb
+- examples/pfop_watermark.rb
 - examples/stat.rb
 - examples/upload.rb
 - examples/upload_callback.rb
@@ -201,6 +215,19 @@ signing_key:
 specification_version: 4
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby
 test_files:
+- examples/copy.rb
+- examples/delete.rb
+- examples/download.rb
+- examples/fetch.rb
+- examples/fops.rb
+- examples/list.rb
+- examples/move.rb
+- examples/pfop_vframe.rb
+- examples/pfop_watermark.rb
+- examples/stat.rb
+- examples/upload.rb
+- examples/upload_callback.rb
+- examples/upload_pfops.rb
 - spec/qiniu/abstract_spec.rb
 - spec/qiniu/auth_spec.rb
 - spec/qiniu/image_logo_for_test.png