aliyunsdkcore 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581d5102e54082d1ca78dc3d44b6bd726c9a5f80975429c5bdb1475c3f6e765f
-  data.tar.gz: ad731df5501c98b5e041dbeda8919d3373ddc93dba736b8d7775b8eea4b75aa2
+  metadata.gz: 75c66f7b9d52d1d4018fcf7a7c1ab5e30642b7ad7136f119209e1703d8b529a9
+  data.tar.gz: ebe5ab5cc9d7be04ecdb1b14985d90054041943cf68825b97a046e0aca4e0402
 SHA512:
-  metadata.gz: 8758835e68a3c9aa352f2d07a2d954b7645faae7165c02e1923535f2c8565f05a4f444a3511dcb6dc62d1d4bf3f15e4e2e59d6e48c531d44c58dce02bf3486ba
-  data.tar.gz: b4aaa9363a1edaca92d3106beccb3dbadb6adb37d0b12803a7aab63631b69ff8e700fd5fa8d2400544451a4d79a012afc7499e01b5988248fb06b8e949465c5d
+  metadata.gz: cdf0d90f0e936a2fd34ece59b8699bc0ab628f09daf9fd75af29ab8db8b52ec6d018dc09f834326132db54665eaeece67cb9de60485f427dcf5316dd076d5c80
+  data.tar.gz: 7f54b1754aa69036f777802c6b10e4de55b682858f59987699561c687c9d34f3a9a8aee35735bd513b794529b5a6f598af400d2409505ec7222bfd23e7853ed2

data/README.md

@@ -47,10 +47,9 @@ response       = client.request(
   opts: request_option
 )
 
-print JSON.parse(response.body)
+print response
 ```
 
-
 The ROA demo:
 
 ```ruby
@@ -71,10 +70,9 @@ response = client.request(
   }
 )
 
-print JSON.parse(response.body)
+print response.body
 ```
 
-
 ## Issues
 [Opening an Issue](https://github.com/aliyun/openapi-core-ruby-sdk/issues/new/choose), Issues not conforming to the guidelines may be closed immediately.
 

data/lib/aliyunsdkcore.rb

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

data/lib/roa_client.rb

@@ -2,6 +2,10 @@ require 'faraday'
 require 'securerandom'
 require 'active_support/all'
 
+def present?(obj)
+  obj.respond_to?(:empty?) ? !obj.empty? : obj
+end
+
 class ROAClient
 
   attr_accessor :endpoint, :api_version, :access_key_id, :access_key_secret, :security_token, :hostname, :opts
@@ -24,7 +28,7 @@ class ROAClient
 
     response = connection.send(method.downcase) do |request|
       request.url uri, params
-      if body.present?
+      if present?(body)
         request_body                  = body.to_json
         request.body                  = request_body
         mix_headers['content-md5']    = Digest::MD5.base64digest request_body
@@ -93,7 +97,6 @@ class ROAClient
   private
 
   def string_to_sign(method, uri, headers, query = {})
-    headers.stringify_keys!
     header_string = [
       method,
       headers['accept'],

data/lib/rpc_client.rb

@@ -3,6 +3,15 @@ require 'openssl'
 require 'faraday'
 require 'active_support/all'
 
+# Converts just the first character to uppercase.
+#
+#   upcase_first('what a Lovely Day') # => "What a Lovely Day"
+#   upcase_first('w')                 # => "W"
+#   upcase_first('')                  # => ""
+def upcase_first(string)
+  string.length > 0 ? string[0].upcase.concat(string[1..-1]) : ""
+end
+
 class RPCClient
 
   attr_accessor :endpoint, :api_version, :access_key_id, :access_key_secret, :security_token, :codes, :opts, :verbose
@@ -24,7 +33,7 @@ class RPCClient
 
   def request(action:, params: {}, opts: {})
     opts           = self.opts.merge(opts)
-    action         = action.upcase_first if opts[:format_action]
+    action         = upcase_first(action) if opts[:format_action]
     params         = format_params(params) unless opts[:format_params]
     defaults       = default_params
     params         = { Action: action }.merge(defaults).merge(params)
@@ -63,15 +72,15 @@ class RPCClient
 
   def default_params
     default_params = {
-      :Format           => 'JSON',
-      :SignatureMethod  => 'HMAC-SHA1',
-      :SignatureNonce   => SecureRandom.hex(16),
-      :SignatureVersion => '1.0',
-      :Timestamp        => Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ'),
-      :AccessKeyId      => self.access_key_id,
-      :Version          => self.api_version,
+      'Format'           => 'JSON',
+      'SignatureMethod'  => 'HMAC-SHA1',
+      'SignatureNonce'   => SecureRandom.hex(16),
+      'SignatureVersion' => '1.0',
+      'Timestamp'        => Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ'),
+      'AccessKeyId'      => self.access_key_id,
+      'Version'          => self.api_version,
     }
-    default_params.merge!(SecurityToken: self.security_token) if self.security_token
+    default_params.merge!('SecurityToken' => self.security_token) if self.security_token
     default_params
   end
 
@@ -81,7 +90,7 @@ class RPCClient
   end
 
   def format_params(param_hash)
-    param_hash.keys.each { |key| param_hash[key.to_s.upcase_first.to_sym] = param_hash.delete key }
+    param_hash.keys.each { |key| param_hash[upcase_first(key.to_s).to_sym] = param_hash.delete key }
     param_hash
   end
 
@@ -102,7 +111,7 @@ class RPCClient
       if value.instance_of?(Array)
         replace_repeat_list(target, key, value)
       else
-        target[key] = value
+        target[key.to_s] = value
       end
     end
     target
@@ -110,7 +119,6 @@ class RPCClient
 
   def normalize(params)
     flat_params(params)
-      .stringify_keys
       .sort
       .to_h
       .map { |key, value| [encode(key), encode(value)] }

data/spec/roa_client_spec.rb

@@ -114,18 +114,6 @@ describe 'roa core' do
     expect(roa_client.default_headers[:accept]).to eq('application/json')
   end
 
-  it 'request with raw body should ok' do
-    stub_request(:get, "https://ecs.aliyuncs.com/").to_return(body: 'raw body')
-    response = roa_client.request(method: 'GET', uri: '/', options: { raw_body: true })
-    expect(response.body).to eq('raw body')
-  end
-
-  it 'get request with raw body should ok' do
-    stub_request(:get, "https://ecs.aliyuncs.com/").to_return(body: 'raw body')
-    response = roa_client.get(uri: '/', options: { raw_body: true })
-    expect(response.body).to eq('raw body')
-  end
-
   describe 'request with json response should ok' do
     it 'json response should ok' do
       stub_request(:get, "https://ecs.aliyuncs.com/")
@@ -263,7 +251,7 @@ describe 'roa core' do
 
   it 'string_to_sign should ok ' do
     expect(
-      roa_client.send(:string_to_sign, 'GET', '/', { accept: 'application/json' })
+      roa_client.send(:string_to_sign, 'GET', '/', { 'accept' => 'application/json' })
     ).to eq("GET\napplication/json\n\n\n\n/")
   end
 
@@ -271,15 +259,15 @@ describe 'roa core' do
     it 'ACSError should ok' do
       expect {
         error_info = {
-          Message:   'error message',
-          Code:      'errorcode',
-          HostId:    'hostid',
-          RequestId: 'requestid',
+          'Message' =>   'error message',
+          'Code' =>     'errorcode',
+          'HostId' =>    'hostid',
+          'RequestId' => 'requestid',
         }
-        raise ROAClient::ACSError, error_info.stringify_keys!
+        raise ROAClient::ACSError, error_info
       }.to raise_error(ROAClient::ACSError, 'error message host_id: hostid, request_id: requestid')
     end
   end
 
 
-end
+end

data/spec/rpc_client_spec.rb

@@ -83,7 +83,7 @@ describe 'rpc core' do
         access_key_secret: 'access_key_secret',
       )
       default_params_keys = %w(Format SignatureMethod SignatureNonce SignatureVersion Timestamp AccessKeyId Version)
-      expect(rpc_client.send(:default_params).stringify_keys.keys).to match_array default_params_keys
+      expect(rpc_client.send(:default_params).keys).to match_array default_params_keys
     end
   end
 
@@ -96,7 +96,7 @@ describe 'rpc core' do
       security_token:    'security_token'
     )
     default_params_keys = %w(Format SignatureMethod SignatureNonce SignatureVersion Timestamp AccessKeyId Version SecurityToken)
-    expect(rpc_client.send(:default_params).stringify_keys.keys).to match_array default_params_keys
+    expect(rpc_client.send(:default_params).keys).to match_array default_params_keys
   end
 
   describe 'request' do
@@ -201,7 +201,7 @@ describe 'rpc core' do
     it 'flat_params should ok' do
       expect(rpc_client.send(:flat_params, {})).to eq({})
       expect(rpc_client.send(:flat_params, { key: ['value'] })).to eq({ 'key.1' => 'value' })
-      expect(rpc_client.send(:flat_params, { key: 'value' })).to eq({ key: 'value' })
+      expect(rpc_client.send(:flat_params, { key: 'value' })).to eq({ 'key' => 'value' })
       expect(rpc_client.send(:flat_params, { key: [{ Domain: '1.com' }] })).to eq({ 'key.1.Domain' => '1.com' })
     end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+
 SimpleCov.start do
   add_filter "/spec/"
 end
@@ -107,4 +108,4 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 =end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aliyunsdkcore
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alibaba Cloud SDK
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement