lark-sdk 1.0.9 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5868e2971c4a26c336cd64e0a8eb6c436148f822ce794af05892df4ff5549bb
-  data.tar.gz: 12409e9192b839c6a2a944ea5a2ab097616859db4038439064ec6370bdb178f1
+  metadata.gz: 9e9e89f6b11b38bdd10e46f82670f14bc4c3b6be4793708d1950cd9487b0326a
+  data.tar.gz: 97557dad510c8ac560acff87fe174615164142c4c5ca0ef422d849bb99a0412a
 SHA512:
-  metadata.gz: 8705f5044981d5d1cce3630ce7f2b4c54e7c6bceb8c61b0d0f24210b12765bfb742689abdc607d9b187b89da237beff6b9d5f52c65db9ec132fcc136a8c28ffe
-  data.tar.gz: ecf301ef9d0f47ac681ee4c0caf0725f1d19ebe75e2de5a1872f4a82735689c23aaed2c9eca238c88cf4bba82e14c99cb75ff74ea1874f972b72c56bfcb823af
+  metadata.gz: 5befe4a9fb2437add97a51e6e7d777991460552d0b712f71c84a1b95b383e5594548497af84f56c853f6ee4f8f7166200126c137d3c25da16f004201dd43a21d
+  data.tar.gz: 3ca75566751184f9c3a891720ec048c9e4c6d9bace74014467b40d9e77230a32c0200400361d025ff2607861ffb249563f5b65eae1efe7391cfabe8b0e8a08b7

data/lib/lark.rb

@@ -5,8 +5,8 @@ require 'lark/config'
 require 'lark/cipher'
 require 'lark/helper'
 
-LIB_PATH = "#{File.dirname(__FILE__)}/lark"
-Dir["#{LIB_PATH}/apis/*.rb",  "#{LIB_PATH}/token_store/*.rb"].each { |path| require path }
+lib_path = "#{File.dirname(__FILE__)}/lark"
+Dir["#{lib_path}/apis/**/*.rb",  "#{lib_path}/token_store/*.rb"].each { |path| require path }
 
 require 'lark/api'
 
@@ -15,6 +15,7 @@ module Lark
 
   # Exceptions
   class RedisNotConfigException < RuntimeError; end
+  class AppNotConfigException < RuntimeError; end
   class AccessTokenExpiredError < RuntimeError; end
   class ResultErrorException < RuntimeError; end
   class ResponseError < StandardError

data/lib/lark/api.rb

@@ -8,6 +8,7 @@ module Lark
     api_mount :authen
     api_mount :contact
     api_mount :user
+    api_mount :search
     api_mount :application
     api_mount :pay
     api_mount :chat
@@ -16,15 +17,18 @@ module Lark
     api_mount :image
     api_mount :mina
     api_mount :notify
+    api_mount :interactive
     api_mount :'drive/file'
     api_mount :'drive/folder'
     api_mount :'drive/platform'
 
     attr_reader :app_id, :app_secret, :tenant_key, :isv, :options
 
-    def initialize options={}
+    def initialize(options = {})
       @app_id = options.delete(:app_id) || Lark.config.default_app_id
       @app_secret = options.delete(:app_secret) || Lark.config.default_app_secret
+      raise AppNotConfigException if @app_id.nil? || @app_id.empty?
+
       @tenant_key = options.delete(:tenant_key)
       @isv = options.delete(:isv) || Lark.config.default_isv
       @options = options
@@ -38,26 +42,26 @@ module Lark
       @request ||= Lark::Request.new(false)
     end
 
-    def get(path, headers={})
-      with_token(headers) do |headers|
-        request.get path, headers
+    def get(path, headers = {})
+      with_token(headers) do |headers_with_token|
+        request.get path, headers_with_token
       end
     end
 
-    def post(path, payload, headers={})
-      with_token(headers) do |headers|
-        request.post path, payload, headers
+    def post(path, payload, headers = {})
+      with_token(headers) do |headers_with_token|
+        request.post path, payload, headers_with_token
       end
     end
 
