stealth 1.1.3 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f8320b2cac826c1cf5148f68e2a6f6150be3cb304a0d53060cc080a09ae12d
-  data.tar.gz: d4b52efb67c07f381bb5db90e1d81fc8de8bec58beb5f9d092bb67848c733112
+  metadata.gz: acde4522ee0154ec5557379bfd1fa928e89771637e4c3dd99880adb624b7c2f7
+  data.tar.gz: f30cc740eb9c40fb90c19cbe35a27cf12ce24209245813d338db25df61ca238a
 SHA512:
-  metadata.gz: afff49469cf84849199aa6ddb275cc49b33df768c117032698e98346645d88b0052cfccaa54cd4e7e55d97bc22531d6761ccc30fd5588acb7fd630b49820473c
-  data.tar.gz: 8717b999c849c5132e17d695534c1b74958d0b372ad2382c2695edde915c3f76c2247e7fb36947a80d67eeda2a51cd1b9bc19337de7ee9c77b1dad10b9433abb
+  metadata.gz: 63ad339fe8d1473ab1118eef9279cf66f1a895748fe61ca7671d49ca8de635fe27f9e4f200c1ae05523501f62e135eb4147d3609f9550c920311498a7abfa26c
+  data.tar.gz: cbcc9083bb56acc3d30aedbcc6a853fb71cf5a57b0586e81b586c36d1f186c5bc39cf5acf6d03768c86c486c7a6ff987ca5e151248cf43c34b70b21778c285ef

data/.circleci/config.yml

@@ -1,9 +1,9 @@
 version: 2
 
 jobs:
-  ruby_2_4:
+  ruby_2_6:
     docker:
-      - image: circleci/ruby:2.4-node-browsers
+      - image: circleci/ruby:2.6-node-browsers
         environment:
           STEALTH_ENV: test
 
@@ -18,55 +18,12 @@ jobs:
           - v1-dependencies-{{ checksum "Gemfile.lock" }}
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      # run tests!
       - run:
-          name: run tests
+          name: Configure Bundler
           command: |
-            mkdir /tmp/test-results
-            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
-
-            bundle exec rspec --format progress \
-                --format RspecJunitFormatter \
-                --out /tmp/test-results/rspec.xml \
-                --format progress \
-                -- \
-                $TEST_FILES
-
-      # collect reports
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-  ruby_2_5:
-    docker:
-      - image: circleci/ruby:2.5-node-browsers
-        environment:
-          STEALTH_ENV: test
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
+            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
+            source $BASH_ENV
+            gem install bundler
       - run:
           name: install dependencies
           command: |
@@ -97,9 +54,9 @@ jobs:
       - store_artifacts:
           path: /tmp/test-results
           destination: test-results
-  ruby_2_6:
+  ruby_2_7:
     docker:
-      - image: circleci/ruby:2.6-node-browsers
+      - image: circleci/ruby:2.7-node-browsers
         environment:
           STEALTH_ENV: test
 
@@ -114,7 +71,12 @@ jobs:
           - v1-dependencies-{{ checksum "Gemfile.lock" }}
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
-
+      - run:
+          name: Configure Bundler
+          command: |
+            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
+            source $BASH_ENV
+            gem install bundler
       - run:
           name: install dependencies
           command: |
@@ -150,6 +112,5 @@ workflows:
   version: 2
   build:
     jobs:
-      - ruby_2_4
-      - ruby_2_5
       - ruby_2_6
+      - ruby_2_7

data/CHANGELOG.md

