qiniu 6.5.1 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4183bac23fa834f48579fbc1b8d05a8218ada08b
-  data.tar.gz: 62ff9f7fb37c1acb45d03b37c72c13d6c5073d67
+  metadata.gz: 6156890d8118959d78f316edf9c7de45fd66affe
+  data.tar.gz: b4750d7adf8b61b924af905c4fe91757e468cf97
 SHA512:
-  metadata.gz: c417b92d7a4a06508a9db2be71a9049843fdcb4730854e3e47b0bddccc0c246c4301504bc5acc7745402f07e5452f5639d9d4d8604a45e8e54e2e8d156fa29a6
-  data.tar.gz: b30fde59f5ff8711b0f8c76c5ee1b8db8539798ac5da75907fc77302a0cdc49a8accbb779ed46fa050711fde471d81a95709a512c7c53a6d22072ed237517661
+  metadata.gz: 49ce22e5fdc92699eb5eed74f9c6c19db50896370c2704251bfb4aa8dd8dd65a575d6c64fe8dbcddbe37560cc29f7b8ba44697f5d531412767c5fec1c119acae
+  data.tar.gz: 5d2df9eb2a1533d9fbf07cc16339779699b9f24f6a00c9a0a2b598206082d9ec742b2eacaa42cb268380f22dd4b064201c9067c2c825588a1c73d41375862e6e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGE LOG
 
