ZReviewTender 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1e614d966b0f41f5b5032eb6f223479688d87b93ae38ad31ac88a3e913cb2d
-  data.tar.gz: f29b845cffc50b86d69d38353385dda2e1aecde20ad947ea19f469bcff951772
+  metadata.gz: 2807fe3efdfb17de59b50713359ba58097f36482389f1d4089056103d16be154
+  data.tar.gz: 8366edb466dda73e67a553084b7b96e97f42c03e4cdb8dc2509e2edacd2f1d3b
 SHA512:
-  metadata.gz: fed9e078491c756e1461ae4c5592f3ff0b07b3037b12dea35488e5ea63f241321ae81b404acd49156cf8240edffa177ebc5bc89ce681cf75b6e3d14a4d27cd9a
-  data.tar.gz: 8819c1f9a5dab412bf6e676eeea9c493b4d2f4e8442d9b7fe99777973955d6c178f7cfc33c7991d56b9574566d926bcac95169f80faa08d4c9c51a7d0bfddd6d
+  metadata.gz: 6eb36009c81955c741701b5c57559d67a16c1fd7df2528b2893ceae37f40c00879d81d8a6a65d4eae930d6125b2f33492f966837ed440acd15d56e42a631c378
+  data.tar.gz: 108d45d065e7f045a5bb88c72fe8e8e79b132f5bb42cdb7e9f00191a4b660e3ff726f4027d79889e5b0d0c67975cf56c02494754449641774f5107b2fb1ed96b

data/lib/Processors/SlackProcessor.rb

@@ -9,7 +9,7 @@ require "time"
 
 class SlackProcessor < Processor
 
-    attr_accessor :botToken, :inCommingWebHookURL, :targetChannel, :timeZoneOffset
+    attr_accessor :botToken, :inCommingWebHookURL, :targetChannel, :timeZoneOffset, :attachmentGroupByNumber
 
     def initialize(config, configFilePath, baseExecutePath)
         @config = config
@@ -20,6 +20,11 @@ class SlackProcessor < Processor
         @inCommingWebHookURL = config["slackInCommingWebHookURL"]
         @targetChannel = config["slackBotTargetChannel"]
         @timeZoneOffset = Helper.unwrapRequiredParameter(config, "slackTimeZoneOffset")
+        @attachmentGroupByNumber = 1
+
+        if !config['slackAttachmentGroupByNumber'].nil? && config['slackAttachmentGroupByNumber'] != "" && config['slackAttachmentGroupByNumber'].to_i > 0  && config['slackAttachmentGroupByNumber'].to_i < 100
+            @attachmentGroupByNumber = config['slackAttachmentGroupByNumber'].to_i
+        end
 
         if (botToken.nil? && inCommingWebHookURL.nil?) || (botToken == "" && inCommingWebHookURL == "")
             raise "must specify slackBotToken or slackInCommingWebHookURL in SlackProcessor."
@@ -29,7 +34,11 @@ class SlackProcessor < Processor
     end
 
     def processReviews(reviews, platform)
-        reviews.each_slice(10) do |reviewGroup|
+
+        pendingPayloads = []
+
+        # Slack Message Limit: posting one message per second per channel
+        reviews.each_slice(attachmentGroupByNumber) do |reviewGroup|
             payload = Payload.new()
             payload.attachments = []
 
@@ -55,10 +64,22 @@ class SlackProcessor < Processor
                 payload.attachments.append(attachment)
             end
 
+            pendingPayloads.append(payload)
+        end
+
+        loop do
+            payload = pendingPayloads.pop
+
             result = request(payload)
-            if result["ok"] != true
+            if !result[:ok]
                 Helper.logError(result)
+                if result[:message] == "ratelimited"
+                    sleep(1)
+                    pendingPayloads.append(payload)
+                end
             end
+
+            break if pendingPayloads.length < 1
         end
 
         return reviews
@@ -87,14 +108,18 @@ class SlackProcessor < Processor
 
     private
     def request(payload)
+
+        isInCommingWebHook = false
         if !botToken.nil? && botToken != ""
             uri = URI("https://slack.com/api/chat.postMessage")
             payload.channel = targetChannel
             headers = {'Content-Type': 'application/json; charset=utf-8', 'Authorization': "Bearer #{botToken}"}
+            isInCommingWebHook = false
         else
             uri = URI(inCommingWebHookURL)
             payload.channel = nil
             headers = {'Content-Type': 'application/json; charset=utf-8'}
+            isInCommingWebHook = true
         end
         
         http = Net::HTTP.new(uri.host, uri.port)
@@ -102,7 +127,14 @@ class SlackProcessor < Processor
         req = Net::HTTP::Post.new(uri.request_uri, headers)
         req.body = payload.to_json
         res = http.request(req)
-        JSON.parse(res.body)
+
+        if isInCommingWebHook
+            return {"ok":res.body == "ok", "message":nil}
+        else
+            result = JSON.parse(res.body)
+            return {"ok":result["ok"] == true, "message":result['error']}
+        end
+        
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - ZhgChgLi