repp 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99c55bb3b5b9a0bb971833d669d6e20f7c3832d334b75309285cb7ebe870baa
-  data.tar.gz: '03248ecc10db6525d5a91d2327d397a7e5d3120af3fbb1d7782346831b28a5ee'
+  metadata.gz: 793302964e0e147e23fa2022f8a620009d0ddec4944df51c5aa0cf7c083260da
+  data.tar.gz: b6f0f7c2a4044e1526fb537311006c7b78565298989af22efec9b54e891209c6
 SHA512:
-  metadata.gz: 2025525b45694117be1f29509ab9c934843a852fbce390b4678f2d8039aacfc064db6e93942a962187ab49de1dd1f4fec140ea28149893378bbb8da4309c3e29
-  data.tar.gz: 3648058e784ff73c4bdf6e8b551648684f2d6db4a1ea2afd96f7a1845f888597a19e4cdc1ae8804129a9b7bd0c82d5fab0f020964a076e5c7d0a27532fe3ff3a
+  metadata.gz: 8f7d521a9ba7c9410018c331cbab8c8140bf334185ee1e266918262c55e5d29b2bac2bdb1f64b22473c44929e211a99676b3c7f3ad6d919f9625f360aa904117
+  data.tar.gz: 78bb318ff1a39dee34c1cf1a941d593a0e99c0ee2066bb897969cc16b6e53d9f0e4b11fcfeb919906ee0f30100f16aebcdd0a8ea172546008227a05a67ed7f1e

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## 0.3.2
+## 0.4.0
 
-- Add ticker to shell handler [Add ticker to shell handler by kinoppyd · Pull Request #8 · kinoppyd/repp](https://github.com/kinoppyd/repp/pull/8)
+- Add Trigger handler [#10](https://github.com/kinoppyd/repp/pull/10)
+- Set detail user data to receive object in Slack handler [#9](https://github.com/kinoppyd/repp/pull/9)
+- Add ticker to shell handler [#8](https://github.com/kinoppyd/repp/pull/8)
 
 ## 0.3.1
 

data/lib/repp/event.rb

@@ -3,5 +3,6 @@ module Repp
     require 'repp/event/base'
     require 'repp/event/receive'
     require 'repp/event/ticker'
+    require 'repp/event/trigger'
   end
 end

data/lib/repp/event/base.rb

@@ -21,7 +21,7 @@ module Repp
 
     class Base
       extend Attributes
-      def initialize(params)
+      def initialize(params = {})
         @attributes = {}
         return unless params.respond_to?(:each_pair)
         params.each_pair do |k, v|

data/lib/repp/event/trigger.rb

@@ -0,0 +1,8 @@
+module Repp
+  module Event
+    class Trigger < Receive
+      event_type :trigger
+      interface :body, :payload, :original
+    end
+  end
+end

data/lib/repp/handler/shell.rb

@@ -8,11 +8,30 @@ module Repp
         def initialize(app) @app = app; end
         def receive_line(data)
           reply_to = /@\w+/.match(data)&.[](1)
-          message = Event::Receive.new(type: :message, body: data, reply_to: reply_to, bot?: false)
+          message = Event::Receive.new(body: data, reply_to: reply_to, bot?: false)
+          res = process_message(message)
+          process_trigger(res, message)
+        end
+
+        def process_message(message)
           res = @app.call(message)
           if res.any?
             $stdout.puts res.first
           end
+          res
+        end
+
+        def process_trigger(res, message)
+          if res[1][:trigger]
+            payload = res[1][:trigger][:payload]
+            res[1][:trigger][:names].each do |name|
+              trigger = Event::Trigger.new(body: name, payload: payload, original: message)
+              Thread.new do
+                trigger_res = process_message(trigger)
+                process_trigger(trigger_res, message)
+              end
+            end
+          end
         end
       end
 
@@ -21,7 +40,7 @@ module Repp
 
         application = app.new
         @ticker = Ticker.task(application) do |res|
-          if res.any?
+          if res.any? && res.first
             $stdout.puts res.first
           end
         end

data/lib/repp/handler/slack.rb

@@ -26,33 +26,60 @@ module Repp
         end
 
         def handle
-          client.on :message do |data|
-            reply_to = (data.text || "").scan(REPLY_REGEXP).map do |node|
-              user = users.find { |u| u.id == node.first }
-              user ? user.name : nil
-            end
+          client.on :message do |message|
+            res, receive = process_message(message)
+            process_trigger(res, receive)
+          end
 
-            receive = SlackReceive.new(
-              body: data.text,
-              channel: data.channel,
-              user: data.user,
-              type: data.type,
-              ts: data.ts,
-              reply_to: reply_to.compact
-            )
+          client.start!
+        end
 
-            user = users.find { |u| u.id == data.user } || users(true).find { |u| u.id == data.user }
-            receive.bot = (data['subtype'] == 'bot_message' || user.nil? || user['is_bot'])
+        def process_message(message)
+          receive = if message.instance_of?(Event::Trigger)
+                      message
+                    else
+                      reply_to = (message.text || "").scan(REPLY_REGEXP).map do |node|
+                        user = users.find { |u| u.id == node.first }
+                        user ? user.name : nil
+                      end
+
+                      from_user = users.find { |u| u.id == message.user } || users(true).find { |u| u.id == message.user }
+
+                      receive = SlackReceive.new(
+                        body: message.text,
+                        channel: message.channel,
+                        user: from_user,
+                        type: message.type,
+                        ts: message.ts,
+                        reply_to: reply_to.compact
+                      )
+
+                      receive.bot = (message['subtype'] == 'bot_message' || from_user.nil? || from_user['is_bot'])
+                      receive
+                    end
+
+          res = app.call(receive)
+
+          receive = message.original if message.instance_of?(Event::Trigger)
+          if res.first
+            channel_to_post = res.last && res.last[:channel] || receive.channel
+            attachments = res.last && res.last[:attachments]
+            web_client.chat_postMessage(text: res.first, channel: channel_to_post, as_user: true, attachments: attachments)
+          end
+          [res, receive]
+        end
 
-            res = app.call(receive)
-            if res.first
-              channel_to_post = res.last && res.last[:channel] || receive.channel
-              attachments = res.last && res.last[:attachments]
-              web_client.chat_postMessage(text: res.first, channel: channel_to_post, as_user: true, attachments: attachments)
+        def process_trigger(res, receive)
+          if res[1][:trigger]
+            payload = res[1][:trigger][:payload]
+            res[1][:trigger][:names].each do |name|
+              trigger = Event::Trigger.new(body: name, payload: payload, original: receive)
+              Thread.new do
+                trigger_res, _ = process_message(trigger)
+                process_trigger(trigger_res, receive)
+              end
             end
           end
-
-          client.start!
         end
       end
 

data/lib/repp/version.rb

@@ -1,3 +1,3 @@
 module Repp
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - kinoppyd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -128,6 +128,7 @@ files:
 - lib/repp/event/base.rb
 - lib/repp/event/receive.rb
 - lib/repp/event/ticker.rb
+- lib/repp/event/trigger.rb
 - lib/repp/handler.rb
 - lib/repp/handler/shell.rb
 - lib/repp/handler/slack.rb