lark-sdk 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984dbad3f83acdb46fa85412a40a4a24ace271a77f78be3d1ace8db19ad7853b
-  data.tar.gz: 8bda6a46d00120a07cb8211d1810125bdde4a1514a8d07d8edb13081d9ceeb73
+  metadata.gz: 7f85b0fe40fd06b6433cc6e3d5d2dfb324fc8587054e3e5338a0bcc255eae20d
+  data.tar.gz: 978dffe16def339df6de1459bb8a7ea21adea598cee7b864b649c21a051549f1
 SHA512:
-  metadata.gz: 8e46b2b15de32650c6a9d1351445b580da7293fec1e09566c510e16ed04490b090ddeaaf4be6f3c6b765d7accdee591c6910f6145ad20b4b94af6282bcdd4ca8
-  data.tar.gz: d59629e8c97033036f10b65d59d0473523f9a80bd862745e70269abd10e31c76565ccabe011f016857a03f1f79b90a734d3773873c2f4641062319c0b4d6608e
+  metadata.gz: 5379f843398ca53a26fdd905bbff9a4f1a98872c8f655ca574881da048c56334832965424d8339986ec96718de0ab6f3e8b8b3581deee32ff2c27604be72e499
+  data.tar.gz: b23e6499d47d352caa05eeef4de1baa1943347fce24b65143c369eff59b274a472e5f966b0a2ac0c4e2770aef6f2b45b1fd433af6a2d7650ef94b999f5f30a48

data/README.md

@@ -12,13 +12,13 @@ gem 'lark-sdk'
 
 And then execute:
 
-	$ bundle install
+  $ bundle install
 
 Or install it yourself as:
 
-	$ gem install lark-sdk
+  $ gem install lark-sdk
 
-	require 'lark/sdk'
+  require 'lark/sdk'
 
 ## 使用
 
@@ -32,6 +32,7 @@ Lark.configure do |config|
   config.default_app_id = 'xxx'       # 应用 app ID
   config.default_app_secret = 'xxx'   # 应用 app secret
   config.default_isv = true           # 自建应用: false, 应用商店应用: true
+  config.api_base_url = 'https://open.feishu.cn/open-apis/' # API 地址，默认：https://open.feishu.cn/open-apis/
   # ...
 end
 ```
@@ -40,10 +41,10 @@ end
 
 ```ruby
 api = Lark::Api.new(
-	app_id: 'xxx',        # default: Lark.config.default_app_id
-	app_secret: 'xxx',    # default: Lark.config.default_app_secret
-	isv: false/true,      # default: Lark.config.default_app_secret
-	tenant_key: 'xxx'     # required while internal app
+  app_id: 'xxx',        # default: Lark.config.default_app_id
+  app_secret: 'xxx',    # default: Lark.config.default_app_secret
+  isv: false/true,      # default: Lark.config.default_app_secret
+  tenant_key: 'xxx'     # required while internal app
 )
 ```
 

data/Rakefile

@@ -8,3 +8,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task :default => :test
+
+task :console do
+  sh 'irb -I lib -r lark.rb'
+end

data/lib/lark.rb

@@ -11,8 +11,6 @@ Dir["#{lib_path}/apis/**/*.rb",  "#{lib_path}/token_store/*.rb"].each { |path| r
 require 'lark/api'
 
 module Lark
-  API_BASE_URL = 'https://open.feishu.cn/open-apis/'.freeze
-
   # Exceptions
   class RedisNotConfigException < RuntimeError; end
   class AppNotConfigException < RuntimeError; end

data/lib/lark/api.rb

@@ -39,7 +39,7 @@ module Lark
     end
 
     def request
-      @request ||= Lark::Request.new(false)
+      @request ||= Lark::Request.new
     end
 
     def get(path, headers = {})

data/lib/lark/apis/authen.rb

@@ -5,7 +5,7 @@ module Lark
     module Authen
       def index(redirect_uri, state)
         uri = ERB::Util.url_encode(redirect_uri)
-        "#{URI::join(API_BASE_URL, 'authen/v1/index')}?redirect_uri=#{uri}&app_id=#{app_id}&state=#{state}"
+        "#{URI.join(Lark.api_base_url, 'authen/v1/index')}?redirect_uri=#{uri}&app_id=#{app_id}&state=#{state}"
       end
 
       def access_token(code)
@@ -25,8 +25,8 @@ module Lark
       end
 
       def user_info(user_access_token)
-        request.get 'authen/v1/user_info', {access_token: user_access_token}
+        request.get 'authen/v1/user_info', { access_token: user_access_token }
       end
     end
   end
-end
+end

data/lib/lark/apis/image.rb

@@ -5,8 +5,8 @@ module Lark
         post_file 'image/v4/put/', image, params: { image_type: image_type }
       end
 
-      def download(image_key)
-        get 'image/v4/get', params: { image_key: image_key }, as: :file
+      def download(image_key, params = {})
+        get 'image/v4/get', params: params.merge(image_key: image_key), as: :file
       end
     end
   end

data/lib/lark/config.rb

@@ -23,11 +23,17 @@ module Lark
     end
 
     def http_timeout_options
-      config.http_timeout_options || {write: 2, connect: 5, read: 10}
+      config.http_timeout_options || { write: 2, connect: 5, read: 10 }
+    end
+
+    def api_base_url
+      return @api_base_url if defined?(@api_base_url)
+
+      @api_base_url = config.api_base_url || 'https://open.feishu.cn/open-apis/'.freeze
     end
   end
 
   class Config
-    attr_accessor :default_app_id, :default_app_secret, :default_isv, :redis, :http_timeout_options, :logger
+    attr_accessor :default_app_id, :default_app_secret, :default_isv, :redis, :http_timeout_options, :logger, :api_base_url
   end
 end

data/lib/lark/request.rb

@@ -7,7 +7,7 @@ module Lark
     def initialize(skip_verify_ssl = true)
       @http = HTTP.timeout(**Lark.http_timeout_options)
       @ssl_context = OpenSSL::SSL::SSLContext.new
-      @ssl_context.ssl_version = :TLSv1
+      #@ssl_context.ssl_version = :TLSv1_2
       @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 
@@ -45,10 +45,12 @@ module Lark
     private
 
     def request(path, header = {}, &_block)
-      url = URI.join(API_BASE_URL, path)
-      Lark.logger.info "request url(#{url}) with headers: #{header}"
+      url = URI.join(Lark.api_base_url, path)
+      request_uuid = SecureRandom.uuid
+      Lark.logger.info "[#{request_uuid}] request url(#{url}) with headers: #{header}"
       as = header.delete(:as)
       header['Accept'] = 'application/json'
+      header['X-Request-ID'] = request_uuid
       response = yield(url, header)
       unless response.status.success?
         Lark.logger.error "request #{url} happen error: #{response.body}"
@@ -79,7 +81,7 @@ module Lark
       Lark.logger.info "response body: #{body}"
       data = JSON.parse body.to_s
       result = Result.new(data)
-      raise ::Lark::AccessTokenExpiredError if [99991663, 99991664].include?(result.code)
+      raise ::Lark::AccessTokenExpiredError if [99_991_663, 99_991_664].include?(result.code)
 
       result
     end

data/lib/lark/version.rb

@@ -1,3 +1,3 @@
 module Lark
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lark-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sean Dong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http