stealth 2.0.0.beta6 → 2.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691209f0b8b7a49ffa802cb57919c23dccb5f85f3da86e7bfec70c7e0ea85c5f
-  data.tar.gz: 3399604a657b73ba4d608d3516321d360b46dfd4ad6b5656845156ba61fee21a
+  metadata.gz: df932db1ce6adab511eb5ebae31e647e3b5c547e7de0ef92ee427d0b592e250b
+  data.tar.gz: 74b9b5099125da94363c2f475062b62fdae543f4a5c40418d0d28293b2a6ca18
 SHA512:
-  metadata.gz: 5f11b7d1acf10695012b0c253622d8cd7e4885265517f596f40364b60a9d0547a104aa700c5da78ec2015c5fb5de7a6314dbba716e5262353b50fee154b3c82e
-  data.tar.gz: 6abe7e7278d7c6a7e13d8c86044baf8d26c266f980decf5415ea9dc0fcf0b9f40e01b233524a933c0c11852b300b7243eff44e27c007c6274aa606ac44b54a5f
+  metadata.gz: 589a9e5064cb490e861528edcd32a3da4ff5859fd0405308d73db36a246ebdab437f4f4bd0510eea765a49f1ac292ec4cd1eb0c8cf43fd0d05404f67c6a91566
+  data.tar.gz: b7e58cd020e541ba183150c27f4cdfc528c70bd47dbb2760d09084822e0334e747d50291672e18a21b68399fa423876f26ab02d94d9c532e2538b9dac7d30dac

data/CHANGELOG.md

@@ -56,6 +56,7 @@
 * [Replies] Voice services (determined by having "voice" in the name) now automatically skip auto-delays.
 * [Controllers] `current_message` now has a `confidence` attribute containing a float with the confidence value of the transcription (from 0 to 1).
 * [Controllers] Added a `halt!` method that can be used with the controller error handlers to stop code execution.
+* [Logger] If the driver makes the `translated_reply` instance variable available, it will now be logged.
 
 ## Bug Fixes
 

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    stealth (2.0.0.beta6)
+    stealth (2.0.0.beta7)
       activesupport (~> 6.0)
       multi_json (~> 1.12)
       puma (>= 4.2, < 6.0)
-      sidekiq (~> 6.0)
+      sidekiq (< 7)
       sinatra (~> 2.0)
       thor (~> 1.0)
 
@@ -24,13 +24,13 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     minitest (5.16.3)
-    mock_redis (0.32.0)
+    mock_redis (0.34.0)
       ruby2_keywords
     multi_json (1.15.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
-    oj (3.10.6)
+    oj (3.13.22)
     puma (5.6.5)
       nio4r (~> 2.0)
     rack (2.2.4)
@@ -39,24 +39,22 @@ GEM
     rack-test (2.0.2)
       rack (>= 1.3)
     redis (4.8.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
-    sidekiq (6.5.6)
-      connection_pool (>= 2.2.5)
+    sidekiq (6.5.8)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
     sinatra (2.2.2)
@@ -68,7 +66,7 @@ GEM
     tilt (2.0.11)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   ruby
@@ -78,7 +76,6 @@ DEPENDENCIES
   oj (~> 3.10)
   rack-test (~> 2.0)
   rspec (~> 3.9)
-  rspec_junit_formatter (~> 0.3)
   stealth!
 
 BUNDLED WITH

data/README.md

@@ -32,6 +32,7 @@ Currently, there are gems for:
 ### Messaging
 * [Facebook Messenger](https://github.com/hellostealth/stealth-facebook)
 * [Twilio SMS](https://github.com/hellostealth/stealth-twilio)
+* [Bandwidth](https://github.com/hellostealth/stealth-bandwidth) 
 * [Smooch](https://github.com/hellostealth/stealth-smooch)
 
 ### Voice

data/VERSION

@@ -1 +1 @@
-2.0.0.beta6
+2.0.0.beta7

data/lib/stealth/base.rb

@@ -123,7 +123,7 @@ module Stealth
 
     load_bot!
 
-    Sidekiq.options[:reloader] = Stealth.bot_reloader
+    Sidekiq[:reloader] = Stealth.bot_reloader
 
     if defined?(ActiveRecord)
       if ENV['DATABASE_URL'].present?

data/lib/stealth/controller/replies.rb

@@ -96,11 +96,11 @@ module Stealth
               reply: reply
             )
 
-            translated_reply = handler.send(reply.reply_type)
-            client = service_client.new(reply: translated_reply)
+            formatted_reply = handler.send(reply.reply_type)
+            client = service_client.new(reply: formatted_reply)
             client.transmit
 
-            log_reply(reply) if Stealth.config.transcript_logging
+            log_reply(reply, handler) if Stealth.config.transcript_logging
 
             # If this was a 'delay' type of reply, we insert the delay
             if reply.delay?
@@ -264,10 +264,14 @@ module Stealth
             end
           end
 
-          def log_reply(reply)
+          def log_reply(reply, reply_handler)
             message = case reply.reply_type
                       when 'text'
-                        reply['text']
+                        if reply_handler.respond_to?(:translated_reply)
+                          reply_handler.translated_reply
+                        else
+                          reply['text']
+                        end
                       when 'speech'
                         reply['speech']
                       when 'ssml'
@@ -282,6 +286,8 @@ module Stealth
               topic: current_service,
               message: "User #{current_session_id} -> Sending: #{message}"
             )
+
+            message
           end
 
       end # instance methods

data/spec/controller/replies_spec.rb

@@ -66,6 +66,10 @@ describe "Stealth::Controller replies" do
       send_replies custom_reply: 'messages/sub1/sub2/say_nested'
     end
 
+    def say_simple_hello
+      send_replies
+    end
+
     def say_inline_reply
       reply = [
         { 'reply_type' => 'text', 'text' => 'Hi, Morty. Welcome to Stealth bot...' },
@@ -609,6 +613,50 @@ describe "Stealth::Controller replies" do
     end
   end
 
+  describe "Logging replies" do
+    let(:stubbed_handler) { double("handler") }
+    let(:stubbed_client) { double("client") }
+
+    before(:each) do
+      allow(Stealth::Services::Facebook::ReplyHandler).to receive(:new).and_return(stubbed_handler)
+      allow(Stealth::Services::Facebook::Client).to receive(:new).and_return(stubbed_client)
+      allow(controller.current_session).to receive(:flow_string).and_return("message")
+      allow(controller.current_session).to receive(:state_string).and_return("say_simple_hello")
+      Stealth.config.auto_insert_delays = false
+      Stealth.config.transcript_logging = true
+    end
+
+    after(:each) do
+      Stealth.config.auto_insert_delays = true
+      Stealth.config.transcript_logging = false
+    end
+
+    it "should log replies if transcript_logging is enabled" do
+      allow(stubbed_client).to receive(:transmit).and_return(true)
+      allow(controller).to receive(:sleep).and_return(true).with(2.0)
+
+      allow(stubbed_handler).to receive(:text).exactly(1).times
+      expect(Stealth::Logger).to receive(:l).with(
+        topic: 'facebook',
+        message: "User #{controller.current_session_id} -> Sending: Hello"
+      )
+      controller.say_simple_hello
+    end
+
+    it "should log translated replies if transcript_logging is enabled and the driver supports it" do
+      allow(stubbed_client).to receive(:transmit).and_return(true)
+      allow(controller).to receive(:sleep).and_return(true).with(2.0)
+
+      allow(stubbed_handler).to receive(:text).exactly(1).times
+      allow(stubbed_handler).to receive(:translated_reply).and_return("Bonjour")
+      expect(Stealth::Logger).to receive(:l).with(
+        topic: 'facebook',
+        message: "User #{controller.current_session_id} -> Sending: Bonjour"
+      )
+      controller.say_simple_hello
+    end
+  end
+
   describe "client errors" do
     let(:stubbed_handler) { double("handler") }
     let(:stubbed_client) { double("client") }

data/spec/replies/messages/say_simple_hello.yml

@@ -0,0 +1,2 @@
+- reply_type: text
+  text: "Hello"

data/stealth.gemspec

@@ -16,11 +16,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'puma', '>= 4.2', '< 6.0'
   s.add_dependency 'thor', '~> 1.0'
   s.add_dependency 'multi_json', '~> 1.12'
-  s.add_dependency 'sidekiq', '~> 6.0'
+  s.add_dependency 'sidekiq', '< 7'
   s.add_dependency 'activesupport', '~> 6.0'
 
   s.add_development_dependency 'rspec', '~> 3.9'
-  s.add_development_dependency 'rspec_junit_formatter', '~> 0.3'
   s.add_development_dependency 'rack-test', '~> 2.0'
   s.add_development_dependency 'mock_redis', '~> 0.22'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stealth
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta6
+  version: 2.0.0.beta7
 platform: ruby
 authors:
 - Mauricio Gomes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -77,16 +77,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -115,20 +115,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -362,6 +348,7 @@ files:
 - spec/replies/messages/say_oi.yml.erb
 - spec/replies/messages/say_randomize_speech.yml
 - spec/replies/messages/say_randomize_text.yml
+- spec/replies/messages/say_simple_hello.yml
 - spec/replies/messages/say_yo.yml
 - spec/replies/messages/say_yo.yml+twitter
 - spec/replies/messages/sub1/sub2/say_nested.yml
@@ -437,6 +424,7 @@ test_files:
 - spec/replies/messages/say_oi.yml.erb
 - spec/replies/messages/say_randomize_speech.yml
 - spec/replies/messages/say_randomize_text.yml
+- spec/replies/messages/say_simple_hello.yml
 - spec/replies/messages/say_yo.yml
 - spec/replies/messages/say_yo.yml+twitter
 - spec/replies/messages/sub1/sub2/say_nested.yml