rbender 0.5.35 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e7dca1a0912cda6f127f976eaca5430eca53305
-  data.tar.gz: ff763b15c52961be0ac08eac1481fd0377100406
+SHA256:
+  metadata.gz: a793668dab825c522287f029506745b94cd5cf86d5aba5af6a5ca8bc59525389
+  data.tar.gz: fcacdcb1c9990bf38b6089546dacd78a7ca57c95856bb8799a6396ed104ffb2f
 SHA512:
-  metadata.gz: 083c5cd21ec62e28fc98a70e9f50465679062fd4578d95eacbe4bc1ec2941fc50b7f5de3e2a1639fbc3e8d97921cb78557ab2359d625f255a1f55905e73dc3c5
-  data.tar.gz: 4bac9546dcf062a3778f5e7b60041b5456cc552c2ae77c0c27a6449e81d2dab50087fda4361d6564b4b5513604e052aaf46f3a44dbd2ac8ea3e5ef46c82f21f8
+  metadata.gz: 21fef267a733b01635afe9ba9cdf1bbba98eae94d64d7ffd53989a73901658223fee1b13db35b31d8dbbd91c4092524ece637e425a40d199968b2095f94da95c
+  data.tar.gz: 1d014f730e8eaec9b504d9751d4bc332b4ab54e0d1133244675e6bbea94ad47ffad3cc1c278499ec02e70074d8366082467895fc422cdab3d1176e248fb1e3da

data/bin/rbender

@@ -37,6 +37,14 @@ class OptParser
 				exit
 			end
 
+			opts.on("-d", "Set bot's working directory") do |dir|
+				if File.directory?(dir)
+			  	options.directory = dir
+				else
+					raise ArgumentError, "#{dir} isn't working directory"
+				end
+			end
+
 		end
 
 		global.order!
@@ -53,8 +61,10 @@ def create_project(options, args)
 	unless args[0] =~ /\w{3,16}/ and args[1] == nil
 		raise ArgumentError, "Name must be from 3 to 16 english letters without spaces"
 	end
+
 	name = args[0]
 	name_undrscr = RBender::ConfigHandler.underscore(name)
+
 	begin
 	FileUtils.mkdir name
 	rescue
@@ -83,7 +93,6 @@ def create_project(options, args)
 	config.save
 
 	puts "Project #{name} successfully created"
-
 end
 
 def run(options, args)
@@ -92,15 +101,48 @@ def run(options, args)
 		rescue
 			puts 'Main file or config are missing!'
 		end
+		wd = options.directory || Dir.pwd
+		Dir.chdir(wd)
 		title = RBender::ConfigHandler.underscore(settings['title'])
-		load "#{Dir.pwd}/#{title}.rb"
+
+
+		recursive_require("#{Dir.pwd}/lib/")
+		load "#{wd}/#{title}.rb"
+		recursive_load("#{Dir.pwd}/screens/")
+		recursive_load("#{Dir.pwd}/states/")
+
+
 		bot_frame = RBender.instance
+
 		#TODO: add mode setting
-		RBender::ConfigHandler.config_path = __dir__
+		RBender::ConfigHandler.config_path = wd
 		bot_frame.set_params(settings)
 		bot_frame.run!
 end
 
+def recursive_require(file_path)
+	return unless Dir.exist? file_path
+	Dir.foreach(file_path) do |file|
+		next if file == "." || file == ".."
+		if File.extname(file) == ".rb"
+			require "#{file_path}/#{file}"
+		elsif File.directory? "#{file_path}/#{file}"
+			recursive_require("#{file_path}#{file}")
+		end
+	end
+end
+
+def recursive_load(file_path)
+	return unless Dir.exist? file_path
+	Dir.foreach(file_path) do |file|
+		next if file == "." || file == ".."
+		if File.extname(file) == ".rb"
+			load "#{file_path}/#{file}"
+		elsif File.directory? "#{file_path}/#{file}"
+			recursive_load("#{file_path}#{file}")
+		end
+	end
+end
 # --- EXECUTE CODE ______
 begin
 	options = OptParser.parse(ARGV.dup)
@@ -111,6 +153,8 @@ begin
 			create_project(options, ARGV.dup)
 		when "start"
 			run(options, ARGV.dup)
+	else
+		puts "Wrong command #{command}"
 	end
 rescue ArgumentError => e
 	puts "Wrong argument: #{e}"

data/lib/rbender/base.rb

@@ -1,195 +1,197 @@
-# require_relative '../rbender'
-# require_relative 'sessionmanager'
-
-require 'rbender/sessionmanager'
+require 'rbender/session_manager'
 require 'rbender/keyboard_inline'
 require 'rbender/mongo_client'
 require 'rbender/state'
 require 'rbender/config_handler'
 require 'rbender/methods'
 require 'rbender/keyboard'
