aliyun-sdk 0.5.0 → 0.7.3

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

@@ -127,6 +127,31 @@ module Aliyun
           expect(WebMock).to have_requested(:get, "#{bucket}.#{ep1}/#{object}")
           expect(WebMock).to have_requested(:put, "#{bucket}.#{ep2}/#{object}")
         end
+
+        it "should fail with invalid bucket name" do
+          bucket = 'INVALID'
+          ep1 = 'oss-cn-hangzhou.aliyuncs.com'
+          client = Client.new(
+            :endpoint => ep1,
+            :access_key_id => 'xxx', :access_key_secret => 'yyy')
+
+          expect {
+            client.create_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.delete_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.bucket_exists?(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+
+          expect {
+            client.get_bucket(bucket)
+          }.to raise_error(ClientError, "The bucket name is invalid.")
+        end
+
       end # construct
 
       def mock_buckets(buckets, more = {})
@@ -247,7 +272,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.'

data/spec/aliyun/oss/object_spec.rb

@@ -20,8 +20,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
@@ -236,7 +236,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           return_headers = {'x-oss-next-append-position' => '101'}
           stub_request(:post, url).with(:query => query)
             .to_return(:headers => return_headers)
@@ -255,7 +255,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           code = 'ObjectNotAppendable'
           message = 'Normal object cannot be appended.'
           stub_request(:post, url).with(:query => query).
@@ -275,7 +275,7 @@ module Aliyun
         it "should use default content-type" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -292,7 +292,7 @@ module Aliyun
         it "should use customized content-type" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -311,7 +311,7 @@ module Aliyun
         it "should set user defined metas" do
           object_name = 'ruby'
           url = get_request_path(object_name)
-          query = {'append' => '', 'position' => 0}
+          query = {'append' => nil, 'position' => 0}
 
           stub_request(:post, url).with(:query => query)
 
@@ -335,7 +335,7 @@ module Aliyun
           content = "hello world"
           content_crc = Aliyun::OSS::Util.crc(content)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc.to_i + 1}
           stub_request(:post, url).with(:query => query)
             .to_return(:headers => return_headers)
@@ -353,7 +353,7 @@ module Aliyun
           content = "hello world"
           content_crc = Aliyun::OSS::Util.crc(content)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc}
           stub_request(:post, url).with(:query => query)
             .to_return(:headers => return_headers)
@@ -377,11 +377,11 @@ module Aliyun
           content = "hello world"
           content_crc = Aliyun::OSS::Util.crc(content)
 
-          query = {'append' => '', 'position' => 11}
+          query = {'append' => nil, 'position' => 11}
           return_headers = {'x-oss-next-append-position' => '101', :x_oss_hash_crc64ecma => content_crc + 1}
           stub_request(:post, url).with(:query => query)
             .to_return(:headers => return_headers)
-            
+
           expect(crc_protocol.upload_crc_enable).to eq(true)
           next_pos = 0
           expect {
@@ -611,6 +611,15 @@ module Aliyun
                   })
         end
 
+        it "should raise Exception on error when setting invalid range" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          stub_request(:get, url)
+          expect {
+            @protocol.get_object(@bucket, object_name, {:range => [0, 10, 5]}) {}
+          }.to raise_error(ClientError)
+        end
+
         it "should match modify time and etag" do
           object_name = 'ruby'
           url = get_request_path(object_name)
@@ -662,6 +671,22 @@ module Aliyun
             .with(:body => nil, :query => query)
         end
 
+        it "should get object with headers" do
+          object_name = 'ruby'
+          url = get_request_path(object_name)
+          headers = {
+            'Range' => 'bytes=0-9'
+          }
+          stub_request(:get, url)
+
+          @protocol.get_object(@bucket, object_name, {:headers => headers}) {}
+
+          expect(WebMock).to have_requested(:get, url)
+            .with(:body => nil, :query => {},
+                  :headers => {
+                    'Range' => 'bytes=0-9'
+                  })
+        end
 
         it "should raise crc exception on error" do
           object_name = 'ruby'
@@ -710,6 +735,23 @@ module Aliyun
                     'Range' => 'bytes=0-9'
                   })
         end
+
+        it "should get to get object with special chars" do
+          object_name = 'ruby///adfadfa//!@#%^*//?key=value&aabc#abc=ad'
+          url = get_request_path(object_name)
+
+          return_content = "hello world"
+          stub_request(:get, url).to_return(:body => return_content)
+
+          content = ""
+          @protocol.get_object(@bucket, object_name) {|c| content << c}
+
+          expect(WebMock).to have_requested(:get, url)
+            .with(:body => nil, :query => {})
+
+          expect(content).to eq(return_content)
+        end
+
       end # Get object
 
       context "Get object meta" do
@@ -804,7 +846,7 @@ module Aliyun
 
         it "should batch delete objects" do
           url = get_request_path
-          query = {'delete' => '', 'encoding-type' => KeyEncoding::URL}
+          query = {'delete' => nil}
 
           object_names = (1..5).map do |i|
             "object-#{i}"
@@ -814,7 +856,7 @@ module Aliyun
             .with(:query => query)
             .to_return(:body => mock_delete_result(object_names))
 
-          opts = {:quiet => false, :encoding => KeyEncoding::URL}
+          opts = {:quiet => false}
           deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
 
           expect(WebMock).to have_requested(:post, url)
@@ -824,7 +866,7 @@ module Aliyun
 
         it "should decode object key in batch delete response" do
           url = get_request_path
-          query = {'delete' => '', 'encoding-type' => KeyEncoding::URL}
+          query = {'delete' => nil, 'encoding-type' => KeyEncoding::URL}
 
           object_names = (1..5).map do |i|
             "对象-#{i}"
@@ -844,6 +886,57 @@ module Aliyun
             .with(:query => query, :body => mock_delete(object_names, opts))
           expect(deleted).to match_array(object_names)
         end
+
+        it "should batch delete objects in quiet mode" do
+          url = get_request_path
+          query = {'delete' => nil}
+
+          object_names = (1..5).map do |i|
+            "object-#{i}"
+          end
+
+          stub_request(:post, url)
+            .with(:query => query)
+            .to_return(:body => "")
+
+          opts = {:quiet => true}
+          deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
+
+          expect(WebMock).to have_requested(:post, url)
+            .with(:query => query, :body => mock_delete(object_names, opts))
+          expect(deleted).to match_array([])
+        end
+
+        it "should rasie Exception wiht invalid responsed body" do
+          url = get_request_path
+          query = {'delete' => nil}
+          body = '<DeleteResult>
+                    <EncodingType>invaid<EncodingType>
+                    <Deleted>
+                      <Key>multipart.data</Key>
+                    </Deleted>
+                    <Deleted>
+                      <Key>test.jpg</Key>
+                    </Deleted>
+                    <Deleted>
+                      <Key>demo.jpg</Key>
+                    </Deleted>
+                  </DeleteResult>'
+
+          object_names = (1..5).map do |i|
+            "object-#{i}"
+          end
+
+          stub_request(:post, url)
+            .with(:query => query)
+            .to_return(:body => body)
+
+          opts = {:quiet => false}
+          expect {
+            deleted = @protocol.batch_delete_objects(@bucket, object_names, opts)
+          }.to raise_error(ClientError)
+
+        end
       end # delete object
 
       context "acl" do
@@ -851,7 +944,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           stub_request(:put, url).with(:query => query)
 
           @protocol.put_object_acl(@bucket, object_name, ACL::PUBLIC_READ)
@@ -866,7 +959,7 @@ module Aliyun
           object_name = 'ruby'
           url = get_request_path(object_name)
 
-          query = {'acl' => ''}
+          query = {'acl' => nil}
           return_acl = ACL::PUBLIC_READ
 
           stub_request(:get, url)

data/spec/aliyun/oss/util_spec.rb

@@ -94,6 +94,57 @@ module Aliyun
         }.to raise_error(CrcInconsistentError, "The crc of post between client and oss is not inconsistent.")
       end
 
+      it "should check bucket name valid" do
+        expect {
+          Util.ensure_bucket_name_valid('abc')
+        }.not_to raise_error
+
+        expect {
+          Util.ensure_bucket_name_valid('abc123-321cba')
+        }.not_to raise_error
+
+        expect {
+          Util.ensure_bucket_name_valid('abcdefghijklmnopqrstuvwxyz1234567890-0987654321zyxwuvtsrqponmlk')
+        }.not_to raise_error
+
+        #>63
+        expect {
+          Util.ensure_bucket_name_valid('abcdefghijklmnopqrstuvwxyz1234567890-0987654321zyxwuvtsrqponmlkj')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        #<3
+        expect {
+          Util.ensure_bucket_name_valid('12')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+        
+        #not [a-z0-9-]
+        expect {
+          Util.ensure_bucket_name_valid('Aabc')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        expect {
+          Util.ensure_bucket_name_valid('abc/')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        expect {
+          Util.ensure_bucket_name_valid('abc#')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        expect {
+          Util.ensure_bucket_name_valid('abc?')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        #start & end not -
+        expect {
+          Util.ensure_bucket_name_valid('-abc')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+
+        expect {
+          Util.ensure_bucket_name_valid('abc-')
+        }.to raise_error(ClientError, "The bucket name is invalid.")
+        
+      end  
+
     end # Util
 
   end # OSS