botbase-module-conversation 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aeba4187a5f280d4d63fa47f48cdaa7a5fa88ab
-  data.tar.gz: f159f665681308c6f21d1c0a9bcf1fb661041a92
+  metadata.gz: b8e722a09208c107d7b529ccd946eee40fad20b5
+  data.tar.gz: 3233c4afb74edde3eda28e0809dce9cbdce89787
 SHA512:
-  metadata.gz: 2872c84dccde1cade23c49cdd85cc250e86ab9640c57645894af3ab9d652027affa5072ac476bb5278bac986d0358719ee2c8a351e7fa37431edc001f971981b
-  data.tar.gz: 13fa51551d4ec34bdc6aff2ac1a30d190f9040566cd119f23ae4ebd18032d79d226ce82d55f396c2db3af61a2e62dbf9482a9a29a829c9dd596677e232254002
+  metadata.gz: 4d68545eccce97a8d3fccbe1081f78ac8c866e96c1e2fbadbe841f172029c1617b0bfa6c038ddf3e2d225ff7bdc6ca2bad8b87cffa11193204ab1074778230ea
+  data.tar.gz: 482c5b8c04fbfff8e3329619b9c6966bb4b8706c62acb83ff7050d6ebc8ca7c0e5154910a385f5ba96cc6aea33cc45bf30821457fa48eefaf0c9d968406dd627

data.tar.gz.sig

@@ -1,3 +1,2 @@
-��~%�*�܈�\ɮ��HM1������\�F�z_2
-�f�������&�B�/�Dq?����4�I('?�
-�/�Z��D�ͫ'�R&y�[�"�����M��k�JSb�A�H<
�i=��{%3O���4r�!���d�O�ڭؿ�KՎ�w��a���tP/0*Q-��7%Y�}Y�j����m���c
�h�5n��<2LR<.d
+<���#�t%B�M�Q�;�6��j��6�G�����'��
+T�"F~:�#�G��t����ȉ+�]]{��Ѣ�c�Mhu^eR喨��[���d���EE%o�(3����}��@!�UUV����\�@�p+����˕A:dQK/t�=>�	\�J��dX͐T�s��p�=��C��q����9dT���#��~�u��A�3�����&
���e���	������81��ݣK���n�\�H
+�H�- `T�

data/lib/botbase-module-conversation.rb

@@ -6,6 +6,7 @@
 
 
 require 'rsc'
+require 'json'
 require 'rexle-builder'
 
 
@@ -33,20 +34,41 @@ class BotBaseModuleConversation
       
       if @bot.log then
         @bot.log.info "BotBaseModuleConversation/query:" + 
-            " found %s in response to %s" % [found[0], said]
+            " found %s in response to %s" % [found.inspect, said]
       end
     
-      package, job = found.last.split
+      _, rsc_command, context_tags = found
+      package, job = rsc_command.split
 
       h = said.match(/#{found.first}/i).named_captures
       r = run(package, job, h)
       
-      if r.is_a? String or r.is_a? Hash then
+      a, tags = [], []
+      
+      a << if r.is_a? String then
         r
+      elsif r.is_a? Hash then
+        
+        if r[:msg] then
+          tags.concat r[:tags].split
+          r[:msg]
+        else
+          r
+        end
+        
       elsif r.is_a? Array then
-        add_phrases(r)
+        add_phrases(r)        
       end
       
+      tags.concat context_tags.split if context_tags
+      a << tags
+      
+      if @bot.log then
+        @bot.log.info "BotBaseModuleConversation/query/result:" + 
+            " result %s in response to %s" % [a.to_json, said]
+      end      
+      a.first
+      
     else  
       no_match_found()
     end
@@ -70,7 +92,7 @@ class BotBaseModuleConversation
     @doc.root.delete "conversations[@id='#{id}']"
     
     a2 = a.inject([]) do |r, x|
-      r << {conversation: {user: x[0], bot: x[-1]}}
+      r << {conversation: {user: x[0], bot: x[1], tags: x[2]}}
     end
 
     a3 = RexleBuilder.new({converstions: a2}).to_a
@@ -79,14 +101,21 @@ class BotBaseModuleConversation
     @doc.root.add_element doc.root
 
     @phrases = @doc.root.xpath('//conversation').map do |e|
-      %w(user bot).map {|x| e.text x}
+      %w(user bot tags).map {|x| e.text x}
     end    
     
     answer
   end
   
   def run(package, job, h={})
+    
+    if @bot.log then
+      @bot.log.info "BotBaseModuleConversation/run: " + 
+          "package: %s, method: %s, args: %s" % [package, job, h.inspect]
+    end    
+    
     @rsc.send(package.to_sym).method(job.to_sym).call(h)
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botbase-module-conversation
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   aNO/RQYUa1Pqx9RMIGgZIeQPtuaxxfqQ6uiq/S5GWoIKIDOmES69g981bASbOtYs
   geN7Uzk3bTsKxA==
   -----END CERTIFICATE-----
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc