telegram_bot_middleware 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19dee6688c9ccd4a5f152303e79a438a3ada2355
-  data.tar.gz: ccd54a63a55513074a270f07fbcd0018a6a2deca
+  metadata.gz: 870191d85926103616be33ea31cb39dc8bb1d272
+  data.tar.gz: bc550f86c1c106ae526d18d4e5afaa31b91fdcf0
 SHA512:
-  metadata.gz: 6ff282369b82fd2ca2f8ee923530f0b7a6d1c1b7ab0ce5dc3a675efef887bf8e1b59d008368aadce034593d69376b89bb3f8b0d6cfcc9779d6c40f025019935e
-  data.tar.gz: 8fcdba4d61f4d1c499aa250f10ce4ef4e3af4ad250f3ea3409353bd0dd0d561a75917d98d39ea87d3ef4afbccef395d59b75ea1f060cce575dcbd93964816460
+  metadata.gz: 42cf0b10bfb844b86c821140e64f35271e0f7ee37fe4f4a818cf14e5040db05fb4f418f70a371d2cae5f9e4f1c529ce4524f85e085a8be701b8a81bd748ce4f3
+  data.tar.gz: 2de4247868fb47150d373d91254ad41fa964e519303e5287243b278744f03cf07fcd77794eba22a8f2d41665ca2189e957ec4590cb0f7afc431275dc61bd1c86

data/README.md

@@ -26,13 +26,16 @@ require 'telegram_bot_middleware'
 use TelegramBotMiddleware do |config|
   config.token = '<TELEGRAM_TOKEN>'
   config.host = '<HOST>'
-  config.get_updates = :polling or :webhook
 end
 ```
 
-* To obtain a token follow the instructions in [telegram bot api](https://core.telegram.org/bots#botfather).
-* The host is the address where the script is running, for example during development could be http://127.0.0.1:9292.
-* The get_updates params specify how to get incoming messages from telegram, can be :polling or :webhook, look at the [telegram bot api](https://core.telegram.org/bots/api#getupdates) for details.
+### Config options:
+* token (required): to obtain the token follow the instructions in [telegram bot api](https://core.telegram.org/bots#botfather).
+* host (required): is the address where the script is running, for example during development could be http://127.0.0.1:9292.
+* get_updates (optional, default is :polling) params specify how to get incoming messages from telegram, can be :polling or :webhook, look at the [telegram bot api](https://core.telegram.org/bots/api#getupdates) for details.
+* connection_pool_size (optional, default is 2):
+* connection_keep_alive (optional, default is 30):
+* connection_force_retry (optional, default is true):
 
 ## Usage
 
@@ -139,6 +142,9 @@ Sometimes can be useful to return more than one message, do this is very simple,
 ```
 In this case the bot will send an image, a message and a location.
 
+### Session and cookies
+The middleware supports the standard sessions variables, that are stored as a cookie and the values are valid for the given chat, see the [calculator sample](https://github.com/MirkoMignini/telegram_bot_middleware/blob/master/examples/sinatra/calc.rb).
+
 ## Examples
 
 To run an example call:

data/examples/sinatra/calc.rb

@@ -1,9 +1,13 @@
 require_relative 'example_init'
 
-calc_string = ''
+use Rack::Session::Cookie, :key => 'rack.session',
+                           :domain => 'foo.com',
+                           :path => '/',
+                           :expire_after => 2592000, # In seconds
+                           :secret => 'some_secret'
 
 get %r{calc/?$}i do
-  calc_string = ''
+  session[:result] = ''
   {
     text: "Let's calc!",
     reply_markup: {keyboard: [%w(7 8 9 *), %w(4 5 6 /), %w(1 2 3 -), %w(0 . = +)], resize_keyboard: true, one_time_keyboard: false, selective: false}
@@ -11,12 +15,12 @@ get %r{calc/?$}i do
 end
 
 get %r{(0|1|2|3|4|5|6|7|8|9|\*|\/|-|\.|\+)$} do |cmd|
-  calc_string += cmd
+  session[:result] += cmd
 end
 
 get '/=' do
   {
-    text: eval(calc_string).to_s,
+    text: eval(session[:result]).to_s,
     reply_markup: {hide_keyboard: true}
   }
 end

data/lib/telegram_bot_middleware/version.rb

@@ -1,3 +1,3 @@
 class TelegramBotMiddleware
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/telegram_bot_middleware.rb

@@ -13,6 +13,10 @@ class TelegramBotMiddleware
   def initialize(app, &block)    
     # save the app var
     @app = app
+    
+    # local cookies hash
+    @cookies = Hash.new
+    
     @env = nil
     
     # create the config and populate passing do the block function
@@ -22,6 +26,8 @@ class TelegramBotMiddleware
     self.class.persistent_connection_adapter  pool_size: (@config.connection_pool_size || 2),
                                               keep_alive: (@config.connection_keep_alive || 30),
                                               force_retry: (@config.connection_force_retry || true)
+    
+    @config.get_updates ||= :polling
 
     # setup webhook
     if @config.webhook.nil?
@@ -122,13 +128,19 @@ class TelegramBotMiddleware
       @env['QUERY_STRING'] = query_string
       @env['REQUEST_METHOD'] = 'GET'
       @env['REQUEST_URI'] = "https://#{req.host}#{path}"
-      # TODO use update(hash) { |name, old_value, new_value| }
+      
+      # if in cache a cookie for this chat was present add to the header
+      @env['HTTP_COOKIE'] = @cookies[params.message.chat.id] if @cookies.include?(params.message.chat.id)
       
       # call the rack stack
       status, headers, body = @app.call(@env)
       
+      # try to send to telegram only if no errors
       if status == 200 or status == '200'
         
+        # if the call setted a cookie save to local cache
+        @cookies[params.message.chat.id] = headers['Set-Cookie'] if headers.include?('Set-Cookie')
+        
         case headers['Content-Type'].split(';').first
           when 'text/html', 'application/json'          
             if body.is_a? Hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_bot_middleware
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mirko Mignini
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake