rbender 0.5.35 → 0.7.3

data/lib/rbender/mongo_client.rb

@@ -6,6 +6,7 @@ class RBender::MongoClient
   attr_reader :mongo_client
 
   public
+
   def self.client
     instance.mongo_client
   end
@@ -15,7 +16,7 @@ class RBender::MongoClient
   end
 
   def setup(bot_name, mongo_string)
-    @bot_name = bot_name
+    @bot_name     = bot_name
     @mongo_client = Mongo::Client.new(mongo_string, :database => bot_name)
 
     Mongo::Logger.logger.level = ::Logger::FATAL

data/lib/rbender/{sessionmanager.rb → session_manager.rb}

@@ -2,8 +2,9 @@ module RBender
   module SessionManager
 
     private
+
     def session_setup(mongo_client)
-      @mongo_client = mongo_client
+      @mongo_client   = mongo_client
       @sessions_mongo = @mongo_client[:sessions]
     end
 
@@ -16,9 +17,9 @@ module RBender
     end
 
     def save_session(session)
-      @sessions_mongo.update_one({chat_id: session[:user][:chat_id]},
-                                 {'$set' => {session: session}},
-                                 {upsert: true})
+      @sessions_mongo.update_one({ chat_id: session[:chat_id] },
+                                 { '$set' => { session: session } },
+                                 { upsert: true })
     end
 
     def has_session?(chat_id)
@@ -27,26 +28,22 @@ module RBender
     end
 
     public
-    def self.chatid_list
-      sessions = RBender::MongoClient.client[:sessions]
-      result = sessions.distinct('chat_id')
-      chatid_list = []
+
+    def self.chat_id_list
+      sessions    = RBender::MongoClient.client[:sessions]
+      result      = sessions.distinct('chat_id')
+      chat_id_list = []
       result.each do |doc|
         chatid_list << doc
       end
-      chatid_list
+      chat_id_list
     end
   end
 end
 
-#
 # Mongo scheme:
 # Session
 # {chat_id: {session_key: session_value}}
 #
 # States
 # {chat_id: state}
-#
-#
-#
-#

data/lib/rbender/state.rb

@@ -1,244 +1,308 @@
 class RBender::State
-
-	def initialize(message, api, session, &state_block)
-		@message          = message
-		@api              = api
-		@session          = session
-		@state_block      = state_block
-		@keyboard         = nil
-		@inline_keyboards = {}
-		@action_after     = nil
-		@action_before    = nil
-		@text_action      = nil
-		@helpers_block    = nil
-		@methods          = RBender::Methods.new(message, api, session)
-		@commands         = {}
-	end
-
-	def get_keyboard
-		@keyboard
-	end
-
-	def message
-		@message
-	end
-
-	# Invokes states and processes user's input
-	def invoke
-		case message
-			when Telegram::Bot::Types::CallbackQuery
-				process_callback
-			when Telegram::Bot::Types::Message
-				if @message.text
-					if @message.text[0] == '/' and @message.text != '/start'
-						process_command(@message.text)
-					else
-						process_text_message
-					end
-				elsif @message.photo
-					process_photo
-				end
-
-			when Telegram::Bot::Types::Document
-				if @message.photo
-					process_photo
-				end
-			else
-				raise "This type isn't available: #{message.class}"
-		end
-	end
-
-	# @param command String
-	def process_command(command_line)
-		splitted = command_line.split(" ")
-		command = splitted[0]
-		splitted.delete_at 0
-		params = splitted
-
-		if @commands.include? command
-			instance_exec(params, &@commands[command])
-		end
-	end
-
-	def process_photo
-		instance_exec(message.photo, &@photo_action) unless @photo_action.nil?
-	end
-
-	# Process if message is just text
-	def process_text_message
-
-		unless @keyboard.nil? # if state has keyboard
-			@keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
-			build_keyboard
-
-			@keyboard.markup_final.each do |btn, final_btn|
-				if message.text == final_btn
-					instance_exec(&@keyboard.actions[btn])
-				end
-			end
-		end
-
-		unless @text_action.nil?
-			instance_exec(@message.text, &@text_action)
-		end
-
-	end
-
-	# Process if message is inline keyboard callback
-	def process_callback
-		keyboard_name, action = @message.data.split(RBender::CALLBACK_SPLITTER)
-		keyboard              = @inline_keyboards[keyboard_name.to_sym]
-		keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
-		keyboard.invoke unless keyboard.nil?
-
-		unless keyboard.nil?
-			unless keyboard.buttons_actions[action].nil?
-				instance_eval(&keyboard.buttons_actions[action])
-			else
-				raise "There is no action called '#{action}'"
-			end
-		else
-			edit_message_text text: "deleted"
-		end
-	end
-
-	def build
-		instance_exec(&@state_block)
-	end
-
-	def build_keyboard
-		@keyboard.build(@session)
-	end
-
-	def invoke_keyboard
-
-		@api.send_message(chat_id:      message.from.id,
-											text:         @keyboard.response,
-											reply_markup: @keyboard.markup_tg)
-	end
-
-	def invoke_before
-		instance_eval(&@action_before)
-	end
-
-	def has_after?
-		@action_after.nil? ? false : true
-	end
-
-	def has_before?
-		@action_before.nil? ? false : true
-	end
-
-	def invoke_after
-		instance_eval(&@action_after)
-	end
-
-	def has_keyboard?
-		@keyboard.nil? ? false : true
-	end
-
-	public
-
-	# adds inline keyboard
-	def keyboard_inline(inline_keyboard_name, &inline_keyboard_block)
-		@inline_keyboards[inline_keyboard_name] = RBender::KeyboardInline.new(inline_keyboard_name,
-																																					@session,
-																																					inline_keyboard_block)
-	end
-
-	#before hook
-	def before(&action)
-		if @action_before.nil?
-			@action_before = action
-		else
-			raise 'Too many before hooks!'
-		end
-	end
-
-	#after hook
-	def after(&action)
-		if @action_after.nil?
-			@action_after = action
-		else
-			raise 'Too many after hooks!'
-		end
-	end
-
-	# Text callbacks
-	def text(&action)
-		if @text_action.nil?
-			@text_action = action
-		else
-			raise 'Too many text processors!'
-		end
-	end
-
-	def keyboard(&keyboard_block)
-		@keyboard         = RBender::Keyboard.new
-		@keyboard.session = @session
-		@keyboard.instance_eval(&keyboard_block)
-	end
-
-	#initialize helper methods
-	def helpers(&helpers_block)
-		@helpers_block = helpers_block
-		instance_eval(&helpers_block)
-	end
-
-	def photo(&action)
-		if @photo_action.nil?
-			@photo_action = action
-		else
-			raise 'Too many image processors!'
-		end
-	end
-
-	alias image photo
-	alias picture photo
-
-	def command(command, &action)
-		unless @commands.include? command
-			if command[0] == '/'
-				@commands[command] = action
-			else
-				raise "Command should be started from slash symbol (/)"
-			end
-		else
-			raise "Command #{command} already exists"
-		end
-	end
-
-
-	def method_missing(m, *args, &block)
-		if RBender::Methods.method_defined? m
-			if block_given?
-				if args.empty?
-					return @methods.send(m, &block)
-				else
-					args = args[0] if args.count == 1
-					return @methods.send(m, args, &block)
-				end
-			else
-				if args.empty?
-					return @methods.send(m)
-				else
-					args = args[0] if args.count == 1
-					return @methods.send(m, args)
-				end
-			end
-		else
-			raise NoMethodError, "Method #{m} is missing"
-		end
-	end
-
-	# Returns Inline keyboard object by name
-	def inline_markup(name)
-		raise "Keyboard #{name} doesn't exists!" unless @inline_keyboards.member? name
-		keyboard = @inline_keyboards[name]
-		keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
-		keyboard.build
-		keyboard.markup_tg
-	end
-
+  def initialize(message, api, session, &state_block)
+    @message          = message
+    @api              = api
+    @session          = session
+    @chat_id          = @session[:chat_id]
+    @methods          = RBender::Methods.new(message, api, session)
+    @state_block      = state_block
+
+    @keyboard                = nil
+
+    @inline_keyboards_blocks = {}
+    @after_block             = nil
+    @before_block            = nil
+    @text_block              = nil
+    @helpers_block           = nil
+    @pre_checkout_block      = nil
+    @checkout_block          = nil
+    @shipping_block          = nil
+    @photo_block             = nil
+    @contact_block           = nil
+
+    @commands_blocks = {}
+  end
+
+  def get_keyboard
+    @keyboard
+  end
+
+  def message
+    @message
+  end
+
+  # Invokes states and processes user's input
+  def invoke
+    case message
+    when Telegram::Bot::Types::CallbackQuery
+      process_callback
+    when Telegram::Bot::Types::Message
+      if @message.text
+        if @message.text[0] == '/' and @message.text != '/start'
+          process_command(@message.text)
+        else
+          process_text_message
+        end
+      elsif @message.successful_payment
+        process_checkout
+      elsif @message.contact
+        process_contact
+      elsif @message.photo
+        process_photo
+      end
+    when Telegram::Bot::Types::Document
+      if @message.photo
+        process_photo
+      end
+    when Telegram::Bot::Types::PreCheckoutQuery
+      process_pre_checkout
+    when Telegram::Bot::Types::ShippingQuery
+      process_shipping
+    else
+      raise "This type isn't available: #{message.class}"
+    end
+  end
+
+  def process_pre_checkout
+    instance_exec(@message, &@pre_checkout_block)
+  end
+
+  def process_checkout
+    instance_exec(@message.successful_payment, &@checkout_block)
+  end
+
+  def process_shipping
+    instance_exec(@message.shipping_query, &@shipping_block)
+  end
+
+  # @param command String
+  def process_command(command_line)
+    splitted = command_line.split(" ")
+    command  = splitted[0]
+    splitted.delete_at 0
+    params = splitted
+
+    if @commands_blocks.include? command
+      instance_exec(params, &@commands_blocks[command])
+    end
+  end
+
+  def process_photo
+    instance_exec(message.photo, &@photo_block) unless @photo_block.nil?
+  end
+
+  def process_contact
+    instance_exec(message.contact, &@contact_block) unless @contact_block.nil?
+  end
+
+  # Process if message is just text
+  def process_text_message
+    unless @keyboard.nil? # if state has keyboard
+      @keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
+      build_keyboard
+
+      @keyboard.markup_final.each do |btn, final_btn|
+        if message.text == final_btn
+          instance_exec(&@keyboard.actions[btn]) # Process keyboard action
+          return
+        end
+      end
+    end
+
+    unless @text_block.nil?  # Else process text action
+      instance_exec(@message.text, &@text_block)
+    end
+  end
+
+  # Process if message is inline keyboard callback
+  def process_callback
+    keyboard_name, action = @message.data.split(RBender::CALLBACK_SPLITTER)
+    keyboard              = @inline_keyboards_blocks[keyboard_name.to_sym]
+    keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
+    keyboard.invoke unless keyboard.nil?
+
+    unless keyboard.nil?
+      unless keyboard.buttons_actions[action].nil?
+        instance_eval(&keyboard.buttons_actions[action])
+      else
+        raise "There is no action called '#{action}'"
+      end
+    else
+      edit_message_text text: "deleted"
+    end
+  end
+
+  def build
+    instance_exec(&@state_block)
+  end
+
+  def build_keyboard
+    @keyboard.build(@session)
+  end
+
+  def invoke_keyboard
+    @api.send_message(chat_id:      @chat_id,
+                      text:         @keyboard.response,
+                      reply_markup: @keyboard.markup_tg)
+  end
+
+  def invoke_before
+    instance_eval(&@before_block)
+  end
+
+  def has_after?
+    @after_block.nil? ? false : true
+  end
+
+  def has_before?
+    @before_block.nil? ? false : true
+  end
+
+  def invoke_after
+    instance_eval(&@after_block)
+  end
+
+  def has_keyboard?
+    @keyboard.nil? ? false : true
+  end
+
+  public
+
+  # adds inline keyboard
+  def keyboard_inline(inline_keyboard_name, &inline_keyboard_block)
+    @inline_keyboards_blocks[inline_keyboard_name] = RBender::KeyboardInline.new(inline_keyboard_name,
+                                                                                 @session,
+                                                                                 inline_keyboard_block)
+  end
+
+  #before hook
+  def before(&action)
+    if @before_block.nil?
+      @before_block = action
+    else
+      raise 'Too many before hooks!'
+    end
+  end
+
+  #after hook
+  def after(&action)
+    if @after_block.nil?
+      @after_block = action
+    else
+      raise 'Too many after hooks!'
+    end
+  end
+
+  # Text callbacks
+  def text(&action)
+    if @text_block.nil?
+      @text_block = action
+    else
+      raise 'Too many text processors!'
+    end
+  end
+
+  def keyboard(&keyboard_block)
+    if @is_global
+      raise 'Global state doesn\'t support :keyboard method'
+    end
+    @keyboard         = RBender::Keyboard.new
+    @keyboard.session = @session
+    @keyboard.instance_eval(&keyboard_block)
+  end
+
+  #initialize helper methods
+  def helpers(&helpers_block)
+    @helpers_block = helpers_block
+    instance_eval(&helpers_block)
+  end
+
+  def photo(&block)
+    if @photo_action.nil?
+      @photo_block = block
+    else
+      raise 'Image block already defined'
+    end
+  end
+
+  alias image photo
+  alias picture photo
+
+  def contact(&block)
+    if @contact_block.nil?
+      @contact_block = block
+    else
+      raise 'Contact block already defined'
+    end
+  end
+
+  def command(command, &action)
+    if @commands_blocks.include? command
+      raise "Command #{command} already exists"
+    else
+      if command[0] == '/'
+        @commands_blocks[command] = action
+      else
+        raise "Command should be started from slash symbol (/)"
+      end
+    end
+  end
+
+
+  def method_missing(m, *args, &block)
+    if RBender::Methods.method_defined? m
+      if block_given?
+        if args.empty?
+          return @methods.send(m, &block)
+        else
+          args = args[0] if args.count == 1
+          return @methods.send(m, args, &block)
+        end
+      else
+        if args.empty?
+          return @methods.send(m)
+        else
+          args = args[0] if args.count == 1
+          return @methods.send(m, args)
+        end
+      end
+    else
+      raise NoMethodError, "Method #{m} is missing"
+    end
+  end
+
+  # Returns Inline keyboard object by name
+  def inline_markup(name)
+    raise "Keyboard #{name} doesn't exists!" unless @inline_keyboards_blocks.member? name
+    keyboard = @inline_keyboards_blocks[name]
+    keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
+    keyboard.build
+    keyboard.markup_tg
+  end
+
+  def pre_checkout(&block)
+    if @pre_checkout_block.nil?
+      @pre_checkout_block = block
+    else
+      raise 'Too many pre_checkout actions'
+    end
+  end
+
+  alias pre_checkout_query pre_checkout
+
+  def checkout(&block)
+    if @checkout_block.nil?
+      @checkout_block = block
+    else
+      raise 'Too many pre_checkout actions'
+    end
+  end
+
+  alias successful_payment checkout
+  alias payment checkout
+
+  def shipping(&block)
+    @shipping_block = block
+  end
 end