aliyun-rails 0.1.18 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e27be7e1a623946c583fc2d8dfd8144c76352b1370f37954f07d1a92379903d
-  data.tar.gz: 73ce2236eacb879c9a4648a1b03701a2f33dfd5ab3060a854fbbb51c54fb50ad
+  metadata.gz: 5ccdac6af59f37792525c9a0b013bd0bfd6a100bb716144cc9396096ade241b8
+  data.tar.gz: 1337c663672fe95a6e3e98d72995065435ed40ef05fe8cb9cfdd6cb0566a4805
 SHA512:
-  metadata.gz: 6db85298bf709c4688a92b7c45c34376c043156ae00443882030e1382b6ae36a5eef5456b1c3f317074799440d7edce17751afb1b560a98ad7cef09425014bfb
-  data.tar.gz: 5041a64210b45a9cf036e4573bb33a9cbc8a652c2f9fcf167f634477cf816a5daf4709e9e3836718a7bc306e2f424edc9b99f21d686e53579c929e03ddf8b49f
+  metadata.gz: 50f671530e769630468705c677ce1787e0924a9fcd82e53133374bafe8edb9b69faa5d14b2f45830c287a24cf920866530576ca73cbb6249fbd01067cb075d6b
+  data.tar.gz: f974dca4cf118419bdfca3d5ff5ee7cced1a2e848293e0d58c642362658a30cc8ce70f6328e98f0bbcbe3dc531da792dd0d72247323b1f93787031f050043a7f

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## [Unreleased]
+
+## [0.1.14] - 2022-04-01
+
+- 优化 rpc_client 代码
+- 优化 roa_client 代码
+- 完善代码范例
+
+## [0.1.0] - 2022-03-31
+
+- 首次发布代码

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at careline@foxmail.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/CONTRIBUTING.md

@@ -0,0 +1 @@
+## 待添加

data/lib/aliyun/connector/rpc_client.rb

@@ -1,19 +1,18 @@
-# frozen_string_literal: true
-
 require "set"
 require "openssl"
 require "faraday"
-require "erb"
 require "active_support/all"
 
 module Aliyun
   module Connector
     class RPCClient
+
       attr_accessor :endpoint, :api_version, :access_key_id, :access_key_secret,
                     :security_token, :codes, :opts, :verbose
 
       # 对象初始化属性
-      def initialize(config = {}, verbose = false)
+      def initialize(config, verbose = false)
+
         validate config
 
         self.endpoint          = config[:endpoint]
@@ -30,30 +29,32 @@ module Aliyun
 
       # 通用请求接口
       def request(action:, params: {}, opts: {})
-        opts                = self.opts.merge(opts)
-        action              = action.upcase_first if opts[:format_action]
-        params              = format_params(params) unless opts[:format_params]
-        defaults            = default_params
-        params              = { Action: action }.merge(defaults).merge(params)
-        method              = (opts[:method] || "GET").upcase
-        sign                = "#{method}&#{encode('/')}&#{encode(params.to_query)}"
-        secret              = "#{self.access_key_secret}&"
-        signature           = Base64.encode64(OpenSSL::HMAC.digest("sha1", secret, sign)).strip
-        params["Signature"] = signature
+        opts           = self.opts.merge(opts)
+        action         = action.upcase_first if opts[:format_action]
+        params         = format_params(params) unless opts[:format_params]
+        defaults       = default_params
+        params         = { Action: action }.merge(defaults).merge(params)
+        method         = (opts[:method] || "GET").upcase
+        normalized     = normalize(params)
+        canonicalized  = canonicalize(normalized)
+        string_to_sign = "#{method}&#{encode('/')}&#{encode(canonicalized)}"
+        secret         = "#{self.access_key_secret}&"
+        signature      = Base64.encode64(OpenSSL::HMAC.digest("sha1", secret, string_to_sign)).strip
+        normalized.push(["Signature", encode(signature)])
 
         # 转换为 query 样式
-        query_string = params.to_query
+        querystring = canonicalize(normalized)
 
         # 特殊处理 POST
-        uri = opts[:method] == "POST" ? "/" : "/?#{query_string}"
+        uri = opts[:method] == "POST" ? "/" : "/?#{querystring}"
 
         # 初始化会话
-        response = connection.send(method.downcase, uri) do |r|
+        response = connection.send(method.downcase, uri) do |request|
           if opts[:method] == "POST"
-            r.headers["Content-Type"] = "application/x-www-form-urlencoded"
-            r.body                    = query_string
+            request.headers["Content-Type"] = "application/x-www-form-urlencoded"
+            request.body                    = querystring
           end
-          r.headers["User-Agent"] = DEFAULT_UA
+          request.headers["User-Agent"] = DEFAULT_UA
         end
 
         # 解析接口响应
@@ -72,22 +73,22 @@ module Aliyun
 
         # 设置缺省参数
         def default_params
-          params                 = {
-            Format:           "JSON",
-            SignatureMethod:  "HMAC-SHA1",
-            SignatureNonce:   SecureRandom.hex(8),
-            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                  = {
+            "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,
           }
-          params[:SecurityToken] = self.security_token if self.security_token.present?
-          params
+          default_params["SecurityToken"] = self.security_token if self.security_token
+          default_params
         end
 
         # 消息签名需要
-        def encode(input)
-          ERB::Util.url_encode input
+        def encode(string)
+          ERB::Util.url_encode(string)
         end
 
         # 转换 HASH key 样式
@@ -96,6 +97,37 @@ module Aliyun
           param_hash
         end
 
+        def replace_repeat_list(target, key, repeat)
+          repeat.each_with_index do |item, index|
+            if item && item.instance_of?(Hash)
+              item.each_key { |k| target["#{key}.#{index.next}.#{k}"] = item[k] }
+            else
+              target["#{key}.#{index.next}"] = item
+            end
+          end
+          target
+        end
+
+        def flat_params(params)
+          target = {}
+          params.each do |key, value|
+            if value.instance_of?(Array)
+              replace_repeat_list(target, key, value)
+            else
+              target[key.to_s] = value
+            end
+          end
+          target.to_query
+        end
+
+        def normalize(params)
+          flat_params(params).sort.to_h.map { |key, value| [encode(key), encode(value)] }
+        end
+
+        def canonicalize(normalized)
+          normalized.map { |element| "#{element.first}=#{element.last}" }.join("&")
+        end
+
         def validate(config = {})
           config.with_indifferent_access
           raise ArgumentError, 'must pass "config"' unless config

data/lib/aliyun/dyvms.rb

@@ -19,7 +19,7 @@ module Aliyun
         TtsParam:         tts_param.to_json
       }
       opts   = { method: "POST", timeout: 15000 }
-      request(action: "SendSms", params: params, opts: opts)
+      request(action: "SingleCallByTts", params: params, opts: opts)
     end
   end
 end

data/lib/aliyun/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Aliyun
-  VERSION    = "0.1.18"
+  VERSION    = "0.1.21"
   DEFAULT_UA = "AlibabaCloud (#{Gem::Platform.local.os}; " +
     "#{Gem::Platform.local.cpu}) Ruby/#{RUBY_VERSION} Core/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.21
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,6 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - LICENSE.txt
 - README.md
 - Rakefile