botbase-module-conversation 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e21063b2cceb29cde8a35fb1560bb01ef349ecb
-  data.tar.gz: 695b94925af4f95b9657e357352a83ff79be6c68
+SHA256:
+  metadata.gz: 4eea7bc90b1ca3326d1e78f57217ad0d55c5870c823a7572cf90b5601f2aaed5
+  data.tar.gz: bf301fc4930ca54140fa2aaec5d95fc19d4113ada0b5907fea189b7d13059caf
 SHA512:
-  metadata.gz: a5b935b54e9c51b6c0475f76ac0654c8b71cccb1fb59ba6e7aa623fac36a2dff8c97fbac7ee30b5991b241df76c7f5fae627325c58478099c3eefe76168a5a3d
-  data.tar.gz: d8cbab9a67cbad19450d21237e08c5c393332a22ad4b1cb3ee0cf96ca6054023aa28b9fa7c09b5570ff072343b68e7581e9d4fc6599b104dd6572a9f889f5606
+  metadata.gz: b998774b6de2d5a1771e24693b18aa6333202fef34d83bc36295b124f7ef8c6d5126d0ce719c533ec5df57ea13e9b9bd08c37872dc2ee06f54468e9b7bae6e70
+  data.tar.gz: 317acb59944aaaa8356c45f91517e693f17265aff3a6ec7b0613f2a26d512574f96eb9485fccef7b75c7d033a427e5d7f2ab6f611a3ab36dd39df964146f887c

data/lib/botbase-module-conversation.rb

@@ -6,23 +6,22 @@
 
 
 require 'rsc'
+require 'json'
 require 'rexle-builder'
 
 
 class BotBaseModuleConversation
   
-  def initialize(host: nil, package_src: nil, 
-              default_package: nil, default_job: nil, callback: nil)    
+  def initialize(host: nil, default_package: nil, default_job: nil, 
+                 callback: nil, debug: false)
 
-    @bot = callback
-    @rsc = RSC.new host, package_src
+    @bot, @rsc, @debug = callback, RSC.new(host), debug
     
     a = run(default_package, default_job)
     
     @doc = Rexle.new("<conversations/>")
 
     add_phrases(a)
-
     
   end
 
@@ -32,19 +31,50 @@ class BotBaseModuleConversation
     
     if found then
       
-      notice 'botbase/debug: module-conversation queried, found ' + found[0]
+      if @bot.log then
+        @bot.log.info "BotBaseModuleConversation/query:" + 
+            " 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
+      
+      if @bot.log then
+        @bot.log.info "BotBaseModuleConversation/query:" + 
+            " h: "  + h.inspect
+      end      
+      
       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
@@ -68,27 +98,30 @@ 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
+    a3 = RexleBuilder.new({converstions: a2}, debug: false).to_a
     doc = Rexle.new(a3[3])
     doc.root.attributes['id'] = id
     @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 notice(msg)
-    @bot.debug msg if @bot
-  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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botbase-module-conversation
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDQwOTE5MTIyNloXDTE4MDQwOTE5MTIyNlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMvQn8SWhW0mgCMTQiNCg67ii6XIpA+pIL/U8cflCKa02vSNA6//YyySmk54
-  Cld6yqD70cwXRoANC+Ejoc3/EEkm/EW+puohigkUguELrM63tt2b/xAItSCjuJkI
-  boQsDeWA3p8kJ0pdZx8LzqXI4DXOmTb7MtNJ7puAGMrJAPj+p+s4xaLdEdACbI3p
-  3/MED6NplF4JzNFOW5nE28I4P8JLRJRMSz7Niz2Zzy+uf6wEvddbtPAQ5qn0bKNs
-  zBdcWNYPCcGBKlGh0DtBgvC08X3Z8a13CbxYyDLK6P/8QPb6TBbB9bx5Ra/KQsxu
-  D8rQZNLyjW1NRLjYucDCfCHjWiECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUF9TD7XacqMi/BfG6aEfVS86KVgkwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAePphndx2
-  +u80h86lt/MSonX9zbr9J6v805UJTWf+EWW39UKN4W/eeg0ZXNCkkyk8oZB2zvef
-  mRe+llzRqfjSB3FDfZLKzj5ZOp3C4pe+gJwEhiu9sgpOc3Z7e8f/cEFSXxB0bp41
-  E7wC49pGNVab+Y7xgvholbhHCULteEqS9kPRM50dnBY5scwFj63CkT7sC9GBpYj8
-  66fZJWc2rmk7hOi6RAbriJo5rB/qjUojYY76GPtEWe3xbRWOI5faKyi4ZBzzeOws
-  aNO/RQYUa1Pqx9RMIGgZIeQPtuaxxfqQ6uiq/S5GWoIKIDOmES69g981bASbOtYs
-  geN7Uzk3bTsKxA==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNzAxMTE1NTMyWhcN
+  MjEwNzAxMTE1NTMyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCfIV6+
+  hg5H0Qhw7VjWnwiUKnHK+uSplrap4qYv2cAGmT8lPPe8VtXJlU9N4ri7hT8LPM7L
+  OiHXSMcT/dJMXWYFwmlmYX9zzLkpfJXnncdxI8MMrSJSabdKYc2TrW6sOynw3NuZ
+  XKeHHJHxfYqUyDsTQ5ep3zNqdWciQSaiil1M687EeoviKnJo/KymtroV5+PdBGxq
+  kXr4zFhlr9k7F8tAVuOrhfv7yiZz+93B+vKjd8EphrMANUKGu4F7dqj5fYi2AQ8J
+  61TNbr2ed23Epd1KPWrzD2kDB5fYVloOZ7yPqUpo4zIdpIJy+4EdsimsmdqL3nAp
+  Z+8iJuc/FYiB4k1mQPHHxi3jLc6lQHudLZuqcHygg3dVYgHClKz7jg67UpqEoYa0
+  dowc8D7jtfQwp1yQ2nl/0SZGqXY9J5IfagJkpPxSQOhKY9TfGGrNXw5q+z6kEIbp
+  HnIkX+XuqsAvOmePXiIRHfkYVHCO+RR5LMmfoZMCcxCqsj2sF48YKBM0vdcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUpbE7DugX
+  RbZ13tXlw/AjVuCq9fowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEANpDLcyccYqrk9S4exFQFUvX08+OIBIlmnlBbP4V7
+  jBp0PCSgQR+EVRo0DrrLdthKm/R2O5yFIwb4Scw2qep4Sp3c/HcUETZcGU+pB6bm
+  wJEtu2+B8x12SDSoFKRXONJkdNfowC+Qoolzvvhr2g9RSBgYwpPUnuU6O+qFB8OD
+  kSZM3Vmu656kJ/4zoFbYVF2ReFs5NEf/a/yOztTqbIzFMsmC7aldfAl1bRD3tKSw
+  pPhUYaWSQevp9fg/GVFyCwvHdaRJKMir4J7genxc8C/z1WcVlL33MegaWzJCMybx
+  W41zJ1zucUcYcCgi8+/lDb4uzVjsoYkR2hJ0/bhZ8DNgqqDH2Ew3nrIuL+SDKlpn
+  ntMunBlsLvsicHe6U6Wv+xs42j3ym2+dKtMGC8SUHmVbYaJFb+1iRg04G6+rmdUE
+  aphuACerPrR4uDeOBSjMAO3hs3eoTpOywAxkYd0Yg3OYPru0gWqhg+dW6aznstpn
+  B4ArDeDo+Ajzq/cuml17PB17
   -----END CERTIFICATE-----
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -39,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A botbase module intended for holding a conversation between the user and

metadata.gz.sig

@@ -1,3 +1,2 @@
-g^�-@ƫ��&9X~� Y�]�U]���V�OL���R�z{
-��d2��q���ZWR����0��H���Y�SB\b�g��J���s��+r�|=�n���'��܏J,W��v �s��F �6�V�I!
�yBx7�C�qp@`������
-��c]6n{������d}��_�U�����6V7TkA��xm����ǿع
+9.�v�����#���u5xJF)�t{T�E��1{�*�˓�)�����9�j
V�����������Dj�`=&3\v��Cj�v�Ɵ{�M
+����h.r�����cbXC��Z遚��8��ý[��{lԏi_ӯ=�1�����a-8�k���)�a(9� ��O^��B�8 0r���'b�O����3 Y1�>5@/�u�Dzx��Ƚ�wq�S3���T�}�Z�û#"S�{�~��Q�\�{��
��?�t�/
ST�Ff�ùaidDE�LY1�T)�k%3��,�8;�>w}m|��q6��rS��ÃF�{��a=������%7!�T���8�Nd�6��f��2S�N���?���p+��k�uB