RBotKit 0.1.31 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb0fac54ff9206b29e32c8dbc1c55d344ea8f64
-  data.tar.gz: fd5510bfd74dd83ea70ecc58d0eb7b2ee49b2b8b
+  metadata.gz: ce4439f709bf4aa99f2327b08db5fba310c38ac0
+  data.tar.gz: 19f924b8ec1ba0dedebd2c25db1633a46f697f42
 SHA512:
-  metadata.gz: 76ab8072ca011c36e79a920bc149186f483e2a936c0797c7e69bef34afacfbafd21f62b817a885e6e65851e07957839eb62d7cec091a6faad39b9c8aa3de9b2f
-  data.tar.gz: 6f368852d0d9da884adf8dcb4c3178d0c5df3e4b448f80bee54b1e7b45a15cf18ae3a5d54d0711c5707283359c1430951e58e023bfd152359c6e8931531dbfe5
+  metadata.gz: 3da9a2d3a9ce74d3c6272c12958802fee629d478075d6bd819156afee3141ab9f8a75655e3bd93adf0dd789f4dbf799595f949c68b9679ef4787f89873d19b97
+  data.tar.gz: ba5b48702541767a3c6d8d9d299530b429469c76fe7fe238a7fdc09bdaff64c10a1bd8be01d4f0c681d91ee066e2ad216733690f10a86738143589f8a02cb24a

data/RBotKit.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
  
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "2.99.0"   
   spec.add_dependency 'rest-client', '~> 1.8' 
   spec.add_dependency 'i18n', '~> 0'
+  spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "2.99.0"  
+    # spec.add_development_dependency 'rest-client', '~> 1.8'  
+   # spec.add_development_dependency 'i18n', '~> 0'
 end

data/lib/RBotKit.rb

@@ -17,7 +17,7 @@ module RBotKit
     @@bot_key
   end
 
-  Request = Struct.new(:id, :chat_id, :user_id, :text, :username) 
+  Request = Struct.new(:id, :chat_id, :user_id, :text, :username, :photo_id) 
   RequestCallback = Struct.new(:id, :chat_id, :user_id, :text, :username) 
  
   def self.tel_parse_data(data)
@@ -29,7 +29,13 @@ module RBotKit
 			user_id = usr[:id]
 			username = usr[:first_name]
 			text = mes[:text] != nil ? mes[:text].strip : nil   
-  		req = Request.new(id, chat_id, user_id, text, username)  
+      photo = mes[:photo]
+      fileid = nil 
+      if photo != nil 
+         photosize = photo.last 
+         fileid = photosize[:file_id]  
+      end
+  		req = Request.new(id, chat_id, user_id, text, username, fileid)  
   	else 
     	cb = data[:callback_query]
     	if cb != nil
@@ -39,11 +45,24 @@ module RBotKit
     		user_id = usr[:id]
     		username = usr[:first_name]
     		text = cb[:data]
-  			req = RequestCallback.new(id, chat_id, user_id, text, username)  
+  			req = RequestCallback.new(id, chat_id, user_id, text, username, nil)  
     	end
   	end
   end
  
+  def self.get_file_link(fileid)
+    responce = RestClient.get "https://api.telegram.org/#{RBotKit.bot_key}/getFile?file_id=#{fileid}"
+    jresp = JSON.parse(responce.body)
+    filepath = nil 
+    p jresp["result"] != nil
+    if jresp["result"] != nil
+      filepath = jresp["result"]["file_path"]  
+      return "https://api.telegram.org/file/#{RBotKit.bot_key}/#{filepath}" 
+    else   
+      p jresp
+      return nil
+    end
+  end
 
   CommandCase = Struct.new(:state, :cmdtext, :cmdclass) 
 
@@ -73,8 +92,7 @@ module RBotKit
       @locale_provider = locale_provider == nil ? LocaleProvider.new : locale_provider
     end
   
-  	def process_request(req)
-  		return if req.text == nil 
+  	def process_request(req) 
       return if @state_provider.is_req_already_processed(req.chat_id, req.id)
 
       @state_provider.update_last_processed_req_id(req.chat_id, req.id)
@@ -86,12 +104,15 @@ module RBotKit
 
       arrs.each do |cc| 
       	in_state = cc.state.class == Array ? cc.state.include?(state) : cc.state == state  
-      	if in_state || cc.state == :any 
+      	if in_state || cc.state == :any  
+
       		if cc.cmdtext.class == Hash 
       			regexp = cc.cmdtext[:regexp] 
       			cmdCase = cc if regexp != nil && regexp.match(req.text) 
       		elsif  cc.cmdtext.class == Symbol && cc.cmdtext == :any
       			cmdCase = cc
+          elsif  cc.cmdtext.class == Symbol && cc.cmdtext == :hasphoto && req.photo_id != nil 
+            cmdCase = cc
       		else 
       			cmdCase = cc if cc.cmdtext == req.text 
       		end  

data/lib/RBotKit/state_provider.rb

@@ -3,8 +3,7 @@ module RBotKit
 	class StateProvider
 
 		def is_req_already_processed(chat_id, req_id)
-			return false if req_id == nil
-
+			return false if req_id == nil 
 		end
 
 		def update_last_processed_req_id(chat_id, req_id)

data/lib/RBotKit/version.rb

@@ -1,3 +1,3 @@
 module RBotKit
-  VERSION = "0.1.31"
+  VERSION = "0.1.35"
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: RBotKit
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.35
 platform: ruby
 authors:
 - alexej
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 2.99.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
 description: Bot Kit for telegramm
 email:
 - a-nenastev@mail.ru
@@ -93,7 +93,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- RBotKit-0.1.30.gem
+- RBotKit-0.1.31.gem
 - RBotKit.gemspec
 - RBotKit/.gitignore
 - RBotKit/.rspec