qiniu 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4e5dae35c9c6f8b0dea9a10c6580f15ec2c42e
-  data.tar.gz: b14c83f41a8fd3b88db57699648d1e8f1dd7a035
+  metadata.gz: 5df0656bef38c727a292ffe6ec54aba7ab0c8cac
+  data.tar.gz: 69d504ea0f9c61410e96600f55aa5cbea08f331e
 SHA512:
-  metadata.gz: e7bdb3f0459b3acf7fa17af1be97d84a784f7817a444356558a8b8c43eed40b9918e9406c1c2e9ef4b280113495b3f0183734478a0bec029bed32b9721f9fda1
-  data.tar.gz: a33a5c831cc472d86a13864e521da41f4844ebc64ae6cf215f492899ca4ae8846700f076d283cb9a55e3efce16a2bddee9a83fbeed963a2d0df69fde7a5c668a
+  metadata.gz: c74fb96b07fee02ab56fb4b25b9ac52637ea478bd3da685238644c0f1b034662211d7b9d483d50b428fc5c69030cb5bae148e14ba0059c4029e80c1d9c498240
+  data.tar.gz: f76c79b88f64661c3876f77ecff944d9bb63ce25ac389d3cfb826abc515ce1646c5edfd44312ba43e907629114b61ca0801c6b883c920ba2312e3ae29a5f1b5a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## CHANGE LOG
 
+### v6.1.0
+
+- Qiniu::Storage所有上传接口返回第三个值raw_headers，类型为Hash，包含已解析的HTTP响应报文中的所有Header信息。
+
+该返回值主要用于调试。当遇到难以理解或解释的错误时，请将其中的X-Log和X-Reqid两项信息[通过邮件反馈](mailto:support@qiniu.com?subject=Ruby-SDK-Bug-Report)给我们。
+
+- 更新Qiniu::Storage所有上传接口的测试用例，打印HTTP响应Header信息。
+
+- 删除过时的Qiniu::Storage#put_file方法和相关测试用例。
+
+该方法调用的API已过时并逐步废弃，建议用户尽快迁移到Qiniu::Storage#upload_with_token_2方法上。
+
 ### v6.0.1
 
 - 重新划分命名空间，存储相关归入Qiniu::Storage，数据处理相关归入Qiniu::Fop，杂项相关归入Qiniu::Misc。

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu (6.0.1)
+    qiniu (6.1.0)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -12,7 +12,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.7)
+    json (1.8.1)
     mime-types (1.23)
     rake (10.0.3)
     rest-client (1.6.7)

data/README.md

@@ -6,14 +6,15 @@
 
 ## 状态
 
-集成测试：[![Build Status](https://api.travis-ci.org/qiniu/ruby-sdk.png?branch=master)](https://travis-ci.org/qiniu/ruby-sdk)
-版本：[![Gem Version](https://badge.fury.io/rb/qiniu-rs.png)](http://badge.fury.io/rb/qiniu-rs)
+[![Build Status](https://api.travis-ci.org/qiniu/ruby-sdk.png?branch=master)](https://travis-ci.org/qiniu/ruby-sdk)
+[![Gem Version](https://badge.fury.io/rb/qiniu.png)](http://badge.fury.io/rb/qiniu)
+[![Dependency Status](https://gemnasium.com/qiniu/ruby-sdk.png)](https://gemnasium.com/qiniu/ruby-sdk)
 
 ## 安装
 
 在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：
 
-    gem 'qiniu'
+    gem 'qiniu', '~> 6.1.0'
 
 然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：
 

data/lib/qiniu.rb

@@ -54,16 +54,6 @@ module Qiniu
         code == StatusOK
       end
 
-      def put_file opts = {}
-        code, data = Storage.put_file(opts[:file],
-                                 opts[:bucket],
-                                 opts[:key],
-                                 opts[:mime_type],
-                                 opts[:note],
-                                 opts[:enable_crc32_check])
-        code == StatusOK
-      end
-
       def upload_file opts = {}
         uncontained_opts = [:uptoken, :file, :bucket, :key] - opts.keys
         raise MissingArgsError, uncontained_opts unless uncontained_opts.empty?

data/lib/qiniu/auth.rb

@@ -10,16 +10,16 @@ module Qiniu
         include Utils
 
         def call_with_signature(url, data, retry_times = 0, options = {})
-          code, data = http_request url, data, options.merge({:qbox_signature_token => generate_qbox_signature(url, data, options[:mime])})
-          [code, data]
-        end
+          code, data, raw_headers = http_request url, data, options.merge({:qbox_signature_token => generate_qbox_signature(url, data, options[:mime])})
+          [code, data, raw_headers]
+        end # call_with_signature
 
         def request(url, data = nil, options = {})
-          code, data = Auth.call_with_signature(url, data, 0, options)
-          [code, data]
-        end
+          code, data, raw_headers = Auth.call_with_signature(url, data, 0, options)
+          [code, data, raw_headers]
+        end # request
 
-      end
+      end # class << self
 
     end # module Auth
 end # module Qiniu

data/lib/qiniu/config.rb

@@ -20,7 +20,6 @@ module Qiniu
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
           :rs_host         => "http://rs.qiniu.com",
-          :io_host         => "http://iovip.qbox.me",
           :up_host         => "http://up.qiniu.com",
           :pub_host        => "http://pu.qbox.me:10200",
           :eu_host         => "http://eu.qbox.me",

data/lib/qiniu/upload.rb

@@ -5,27 +5,6 @@ module Qiniu
     class << self
       include Utils
 
-      def put_file(local_file,
-                   bucket,
-                   key = nil,
-                   mime_type = nil,
-                   custom_meta = nil,
-                   enable_crc32_check = false)
-        action_params = _generate_action_params(
-          local_file,
-          bucket,
-          key,
-          mime_type,
-          custom_meta,
-          enable_crc32_check
-        )
-
-        url = Config.settings[:io_host] + action_params
-        options = {:content_type => 'application/octet-stream'}
-
-        Auth.request url, ::IO.read(local_file), options
-      end # put_file
-
       def upload_with_token(uptoken,
                             local_file,
                             bucket,

data/lib/qiniu/utils.rb

@@ -74,10 +74,11 @@ module Qiniu
         else
           data = {}
           body = response.respond_to?(:body) ? response.body : {}
+          raw_headers = response.respond_to?(:raw_headers) ? response.raw_headers : {}
           data = safe_json_parse(body) unless body.empty?
         end
-        [code, data]
-      end
+        [code, data, raw_headers]
+      end # send_request_with
 
       def http_request url, data = nil, options = {}
         retry_times = 0
@@ -99,9 +100,10 @@ module Qiniu
             res = e.response
             code = res.code.to_i if res.respond_to? :code
             body = res.respond_to?(:body) ? res.body : ""
+            raw_headers = res.respond_to?(:raw_headers) ? res.raw_headers : {}
             data = safe_json_parse(body) unless body.empty?
           end
-          [code, data]
+          [code, data, raw_headers]
         end
       end
 

data/lib/qiniu/version.rb

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

data/spec/qiniu/image_spec.rb

@@ -11,14 +11,18 @@ module Qiniu
 
       before :all do
 
-        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
-        @key = "image_logo_for_test.png"
+        ### 复用RubySDK-Test-Storage空间
+        @bucket = 'RubySDK-Test-Storage'
+        @bucket = make_unique_bucket(@bucket)
 
+        ### 尝试创建空间
         result = Qiniu.mkbucket(@bucket)
         puts result.inspect
-        result.should be_true
 
-        local_file = File.expand_path('../' + @key, __FILE__)
+        pic_fname = "image_logo_for_test.png"
+        @key = make_unique_key_in_bucket(pic_fname)
+
+        local_file = File.expand_path('../' + pic_fname, __FILE__)
 
         upopts = {
             :scope => @bucket,
@@ -53,9 +57,7 @@ module Qiniu
       end
 
       after :all do
-        result = Qiniu.drop(@bucket)
-        puts result.inspect
-        result.should_not be_false
+        ### 不删除Bucket以备下次使用
       end
 
       context ".info" do

data/spec/qiniu/management_spec.rb

@@ -11,29 +11,40 @@ module Qiniu
     describe Storage do
 
       before :all do
-        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @bucket = 'RubySDK-Test-Management'
+        @bucket = make_unique_bucket(@bucket)
+
+        ### 尝试创建Bucket
+        result = Qiniu.mkbucket(@bucket)
+        puts result.inspect
+
         @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
-        @key2 = @key + rand(100).to_s
+        @key = make_unique_key_in_bucket(@key)
 
-        code, data = Storage.mkbucket(@bucket)
-        puts [code, data].inspect
-        code.should == 200
+        @key2 = @key + rand(100).to_s
       end
 
       after :all do
-        code, data = Storage.drop(@bucket)
-        puts [code, data].inspect
-        code.should == 200
+        ### 不删除Bucket以备下次使用
       end
 
-      context ".put_file" do
+      ### 准备数据
+      context ".upload_with_token_2" do
         it "should works" do
-          code, data = Storage.put_file(__FILE__, @bucket, @key, 'application/x-ruby', 'customMeta', true)
+          upopts = {:scope => @bucket, :expires_in => 3600, :endUser => "why404@gmail.com"}
+          uptoken = Qiniu.generate_upload_token(upopts)
+
+          code, data, raw_headers = Qiniu::Storage.upload_with_token_2(
+            uptoken,
+            __FILE__,
+            @key
+          )
           code.should == 200
           puts data.inspect
         end
       end
 
+      ### 列举Bucket
       context ".buckets" do
         it "should works" do
           code, data = Storage.buckets
@@ -52,7 +63,7 @@ module Qiniu
 
       context ".get" do
         it "should works" do
-          code, data = Storage.get(@bucket, @key, "rs_spec.rb", 1)
+          code, data = Storage.get(@bucket, @key)
           code.should == 200
           puts data.inspect
         end
@@ -88,10 +99,6 @@ module Qiniu
           code.should == 200
           puts data.inspect
 
-          #code2, data2 = Qiniu.stat(@bucket, @key2)
-          #code2.should == 200
-          #puts data2.inspect
-
           code, data = Storage.delete @bucket, @key2
           code.should == 200
           puts data.inspect
@@ -104,34 +111,12 @@ module Qiniu
           code.should == 200
           puts data.inspect
 
-          #code2, data2 = Qiniu.stat(@bucket, @key2)
-          #code2.should == 200
-          #puts data2.inspect
-
           code3, data3 = Storage.batch_move @bucket, @key2, @bucket, @key
           code3.should == 200
           puts data3.inspect
         end
       end
 
-=begin
-      context ".publish" do
-        it "should works" do
-          code, data = Qiniu.publish(@domain, @bucket)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-
-      context ".unpublish" do
-        it "should works" do
-          code, data = Qiniu.unpublish(@domain)
-          code.should == 200
-          puts data.inspect
-        end
-      end
-=end
-
       context ".move" do
         it "should works" do
           code, data = Storage.move(@bucket, @key, @bucket, @key2)
@@ -154,23 +139,15 @@ module Qiniu
           code.should == 200
           puts data.inspect
 
-          #code2, data2 = Qiniu.stat(@bucket, @key2)
-          #code2.should == 200
-          #puts data2.inspect
-        end
-      end
-
-      context ".delete" do
-        it "should works" do
-          code, data = Storage.delete(@bucket, @key)
+          code, data = Storage.delete(@bucket, @key2)
           code.should == 200
           puts data.inspect
         end
       end
 
-      context ".drop" do
+      context ".delete" do
         it "should works" do
-          code, data = Storage.drop(@bucket)
+          code, data = Storage.delete(@bucket, @key)
           code.should == 200
           puts data.inspect
         end

data/spec/qiniu/misc_spec.rb

@@ -10,16 +10,16 @@ module Qiniu
     describe Misc do
 
       before :all do
-        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        ### 复用RubySDK-Test-Management空间
+        @bucket = 'RubySDK-Test-Management'
+        @bucket = make_unique_bucket(@bucket)
+
         result = Qiniu.mkbucket(@bucket)
         puts result.inspect
-        result.should_not be_false
       end
 
       after :all do
-        result = Qiniu.drop(@bucket)
-        puts result.inspect
-        result.should_not be_false
+        ### 不删除Bucket以备下次使用
       end
 
       context ".set_protected" do

data/spec/qiniu/qiniu_spec.rb

@@ -9,18 +9,20 @@ module Qiniu
   describe Qiniu do
 
     before :all do
-      @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
-      @key = Digest::SHA1.hexdigest Time.now.to_s
-      @key2 = @key + rand(100).to_s
-      #@domain = @bucket + '.dn.qbox.me'
+      @bucket = 'RubySDK-Test'
+      @bucket = make_unique_bucket(@bucket)
 
+      @test_image_bucket = @bucket
+
+      ### 尝试创建Bucket
       result = Qiniu.mkbucket(@bucket)
-      result.should_not be_false
+      puts result.inspect
+
+      @key = Digest::SHA1.hexdigest Time.now.to_s
+      @key = make_unique_key_in_bucket(@key)
 
-      @test_image_bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
-      result2 = Qiniu.mkbucket(@test_image_bucket)
-      puts result2.inspect
-      result2.should be_true
+      @key2 = @key + rand(100).to_s
+      #@domain = @bucket + '.dn.qbox.me'
 
       @test_image_key = 'image_logo_for_test.png'
       local_file = File.expand_path('./' + @test_image_key, File.dirname(__FILE__))
@@ -32,27 +34,7 @@ module Qiniu
     end
 
     after :all do
-      #result = Qiniu.unpublish(@domain)
-      #result.should_not be_false
-
-      result1 = Qiniu.drop(@bucket)
-      puts result1.inspect
-      result1.should_not be_false
-
-      result2 = Qiniu.drop(@test_image_bucket)
-      puts result2.inspect
-      result2.should_not be_false
-    end
-
-    context ".put_file" do
-      it "should works" do
-        result = Qiniu.put_file :file =>  __FILE__,
-                                    :bucket => @bucket,
-                                    :key => @key,
-                                    :mime_type => 'application/x-ruby',
-                                    :enable_crc32_check => true
-        result.should be_true
-      end
+      ### 不删除Bucket以备下次使用
     end
 
     context ".buckets" do
@@ -180,7 +162,7 @@ module Qiniu
 
     context ".get" do
       it "should works" do
-        result = Qiniu.get(@bucket, @key, "rs_spec.rb", 10)
+        result = Qiniu.get(@bucket, @key, "qiniu_spec.rb", 10)
         result.should_not be_false
         result.should_not be_empty
         puts result.inspect
@@ -232,24 +214,6 @@ module Qiniu
       end
     end
 
-=begin
-    context ".publish" do
-      it "should works" do
-        result = Qiniu.publish(@domain, @bucket)
-        result.should_not be_false
-      end
-    end
-=end
-
-=begin
-    context ".unpublish" do
-      it "should works" do
-        result = Qiniu.unpublish(@domain)
-        result.should_not be_false
-      end
-    end
-=end
-
 =begin
     context ".batch_copy" do
       it "should works" do
@@ -293,8 +257,8 @@ module Qiniu
         result = Qiniu.copy(@bucket, @key, @bucket, @key2)
         result.should_not be_false
 
-        #result2 = Qiniu.stat(@bucket, @key2)
-        #result2.should_not be_false
+        result3 = Qiniu.delete(@bucket, @key2)
+        result3.should_not be_false
       end
     end
 
@@ -305,13 +269,6 @@ module Qiniu
       end
     end
 
-    context ".drop" do
-      it "should works" do
-        result = Qiniu.drop(@bucket)
-        result.should_not be_false
-      end
-    end
-
     context ".image_info" do
       it "should works" do
         data = Qiniu.get(@test_image_bucket, @test_image_key)
@@ -325,19 +282,6 @@ module Qiniu
       end
     end
 
-=begin
-    context ".image_exif" do
-      it "should works" do
-        data = Qiniu.get(@test_image_bucket, @test_image_key)
-        data.should_not be_false
-        data.should_not be_empty
-        puts data.inspect
-        result = Qiniu.image_exif(data["url"])
-        puts result.inspect
-      end
-    end
-=end
-
     context ".image_mogrify_save_as" do
       it "should works" do
         data = Qiniu.get(@test_image_bucket, @test_image_key)

data/spec/qiniu/upload_spec.rb

@@ -10,56 +10,86 @@ module Qiniu
     describe Storage do
 
       before :all do
-        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
-        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
+        @bucket = 'RubySDK-Test-Storage'
+        @bucket = make_unique_bucket(@bucket)
 
-        @localfile1 = "bigfile.txt"
-        File.open(@localfile1, "w"){|f| 5242888.times{ f.write(rand(9).to_s) }}
-        @key1 = Digest::SHA1.hexdigest(@localfile1+Time.now.to_s)
+        ### 尝试创建Bucket
+        result = Qiniu.mkbucket(@bucket)
+        puts result.inspect
 
-        @localfile2 = "bigfile2.txt"
-        File.open(@localfile2, "w"){|f| (1 << 22).times{ f.write(rand(9).to_s) }}
-        @key2 = Digest::SHA1.hexdigest(@localfile2+Time.now.to_s)
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
+        @key = make_unique_key_in_bucket(@key)
+        puts "key=#{@key}"
 
-        @localfile3 = "bigfile3.txt"
-        File.open(@localfile3, "w"){|f| (1 << 23).times{ f.write(rand(9).to_s) }}
-        @key3 = Digest::SHA1.hexdigest(@localfile3+Time.now.to_s)
+        @localfile_5m = "5M.txt"
+        File.open(@localfile_5m, "w"){|f| 5242888.times{ f.write(rand(9).to_s) }}
+        @key_5m = Digest::SHA1.hexdigest(@localfile_5m+Time.now.to_s)
+        @key_5m = make_unique_key_in_bucket(@key_5m)
+        puts "key_5m=#{@key_5m}"
 
-        @localfile4 = "smallfile.txt"
-        File.open(@localfile4, "w"){|f| (1 << 20).times{ f.write(rand(9).to_s) }}
-        @key4 = Digest::SHA1.hexdigest(@localfile4+Time.now.to_s)
+        @localfile_4m = "4M.txt"
+        File.open(@localfile_4m, "w"){|f| (1 << 22).times{ f.write(rand(9).to_s) }}
+        @key_4m = Digest::SHA1.hexdigest(@localfile_4m+Time.now.to_s)
+        @key_4m = make_unique_key_in_bucket(@key_4m)
+        puts "key_4m=#{@key_4m}"
 
-        result = Qiniu.mkbucket(@bucket)
-        puts result.inspect
-        result.should be_true
+        @localfile_8m = "8M.txt"
+        File.open(@localfile_8m, "w"){|f| (1 << 23).times{ f.write(rand(9).to_s) }}
+        @key_8m = Digest::SHA1.hexdigest(@localfile_8m+Time.now.to_s)
+        @key_8m = make_unique_key_in_bucket(@key_8m)
+        puts "key_8m=#{@key_8m}"
+
+        @localfile_1m = "1M.txt"
+        File.open(@localfile_1m, "w"){|f| (1 << 20).times{ f.write(rand(9).to_s) }}
+        @key_1m = Digest::SHA1.hexdigest(@localfile_1m+Time.now.to_s)
+        @key_1m = make_unique_key_in_bucket(@key_1m)
+        puts "key_1m=#{@key_1m}"
       end
 
       after :all do
-        File.unlink(@localfile1) if File.exists?(@localfile1)
-        File.unlink(@localfile2) if File.exists?(@localfile2)
-        File.unlink(@localfile3) if File.exists?(@localfile3)
-        File.unlink(@localfile4) if File.exists?(@localfile4)
+        ### 清除本地临时文件
+        File.unlink(@localfile_5m) if File.exists?(@localfile_5m)
+        File.unlink(@localfile_4m) if File.exists?(@localfile_4m)
+        File.unlink(@localfile_8m) if File.exists?(@localfile_8m)
+        File.unlink(@localfile_1m) if File.exists?(@localfile_1m)
 
-        result = Qiniu.drop(@bucket)
-        puts result.inspect
-        result.should_not be_false
+        ### 不删除Bucket以备下次使用
       end
 
-      context ".put_file" do
+      ### 测试单文件直传
+      context ".upload_with_token" do
         it "should works" do
-          code, data = Qiniu::Storage.put_file(__FILE__, @bucket, @key, 'application/x-ruby', 'customMeta', true)
+          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
+          uptoken = Qiniu.generate_upload_token(upopts)
+          code, data, raw_headers = Qiniu::Storage.upload_with_token(
+            uptoken,
+            __FILE__,
+            @bucket,
+            @key,
+            nil,
+            nil,
+            nil,
+            true
+          )
           code.should == 200
           puts data.inspect
+          puts raw_headers.inspect
         end
       end
 
-      context ".upload_with_token" do
-        it "should works" do
-          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
-          uptoken = Qiniu.generate_upload_token(upopts)
-          code, data = Qiniu::Storage.upload_with_token(uptoken, __FILE__, @bucket, @key, nil, nil, nil, true)
+      context ".stat" do
+        it "should exists" do
+          code, data = Qiniu::Storage.stat(@bucket, @key)
+          puts data.inspect
           code.should == 200
+        end
+      end
+
+      context ".delete" do
+        it "should works" do
+          code, data = Qiniu::Storage.delete(@bucket, @key)
           puts data.inspect
+          code.should == 200
         end
       end
 
@@ -68,26 +98,55 @@ module Qiniu
           upopts = {:scope => @bucket, :expires_in => 3600, :endUser => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
 
-          code, data = Qiniu::Storage.upload_with_token_2(uptoken, __FILE__, @key)
+          code, data, raw_headers = Qiniu::Storage.upload_with_token_2(
+            uptoken,
+            __FILE__,
+            @key
+          )
 
           code.should == 200
           puts data.inspect
+          puts raw_headers.inspect
         end
       end # .upload_with_token_2
 
+      context ".stat" do
+        it "should exists" do
+          code, data = Qiniu::Storage.stat(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+      end
+
+      context ".delete" do
+        it "should works" do
+          code, data = Qiniu::Storage.delete(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+      end
+
+      ### 测试断点续上传
       context ".resumable_upload_with_token" do
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
-          code, data = Qiniu::Storage.resumable_upload_with_token(uptoken, @localfile1, @bucket, @key1)
-          puts data.inspect
+          code, data, raw_headers = Qiniu::Storage.resumable_upload_with_token(
+            uptoken,
+            @localfile_5m,
+            @bucket,
+            @key_5m
+          )
           (code/100).should == 2
+          puts data.inspect
+          puts raw_headers.inspect
+          puts "key_5m=#{@key_5m}"
         end
       end
 
       context ".stat" do
         it "should exists" do
-          code, data = Qiniu::Storage.stat(@bucket, @key1)
+          code, data = Qiniu::Storage.stat(@bucket, @key_5m)
           puts data.inspect
           code.should == 200
         end
@@ -95,7 +154,7 @@ module Qiniu
 
       context ".delete" do
         it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key1)
+          code, data = Qiniu::Storage.delete(@bucket, @key_5m)
           puts data.inspect
           code.should == 200
         end
@@ -105,15 +164,22 @@ module Qiniu
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
-          code, data = Qiniu::Storage.resumable_upload_with_token(uptoken, @localfile2, @bucket, @key2)
-          puts data.inspect
+          code, data, raw_headers = Qiniu::Storage.resumable_upload_with_token(
+            uptoken,
+            @localfile_4m,
+            @bucket,
+            @key_4m
+          )
           (code/100).should == 2
+          puts data.inspect
+          puts raw_headers.inspect
+          puts "key_4m=#{@key_4m}"
         end
       end
 
       context ".stat" do
         it "should exists" do
-          code, data = Qiniu::Storage.stat(@bucket, @key2)
+          code, data = Qiniu::Storage.stat(@bucket, @key_4m)
           puts data.inspect
           code.should == 200
         end
@@ -121,7 +187,7 @@ module Qiniu
 
       context ".delete" do
         it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key2)
+          code, data = Qiniu::Storage.delete(@bucket, @key_4m)
           puts data.inspect
           code.should == 200
         end
@@ -131,15 +197,22 @@ module Qiniu
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
-          code, data = Qiniu::Storage.resumable_upload_with_token(uptoken, @localfile3, @bucket, @key3)
-          puts data.inspect
+          code, data, raw_headers = Qiniu::Storage.resumable_upload_with_token(
+            uptoken,
+            @localfile_8m,
+            @bucket,
+            @key_8m
+          )
           (code/100).should == 2
+          puts data.inspect
+          puts raw_headers.inspect
+          puts "key_8m=#{@key_8m}"
         end
       end
 
       context ".stat" do
         it "should exists" do
-          code, data = Qiniu::Storage.stat(@bucket, @key3)
+          code, data = Qiniu::Storage.stat(@bucket, @key_8m)
           puts data.inspect
           code.should == 200
         end
@@ -147,7 +220,7 @@ module Qiniu
 
       context ".delete" do
         it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key3)
+          code, data = Qiniu::Storage.delete(@bucket, @key_8m)
           puts data.inspect
           code.should == 200
         end
@@ -157,15 +230,22 @@ module Qiniu
         it "should works" do
           upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
           uptoken = Qiniu.generate_upload_token(upopts)
-          code, data = Qiniu::Storage.resumable_upload_with_token(uptoken, @localfile4, @bucket, @key4)
-          puts data.inspect
+          code, data, raw_headers = Qiniu::Storage.resumable_upload_with_token(
+            uptoken,
+            @localfile_1m,
+            @bucket,
+            @key_1m
+          )
           (code/100).should == 2
+          puts data.inspect
+          puts raw_headers.inspect
+          puts "key_1m=#{@key_1m}"
         end
       end
 
       context ".stat" do
         it "should exists" do
-          code, data = Qiniu::Storage.stat(@bucket, @key4)
+          code, data = Qiniu::Storage.stat(@bucket, @key_1m)
           puts data.inspect
           code.should == 200
         end
@@ -173,7 +253,7 @@ module Qiniu
 
       context ".delete" do
         it "should works" do
-          code, data = Qiniu::Storage.delete(@bucket, @key4)
+          code, data = Qiniu::Storage.delete(@bucket, @key_1m)
           puts data.inspect
           code.should == 200
         end

data/spec/qiniu/utils_spec.rb

@@ -28,7 +28,7 @@ module Qiniu
           FakeWeb.allow_net_connect = false
           FakeWeb.register_uri(:get, "http://docs.qiniutek.com/", :body => {:abc => 123}.to_json)
           res = Utils.send_request_with 'http://docs.qiniutek.com/', nil, :method => :get
-          res.should == [200, {"abc" => 123}]
+          res.should == [200, {"abc" => 123}, {}]
         end
 
         [400, 500].each do |code|

data/spec/spec_helper.rb

@@ -9,3 +9,11 @@ RSpec.configure do |config|
     Qiniu.establish_connection! :access_key => ENV["QINIU_ACCESS_KEY"], :secret_key => ENV["QINIU_SECRET_KEY"]
   end
 end
+
+def make_unique_bucket (bucket)
+    bucket + "-" + ENV["QINIU_ACCESS_KEY"][0, 8]
+end # make_unique_bucket
+
+def make_unique_key_in_bucket (key)
+    "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}-" + key
+end # make_unique_key_in_bucket

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiniu
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - why404
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake