aliyun-sdk 0.5.0 → 0.6.0

data/lib/aliyun/oss/http.rb

@@ -105,35 +105,11 @@ module Aliyun
           false
         end
 
-        def inspect
-          "@buffer: " + @buffer[0, 32].inspect + "...#{@buffer.size} bytes"
-        end
-      end
-
-      # RestClient requires the payload to respones to :read(bytes)
-      # and return a stream.
-      # We are not doing the real read here, just return a
-      # readable stream for RestClient playload.rb treats it as:
-      #     def read(bytes=nil)
-      #       @stream.read(bytes)
-      #     end
-      #     alias :to_s :read
-      #     net_http_do_request(http, req, payload ? payload.to_s : nil,
-      #                     &@block_response)
-      class StreamPayload
-        def initialize(crc_enable = false, init_crc = 0, &block)
-          @stream = StreamWriter.new(crc_enable, init_crc, &block)
-        end
-
-        def read(bytes = nil)
-          @stream
-        end
-
         def close
         end
 
-        def closed?
-          false
+        def inspect
+          "@buffer: " + @buffer[0, 32].inspect + "...#{@buffer.size} bytes"
         end
       end
 
@@ -281,44 +257,44 @@ module Aliyun
         headers[:params] = (sub_res || {}).merge(http_options[:query] || {})
 
         block_response = ->(r) { handle_response(r, &block) } if block
-        r = RestClient::Request.execute(
+        request = RestClient::Request.new(
           :method => verb,
           :url => get_request_url(bucket, object),
           :headers => headers,
           :payload => http_options[:body],
           :block_response => block_response,
           :open_timeout => @config.open_timeout || OPEN_TIMEOUT,
-          :timeout => @config.read_timeout || READ_TIMEOUT
-        ) do |response, request, result, &blk|
-
-          if response.code >= 300
-            e = ServerError.new(response)
+          :read_timeout => @config.read_timeout || READ_TIMEOUT
+        )
+        response = request.execute do |resp, &blk|
+          if resp.code >= 300
+            e = ServerError.new(resp)
             logger.error(e.to_s)
             raise e
           else
-            response.return!(request, result, &blk)
+            resp.return!(&blk)
           end
         end
 
         # If streaming read_body is used, we need to create the
         # RestClient::Response ourselves
-        unless r.is_a?(RestClient::Response)
-          if r.code.to_i >= 300
-            r = RestClient::Response.create(
-              RestClient::Request.decode(r['content-encoding'], r.body),
-              r, nil, nil)
-            e = ServerError.new(r)
+        unless response.is_a?(RestClient::Response)
+          if response.code.to_i >= 300
+            response = RestClient::Response.create(
+              RestClient::Request.decode(response['content-encoding'], response.body),
+              response, request)
+            e = ServerError.new(response)
             logger.error(e.to_s)
             raise e
           end
-          r = RestClient::Response.create(nil, r, nil, nil)
-          r.return!
+          response = RestClient::Response.create(nil, response, request)
+          response.return!
         end
 
-        logger.debug("Received HTTP response, code: #{r.code}, headers: " \
-                      "#{r.headers}, body: #{r.body}")
+        logger.debug("Received HTTP response, code: #{response.code}, headers: " \
+                      "#{response.headers}, body: #{response.body}")
 
-        r
+        response
       end
 
       def get_user_agent

data/lib/aliyun/oss/protocol.rb

@@ -535,7 +535,7 @@ module Aliyun
           headers[CALLBACK_HEADER] = opts[:callback].serialize
         end
 
-        payload = HTTP::StreamPayload.new(@config.upload_crc_enable, opts[:init_crc], &block)
+        payload = HTTP::StreamWriter.new(@config.upload_crc_enable, opts[:init_crc], &block)
         r = @http.put(
           {:bucket => bucket_name, :object => object_name},
           {:headers => headers, :body => payload})
@@ -547,7 +547,7 @@ module Aliyun
         end
 
         if @config.upload_crc_enable && !r.headers[:x_oss_hash_crc64ecma].nil?
-          data_crc = payload.read.data_crc
+          data_crc = payload.data_crc
           Aliyun::OSS::Util.crc_check(data_crc, r.headers[:x_oss_hash_crc64ecma], 'put')
         end
 
@@ -593,16 +593,17 @@ module Aliyun
 
         headers.merge!(to_lower_case(opts[:headers])) if opts.key?(:headers)
 
-        payload = HTTP::StreamPayload.new(@config.upload_crc_enable && !opts[:init_crc].nil?, opts[:init_crc], &block)
+        payload = HTTP::StreamWriter.new(
+          @config.upload_crc_enable && !opts[:init_crc].nil?, opts[:init_crc], &block)
 
         r = @http.post(
           {:bucket => bucket_name, :object => object_name, :sub_res => sub_res},
           {:headers => headers, :body => payload})
 
-        if @config.upload_crc_enable && 
-          !r.headers[:x_oss_hash_crc64ecma].nil? && 
+        if @config.upload_crc_enable &&
+          !r.headers[:x_oss_hash_crc64ecma].nil? &&
           !opts[:init_crc].nil?
-          data_crc = payload.read.data_crc
+          data_crc = payload.data_crc
           Aliyun::OSS::Util.crc_check(data_crc, r.headers[:x_oss_hash_crc64ecma], 'append')
         end
 
@@ -780,7 +781,7 @@ module Aliyun
           {:bucket => bucket_name, :object => object_name,
            :sub_res => sub_res},
           {:headers => headers}
-        ) do |chunk| 
+        ) do |chunk|
           if block_given?
             # crc enable and no range and oss server support crc
             data_crc = Aliyun::OSS::Util.crc(chunk, data_crc) if @config.download_crc_enable && range.nil?
@@ -1110,13 +1111,13 @@ module Aliyun
 
         sub_res = {'partNumber' => part_no, 'uploadId' => txn_id}
 
-        payload = HTTP::StreamPayload.new(@config.upload_crc_enable, &block)
+        payload = HTTP::StreamWriter.new(@config.upload_crc_enable, &block)
         r = @http.put(
           {:bucket => bucket_name, :object => object_name, :sub_res => sub_res},
           {:body => payload})
 
         if @config.upload_crc_enable && !r.headers[:x_oss_hash_crc64ecma].nil?
-          data_crc = payload.read.data_crc
+          data_crc = payload.data_crc
           Aliyun::OSS::Util.crc_check(data_crc, r.headers[:x_oss_hash_crc64ecma], 'put')
         end
 

data/lib/aliyun/sts/protocol.rb

@@ -88,14 +88,14 @@ module Aliyun
           :method => 'POST',
           :url => @config.endpoint || ENDPOINT,
           :payload => query
-        ) do |response, request, result, &blk|
+        ) do |response, &blk|
 
           if response.code >= 300
             e = ServerError.new(response)
             logger.error(e.to_s)
             raise e
           else
-            response.return!(request, result, &blk)
+            response.return!(&blk)
           end
         end
 

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
 
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
 
 end # Aliyun

data/spec/aliyun/oss/bucket_spec.rb

@@ -356,7 +356,7 @@ module Aliyun
 
       context "acl, logging, website, referer, lifecycle" do
         it "should update acl" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           @protocol.put_bucket_acl(@bucket, ACL::PUBLIC_READ)
@@ -366,7 +366,7 @@ module Aliyun
         end
 
         it "should get acl" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
           stub_request(:get, request_path)
             .with(:query => query)
@@ -380,7 +380,7 @@ module Aliyun
         end
 
         it "should enable logging" do
-          query = {'logging' => ''}
+          query = {'logging' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           logging_opts = BucketLogging.new(
@@ -393,7 +393,7 @@ module Aliyun
         end
 
         it "should disable logging" do
-          query = {'logging' => ''}
+          query = {'logging' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           logging_opts = BucketLogging.new(:enable => false)
@@ -404,7 +404,7 @@ module Aliyun
         end
 
         it "should get logging" do
-          query = {'logging' => ''}
+          query = {'logging' => nil}
           logging_opts = BucketLogging.new(
             :enable => true,
             :target_bucket => 'target-bucket', :target_prefix => 'foo')
@@ -421,7 +421,7 @@ module Aliyun
         end
 
         it "should delete logging" do
-          query = {'logging' => ''}
+          query = {'logging' => nil}
           stub_request(:delete, request_path).with(:query => query)
 
           @protocol.delete_bucket_logging(@bucket)
@@ -431,7 +431,7 @@ module Aliyun
         end
 
         it "should update website" do
-          query = {'website' => ''}
+          query = {'website' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           website_opts = BucketWebsite.new(
@@ -443,7 +443,7 @@ module Aliyun
         end
 
         it "should get website" do
-          query = {'website' => ''}
+          query = {'website' => nil}
           website_opts = BucketWebsite.new(
             :enable => true, :index => 'index.html', :error => 'error.html')
 
@@ -459,7 +459,7 @@ module Aliyun
         end
 
         it "should delete website" do
-          query = {'website' => ''}
+          query = {'website' => nil}
           stub_request(:delete, request_path).with(:query => query)
 
           @protocol.delete_bucket_website(@bucket)
@@ -469,7 +469,7 @@ module Aliyun
         end
 
         it "should update referer" do
-          query = {'referer' => ''}
+          query = {'referer' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           referer_opts = BucketReferer.new(
@@ -481,7 +481,7 @@ module Aliyun
         end
 
         it "should get referer" do
-          query = {'referer' => ''}
+          query = {'referer' => nil}
           referer_opts = BucketReferer.new(
             :allow_empty => true, :whitelist => ['xxx', 'yyy'])
 
@@ -497,7 +497,7 @@ module Aliyun
         end
 
         it "should update lifecycle" do
-          query = {'lifecycle' => ''}
+          query = {'lifecycle' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           rules = (1..5).map do |i|
@@ -513,7 +513,7 @@ module Aliyun
         end
 
         it "should get lifecycle" do
-          query = {'lifecycle' => ''}
+          query = {'lifecycle' => nil}
           return_rules = (1..5).map do |i|
             LifeCycleRule.new(
               :id => i, :enable => i % 2 == 0, :prefix => "foo#{i}",
@@ -532,7 +532,7 @@ module Aliyun
         end
 
         it "should delete lifecycle" do
-          query = {'lifecycle' => ''}
+          query = {'lifecycle' => nil}
           stub_request(:delete, request_path).with(:query => query)
 
           @protocol.delete_bucket_lifecycle(@bucket)
@@ -542,7 +542,7 @@ module Aliyun
         end
 
         it "should set cors" do
-          query = {'cors' => ''}
+          query = {'cors' => nil}
           stub_request(:put, request_path).with(:query => query)
 
           rules = (1..5).map do |i|
@@ -559,7 +559,7 @@ module Aliyun
         end
 
         it "should get cors" do
-          query = {'cors' => ''}
+          query = {'cors' => nil}
           return_rules = (1..5).map do |i|
             CORSRule.new(
               :allowed_origins => (1..3).map {|x| "origin-#{x}"},
@@ -580,7 +580,7 @@ module Aliyun
         end
 
         it "should delete cors" do
-          query = {'cors' => ''}
+          query = {'cors' => nil}
 
           stub_request(:delete, request_path).with(:query => query)
 

data/spec/aliyun/oss/client/bucket_spec.rb

@@ -120,7 +120,7 @@ module Aliyun
 
       context "bucket operations" do
         it "should get acl" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
 
           stub_request(:get, bucket_url)
@@ -135,7 +135,7 @@ module Aliyun
         end
 
         it "should set acl" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
 
           stub_request(:put, bucket_url).with(:query => query)
 
@@ -146,7 +146,7 @@ module Aliyun
         end
 
         it "should delete logging setting" do
-          query = {'logging' => ''}
+          query = {'logging' => nil}
 
           stub_request(:delete, bucket_url).with(:query => query)
 
@@ -303,7 +303,7 @@ module Aliyun
 
         it "should set custom headers when append object" do
           key = 'ruby'
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           stub_request(:post, object_url(key)).with(:query => query)
 
           @bucket.append_object(
@@ -362,7 +362,7 @@ module Aliyun
 
         it "should append object from file" do
           key = 'ruby'
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           stub_request(:post, object_url(key)).with(:query => query)
 
           content = (1..10).map{ |i| i.to_s.rjust(9, '0') }.join("\n")
@@ -378,7 +378,7 @@ module Aliyun
 
         it "should append object with acl" do
           key = 'ruby'
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           stub_request(:post, object_url(key)).with(:query => query)
 
           @bucket.append_object(key, 11, :acl => ACL::PUBLIC_READ_WRITE)
@@ -497,7 +497,7 @@ module Aliyun
           query_1 = {
             :prefix => 'list-',
             'encoding-type' => 'url',
-            'uploads' => ''
+            'uploads' => nil
           }
           return_up_1 = (1..5).map{ |i| Multipart::Transaction.new(
             :id => "txn-#{i}",
@@ -513,7 +513,7 @@ module Aliyun
             :prefix => 'list-',
             'upload-id-marker' => 'txn-5',
             'encoding-type' => 'url',
-            'uploads' => ''
+            'uploads' => nil
           }
           return_up_2 = (6..8).map{ |i| Multipart::Transaction.new(
             :id => "txn-#{i}",

data/spec/aliyun/oss/client/client_spec.rb

@@ -247,7 +247,7 @@ module Aliyun
         end
 
         it "should test bucket existence" do
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
           stub_request(:get, bucket_url)
             .with(:query => query)

data/spec/aliyun/oss/multipart_spec.rb

@@ -26,8 +26,8 @@ module Aliyun
       def crc_protocol
         Protocol.new(
           Config.new(:endpoint => @endpoint,
-                     :access_key_id => 'xxx', 
-                     :access_key_secret => 'yyy', 
+                     :access_key_id => 'xxx',
+                     :access_key_secret => 'yyy',
                      :upload_crc_enable => true,
                      :download_crc_enable => true))
       end
@@ -111,7 +111,7 @@ module Aliyun
       context "Initiate multipart upload" do
 
         it "should POST to create transaction" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
           stub_request(:post, request_path).with(:query => query)
 
           @protocol.initiate_multipart_upload(
@@ -129,7 +129,7 @@ module Aliyun
         end
 
         it "should return transaction id" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
           return_txn_id = 'zyx'
           stub_request(:post, request_path).
             with(:query => query).
@@ -143,7 +143,7 @@ module Aliyun
         end
 
         it "should raise Exception on error" do
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           code = 'InvalidArgument'
           message = 'Invalid argument.'
@@ -462,7 +462,7 @@ module Aliyun
 
         it "should GET to list multiparts" do
           request_path = "#{@bucket}.#{@endpoint}/"
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           stub_request(:get, request_path).with(:query => query)
 
@@ -475,7 +475,7 @@ module Aliyun
         it "should send extra params when list multiparts" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -501,7 +501,7 @@ module Aliyun
         it "should get multipart transactions" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -548,7 +548,7 @@ module Aliyun
         it "should decode object key" do
           request_path = "#{@bucket}.#{@endpoint}/"
           query = {
-            'uploads' => '',
+            'uploads' => nil,
             'prefix' => 'foo-',
             'upload-id-marker' => 'id-marker',
             'key-marker' => 'key-marker',
@@ -614,7 +614,7 @@ module Aliyun
 
         it "should raise Exception on error" do
           request_path = "#{@bucket}.#{@endpoint}/"
-          query = {'uploads' => ''}
+          query = {'uploads' => nil}
 
           code = 'InvalidArgument'
           message = 'Invalid argument.'