-    def post_file(path, file, headers={})
-      with_token(headers) do |headers|
-        request.post_file path, file, headers
+    def post_file(path, file, headers = {})
+      with_token(headers) do |headers_with_token|
+        request.post_file path, file, headers_with_token
       end
     end
 
-    def app_ticket= ticket
-      Lark.redis.set "APP_TICKET_#{app_id}", ticket
+    def app_ticket=(new_ticket)
+      Lark.redis.set "APP_TICKET_#{app_id}", new_ticket
     end
 
     def app_ticket
@@ -76,17 +80,19 @@ module Lark
 
     def app_token_store
       return @app_token_store if defined?(@app_token_store)
+
       klass = isv ? TokenStore::IsvAppToken : TokenStore::AppToken
       @app_token_store = klass.new(self)
     end
 
     def tenant_token_store
       return @tenant_token_store if defined?(@tenant_token_store)
+
       klass = isv ? TokenStore::IsvTenantToken : TokenStore::TenantToken
       @tenant_token_store = klass.new(self)
     end
 
-    def with_token(headers, tries=2)
+    def with_token(headers, tries = 2)
       token = headers[:access_token]
       if token.nil?
         via = headers[:via] || 'tenant'

data/lib/lark/apis/application.rb

@@ -1,6 +1,10 @@
 module Lark
   module Apis
     module Application
+      def app_admin_user_list
+        get 'user/v4/app_admin_user/list'
+      end
+
       def is_user_admin(params={})
         get 'application/v3/is_user_admin', params: params
       end

data/lib/lark/apis/chat.rb

@@ -39,7 +39,7 @@ module Lark
       end
 
       def update(payload={})
-        get 'chat/v4/update/', payload
+        post 'chat/v4/update/', payload
       end
 
       def chatter_add(chat_id:, user_ids: nil, open_ids: nil)
@@ -63,4 +63,4 @@ module Lark
       end
     end
   end
-end
+end

data/lib/lark/apis/contact.rb

@@ -42,19 +42,21 @@ module Lark
         get 'contact/v1/department/detail/batch_get', params: {department_ids: department_ids}
       end
 
-      def department_user_list(department_id:, offset:, page_size:, fetch_child: false)
+      def department_user_list(department_id:, offset: nil, page_token: nil, page_size:, fetch_child: false)
         get 'contact/v1/department/user/list', params: {
           department_id: department_id,
-          offset: offset,
+          offset: offset, # deprecation
+          page_token: page_token,
           page_size: page_size,
           fetch_child: fetch_child
         }.compact
       end
 
-      def department_user_detail_list(department_id:, offset:, page_size:, fetch_child: false)
+      def department_user_detail_list(department_id:, offset: nil, page_token: nil, page_size:, fetch_child: false)
         get 'contact/v1/department/user/detail/list', params: {
           department_id: department_id,
-          offset: offset,
+          offset: offset, # deprecation
+          page_token: page_token,
           page_size: page_size,
           fetch_child: fetch_child
         }.compact

data/lib/lark/apis/interactive.rb

@@ -0,0 +1,12 @@
+module Lark
+  module Apis
+    module Interactive
+      def card_update(token:, card:)
+        post 'interactive/v1/card/update', {
+          token: token,
+          card: card
+        }
+      end
+    end
+  end
+end

data/lib/lark/apis/message.rb

@@ -8,6 +8,10 @@ module Lark
       def direct_send(payload)
         post 'message/v4/send/', payload
       end
+
+      def ephemeral_send(payload)
+        post 'ephemeral/v1/send/', payload
+      end
     end
   end
-end
+end

data/lib/lark/apis/pay.rb

@@ -9,11 +9,11 @@ module Lark
       end
 
       def order_list(params={})
-        get 'pay/v1/order/list', via: 'app', params: params
+        get 'pay/v1/order/list', params: params
       end
 
       def order_get(order_id)
-        get 'pay/v1/order/get', via: 'app', params: {order_id: order_id}
+        get 'pay/v1/order/get', params: {order_id: order_id}
       end
     end
   end

data/lib/lark/apis/search.rb

@@ -0,0 +1,16 @@
+module Lark
+  module Apis
+    module Search
+      def user(query:, user_access_token:, page_size: 20, page_token: nil)
+        get 'search/v1/user', {
+          access_token: user_access_token,
+          params: {
+            query: query,
+            page_size: page_size,
+            page_token: page_token
+          }.compact
+        }
+      end
+    end
+  end
+end

data/lib/lark/helper.rb

@@ -7,7 +7,7 @@ module Lark
         class_eval <<-CODE, __FILE__, __LINE__ + 1
           def #{name.to_s.gsub('/', '_')}
             @#{name.to_s.gsub('/', '_')} ||= Class.new(SimpleDelegator) do
-              include Apis::#{name.to_s.classify}
+              include ::Lark::Apis::#{name.to_s.classify}
             end.new(self)
           end
         CODE

data/lib/lark/request.rb

@@ -4,14 +4,14 @@ module Lark
   class Request
     attr_reader :ssl_context, :http
 
-    def initialize(skip_verify_ssl=true)
+    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.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
     end
 
-    def get(path, get_header={})
+    def get(path, get_header = {})
       request(path, get_header) do |url, header|
         params = header.delete(:params)
         http.headers(header).get(url, params: params, ssl_context: ssl_context)
@@ -19,7 +19,7 @@ module Lark
     end
     alias delete get
 
-    def post(path, post_body, post_header={})
+    def post(path, post_body, post_header = {})
       request(path, post_header) do |url, header|
         Lark.logger.info "payload: #{post_body}"
         params = header.delete(:params)
@@ -27,7 +27,7 @@ module Lark
       end
     end
 
-    def post_file(path, file, post_header={})
+    def post_file(path, file, post_header = {})
       request(path, post_header) do |url, header|
         params = header.delete(:params)
         http.headers(header).post(
@@ -44,13 +44,16 @@ module Lark
 
     private
 
-    def request(path, header={}, &_block)
-      url = URI::join(API_BASE_URL, path)
+    def request(path, header = {}, &_block)
+      url = URI.join(API_BASE_URL, path)
       Lark.logger.info "request url(#{url}) with headers: #{header}"
       as = header.delete(:as)
       header['Accept'] = 'application/json'
       response = yield(url, header)
-      raise ResponseError.new(response.status) unless response.status.success?
+      unless response.status.success?
+        Lark.logger.error "request #{url} happen error: #{response.body}"
+        raise ResponseError.new(response.status, response.body)
+      end
       handle_response(response, as || :json)
     end
 
@@ -77,6 +80,7 @@ module Lark
       data = JSON.parse body.to_s
       result = Result.new(data)
       raise ::Lark::AccessTokenExpiredError if [99991663, 99991664].include?(result.code)
+
       result
     end
 
@@ -99,7 +103,7 @@ module Lark
     end
 
     def success?
-      code == 0
+      code.zero?
     end
   end
 end

data/lib/lark/version.rb

@@ -1,3 +1,3 @@
 module Lark
-  VERSION = '1.0.9'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lark-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.3
 platform: ruby
 authors:
 - Sean Dong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -123,10 +123,12 @@ files:
 - lib/lark/apis/drive/folder.rb
 - lib/lark/apis/drive/platform.rb
 - lib/lark/apis/image.rb
+- lib/lark/apis/interactive.rb
 - lib/lark/apis/message.rb
 - lib/lark/apis/mina.rb
 - lib/lark/apis/notify.rb
 - lib/lark/apis/pay.rb
+- lib/lark/apis/search.rb
 - lib/lark/apis/user.rb
 - lib/lark/cipher.rb
 - lib/lark/config.rb