aliyun-sdk 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b100cc95c5037862d703916b478002db371f0a6
-  data.tar.gz: cad01a4961627efe0b9f7b715ebc74de14542e85
+  metadata.gz: 96cdc1616990ccc7955bcb5a53736adebc159af0
+  data.tar.gz: afef99f79b8ab82e8b4cae152b621391eb2a2481
 SHA512:
-  metadata.gz: 9ae0b923399d7480680b824e719def6da96fe278234b9e3e51496880b76699bb744f5fbd164dafe7d54f5b853d131b480a567017c2c8c25905432291d020b177
-  data.tar.gz: fe7398a96244d8f9c64aa89a7196753f2569ae6922c329761c9c48fc13432650d8a0dcafc42e3646094ede356294c6410268279e605b9b97f4eb3d60b6f759c4
+  metadata.gz: 9b5534e876814e787bbbb3ed21cb6fbdef571acf67e3bf9e0bafa54b1b363440cf06e61bd7a3b9441380a89bb9abf4d677b118ec39a5090e4bd8dc2ac02c2dd6
+  data.tar.gz: 899d71d9038bc6fe11eace3aad493ff5ca90348713f37ab48e678dd574a19f6add94508f760466172977ce1d3869f5e35f2ace060912cfa7440b252beb268940

data/lib/aliyun/oss/exception.rb

@@ -42,7 +42,8 @@ module Aliyun
       end
 
       def message
-        @attrs['Message'] || "UnknownError, HTTP Code: #{http_code}"
+        msg = @attrs['Message'] || "UnknownError[#{http_code}]."
+        "#{msg} RequestId: #{request_id}"
       end
 
       def to_s

data/lib/aliyun/oss/version.rb

@@ -3,7 +3,7 @@
 module Aliyun
   module OSS
 
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 
   end # OSS
 end # Aliyun

data/spec/aliyun/oss/bucket_spec.rb

@@ -171,15 +171,17 @@ module Aliyun
       end
 
       def mock_error(code, message)
-        builder = Nokogiri::XML::Builder.new do |xml|
+        Nokogiri::XML::Builder.new do |xml|
           xml.Error {
             xml.Code code
             xml.Message message
             xml.RequestId '0000'
           }
-        end
+        end.to_xml
+      end
 
-        builder.to_xml
+      def err(msg, reqid = '0000')
+        "#{msg} RequestId: #{reqid}"
       end
 
       context "Create bucket" do
@@ -348,7 +350,7 @@ module Aliyun
 
           expect {
             @protocol.delete_bucket(@bucket)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
         end
       end # delete bucket
 

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

@@ -77,6 +77,10 @@ module Aliyun
         end.to_xml
       end
 
+      def err(msg, reqid = '0000')
+        "#{msg} RequestId: #{reqid}"
+      end
+
       context "bucket operations" do
         it "should get acl" do
           query = {'acl' => ''}
@@ -262,7 +266,7 @@ module Aliyun
 
           expect {
             @bucket.get_object(key)
-          }.to raise_error(Exception, "UnknownError, HTTP Code: 404")
+          }.to raise_error(ServerError, err("UnknownError[404].", ''))
 
           expect(@bucket.object_exists?(key)).to be false
           expect(@bucket.object_exist?(key)).to be false
@@ -288,7 +292,7 @@ module Aliyun
 
           expect {
             @bucket.object_exists?(key)
-          }.to raise_error(Exception, "UnknownError, HTTP Code: 500")
+          }.to raise_error(ServerError, err("UnknownError[500].", ''))
         end
 
         it "should update object metas" do

data/spec/aliyun/oss/multipart_spec.rb

@@ -87,15 +87,17 @@ module Aliyun
       end
 
       def mock_error(code, message)
-        builder = Nokogiri::XML::Builder.new do |xml|
+        Nokogiri::XML::Builder.new do |xml|
           xml.Error {
             xml.Code code
             xml.Message message
             xml.RequestId '0000'
           }
-        end
+        end.to_xml
+      end
 
-        builder.to_xml
+      def err(msg, reqid = '0000')
+        "#{msg} RequestId: #{reqid}"
       end
 
       context "Initiate multipart upload" do
@@ -143,7 +145,7 @@ module Aliyun
 
           expect {
             @protocol.initiate_multipart_upload(@bucket, @object)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:post, request_path)
             .with(:body => nil, :query => query)
@@ -200,7 +202,7 @@ module Aliyun
 
           expect {
             @protocol.upload_part(@bucket, @object, txn_id, part_no) {}
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:put, request_path)
             .with(:body => nil, :query => query)
@@ -302,7 +304,7 @@ module Aliyun
 
           expect {
             @protocol.upload_part_by_copy(@bucket, @object, txn_id, part_no, 'src_obj')
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:put, request_path)
             .with(:body => nil, :query => query, :headers => headers)
@@ -351,7 +353,7 @@ module Aliyun
 
           expect {
             @protocol.complete_multipart_upload(@bucket, @object, txn_id, [])
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:post, request_path)
             .with(:query => query)
@@ -386,7 +388,7 @@ module Aliyun
 
           expect {
             @protocol.abort_multipart_upload(@bucket, @object, txn_id)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:delete, request_path)
             .with(:body => nil, :query => query)
@@ -568,7 +570,7 @@ module Aliyun
 
           expect {
             @protocol.list_multipart_uploads(@bucket)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:get, request_path)
             .with(:body => nil, :query => query)
@@ -662,7 +664,7 @@ module Aliyun
 
           expect {
             @protocol.list_parts(@bucket, @object, txn_id)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:get, request_path)
             .with(:body => nil, :query => query)

data/spec/aliyun/oss/object_spec.rb

@@ -80,14 +80,17 @@ module Aliyun
       end
 
       def mock_error(code, message)
-        builder = Nokogiri::XML::Builder.new do |xml|
+        Nokogiri::XML::Builder.new do |xml|
           xml.Error {
             xml.Code code
             xml.Message message
+            xml.RequestId '0000'
           }
-        end
+        end.to_xml
+      end
 
-        builder.to_xml
+      def err(msg, reqid = '0000')
+        "#{msg} RequestId: #{reqid}"
       end
 
       context "Put object" do
@@ -120,7 +123,7 @@ module Aliyun
             @protocol.put_object(@bucket, object_name) do |c|
               c << content
             end
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:put, url)
             .with(:body => content, :query => {})
@@ -226,7 +229,7 @@ module Aliyun
             @protocol.append_object(@bucket, object_name, 11) do |c|
               c << content
             end
-          }.to raise_error(Exception, message)
+          }.to raise_error(Exception, err(message))
 
           expect(WebMock).to have_requested(:post, url)
             .with(:body => content, :query => query)
@@ -382,7 +385,7 @@ module Aliyun
           message = 'The object to copy is too large.'
           stub_request(:put, url).to_return(
             :status => 400,
-            :headers => {'x-oss-request-id' => '0000-1111'},
+            :headers => {'x-oss-request-id' => '0000'},
             :body => mock_error(code, message))
 
           begin
@@ -391,8 +394,8 @@ module Aliyun
           rescue ServerError => e
             expect(e.http_code).to eq(400)
             expect(e.error_code).to eq(code)
-            expect(e.message).to eq(message)
-            expect(e.request_id).to eq('0000-1111')
+            expect(e.message).to eq(err(message))
+            expect(e.request_id).to eq('0000')
           end
 
           expect(WebMock).to have_requested(:put, url)
@@ -462,7 +465,7 @@ module Aliyun
 
           expect {
             @protocol.get_object(@bucket, object_name) {|c| true}
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:get, url)
             .with(:body => nil, :query => {})
@@ -619,7 +622,7 @@ module Aliyun
 
           expect {
             @protocol.delete_object(@bucket, object_name)
-          }.to raise_error(Exception, message)
+          }.to raise_error(ServerError, err(message))
 
           expect(WebMock).to have_requested(:delete, url)
             .with(:body => nil, :query => {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tianlong Wu
@@ -56,28 +56,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency