From 7e41bd4f9bc032f9e89e6dcd7a121556cae6fa2d Mon Sep 17 00:00:00 2001
From: Max Melentiev <melentievm@gmail.com>
Date: Fri, 6 Oct 2017 11:10:05 +0300
Subject: [PATCH] Allow use different sessions for MessageContext

---
 .../bot/updates_controller/message_context.rb | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/telegram/bot/updates_controller/message_context.rb b/lib/telegram/bot/updates_controller/message_context.rb
index bc3fbbf..3186300 100644
--- a/lib/telegram/bot/updates_controller/message_context.rb
+++ b/lib/telegram/bot/updates_controller/message_context.rb
@@ -7,14 +7,11 @@ module Telegram
 
         include Session
 
-        included do
-          # As we use before_action context is cleared anyway,
-          # no matter we used it or not.
-          singleton_class.send :attr_reader, :context_handlers, :context_to_action
-          @context_handlers = {}
-        end
-
         module ClassMethods
+          def context_handlers
+            @_context_handlers ||= {}
+          end
+
           # Registers handler for context.
           #
           #     context_handler :rename do |*|
@@ -39,6 +36,8 @@ module Telegram
             context_handlers[context] = action || context
           end
 
+          attr_reader :context_to_action
+
           # Use it to use context value as action name for all contexts
           # which miss handlers.
           # For security reasons it supports only action methods and will
@@ -59,10 +58,16 @@ module Telegram
         # according to previous request.
         attr_reader :context
 
+        # Controller may have multiple sessions, let it be possible
+        # to select session for message context.
+        def message_context_session
+          session
+        end
+
         # Fetches context and finds handler for it. If message has new command,
         # it has higher priority than contextual action.
         def action_for_message
-          val = session.delete(:context)
+          val = message_context_session.delete(:context)
           @context = val && val.to_sym
           super || context && begin
             handler = handler_for_context
@@ -72,7 +77,7 @@ module Telegram
 
         # Save context for the next request.
         def save_context(context)
-          session[:context] = context
+          message_context_session[:context] = context
         end
 
         def handler_for_context