+### V6.6.0
+
+- 添加 upload_buffer_with_put_policy() 方法，直接上传一块数据作为文件内容。[https://github.com/qiniu/ruby-sdk/pull/146](https://github.com/qiniu/ruby-sdk/pull/146)
+
+### V6.5.2
+
+- 修正无法触发加载异常类的问题；修正 batch_move 参数未正确打包的问题。[https://github.com/qiniu/ruby-sdk/pull/142](https://github.com/qiniu/ruby-sdk/pull/142)
+
 ### V6.5.1
 
 - 为 Qiniu::Auth 添加验证七牛回调请求签名合法性的函数。[https://github.com/qiniu/ruby-sdk/pull/133](https://github.com/qiniu/ruby-sdk/pull/133)

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     qiniu (6.5.1)
       json (~> 1.8)
       mime-types (~> 1.19)
-      rest-client (~> 1.7.3)
+      rest-client (~> 1.8.0)
       ruby-hmac (~> 0.4)
 
 GEM
@@ -16,7 +16,8 @@ GEM
     mime-types (1.25.1)
     netrc (0.10.3)
     rake (10.4.2)
-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rspec (3.2.0)

data/README.md

@@ -15,7 +15,7 @@
 
 在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：
 
-    gem 'qiniu', '~> 6.4.1'
+    gem 'qiniu', '=> 6.4.1', '<= 6.6.0'
 
 然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：
 
@@ -25,6 +25,14 @@
 
     $ gem install qiniu
 
+## Rails 4 项目安装
+
+在 Rails 4 项目的 `Gemfile` 里添加 `qiniu` 后执行 `bundle` 命令可能会失败，这是因为 Rails 4 项目默认会使用 `mime-types` 3.x 版本。需要使用以下命令将 `mime-types` 降级为满足 Qiniu Ruby SDK 的 2.6.x 版本。
+
+    bundle update mime-types
+
+由于 `mime-types` 3.0 要求的最低 Ruby 版本是 2.0，而 Qiniu Ruby SDK 支持 Ruby 1.9，因此我们不能通过简单修改对 `mime-types` 的版本依赖来解决此问题。
+
 ## 使用
 
 参考文档：[七牛云存储 Ruby SDK 使用指南](http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html)

data/lib/qiniu.rb

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 
+require 'qiniu/exceptions'
+
 module Qiniu
   autoload :Version, 'qiniu/version'
   autoload :Utils, 'qiniu/utils'
   autoload :Auth, 'qiniu/auth'
   autoload :Config, 'qiniu/config'
   autoload :Log, 'qiniu/log'
-  autoload :Exception, 'qiniu/exceptions'
   autoload :AccessToken, 'qiniu/tokens/access_token'
   autoload :QboxToken, 'qiniu/tokens/qbox_token'
   autoload :UploadToken, 'qiniu/tokens/upload_token'
@@ -117,6 +118,11 @@ module Qiniu
         code == StatusOK
       end
 
+      def fetch(bucket, target_url, key)
+        code, data = Storage.fetch(bucket, target_url, key)
+        code == StatusOK
+      end
+
       def batch(command, bucket, keys)
         code, data = Storage.batch(command, bucket, keys)
         code == StatusOK ? data : false

data/lib/qiniu/config.rb

@@ -20,10 +20,12 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
+          :fetch_host      => "http://iovip.qbox.me",
           :rsf_host        => "http://rsf.qbox.me",
           :up_host         => "http://up.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",
+          :iovip_host         => "http://iovip.qbox.me",
           :access_key      => "",
           :secret_key      => "",
           :auto_reconnect  => true,

data/lib/qiniu/management.rb

@@ -82,6 +82,11 @@ module Qiniu
           return HTTP.management_post(url)
         end # delete
 
+        def fetch(bucket, target_url, key)
+          url = Config.settings[:fetch_host] + '/fetch/' + Utils.urlsafe_base64_encode(target_url) + '/to/' + encode_entry_uri(bucket, key)
+          return HTTP.management_post(url)
+        end # fetch
+
         def batch(command, bucket, keys)
           execs = []
           keys.each do |key|
@@ -105,7 +110,7 @@ module Qiniu
         end # batch_copy
 
         def batch_move(*args)
-          _batch_cp_or_mv('move', args)
+          _batch_cp_or_mv('move', *args)
         end # batch_move
 
         def batch_delete(bucket, keys)
@@ -144,6 +149,11 @@ module Qiniu
           return resp_code, resp_body, resp_headers, has_more, new_list_policy
         end # list
 
+        def fetch(url, bucket, key)
+          api_url = Config.settings[:iovip_host] + '/fetch/' + Utils.urlsafe_base64_encode(url) + '/to/' + Utils.urlsafe_base64_encode("#{bucket}:#{key}")
+          return HTTP.management_post(api_url)
+        end # fetch
+
         private
 
         def _generate_cp_or_mv_opstr(command, source_bucket, source_key, target_bucket, target_key)

data/lib/qiniu/upload.rb

@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # vim: sw=2 ts=2
 
+require 'stringio'
+
 module Qiniu
   module Storage
     class << self
@@ -80,6 +82,51 @@ module Qiniu
         HTTP.api_post(url, post_data)
       end # upload_with_token_2
 
+      def upload_buffer_with_token(uptoken,
+                              buf,
+                              key = nil,
+                              x_vars = nil,
+                              opts = {})
+        ### 构造 URL
+        url = Config.settings[:up_host]
+        url[/\/*$/] = ''
+        url += '/'
+
+        ### 构造 HTTP Body
+        if buf.is_a?(String)
+          data = StringIO.new(buf)
+        elsif buf.respond_to?(:read)
+          data = buf
+        end
+
+        data.define_singleton_method("path") do
+          'NO-PATH'
+        end
+        data.define_singleton_method("original_filename") do
+          'A-MASS-OF-DATA'
+        end
+        data.define_singleton_method("content_type") do
+          (opts[:content_type].nil? || opts[:content_type].empty?) ? 'application/octet-stream' : opts[:content_type]
+        end
+
+        post_data = {
+          :file      => data,
+          :multipart => true,
+        }
+        if not uptoken.nil?
+          post_data[:token] = uptoken
+        end
+        if not key.nil?
+          post_data[:key] = key
+        end
+        if x_vars.is_a?(Hash)
+          post_data.merge!(x_vars)
+        end
+
+        ### 发送请求
+        HTTP.api_post(url, post_data)
+      end # upload_with_token_2
+
       ### 授权举例
       # put_policy.bucket | put_policy.key | key     | 语义 | 授权
       # :---------------- | :------------- | :------ | :--- | :---
@@ -102,6 +149,19 @@ module Qiniu
         return upload_with_token_2(uptoken, local_file, key, x_vars, opts)
       end # upload_with_put_policy
 
+      def upload_buffer_with_put_policy(put_policy,
+                                 buf,
+                                 key = nil,
+                                 x_vars = nil,
+                                 opts = {})
+        uptoken = Auth.generate_uptoken(put_policy)
+        if key.nil? then
+          key = put_policy.key
+        end
+
+        return upload_buffer_with_token(uptoken, buf, key, x_vars, opts)
+      end # upload_buffer_with_put_policy
+
       private
       def _generate_action_params(local_file,
                                   bucket,

data/lib/qiniu/version.rb

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

data/qiniu.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   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.7.3"
+  gem.add_runtime_dependency "rest-client", "~> 1.8.0"
   gem.add_runtime_dependency "mime-types", "~> 2.4.3"
   gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
   gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"

data/rails3/qiniu.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   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.7.3"
+  gem.add_runtime_dependency "rest-client", "~> 1.8.0"
   gem.add_runtime_dependency "mime-types", "~> 1.19"
   gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
   gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"

data/spec/qiniu/management_spec.rb

@@ -99,11 +99,11 @@ module Qiniu
 
       context ".batch_move" do
         it "should works" do
-          code, data = Storage.batch_move @bucket, @key, @bucket, @key2
+          code, data = Storage.batch_move [@bucket, @key, @bucket, @key2]
           code.should == 200
           puts data.inspect
 
-          code3, data3 = Storage.batch_move @bucket, @key2, @bucket, @key
+          code3, data3 = Storage.batch_move [@bucket, @key2, @bucket, @key]
           code3.should == 200
           puts data3.inspect
         end

data/spec/qiniu/upload_spec.rb

@@ -147,6 +147,24 @@ module Qiniu
         end
       end # .upload_with_put_policy
 
+      context ".upload_buffer_with_put_policy" do
+        it "should works" do
+          pp = Qiniu::Auth::PutPolicy.new(@bucket, @key)
+          pp.end_user = "amethyst.black@gmail.com"
+          puts 'put_policy=' + pp.to_json
+
+          test_line = 'This is a test line for testing put_buffer function.'
+          code, data, raw_headers = Qiniu::Storage.upload_buffer_with_put_policy(
+            pp,
+            test_line,
+            @key
+          )
+          code.should == 200
+          puts data.inspect
+          puts raw_headers.inspect
+        end
+      end # .upload_buffer_with_put_policy
+
       context ".stat" do
         it "should exists" do
           code, data = Qiniu::Storage.stat(@bucket, @key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.6.0
 platform: ruby
 authors:
 - why404
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby