aliyunsdkcore 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b91a1f18e37ba166b834f1eae8c3de8260a7f2f94036cbb3f0c2473ac87deea0
-  data.tar.gz: 8ee808dd7056fa847b6b89eaa46c0441719d75bab0d591eda5cee3e9442b43ed
+  metadata.gz: 581d5102e54082d1ca78dc3d44b6bd726c9a5f80975429c5bdb1475c3f6e765f
+  data.tar.gz: ad731df5501c98b5e041dbeda8919d3373ddc93dba736b8d7775b8eea4b75aa2
 SHA512:
-  metadata.gz: 27556d5341ae7189049c4824f393bc2134c21a3ca5e2ad68e59632a64e4c55611a3cf72e31cc330590634299fbf21e2ac173fd9067e56c0dbde6a665c6218e7b
-  data.tar.gz: 82b71633d0d92792e3520aacf3adc2244f448a2b2171a9c71152c16cde27fc4057486bf6bb8b6c08161ea81009916d8954c5acbb420890e4e235a58501b3b683
+  metadata.gz: 8758835e68a3c9aa352f2d07a2d954b7645faae7165c02e1923535f2c8565f05a4f444a3511dcb6dc62d1d4bf3f15e4e2e59d6e48c531d44c58dce02bf3486ba
+  data.tar.gz: b4aaa9363a1edaca92d3106beccb3dbadb6adb37d0b12803a7aab63631b69ff8e700fd5fa8d2400544451a4d79a012afc7499e01b5988248fb06b8e949465c5d

data/lib/aliyunsdkcore.rb

@@ -2,5 +2,5 @@ require_relative './rpc_client'
 require_relative './roa_client'
 
 module AliyunSDKCore
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/rpc_client.rb

@@ -36,18 +36,23 @@ class RPCClient
     signature      = Base64.encode64(OpenSSL::HMAC.digest('sha1', key, string_to_sign)).strip
     normalized.push(['Signature', encode(signature)])
 
-    uri           = opts[:method] == 'POST' ? '/' : "/?#{canonicalize(normalized)}"
+    querystring = canonicalize(normalized)
+
+    uri           = opts[:method] == 'POST' ? '/' : "/?#{querystring}"
+
     response      = connection.send(method.downcase, uri) do |request|
       if opts[:method] == 'POST'
         request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-        request.body                    = canonicalize(normalized)
+        request.body                    = querystring
       end
     end
+
     response_body = JSON.parse(response.body)
     if response_body['Code'] && !self.codes.include?(response_body['Code'])
       raise StandardError, "#{response_body['Message']}, URL: #{uri}"
     end
-    response
+
+    response_body
   end
 
   private
@@ -71,7 +76,8 @@ class RPCClient
   end
 
   def encode(string)
-    CGI.escape string
+    encoded = CGI.escape string
+    encoded.gsub(/[\+]/, '%20')
   end
 
   def format_params(param_hash)

data/spec/rpc_client_integration_spec.rb

@@ -19,17 +19,24 @@ describe 'rpc request' do
     params         = { key: (1..11).to_a.map(&:to_s) }
     request_option = { method: 'POST', timeout: 15000 }
     response       = rpc_client.request(action: 'DescribeRegions', params: params, opts: request_option)
-    response_body  = JSON.parse(response.body)
-    expect(response_body.keys.include?('Regions')).to be true
-    expect(response_body.keys.include?('RequestId')).to be true
+    expect(response.keys.include?('Regions')).to be true
+    expect(response.keys.include?('RequestId')).to be true
   end
 
   it 'should ok with repeat list less 10 item' do
     params         = { key: (1..9).to_a.map(&:to_s) }
     request_option = { method: 'POST', timeout: 15000 }
     response       = rpc_client.request(action: 'DescribeRegions', params: params, opts: request_option)
-    response_body  = JSON.parse(response.body)
-    expect(response_body.keys.include?('Regions')).to be true
-    expect(response_body.keys.include?('RequestId')).to be true
+    expect(response.keys.include?('Regions')).to be true
+    expect(response.keys.include?('RequestId')).to be true
   end
+
+  it 'should ok with space' do
+    params         = { key: 'the string with spaces' }
+    request_option = { method: 'POST', timeout: 15000 }
+    response       = rpc_client.request(action: 'DescribeRegions', params: params, opts: request_option)
+    expect(response.keys.include?('Regions')).to be true
+    expect(response.keys.include?('RequestId')).to be true
+  end
+
 end

data/spec/rpc_client_spec.rb

@@ -108,7 +108,7 @@ describe 'rpc core' do
         access_key_secret: 'access_key_secret',
       )
       stub_request(:get, /https:\/\/ecs.aliyuncs.com/).to_return(status: 200, body: {}.to_json)
-      expect(rpc_client.request(action: 'action').body).to eq({}.to_json)
+      expect(rpc_client.request(action: 'action')).to eql({})
     end
   end
 
@@ -126,33 +126,25 @@ describe 'rpc core' do
 
     it 'should ok' do
       stub_request(:get, /https:\/\/ecs.aliyuncs.com/).to_return(status: 200, body: {}.to_json)
-      expect(rpc_client.request(action: 'action').body).to eq({}.to_json)
+      expect(rpc_client.request(action: 'action')).to eql({})
     end
 
     it 'should ok with format_action' do
       stub_request(:get, /https:\/\/ecs.aliyuncs.com/).to_return(status: 200, body: {}.to_json)
       response = rpc_client.request(action: 'action', opts: { format_action: false })
-      expect(response.body).to eq({}.to_json)
+      expect(response).to eql({})
     end
 
     it 'should ok with format_params' do
       stub_request(:get, /https:\/\/ecs.aliyuncs.com/).to_return(status: 200, body: {}.to_json)
       response = rpc_client.request(action: 'action', opts: { format_params: false })
-      expect(response.body).to eq({}.to_json)
+      expect(response).to eql({})
     end
 
     it 'get with raw body should ok' do
       stub_request(:post, "https://ecs.aliyuncs.com").to_return(status: 200, body: {}.to_json)
       response = rpc_client.request(action: 'action', opts: { method: 'POST' })
-      expect(response.body).to eq({}.to_json)
-    end
-
-    it 'get with verbose should ok' do
-      stub_request(:get, /https:\/\/ecs.aliyuncs.com/).to_return(status: 200, body: {}.to_json)
-      response = rpc_client.request(action: 'action')
-      expect(response.status).to eq 200
-      expect(response.success?).to be true
-      expect(response.body).to eq({}.to_json)
+      expect(response).to eql({})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyunsdkcore
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alibaba Cloud SDK
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday