rbender 0.5.1 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b87a6e8247553462fc13653986bfd04271ace3dd
-  data.tar.gz: ac5cd960c69eb6a092ac357fc21fa594908b61cf
+  metadata.gz: 1e7dca1a0912cda6f127f976eaca5430eca53305
+  data.tar.gz: ff763b15c52961be0ac08eac1481fd0377100406
 SHA512:
-  metadata.gz: 50ce484bc121cefb24e04ebc139472f8615fe0de81118025eda139d9f7c7bbb20f0e09cbea343e7f7ff480b5569fee84c455241d7a8db9df58891eb3618bb6b9
-  data.tar.gz: 8b69df3a95f933ef6f5f654b1968065bea321e8a3da0de6d5cfde94c15dda3d2106360a8a25786bb43b1935f980c4350292001e2133f83fbb9f57ca0d59ab0d8
+  metadata.gz: 083c5cd21ec62e28fc98a70e9f50465679062fd4578d95eacbe4bc1ec2941fc50b7f5de3e2a1639fbc3e8d97921cb78557ab2359d625f255a1f55905e73dc3c5
+  data.tar.gz: 4bac9546dcf062a3778f5e7b60041b5456cc552c2ae77c0c27a6449e81d2dab50087fda4361d6564b4b5513604e052aaf46f3a44dbd2ac8ea3e5ef46c82f21f8

data/bin/rbender

@@ -20,7 +20,7 @@ class OptParser
 			opts.separator ""
 			opts.separator "Common options:"
 			opts.on_tail("-v", "--version", "Prints current RBender version") do
-				puts "RBender version: #{RBender::VERSION}"
+				puts "RBender version: #{Gem.loaded_specs["rbender"].version}"
 				puts "by art2rik (https://github.com/art2rik)"
 			end
 

data/lib/rbender.rb

@@ -2,7 +2,7 @@ require 'rbender/base'
 require 'colorize'
 
 module RBender
-  VERSION = '0.5.1'
+  CALLBACK_SPLITTER = '|'
   @@bot = RBender::Base.new
 
   def self.instance

data/lib/rbender/base.rb

@@ -44,7 +44,7 @@ class RBender::Base
 					process_message(message)
 				rescue => ex
 					puts ex.message.red
-					puts ex.backtrace
+					puts ex.backtrace_locations
 				end
 			end
 		end
@@ -63,6 +63,8 @@ class RBender::Base
 		session_setup(RBender::MongoClient.client)
 
 		@token = params['development']['token']
+		RBender::ConfigHandler.token = @token
+
 		# if params.has_key? localizations
 		#
 		# end

data/lib/rbender/config_handler.rb

@@ -31,5 +31,13 @@ module RBender
 		def self.config_path=(path)
 			@@config_path = "#{path}/#{CONFIG_NAME}"
 		end
+
+		def self.token=(token)
+			@@token = token
+		end
+
+		def self.token
+			@@token
+		end
 	end
 end

data/lib/rbender/keyboard_inline.rb

@@ -1,5 +1,3 @@
-CALLBACK_SPLITTER = '|'
-
 class RBender::KeyboardInline
   attr_accessor :markup_tg,
                 :buttons_actions

data/lib/rbender/methods.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 class RBender::Methods
 
 	def initialize(message, api, session)
@@ -25,15 +27,6 @@ class RBender::Methods
 		@message
 	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 switch(state_to)
 		@session[:state_stack].push(@session[:state])
 		@session[:state] = state_to
@@ -49,27 +42,6 @@ class RBender::Methods
 	#--------------
 	# Hides inline keyboard
 	# Must be called from any inline keyboard state
-	def hide_inline
-		edit_message_reply_markup
-	end
-
-	# Hides keyboard's markup.
-	def hide_keyboard
-
-	end
-
-	#
-	# @param text [String] string
-	#
-	def answer_callback_query(text: nil,
-														show_alert: nil)
-		begin
-			@api.answer_callback_query callback_query_id: @message.id,
-																 text:              text,
-																 show_alert:        show_alert
-		rescue
-		end
-	end
 
 	def send_message(text:,
 									 chat_id: @message.from.id,
@@ -376,5 +348,35 @@ class RBender::Methods
 												 user_id: user_id)
 	end
 
+	def upload_file(filename, content_type)
+		filepath = "#{__dir__}/public/#{filename}"
+		Faraday::UploadIO.new(filepath, content_type)
+	end
+
+	alias file upload_file
+	alias upload upload_file
+
+	def download_file(file_path:, to:)
+		url   = 'https://api.telegram.org/file/bot'
+		token = RBender::ConfigHandler.token
+		path  = Dir.pwd + "/public/#{to}"
+
+
+		http_conn = Faraday.new do |builder|
+			builder.adapter(Faraday.default_adapter)
+		end
+
+		response = http_conn.get "#{url}#{token}/#{file_path}"
+
+		dir = File.dirname(path)
+
+		unless File.directory?(dir)
+			FileUtils.mkdir_p(dir)
+		end
+
+		File.open(path, 'wb') { |fp| fp.write(response.body)}
+	end
+
+	alias download download_file
 end
 

data/lib/rbender/state.rb

@@ -12,6 +12,7 @@ class RBender::State
 		@text_action      = nil
 		@helpers_block    = nil
 		@methods          = RBender::Methods.new(message, api, session)
+		@commands         = {}
 	end
 
 	def get_keyboard
@@ -29,7 +30,11 @@ class RBender::State
 				process_callback
 			when Telegram::Bot::Types::Message
 				if @message.text
-					process_text_message
+					if @message.text[0] == '/' and @message.text != '/start'
+						process_command(@message.text)
+					else
+						process_text_message
+					end
 				elsif @message.photo
 					process_photo
 				end
@@ -43,9 +48,22 @@ class RBender::State
 		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
 
@@ -178,6 +196,18 @@ class RBender::State
 	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
@@ -201,5 +231,14 @@ class RBender::State
 		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
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbender
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.35
 platform: ruby
 authors:
 - Arthur
@@ -43,7 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="