-
+require 'rbender/fly_settings'
 
 require 'telegram/bot'
 
-
 class RBender::Base
-	attr_accessor :api
-	include RBender::SessionManager
-
-	public
-
-	def initialize
-		@states       = {}
-		@global_state = nil
-		@modules_block
-	end
-
-	def modules(&modules_block)
-		@modules_block = modules_block
-	end
-
-	# Runs the bot with server
-	def run!
-		puts "Bot is loading...".green
-		puts "Bot is running...".green
-		Telegram::Bot::Client.run(@token) do |bot|
-			@api = bot.api
-
-			unless @modules_block.nil?
-				instance_exec(@api, @mongo_client, &@modules_block)
-			end
-			bot.listen do |message| # When message has gotten
-				begin
-					process_message(message)
-				rescue => ex
-					puts ex.message.red
-					puts ex.backtrace_locations
-				end
-			end
-		end
-	end
-
-
-	# @param [Hash] params - hash with params
-	#
-	# Available parameters:
-	# * mongo (required) connection string
-	# * bot_name (required) name of bot
-	# * token (required) token
-	def set_params(params)
-		RBender::MongoClient.setup(params['title'], params['mongo'])
-
-		session_setup(RBender::MongoClient.client)
-
-		@token = params['development']['token']
-		RBender::ConfigHandler.token = @token
-
-		# if params.has_key? localizations
-		#
-		# end
-	end
-
-	# Adds new state to the bot.
-	# @param [String] state_name - name of the state
-	# @param [Block] block - actions while state has invoked
-	#
-	def state(state_name, &block)
-		unless @states.has_key? state_name
-			@states[state_name] = block
-		else
-			raise "State name is duplicated!"
-		end
-	end
-
-
-	def global(&block)
-		@global_state = block
-	end
-
-
-	private
-
-	def process_message(message)
-		chat_id = message.from.id # Unique chat ID
-
-		session = get_session(chat_id, message)
-
-
-		state        = session[:state] # User's state
-		state_block  = @states[state] # Block of the state
-		state_object = RBender::State.new message, # Object to invoke
-																			 @api,
-																			 session,
-																			 &state_block
-		state_object.instance_eval(&@global_state) unless @global_state.nil?
-		state_object.build
-		state_object.invoke
-
-		if is_start_message? message
-			state_object.invoke_before if state_object.has_before?
-		end
-
-		save_session session
-
-		state_new = session[:state] # New user's state
-
-
-		on_state_changed(state_object,
-										 state,
-										 state_new,
-										 message,
-										 session)
-	end
-
-	def on_state_changed(state_object, state_old, state_new, message, session)
-		if state_new != state_old  # If state has changed
-			state_object.invoke_after if state_object.has_after? #invoke after hook for an old state
-
-			state_new_block = @states[state_new]
-			state_object    = RBender::State.new message,
-																						@api,
-																						session,
-																						&state_new_block
-
-			state_object.instance_eval(&@global_state) unless @global_state.nil?
-			state_object.build
-
-			if state_object.has_keyboard? # Invoke a keyboard if it's exists
-				state_object.build_keyboard
-				state_object.invoke_keyboard
-			end
-
-			state_object.invoke_before if state_object.has_before? #invoke before hook for a new state
-		else
-			if state_object.has_keyboard? # Invoke a keyboard if it's exists
-				unless state_object.get_keyboard.one_time? or not state_object.get_keyboard.force_invoked?
-					state_object.build_keyboard
-					state_object.invoke_keyboard
-				end
-			end
-		end
-	end
-
-	def get_session(chat_id, message)
-		if has_session?(chat_id)
-			session = load_session(chat_id)
-
-		else # If user is new
-			session = {state:                  :start,
-								 state_stack:            [],
-								 keyboard_switchers:     {},
-								 keyboard_switch_groups: {},
-								 lang:                   :default
-			}
-
-		end
-
-		session[:user] = {chat_id:    chat_id,
-											first_name: message.from.first_name,
-											last_name:  message.from.last_name,
-											user_name:  message.from.username
-		}
-
-		session[:user].freeze # User's data must be immutable!
-
-		if is_start_message? message
-			session[:state]       = :start
-			session[:state_stack] = []
-		end
-
-		session
-	end
-
-	def is_start_message?(message)
-		if message.instance_of? Telegram::Bot::Types::Message
-			if message.text == '/start'
-				true
-			else
-				false
-			end
-		end
-	end
+  attr_accessor :api
+  include RBender::SessionManager
+
+  public
+
+  def initialize
+    @states       = {}
+    @global_state = nil
+    @modules_block
+  end
+
+  def modules(&modules_block)
+    @modules_block = modules_block
+  end
+
+  # Runs the bot with server
+  def run!
+    puts "Bot is loading...".green
+    puts "Bot is running...".green
+    Telegram::Bot::Client.run(@token) do |bot|
+      @api = bot.api
+
+      unless @modules_block.nil?
+        instance_exec(@api, @mongo_client, &@modules_block)
+      end
+      bot.listen do |message| # When message has gotten
+        begin
+          process_message(message)
+        rescue => ex
+          puts ex.message.red
+          puts ex.backtrace_locations
+        end
+      end
+    end
+  end
+
+
+  # @param [Hash] params - hash with params
+  #
+  # Available parameters:
+  # * mongo (required) connection string
+  # * bot_name (required) name of bot
+  # * token (required) token
+  def set_params(params)
+    RBender::MongoClient.setup(params['title'], params['mongo'])
+
+    session_setup(RBender::MongoClient.client)
+
+    @token                       = params['development']['token']
+    RBender::ConfigHandler.token = @token
+
+    # if params.has_key? localizations
+    #
+    # end
+  end
+
+  # Adds new state to the bot.
+  # @param [String] state_name - name of the state
+  # @param [Block] block - actions while state has invocked
+  #
+  def state(state_name, &block)
+    if @states.has_key? state_name
+      raise "State :#{state_name} is duplicated!"
+    else
+      @states[state_name] = block
+    end
+  end
+
+
+  def global(&block)
+    if @global_state
+      raise 'Global state already defined: You\'ve trying to define too much :global blocks'
+    else
+      @global_state = block
+    end
+  end
+
+  private
+
+  def process_message(message)
+    chat_id = message&.from&.id || message&.chat&.id # Unique chat ID
+
+    session = session(chat_id, message)
+
+    state        = session[:state] # User's state
+    state_block  = @states[state] # Block of the state
+    state_object = RBender::State.new message, # Object to invoke
+                                      @api,
+                                      session,
+                                      &state_block
+
+    state_object.instance_eval(&@global_state) unless @global_state.nil?
+    state_object.build
+    state_object.invoke
+
+    if is_start_message? message
+      state_object.invoke_before if state_object.has_before?
+    end
+
+    save_session session
+
+    state_new = session[:state] # New user's state
+
+    on_state_changed(state_object,
+                     state,
+                     state_new,
+                     message,
+                     session)
+  end
+
+  def on_state_changed(state_object, state_old, state_new, message, session)
+    if state_new != state_old # If state has changed
+      state_object.invoke_after if state_object.has_after? #invoke after hook for an old state
+
+      state_new_block = @states[state_new]
+      state_object    = RBender::State.new message,
+                                           @api,
+                                           session,
+                                           &state_new_block
+
+      state_object.instance_eval(&@global_state) unless @global_state.nil?
+      state_object.build
+
+      if state_object.has_keyboard? # Invoke a keyboard if it's exists
+        state_object.build_keyboard
+        state_object.invoke_keyboard
+      end
+
+      state_object.invoke_before if state_object.has_before? #invoke before hook for a new state
+      save_session session
+    else
+      if state_object.has_keyboard? # Invoke a keyboard if it's exists
+        unless state_object.get_keyboard.one_time? or not state_object.get_keyboard.force_invoked?
+          state_object.build_keyboard
+          state_object.invoke_keyboard
+        end
+      end
+    end
+  end
+
+  def session(chat_id, message)
+    if has_session?(chat_id)
+      session = load_session(chat_id)
+    else # If user is new
+      session = { state:                  :start,
+                  state_stack:            [],
+                  keyboard_switchers:     {},
+                  keyboard_switch_groups: {},
+                  lang:                   :default,
+                  chat_id:                chat_id
+      }
+    end
+
+    if (message.try(:chat) rescue nil)
+      session[:chat] = {
+          chat_id:     message.chat.id,
+          description: message.chat.description,
+          invite_link: message.chat.invite_link,
+          title:       message.chat.title,
+          first_name:  message.chat.first_name,
+          last_name:   message.chat.last_name,
+          user_name:   message.chat.username
+      }
+    end
+
+    session[:user].freeze # User's data must be immutable!
+
+    if is_start_message? message
+      session[:state]       = :start
+      session[:state_stack] = []
+    end
+
+    session
+  end
+
+  def is_start_message?(message)
+    if message.instance_of? Telegram::Bot::Types::Message
+      message.text == '/start' ? true : false
+    else
+      false
+    end
+  end
 end