aliyun-sdk 0.6.0 → 0.8.0

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 = {})

data/spec/aliyun/oss/object_spec.rb

@@ -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' => nil, '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)
@@ -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

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

data/tests/test_bucket.rb

@@ -0,0 +1,73 @@
+require 'minitest/autorun'
+require 'yaml'
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require 'aliyun/oss'
+require 'time'
+require_relative 'config'
+
+class TestBucket < Minitest::Test
+  def setup
+    Aliyun::Common::Logging.set_log_level(Logger::DEBUG)
+    @client = Aliyun::OSS::Client.new(TestConf.creds)
+    @bucket_name = TestConf.bucket + Time.now.to_i.to_s
+    @client.create_bucket(@bucket_name)
+    @bucket = @client.get_bucket(@bucket_name)
+  end
+
+  def teardown
+    @client.delete_bucket(@bucket_name)
+  end
+
+  def test_bucket_versioning
+    ret = @bucket.versioning
+    assert_nil ret.status
+
+    @bucket.versioning =  Aliyun::OSS::BucketVersioning.new(:status => 'Enabled')
+    ret = @bucket.versioning
+    assert_equal 'Enabled', ret.status
+
+    @bucket.versioning =  Aliyun::OSS::BucketVersioning.new(:status => 'Suspended')
+    ret = @bucket.versioning
+    assert_equal 'Suspended', ret.status
+
+  end
+
+  def test_bucket_encryption
+
+    begin
+      ret = @bucket.encryption
+      assert_raises "should not here"
+    rescue => exception
+    end  
+
+    @bucket.encryption =  Aliyun::OSS::BucketEncryption.new(
+      :enable => true,
+      :sse_algorithm => 'KMS')
+    ret = @bucket.encryption
+    assert_equal 'KMS', ret.sse_algorithm
+    assert_nil ret.kms_master_key_id
+
+    @bucket.encryption =  Aliyun::OSS::BucketEncryption.new(
+      :enable => true,
+      :sse_algorithm => 'KMS',
+      :kms_master_key_id => 'kms-id')
+    ret = @bucket.encryption
+    assert_equal 'KMS', ret.sse_algorithm
+    assert_equal 'kms-id', ret.kms_master_key_id
+
+    @bucket.encryption =  Aliyun::OSS::BucketEncryption.new(
+      :enable => true,
+      :sse_algorithm => 'AES256')
+    ret = @bucket.encryption
+    assert_equal 'AES256', ret.sse_algorithm
+    assert_nil ret.kms_master_key_id
+
+    @bucket.encryption =  Aliyun::OSS::BucketEncryption.new(
+      :enable => false)
+    begin
+      ret = @bucket.encryption
+      assert_raises "should not here"
+    rescue => exception
+    end  
+  end
+end

data/tests/test_object_key.rb

@@ -17,6 +17,8 @@ class TestObjectKey < Minitest::Test
       chinese: '杭州・中国',
       space: '是 空格 yeah +-/\\&*#',
       invisible: '' << 1 << 10 << 12 << 7 << 80 << 99,
+      specail1: 'testkey/',
+      specail2: 'testkey/?key=value#abc=def',
       xml: 'a<b&c>d +'
     }
   end
@@ -57,6 +59,22 @@ class TestObjectKey < Minitest::Test
     assert_equal key, @bucket.get_object(key).key
   end
 
+  def test_specail1
+    key = get_key(:specail1)
+    @bucket.put_object(key)
+    all = @bucket.list_objects(prefix: @prefix).map(&:key)
+    assert_includes all, key
+    assert_equal key, @bucket.get_object(key).key
+  end
+
+  def test_specail2
+    key = get_key(:specail2)
+    @bucket.put_object(key)
+    all = @bucket.list_objects(prefix: @prefix).map(&:key)
+    assert_includes all, key
+    assert_equal key, @bucket.get_object(key).key
+  end
+
   def test_batch_delete
     keys = @keys.map { |k, _| get_key(k) }
     keys.each { |k| @bucket.put_object(k) }

data/tests/test_object_url.rb

@@ -66,4 +66,24 @@ class TestObjectUrl < Minitest::Test
 
     assert_equal 200, r.code
   end
+
+  def test_signed_url_with_parameters
+    key = get_key('example.jpg')
+
+    @bucket.put_object(key, :file => 'tests/example.jpg', acl: Aliyun::OSS::ACL::PRIVATE)
+
+    meta = @bucket.get_object(key)
+    assert_equal 21839, meta.size 
+
+    parameters = {
+      'x-oss-process' => 'image/resize,m_fill,h_100,w_100',
+    }
+    signed_url = @bucket.object_url(key, true, 60, parameters)
+    r = RestClient.get(signed_url)
+    lenth = r.headers[:content_length].to_i
+    assert_equal 200, r.code
+    assert_equal true, lenth < meta.size
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tianlong Wu
 autorequire: 
 bindir: lib/aliyun
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +200,7 @@ files:
 - spec/aliyun/sts/util_spec.rb
 - tests/config.rb
 - tests/helper.rb
+- tests/test_bucket.rb
 - tests/test_content_encoding.rb
 - tests/test_content_type.rb
 - tests/test_crc_check.rb
@@ -229,15 +224,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS SDK for Ruby
@@ -256,6 +250,7 @@ test_files:
 - spec/aliyun/sts/util_spec.rb
 - tests/config.rb
 - tests/helper.rb
+- tests/test_bucket.rb
 - tests/test_content_encoding.rb
 - tests/test_content_type.rb
 - tests/test_crc_check.rb