ruboty-chatwork 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246286c18bf0f12d4711d3e535c5acb029fc92b5
-  data.tar.gz: 673ff2c18228ebdc3f851cb826acad18936e5016
+  metadata.gz: 8a4d6f6a32e777888e2529adbd2ee2028508f03b
+  data.tar.gz: 8d96ddb59bc8b2df1ac4fbae33e6e72a07453a88
 SHA512:
-  metadata.gz: 21b6d6daf6fd62aad61191f60eb7ea388091725954589cec28079aedcb7364b27980aa2d91defaf12dfd9141a8ef6772e81d25ed1df9c346dbf7631c0e06991e
-  data.tar.gz: 9340100902a04a4c76ffce61eca1fadc57c87e93a6bfebecc3464ad8bf77ffe5ef0d374006cebde6e61476adc119ab912df2a036f94e6244477f2e8ace258ddd
+  metadata.gz: d1a78528b9f1dc5c0bd4c5d31bff60337e2ce11b65f03576cefe64891224cb9043fae21de29970b9a71afea24d7f471d5c1819efbe4114c9ffc75c4d21969851
+  data.tar.gz: 24099b27170a9a89e5a3e319f5e51d0a51a05b5e1bdb48c0ea1632ad8442a07579753505bfcf5c4d05512072691afcbece75176593a948e5b8670d8ec0d2e0c9

data/README.md

@@ -16,8 +16,20 @@ gem 'ruboty-chatwork'
 CHATWORK_API_TOKEN             - ChatWork API Token
 CHATWORK_ROOM                  - ChatWork Room ID
 CHATWORK_API_RATE              - ChatWork API Rate(Requests per Hour)
+CHATWORK_ROOM_FOR_SAYING       - ChatWork Room ID for Saying(Optional)
 ```
 
+## HOW TO SET THE ROOM TO SAY MESSAGE
+- Priority is high in numerical order (lower is ignored)
+    1. `room_id:12345678` statement at last in message by saying 
+        - ex. `ruboty Good Morning! room_id:12345678` 
+    2. `room_id` key in `reply` method
+        - ex. `message.reply("Hello!", room_id:12345678)`
+    3. ENV["CHATWORK_ROOM_FOR_SAYING"]
+    4. ENV["CHATWORK_ROOM"]
+- Note
+    - regexp of extracting `room_id` is poor ;)
+
 ## Contributing
 
 1. Fork it ( http://github.com/mhag/ruboty-chatwork/fork )

data/lib/ruboty/adapters/chatwork.rb

@@ -18,9 +18,13 @@ module Ruboty
 
       def say(message)
         pp message
-        req = Net::HTTP::Post.new(chatwork_messages_url.path, headers)
+
+        url_for_saying = chatwork_messages_url_for_saying(message)
+
+        req = Net::HTTP::Post.new(url_for_saying.path, headers)
         req.form_data = { 'body' => message[:body] }
-        https = Net::HTTP.new(chatwork_messages_url.host, chatwork_messages_url.port)
+
+        https = Net::HTTP.new(url_for_saying.host, url_for_saying.port)
         https.use_ssl = true
         https.start {|https| https.request(req) }
       end
@@ -45,6 +49,14 @@ module Ruboty
       end
       memoize :chatwork_messages_url
 
+      def chatwork_room_for_saying(message)
+        message[:original][:room_id] || message[:room_id] || ENV["CHATWORK_ROOM_FOR_SAYING"] || ENV["CHATWORK_ROOM"]
+      end
+
+      def chatwork_messages_url_for_saying(message)
+        URI.join(chatwork_url, "/v2/rooms/#{chatwork_room_for_saying(message)}/messages")
+      end
+
       def chatwork_api_rate
         ENV["CHATWORK_API_RATE"].to_i
       end
@@ -62,19 +74,42 @@ module Ruboty
           req = Net::HTTP::Get.new(chatwork_messages_url.path, headers)
           https = Net::HTTP.new(chatwork_messages_url.host, chatwork_messages_url.port)
           https.use_ssl = true
+
           res = https.start {|https| https.request(req) }
           pp res.body
+
           unless res.body.nil?
-            message = JSON.parse(res.body)
-            robot.receive(
-              body: message[0]['body'],
-              from_name: message[0]['account']['name']
-            )
+            message       = JSON.parse(res.body)
+            message.each do | m |
+              original_body = m['body']
+
+              body          = remove_room_id_statement(original_body)
+              from_name     = m['account']['name']
+              room_id       = extract_room_id_statement(original_body)
+
+              robot.receive(
+                body: body,
+                from_name: from_name,
+                room_id: room_id,
+              )
+            end
           end
 
           sleep (60 * 60) / chatwork_api_rate
         end
       end
+
+      def extract_room_id_statement(original_body)
+        original_body[/(.*)( room_id:([0-9]+))\z/, 3]
+      end
+
+      def remove_room_id_statement(original_body)
+        if !(original_body[/(.*)( room_id:([0-9]+)\z)/, 1].nil?)
+          return original_body[/(.*)( room_id:([0-9]+)\z)/, 1].rstrip
+        else
+          original_body
+        end
+      end
     end
   end
 end

data/lib/ruboty/chatwork/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Chatwork
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-chatwork
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - mhag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty