botbase-module-phrases 0.1.4 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +5 -5
  2. checksums.yaml.gz.sig +5 -1
  3. data.tar.gz.sig +0 -0
  4. data/lib/botbase-module-phrases.rb +42 -23
  5. metadata +41 -38
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 577a3992a459a19f616c2f94b888932f0d5ac30f
4
- data.tar.gz: 1df61881965e1308955c3c2f7afad923012399b0
2
+ SHA256:
3
+ metadata.gz: 8fb52bd6f5c10bc8237a853279c20d03cef0853a46f429567339c1b186e72ca5
4
+ data.tar.gz: acd4bd1ee6ff205e2fb0e29f7aa9cc5e06a6722cda038c0b8b6f49351443dc09
5
5
  SHA512:
6
- metadata.gz: 19e5ae64958e9266779d164c0a1de56d14b43cd92d2768bbf72c7d76956c67a109df8f836849c03c2de97de8c78670e4409c4e13f0660f07b2a404f4ca769845
7
- data.tar.gz: 380cb0b268ad8955c4fffde88649727e06531c1050a0b7c1c6ca863120e3eb8082d41cfabe50beb8de803e0908fac22fd90dcf96b5795e2d509ff7ba7e2892dd
6
+ metadata.gz: dcf077f4a846aa51971a2618f8c59fbf6a0e1985a2142627c81c8fc49b5b1528a3628e1cf2d12fa79ab07c4223520dd22cc101d7f67604a9f3d611ccd789a0ba
7
+ data.tar.gz: d47be80b35a8245fb0c93f66feb26a49c941086307126795e21f761321273cbe5e46221a61f69b758b87d40121044ee966cb81fe223d1a4b30166b02761bcc8c
checksums.yaml.gz.sig CHANGED
@@ -1 +1,5 @@
1
- �
1
+
2
+ �m/�#q��rK�O%�`���
3
+ �--&ɥ.��z�`�é
4
+ �
5
+ ?�X�gߊk�ǟ
data.tar.gz.sig CHANGED
Binary file
data/lib/botbase-module-phrases.rb CHANGED
@@ -13,22 +13,22 @@ require 'spstrigger_execute'
13
13
 
14
14
  class BotBaseModulePhrases
15
15
 
16
- def initialize(host: nil, package_src: nil, reg: nil, keywords: '',
17
- px_url: nil, sps_host: 'sps', sps_port: '59000',
18
- logfile: nil, voiceassistant: 'emma')
16
+ def initialize(host: nil, reg: nil, keywords: '',
17
+ px_url: nil, voiceassistant: 'emma', callback: nil)
19
18
 
20
- @rsc = RSC.new host, package_src
21
-
19
+ @rsc = RSC.new host
20
+
21
+ # px may be use in future for advanced rules which use conditionals
22
22
  #px = Polyrex.new px_url
23
+
24
+ @keywords, @voiceassistant, @bot = keywords, voiceassistant, callback
25
+ botlog = @bot.log ? @bot.log : nil
23
26
 
24
- @ste = SPSTriggerExecute.new keywords, reg=nil, px=nil, logfile: logfile
25
- @keywords = keywords
26
- @sps = SPSPub.new host: sps_host, port: sps_port
27
- @voiceassistant = voiceassistant
27
+ @ste = SPSTriggerExecute.new keywords, reg=nil, px=nil, log: botlog
28
28
 
29
29
  end
30
30
 
31
- def query(sender='user01', said, mode: :voicechat)
31
+ def query(sender='user01', said, mode: :voicechat, echo_node: 'node1')
32
32
 
33
33
  #puts 'inside phrases::query()' + said.inspect
34
34
 
@@ -46,13 +46,19 @@ class BotBaseModulePhrases
46
46
 
47
47
  rsc.run_job package, job, {}, args=x, package_path: package_path
48
48
  },
49
+ rse_uri: ->(x, rsc){
50
+
51
+ Rse.call x
52
+
53
+ },
49
54
  sps: ->(x, rsc){
50
55
 
51
56
  topic, msg = x.split(':',2)
52
57
 
53
58
  fqm = (topic == 'reply' and mode == :voicechat) ?
54
- "echo/#{@voiceassistant}: " + msg : x
55
- @sps.notice fqm
59
+ echo_node + "/echo/#{@voiceassistant}: " + msg : x
60
+
61
+ @bot.notice fqm
56
62
  },
57
63
  ste: ->(x, rsc){ @ste.run x }
58
64
  }
@@ -62,29 +68,42 @@ class BotBaseModulePhrases
62
68
 
63
69
  r = nil
64
70
 
65
- a.each do |type, x|
71
+ a2 = a.map do |type, x|
66
72
 
67
- Thread.new do
68
73
 
69
- begin
70
- h[type].call x, @rsc
71
- rescue
72
- warning = 'botbase-module-phrases warning: ' + ($!).inspect
73
- puts warning
74
- end
74
+ if @bot.log then
75
75
 
76
- end # /thread
76
+ instruction = x.length > 60 ? x[0..57] + '...' : x
77
+ @bot.log.info "BotBaseModulePhrases/query: matched type: %," +
78
+ " instruction: %s in response to %s" % [type, instruction, said]
79
+
80
+ end
81
+
82
+ begin
83
+ r = h[type].call x, @rsc
84
+ rescue
85
+
86
+ if @bot.log then
87
+ @bot.log.debug 'BotBaseModulePhrases/query/error: ' + ($!).inspect
88
+ end
89
+
90
+ end
91
+
77
92
 
78
93
  if type == :sps and x[/^reply/] and mode != :voicechat then
79
94
 
80
95
  r = x[/:\s*(.*)/,1].to_s
96
+
97
+ else
98
+
99
+ r
81
100
 
82
101
  end
83
102
 
84
103
  end # /each
85
104
 
86
- return r
105
+ return a2.join(' ')
87
106
 
88
107
  end
89
108
 
90
- end
109
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: botbase-module-phrases
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
10
10
  cert_chain:
11
11
  - |
12
12
  -----BEGIN CERTIFICATE-----
13
- MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
14
- YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
15
- 8ixkARkWAmV1MB4XDTE3MDQyNDIxMDEzOVoXDTE4MDQyNDIxMDEzOVowSDESMBAG
16
- A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
17
- EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
18
- ggEBAL4jstPeY6aWcMnd3LTqAR76LnAfyZt9eiPLCdSk1aDyTFWftNoDdTlVmGiT
19
- 43r91ihamdMcB7qMc5hy46cmFq7a05kMY+6KrVOpGF7ozKJBjgnz6FQeVquWHVe/
20
- Folc5dm4nXxThLVYQ6zSp1VEuZMn26J0rQ1QxabL9WHpU5Ln5TyVGuo+WcKZFX5P
21
- KNpFXJWh15bBDjjF62ZvN4w7kvT3d7kU76ElDqnSfsvAt4DsgrpnwxO9KK4e7mp8
22
- /VctqLNByTZYN95QC1vcGH6MgMJXxD54RT0IBFrQMnNkFeugYs/a0U3iTmtsVXsa
23
- eDAx+hTtODigDg3tblbum1ygdd8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
- DwQEAwIEsDAdBgNVHQ4EFgQUI70EaT9kBbyGAg1NdD55965uV5MwJgYDVR0RBB8w
25
- HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
26
- c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAViW8EMFX
27
- u95Moqfcf3z0OT4+hMOa84BdnMZIzp81uimmxTeJq/qxPunOwUyJSiSsfy9Ucatd
28
- JT9eBb79WgSsC2CwBJiY79uuAczxD9siXIcqogNzH2izay4RQtih1WnmxZ9NAA0F
29
- 5b5dBSThFAYd5oClhp8XFcMojEAWCVlkokdVKRpBYOn8JPzgY7LX74UroS94GDSG
30
- p1h3RDCojodg5D9UayFuFD++av/RaiIyw4X5/VUUX6twwL4P1pSFKMuFG5UoEtlJ
31
- 4iQOEvIvyfh1vrJ0687D/rFgCEoNGhCnJptpgDrfnz7BMcmYjHYRdSXTL/iS+lDo
32
- 5tGeZHWa8uIcew==
13
+ MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
14
+ YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjMwMDkzNDAwWhcN
15
+ MjEwNjMwMDkzNDAwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
16
+ cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDDuTM6
17
+ kya8GeO2EF0lXBLlWwacQEH7YsKNxFRFfPsRMOXV0N6ztxOlRxnn7lIrwhOH8LjM
18
+ AkmbEdFZDnffL5Nf2aaoY1h5hWM4TyHxBmlJjGOyWlHBEi/cxg+OBifVjPIFFYGT
19
+ eeOepWPFFPHTyzCZZ8VDssk3Oh2c0B2VXtqyQmzOA+c8ybRWMVYkyfQuguvzffYh
20
+ 4ibATHwriRpgRN+kZAUEa2mdQOHxqfwRbcCLZD6AjBR5MWPNaNjPSk/QZY079m7b
21
+ rDQyxJI0dcgDuQTF+QPjK0P2NdgYdKlqXnK/ZsLmB2XkVTqykLwcs6XHWS6bMPvq
22
+ HHPmbAfhIjZGuk9tMlyRHG0IyuNMFbf38mEVo2jH5psrGprCZiZG3hhJI9ha6TqZ
23
+ LynRRKa+Qzqo3CqbIT3muQjYn5fXDclx4CktuopzHFFsphr+OHYZwWnV9VXyWDpG
24
+ jwW4TuZRbwY65pgxCirxXRJxnSGReU6r7CMzYw2EUMiV13xZW6Zrx/IDXQcCAwEA
25
+ AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUNxgwYoj8
26
+ iyo0EBfMQ2sYH5b+S2QwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
27
+ c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
28
+ BgkqhkiG9w0BAQsFAAOCAYEAVc7c1nZgu/I3R9lmqMtYNIGcVIqxEElIe+/ZlBCo
29
+ ugpNqKYLQ3SWauyleJxblQb3bdmOfwJyD/QVLVxEB6JJ5r6GoJcTP4q0sRtipmkt
30
+ kLAECP/NzXo5ddIUWYNXOAecPCS8JYFqzfZkYCNYdiS7c3EFnZW0ZF/BI+MNM1jD
31
+ faxvZFsD4JBjSl6sW6Qn0UNorhp4AzBXlAWMMHvRx8N2MkHsdvrvI+lG954i6mB2
32
+ 7h5ay2yXOAgxqIJPl7lvU+6dDH/o0qUcpPbSQ+RQs72chrSrohovRv9ajivHD/Od
33
+ mAKCPsv4m8oDrypNEN7d4XjQdenAVqv9EVopuY0/2FjTChQsFfqsWGlOuh+3Gm+x
34
+ vLmttuvduLoy/X/GnoH5KmfwELeTU1g52fFZ4gei+GT64Cpd2rcCv1bDttmmql8o
35
+ zJeJvMM+IyBvJlppieIezSGxMZ9INu/2o5OyJGNmBETYbsWbt0EnbY2xT9+xKgB5
36
+ TzZHYncJZRgc+rpXe9YDypIB
33
37
  -----END CERTIFICATE-----
34
- date: 2017-06-11 00:00:00.000000000 Z
38
+ date: 2020-06-30 00:00:00.000000000 Z
35
39
  dependencies:
36
40
  - !ruby/object:Gem::Dependency
37
41
  name: rsc
@@ -39,40 +43,40 @@ dependencies:
39
43
  requirements:
40
44
  - - "~>"
41
45
  - !ruby/object:Gem::Version
42
- version: '0.2'
46
+ version: '0.4'
43
47
  - - ">="
44
48
  - !ruby/object:Gem::Version
45
- version: 0.2.2
49
+ version: 0.4.4
46
50
  type: :runtime
47
51
  prerelease: false
48
52
  version_requirements: !ruby/object:Gem::Requirement
49
53
  requirements:
50
54
  - - "~>"
51
55
  - !ruby/object:Gem::Version
52
- version: '0.2'
56
+ version: '0.4'
53
57
  - - ">="
54
58
  - !ruby/object:Gem::Version
55
- version: 0.2.2
59
+ version: 0.4.4
56
60
  - !ruby/object:Gem::Dependency
57
61
  name: polyrex
58
62
  requirement: !ruby/object:Gem::Requirement
59
63
  requirements:
60
64
  - - "~>"
61
65
  - !ruby/object:Gem::Version
62
- version: '1.1'
66
+ version: '1.3'
63
67
  - - ">="
64
68
  - !ruby/object:Gem::Version
65
- version: 1.1.12
69
+ version: 1.3.1
66
70
  type: :runtime
67
71
  prerelease: false
68
72
  version_requirements: !ruby/object:Gem::Requirement
69
73
  requirements:
70
74
  - - "~>"
71
75
  - !ruby/object:Gem::Version
72
- version: '1.1'
76
+ version: '1.3'
73
77
  - - ">="
74
78
  - !ruby/object:Gem::Version
75
- version: 1.1.12
79
+ version: 1.3.1
76
80
  - !ruby/object:Gem::Dependency
77
81
  name: sps-pub
78
82
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +86,7 @@ dependencies:
82
86
  version: '0.5'
83
87
  - - ">="
84
88
  - !ruby/object:Gem::Version
85
- version: 0.5.4
89
+ version: 0.5.5
86
90
  type: :runtime
87
91
  prerelease: false
88
92
  version_requirements: !ruby/object:Gem::Requirement
@@ -92,27 +96,27 @@ dependencies:
92
96
  version: '0.5'
93
97
  - - ">="
94
98
  - !ruby/object:Gem::Version
95
- version: 0.5.4
99
+ version: 0.5.5
96
100
  - !ruby/object:Gem::Dependency
97
101
  name: spstrigger_execute
98
102
  requirement: !ruby/object:Gem::Requirement
99
103
  requirements:
100
104
  - - "~>"
101
105
  - !ruby/object:Gem::Version
102
- version: '0.4'
106
+ version: '0.5'
103
107
  - - ">="
104
108
  - !ruby/object:Gem::Version
105
- version: 0.4.6
109
+ version: 0.5.11
106
110
  type: :runtime
107
111
  prerelease: false
108
112
  version_requirements: !ruby/object:Gem::Requirement
109
113
  requirements:
110
114
  - - "~>"
111
115
  - !ruby/object:Gem::Version
112
- version: '0.4'
116
+ version: '0.5'
113
117
  - - ">="
114
118
  - !ruby/object:Gem::Version
115
- version: 0.4.6
119
+ version: 0.5.11
116
120
  description:
117
121
  email: james@jamesrobertson.eu
118
122
  executables: []
@@ -139,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
143
  - !ruby/object:Gem::Version
140
144
  version: '0'
141
145
  requirements: []
142
- rubyforge_project:
143
- rubygems_version: 2.6.8
146
+ rubygems_version: 3.0.3
144
147
  signing_key:
145
148
  specification_version: 4
146
149
  summary: A botbase module for matching a speech keyword which then triggers a general
metadata.gz.sig CHANGED
Binary file