stealth 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee7236c0ff0afce9f29f067802b34bf412189f995e59b284dc4e03f2216e2dc
-  data.tar.gz: bb4f56ec2bea359aa040a57f6ddda50fed0d8be61333cc05f0f64832839e190f
+  metadata.gz: cb5b41def6c4e13619ace50cff93ef042e41907d847d5bc391342a07b659c12f
+  data.tar.gz: edff40b0be61bb0ce35db7376b85fcbeb287daadb0a936266c0fb3ba2a442b11
 SHA512:
-  metadata.gz: 7185cb82248979039e11210b0a5a952e2973aef404f9d2717494f0045df1da7e225021b6b1134cb72c3335c7c9926ce32d641a510c4b52a0c359cfe9a3deda37
-  data.tar.gz: f137a529a1ef04b6803fb145bda12992991a57ff970c20b539ed49b78472285a4ac7e47cb08a4a2fabcc2336f8d01648b9a1f6df124cbf6857918facd1e6393d
+  metadata.gz: d41a57396b557409239312b03ed2009630a0b8d9396f97a5b5582ef6a9d7a68fc76696bf3ea7629a1af9fab3f3ccb9b2dd0b53db8f32cb9376c7b7769b289a75
+  data.tar.gz: 490adbca626688b0af47b89d857cf7bb14a307b49b1a6b92012d49b2eec5d5fc09f5176a5976b493f772af1c6fdc8c91cd8995d7cc08f8843db853135a09dd1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stealth (1.0.2)
+    stealth (1.0.3)
       activerecord (~> 5.2)
       activesupport (~> 5.2)
       multi_json (~> 1.12)
@@ -56,7 +56,7 @@ GEM
     mock_redis (0.17.3)
     multi_json (1.13.1)
     mustermann (1.0.2)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     oj (3.5.0)
     puma (3.11.4)

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/stealth/controller/catch_all.rb

@@ -13,10 +13,10 @@ module Stealth
           error_level = fetch_error_level
           Stealth::Logger.l(topic: "catch_all", message: "CatchAll #{calculate_catch_all_state(error_level)} triggered for #{error_slug}: #{reason}")
 
-          if defined?(CatchAllsController) && defined?(CatchAllFlow)
+          if defined?(CatchAllsController) && FlowMap.flow_spec[:catch_all].present?
             catch_all_state = calculate_catch_all_state(error_level)
 
-            if CatchAllFlow.flow_spec.states.keys.include?(catch_all_state.to_sym)
+            if FlowMap.flow_spec[:catch_all].states.keys.include?(catch_all_state.to_sym)
               step_to flow: 'catch_all', state: catch_all_state
             else
               # We are out of bounds, do nothing to prevent an infinite loop

data/lib/stealth/controller/controller.rb

@@ -63,7 +63,7 @@ module Stealth
           flow_controller.send(@action_name)
           run_catch_all(reason: 'Did not send replies, update session, or step') unless flow_controller.progressed?
         rescue StandardError => e
-          Stealth::Logger.l(topic: "catch_all", message: e.backtrace)
+          Stealth::Logger.l(topic: "catch_all", message: e.backtrace.join("\n"))
           run_catch_all(reason: e.message)
         end
       end

data/spec/controller/catch_all_spec.rb

@@ -0,0 +1,101 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+
+describe "Stealth::Controller::CatchAll" do
+
+  class VadersController < Stealth::Controller
+    def my_action
+      raise "oops"
+    end
+
+    def my_action2
+
+    end
+
+    def my_action3
+
+    end
+  end
+
+  class StubbedCatchAllsController < Stealth::Controller
+    def level1
+
+    end
+
+    def level2
+
+    end
+
+    def level3
+
+    end
+  end
+
+  class FlowMap
+    include Stealth::Flow
+
+    flow :vader do
+      state :my_action
+      state :my_action2
+      state :my_action3
+    end
+
+    flow :catch_all do
+      state :level1
+      state :level2
+      state :level3
+    end
+  end
+
+  let(:facebook_message) { SampleMessage.new(service: 'facebook') }
+  let(:controller) { VadersController.new(service_message: facebook_message.message_with_text) }
+
+  describe "when a CatchAll flow is defined" do
+    before(:each) do
+      stub_const("CatchAllsController", StubbedCatchAllsController)
+    end
+
+    after(:each) do
+      $redis.flushdb
+    end
+
+    it "should step_to catch_all->level1 when a StandardError is raised" do
+      controller.action(action: :my_action)
+      expect(controller.current_session.flow_string).to eq("catch_all")
+      expect(controller.current_session.state_string).to eq("level1")
+    end
+
+    it "should step_to catch_all->level1 when an action doesn't progress the flow" do
+      controller.action(action: :my_action2)
+      expect(controller.current_session.flow_string).to eq("catch_all")
+      expect(controller.current_session.state_string).to eq("level1")
+    end
+
+    it "should step_to catch_all->level2 when an action raises back to back" do
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      expect(controller.current_session.flow_string).to eq("catch_all")
+      expect(controller.current_session.state_string).to eq("level2")
+    end
+
+    it "should step_to catch_all->level3 when an action raises back to back to back" do
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      expect(controller.current_session.flow_string).to eq("catch_all")
+      expect(controller.current_session.state_string).to eq("level3")
+    end
+
+    it "should just stop after the maximum number of catch_all levels have been reached" do
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      controller.step_to flow: :vader, state: :my_action
+      expect(controller.current_session.flow_string).to eq("vader")
+      expect(controller.current_session.state_string).to eq("my_action")
+    end
+  end
+end
+

data/spec/controller/controller_spec.rb

@@ -345,4 +345,55 @@ describe "Stealth::Controller" do
     end
   end
 
+  describe "progressed?" do
+    it "should be truthy if an action calls step_to" do
+      expect(controller.progressed?).to be_falsey
+      controller.step_to flow: "mr_robot"
+      expect(controller.progressed?).to be_truthy
+    end
+
+    it "should be falsey if an action only calls step_to_at" do
+      expect(controller.progressed?).to be_falsey
+
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_at)
+      controller.step_to_at (DateTime.now + 10.hours), flow: 'mr_robot'
+
+      expect(controller.progressed?).to be_falsey
+    end
+
+    it "should be falsey if an action only calls step_to_in" do
+      expect(controller.progressed?).to be_falsey
+
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_in)
+      controller.step_to_in 100.seconds, flow: 'mr_robot'
+
+      expect(controller.progressed?).to be_falsey
+    end
+
+    it "should be truthy if an action calls update_session_to" do
+      expect(controller.progressed?).to be_falsey
+      controller.update_session_to flow: "mr_robot"
+      expect(controller.progressed?).to be_truthy
+    end
+
+    it "should be truthy if an action sends replies" do
+      expect(controller.progressed?).to be_falsey
+
+      # Stub out a service reply -- we just want send_replies to succeed here
+      stubbed_service_reply = double("service_reply")
+      allow(controller).to receive(:action_replies).and_return([], :erb)
+      allow(stubbed_service_reply).to receive(:replies).and_return([])
+      allow(Stealth::ServiceReply).to receive(:new).and_return(stubbed_service_reply)
+
+      controller.send_replies
+      expect(controller.progressed?).to be_truthy
+    end
+
+    it "should be falsey otherwise" do
+      expect(controller.progressed?).to be_falsey
+      controller.action(action: :other_action)
+      expect(controller.progressed?).to be_falsey
+    end
+  end
+
 end

data/spec/controller/replies_spec.rb

@@ -34,6 +34,21 @@ describe "Stealth::Controller replies" do
     def say_offer
       send_replies
     end
+
+    def say_uh_oh
+      send_replies
+    end
+  end
+
+  describe "missing reply" do
+    it "should raise a Stealth::Errors::ReplyNotFound" do
+      allow(controller.current_session).to receive(:flow_string).and_return("message")
+      allow(controller.current_session).to receive(:state_string).and_return("say_uh_oh")
+
+      expect {
+        controller.send_replies
+      }.to raise_error(Stealth::Errors::ReplyNotFound)
+    end
   end
 
   describe "class attributes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stealth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Mauricio Gomes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -284,6 +284,7 @@ files:
 - logo.svg
 - spec/configuration_spec.rb
 - spec/controller/callbacks_spec.rb
+- spec/controller/catch_all_spec.rb
 - spec/controller/controller_spec.rb
 - spec/controller/helpers_spec.rb
 - spec/controller/replies_spec.rb
@@ -332,6 +333,7 @@ summary: Ruby framework for conversational bots
 test_files:
 - spec/configuration_spec.rb
 - spec/controller/callbacks_spec.rb
+- spec/controller/catch_all_spec.rb
 - spec/controller/controller_spec.rb
 - spec/controller/helpers_spec.rb
 - spec/controller/replies_spec.rb