@@ -1,3 +1,96 @@
+# Changelog for Stealth v2.0.0
+
+## Enhancements
+
+* [Controllers] Added support for Dev Jumping. This feature allows developers to jump around flows and states for bot's in development.
+* [NLP] Added base classes for `Stealth::Nlp::Result` and `Stealth::Nlp::Client` to be used by NLP drivers.
+* [Controllers] Scheduled replies no longer call `controller.route` when they run. Instead we `step_to` to the flow and state directly. This ensures the `route` is reserved for incoming messages.
+* [Catch All] Backtrace logging has been improved. The error message is now included first in the backtrace.
+* [Logger] The thread's ID (TID) is now included in every logging entry preceding the log type, ie "[facebook]"
+* [Interrupt] Interrupt detection has been added. See the docs for more info on this feature.
+* [Controllers] When user's flow is set to `catch_all` or `interrupt`, Stealth will ignore incoming messages. If you have interactive states in either of these controllers, you will need to move those interactions to a different controller.
+* [Sessions] Sessions can now be cleared by calling `session.clear_session`. Clearing a session removes the key from Redis.
+* [Logging] `primary_session`, `previous_session`, and `back_to_session` now explicitly logged
+* [Sessions] The session is no longer set on update or stepping witht destination flow and state match the existing session.
+* [Scheduled Replies] The `service_message.target_id` is now set for scheduled replies. NOTE: scheduled replies that are already enqueued will NOT have this set.
+* [Server] Updated to Puma 4.3
+* [Server] Updated to Sinatra 2.1
+* [Sessions] Added `to_s` for sessions to pretty print the slug. Useful when debugging.
+* `send_reples` now supports two additional options for replies:
+  `send_replies(custom_reply: 'hello/say_hello')`
+  `send_replies(inline: [])`
+* Dynamic delays for SMS platforms do not delay at the beginning of a reply.
+* Added support for Bandwidth SMS
+* The `ServiceMessage` (current_message) now contains a `target_id`. This can be set by the platform driver to provide more information about the intended target of a message.
+* [Controller] Added a `do_nothing` method that prevents `catch_all` from firing when a controller action doesn't send replies nor progresses the session.
+* [Replies] If `text` and `speech` replies are specified as an Array, Stealth will now randomize the selected text.
+* [Generators] Added sample payload handling to generated bots since it can be tricky.
+* [Generators] Added `inflections.rb` to generators since we rely on `ActiveSupport::Inflector` to derive flow and controller names.
+* [Sessions] previous_session log entries now appear below current_session entries.
+* [Logging] Add option, `Stealth.config.transcript_logging`, to log incoming and outgoing messages.
+* [Server] The only HTTP header passed along to `handle_message_job` is now `HTTP_HOST`.
+* [Controllers] Added `set_back_to` and `step_back` to allow user specified "redirect back". Useful for multi-state transitions that would otherwise not be possible with just `previous_session`.
+* [Configuration] Stealth::Configuration now returns `nil` for a configuration option that is missing. It still returns a `NoMethodError` if attempting to access a key from a parent node that is also missing.
+* [Reloading] Bots in development mode now hot reload! It's no longer necessary to stop your local server.
+* [Production] Production bots now eager load bot code to improve copy-on-write performance. The `puma.rb` config has been updated with instructions for multiple workers.
+* [Flows] You can now specify custom options when defining states. These options can later be accessed via the flow specification.
+* [CoreExt] Added a `String#without_punctuation` method. Removes a lot of common punctuation.
+* [CoreExt] `String#normalize` no longer removes quotation marks.
+* [Controllers] Alpha ordinal checks are now done against a "normalized" string without punctuation. See above.
+* [Controllers] `normalized_msg` and `homophone_translated_msg` are now memoized for performance.
+* [Errors] `Stealth::Errors::MessageNotRecognized` has been renamed to `Stealth::Errors::UnrecognizedMessage`
+* [Controllers] When `handle_message` or `get_match` raise a `Stealth::Errors::UnrecognizedMessage`, the user is first routed to a new `UnrecognizedMessagesController` to perform NLP. If that controller fails to match, the `catch_all` is run as normal.
+* [Errors] Client errors now call respective BotController actions: `handle_opt_out` and `handle_invalid_session_id`. Each client is responsible for raising `Stealth::Errors::UserOptOut` or `Stealth::Errors::InvalidSessionId` errors.
+* [Controllers] `handle_message` and `get_match` now detect homophones for alpha ordinals (A-Z)
+* [Controllers] `handle_message` and `get_match` now ignore single and double quotes for alpha-ordinals
+* [CoreExt] Strings now have a `normalize` method for removing padding and quotes
+* [Controllers] Improved logging when `UnrecognizedMessagesController` runs.
+* [Controllers] State transitions (via `step_to`, `update_session_to`, `step_to_at`, `step_to_in`, and `set_back_to`) now accept a session `slug` argument.
+* [Replies] Added support for sub-state replies. `step_to` can now take a `pos` argument that will force any resulting `send_replies` to be sent starting at the `pos` specified. `pos` can also be negative, for example, `-1` will force `send_replies` to send replies starting at (only) the last reply.
+* [Replies] Dynamic delays are automatically sent before each reply. This can be disabled by setting `Stealth.config.auto_insert_delays` to `false`. If a delay is already included, the auto-delay is skipped.
+* [Controllers] `handle_message` now supports `Regexp` keys.
+* [Configuration] `database.yml` is now parsed with ERB in order to support environment variables. Thanks @malkovro.
+* [Replies] Speech and SSML replies now use `speech` and `ssml` as keys, respectively, instead of `text`
+
+## Bug Fixes
+
+* [Catch All] Errors triggered within CatchAlls no longer trigger a CatchAll. They are simply ignored. This prevents infinite looping scenarios.
+* [Interrupt] If CatchAll runs and doesn't `step_to`, it releases the session lock.
+* [Controller] Messages are no longer ignored in CatchAll and Interrupt controllers
+* [Interrupts] After `send_replies`, we now release the session lock. This ensures replies that send buttons can properly receive responses from them.
+* Callbacks specified in child controllers of `BotController` where not being called during `step_to`. While the fix was small, we've bumped the minor release to ensure this fix does not break existing codebases.
+* Fixed another bug loading replies from a `custom_reply` path in `send_replies`
+* Fixed bug loading replies from a `custom_reply` path in `send_replies`
+* Leading dynamic delays in a reply are not sent again on SMS platforms.
+* [Sessions] Sessions retrieved when session expiration was enabled would return as an Array rather than a slug.
+* [Sessions] previous_session now respects session_ttl values.
+* [Catch All] Log output from all catch_all logging now includes the session_id so they can be included in log searches.
+* [NLP] Strip out values from single element arrays in the case of custom LUIS List entities.
+* [Config] Attempting to overwrite default config values with `nil` or `false` now correctly sets those config values.
+
+## Deprecations
+
+* [Controllers] current_user_id has now been completely removed since becoming deprecated in 1.1.0.
+* [Ruby] MRI 2.4 is no longer supported as we depend on ActiveSupport 6.0 now. Rails 6.0 only supports Ruby MRI 2.5+.
+
+# Changelog for Stealth v1.1.5
+
+## Enhancements
+
+* [Replies] Replies will now always send the `sender_id` that came in to the service drivers. This ensures `current_session_id` hasn't been modified which would cause replies to fail to send.
+
+# Changelog for Stealth v1.1.4
+
+## Bug Fixes
+
+* [General] Fixed controller and model concern load order. Previously files in the concerns folder were not loading before their respective controllers or models causing LoadErrors.
+
+# Changelog for Stealth v1.1.3
+
+## Bug Fixes
+
+* [Server] Additional CONTENT_TYPE fixes that would cause the server to 500 when it was missing.
+
 # Changelog for Stealth v1.1.2
 
 ## Bug Fixes

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :mri do
-  gem 'oj', '~> 3.7'
+  gem 'oj', '~> 3.10'
 end

data/Gemfile.lock

@@ -1,79 +1,84 @@
 PATH
   remote: .
   specs:
-    stealth (1.1.0.rc2)
-      activesupport (~> 5.2)
+    stealth (2.0.0.beta2)
+      activesupport (~> 6.0)
       multi_json (~> 1.12)
-      puma (~> 3.10)
-      sidekiq (~> 5.0)
+      puma (>= 4.2, < 5.0)
+      sidekiq (~> 6.0)
       sinatra (~> 2.0)
-      thor (~> 0.20)
+      thor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.3)
-    connection_pool (2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.7)
+    connection_pool (2.2.3)
     diff-lcs (1.3)
-    i18n (1.1.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    mock_redis (0.19.0)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    oj (3.7.6)
-    puma (3.12.0)
-    rack (2.0.6)
-    rack-protection (2.0.5)
+    minitest (5.14.2)
+    mock_redis (0.23.0)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.4)
+    oj (3.10.6)
+    puma (4.3.7)
+      nio4r (~> 2.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    redis (4.0.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    redis (4.2.5)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sidekiq (5.2.3)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
+    ruby2_keywords (0.0.2)
+    sidekiq (6.1.2)
+      connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      redis (>= 4.2.0)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    thor (1.0.1)
+    tilt (2.0.10)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mock_redis (~> 0.17)
-  oj (~> 3.7)
+  mock_redis (~> 0.22)
+  oj (~> 3.10)
   rack-test (~> 1.1)
-  rspec (~> 3.6)
+  rspec (~> 3.9)
   rspec_junit_formatter (~> 0.3)
   stealth!
 
 BUNDLED WITH
-   1.16.6
+   2.1.4

data/LICENSE

@@ -1,20 +1,7 @@
-Copyright (c) 2017 Mauricio Gomes, The Black Ops Bureau, Inc
+Copyright (c) 2017-2020 Mauricio Gomes, Mav Automation Ventures Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,9 +1,8 @@
 # <a href='https://hellostealth.org'><img src='logo.svg' height='120' alt='Stealth Logo' aria-label='hellostealth.org' /></a>
 
-Stealth is a Ruby based framework for creating voice & text chatbots. It's design is inspired by Ruby on Rails's philosophy of convention over configuration. It has an MVC architecture with the slight caveat that `views` are aptly named `replies`.
+Stealth is a Ruby framework for creating text and voice chatbots. It's design is inspired by Ruby on Rails's philosophy of convention over configuration. It has an MVC architecture with the slight caveat that `views` are aptly named `replies`.
 
-[![Gem Version](https://badge.fury.io/rb/stealth.svg)](https://badge.fury.io/rb/stealth)
-[![CircleCI](https://circleci.com/gh/hellostealth/stealth/tree/master.svg?style=shield)](https://circleci.com/gh/hellostealth/stealth/tree/master)
+[![CircleCI](https://circleci.com/gh/hellostealth/stealth.svg?style=svg)](https://circleci.com/gh/hellostealth/stealth)
 
 ## Features
 
@@ -34,6 +33,9 @@ Currently, there are gems for:
 * [Twilio SMS](https://github.com/hellostealth/stealth-twilio)
 * [Smooch](https://github.com/hellostealth/stealth-smooch)
 
+### Voice
+* [Alexa Skill](https://github.com/hellostealth/stealth-alexa) (Early alpha)
+
 ### Natural Language Processing
 * [AWS Comprehend](https://github.com/hellostealth/stealth-aws-comprehend)
 
@@ -42,22 +44,12 @@ Currently, there are gems for:
 
 ## Docs
 
-You can find our full docs [here](https://hellostealth.org/docs). If something is not clear in the docs, please file an issue! We consider all shortcomings in the docs as bugs.
-
-## Thanks
+You can find our full docs [here](https://github.com/hellostealth/stealth/wiki). If something is not clear in the docs, please file an issue! We consider all shortcomings in the docs as bugs.
 
-Stealth wouldn't exist without the great work of many other open source projects and people including:
+## Versioning
 
-* [Ruby](https://www.ruby-lang.org/) for creating our favorite programming language;
-* [Ruby on Rails](http://rubyonrails.org) for projects like `ActiveRecord` and serving as an inspiration;
-* [Thor](http://whatisthor.com) for providing us with CLI tools and generators;
-* [Sinatra](http://sinatrarb.com) for providing a fantastic, modular way for handling HTTP requests;
-* [Sidekiq](https://sidekiq.org) for the super quick background jobs;
-* [standalone-migrations](https://github.com/thuss/standalone-migrations) for the help with Rails migrations;
-* [Dr. Robert Ford](http://westworld.wikia.com/wiki/Robert_Ford) a.k.a. Anthony Hopkins.
+Stealth is versioned using [Semantic Versioning](https://semver.org), but it's more like the Linux Kernel. Major version releases are just as arbitrary as minor version releases. We strive to never break anything with any version change. Patches are still issues as the "third dot" in the version string.
 
 ## License
 
-"Stealth" and the Stealth logo are copyright (c) 2018 The Black Ops Bureau Inc.
-
-Stealth source code is released under the MIT License.
+"Stealth" and the Stealth logo are Copyright (c) 2020 Mauricio Gomes and Mav Automation Ventures Inc.

data/VERSION

@@ -1 +1 @@
-1.1.3
+2.0.0.beta2

data/lib/stealth/base.rb

@@ -16,8 +16,13 @@ end
 # core
 require 'stealth/version'
 require 'stealth/errors'
+require 'stealth/core_ext'
 require 'stealth/logger'
 require 'stealth/configuration'
+require 'stealth/reloader'
+
+# helpers
+require 'stealth/helpers/redis'
 
 module Stealth
 
@@ -30,6 +35,7 @@ module Stealth
   end
 
   def self.boot
+    load_services_config
     load_environment
   end
 
@@ -41,9 +47,36 @@ module Stealth
     Thread.current[:configuration] = config
   end
 
+  def self.default_autoload_paths
+    [
+      File.join(Stealth.root, 'bot', 'controllers', 'concerns'),
+      File.join(Stealth.root, 'bot', 'controllers'),
+      File.join(Stealth.root, 'bot', 'models', 'concerns'),
+      File.join(Stealth.root, 'bot', 'models'),
+      File.join(Stealth.root, 'bot', 'helpers'),
+      File.join(Stealth.root, 'config')
+    ]
+  end
+
+  def self.bot_reloader
+    @bot_reloader
+  end
+
   def self.set_config_defaults(config)
-    config.dynamic_delay_muliplier = 1.0
-    config.session_ttl = 0
+    defaults = {
+      dynamic_delay_muliplier: 1.0,                     # values > 1 increase, values < 1 decrease delay
+      session_ttl: 0,                                   # 0 seconds; don't expire sessions
+      lock_autorelease: 30,                             # 30 seconds
+      transcript_logging: false,                        # show user replies in the logs
+      hot_reload: Stealth.env.development?,             # hot reload bot files on change (dev only)
+      eager_load: Stealth.env.production?,              # eager load bot files for performance (prod only)
+      autoload_paths: Stealth.default_autoload_paths,   # array of autoload paths used in eager and hot reloading
+      autoload_ignore_paths: [],                        # paths to exclude from eager and hot reloading
+      nlp_integration: nil,                             # NLP service to use, defaults to none
+      log_all_nlp_results: false,                       # log NLP service requests; useful for debugging/improving NLP models
+      auto_insert_delays: true                          # automatically insert delays/typing indicators between all replies
+    }
+    defaults.each { |option, default| config.set_default(option, default) }
   end
 
   # Loads the services.yml configuration unless one has already been loaded
@@ -76,39 +109,51 @@ module Stealth
     load_services_config(services_yaml)
   end
 
+  def self.load_bot!
+    @bot_reloader ||= begin
+      bot_reloader = Stealth::Reloader.new
+      bot_reloader.load_bot!
+      bot_reloader
+    end
+  end
+
   def self.load_environment
     require File.join(Stealth.root, 'config', 'boot')
-    require_directory("config/initializers")
+    require_directory('config/initializers')
 
-    # Require explicitly to ensure it loads first
-    require File.join(Stealth.root, 'bot', 'controllers', 'bot_controller')
-    require File.join(Stealth.root, 'bot', 'models', 'bot_record')
+    load_bot!
 
-    require File.join(Stealth.root, 'config', 'flow_map')
-    require_directory("bot")
+    Sidekiq.options[:reloader] = Stealth.bot_reloader
 
     if defined?(ActiveRecord)
       if ENV['DATABASE_URL'].present?
         ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
       else
-        ActiveRecord::Base.establish_connection(YAML::load_file("config/database.yml")[Stealth.env])
+        database_config = File.read(File.join(Stealth.root, 'config', 'database.yml'))
+        ActiveRecord::Base.establish_connection(
+          YAML.load(ERB.new(database_config).result)[Stealth.env]
+        )
       end
     end
   end
 
-  private
+  def self.tid
+    Thread.current.object_id.to_s(36)
+  end
 
-    def self.require_directory(directory)
-      for_each_file_in(directory) { |file| require_relative(file) }
-    end
+  def self.require_directory(directory)
+    for_each_file_in(directory) { |file| require_relative(file) }
+  end
 
-    def self.for_each_file_in(directory, &blk)
-      directory = directory.to_s.gsub(%r{(\/|\\)}, File::SEPARATOR)
-      directory = Pathname.new(Dir.pwd).join(directory).to_s
-      directory = File.join(directory, '**', '*.rb') unless directory =~ /(\*\*)/
+private
 
-      Dir.glob(directory).sort.each(&blk)
-    end
+  def self.for_each_file_in(directory, &blk)
+    directory = directory.to_s.gsub(%r{(\/|\\)}, File::SEPARATOR)
+    directory = Pathname.new(Dir.pwd).join(directory).to_s
+    directory = File.join(directory, '**', '*.rb') unless directory =~ /(\*\*)/
+
+    Dir.glob(directory).sort.each(&blk)
+  end
 
 end
 
@@ -120,11 +165,19 @@ require 'stealth/scheduled_reply'
 require 'stealth/service_reply'
 require 'stealth/service_message'
 require 'stealth/session'
+require 'stealth/lock'
+require 'stealth/nlp/result'
+require 'stealth/nlp/client'
 require 'stealth/controller/callbacks'
 require 'stealth/controller/replies'
+require 'stealth/controller/messages'
+require 'stealth/controller/unrecognized_message'
 require 'stealth/controller/catch_all'
 require 'stealth/controller/helpers'
 require 'stealth/controller/dynamic_delay'
+require 'stealth/controller/interrupt_detect'
+require 'stealth/controller/dev_jumps'
+require 'stealth/controller/nlp'
 require 'stealth/controller/controller'
 require 'stealth/flow/base'
 require 'stealth/services/base_client'