telegram-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182d125795a4e088af6c27402934a4fa901a4c06
-  data.tar.gz: aeb4a85c703ab577fbc520727a1afa00d420d8ab
+  metadata.gz: 4cc8e332062f1de259d8d94fc1a085d939ba651e
+  data.tar.gz: 92f18fd15c4d8bb3b3937dab3a76c24ba5e57e3e
 SHA512:
-  metadata.gz: b11c81be68b1188df5afd01b5976f450c602c4bc84c8ab451c9d901514501a196efbbbfb7de86fbdff0a3cc7f8cd7c9cd8aec0006e59874ced2d0cb5488f796d
-  data.tar.gz: 797894a095d7ad53c76fe65a7f706c51c6511800baa8e4055b648d53f41229da9fea0d32b998bff8203737fb9be4fa5a9253272cef2dd164b79060e3c05c8a10
+  metadata.gz: 55c1e49bcb0ca3b075dc23ed3a948d50d0ce457c199ee3ea3b8c03aa5d81d0365cf81ee4d10efac3e49746e33420e05757cc4a495477645af0fac2aa4b5fa2a5
+  data.tar.gz: 20be9baa1e333b9704761d135ed71eeea26fa7732a623885536a0e9335bbc744d7e84855f23f603ac01e6f4bb98ae220f76d81fdcee6f086718d59b14342ab67

data/lib/telegram/controller.rb

@@ -8,19 +8,10 @@ require 'telegram/controller/renderer'
 module Telegram
   class Controller
 
-    def bots= adapters
-      @bots = adapters
-    end
-
-
-    def bot_name= name
-      @bot_name = name
-    end
-
-
-    def message= payload
-      @message = payload
-    end
+    attr_writer :bots
+    attr_writer :bot_name
+    attr_writer :message
+    attr_writer :params
 
 
     def dispatch action
@@ -101,6 +92,11 @@ module Telegram
     end
 
 
+    def params
+      @params
+    end
+
+
     def send_message *args
       bot.api.send_message *args
       @has_response = true

data/lib/telegram/controller/renderer.rb

@@ -18,7 +18,7 @@ module Telegram
 
 
       def render opts = {}
-        options = opts.merge(default_render_options)
+        options = normalize_options(opts)
         view    = Controller::ViewObject.new(@controller.expose_instance_variables)
         template_file_name, response_format = resolve_template(options)
 
@@ -32,6 +32,14 @@ module Telegram
 
       private
 
+      def normalize_options opts
+        if opts.is_a? String
+          opts = {template: opts}
+        end
+        default_render_options.merge(opts)
+      end
+
+
       def default_render_options
         controller_name = @controller.class.to_s.underscore.gsub(/_controller$/,'')
         {

data/lib/telegram/rails/action_dispatcher.rb

@@ -32,7 +32,7 @@ module Telegram
         route = find_route_for bot_name, command
         return unless route
 
-        process_message message, with: route
+        process_message message, with: route, args: args, command: command
       end
 
 
@@ -58,19 +58,23 @@ module Telegram
 
       def process_message message, opts
         route = opts[:with]
+
         controller = route[:controller_class].new
         controller.tap do |c|
           c.bots     = @adapters
           c.bot_name = route[:bot_name]
           c.message  = message
+          c.params   = {
+            command: opts[:command],
+            args:    opts[:args],
+          }
         end
 
         controller.dispatch route[:action_name]
-        #HERE args support
       end
 
 
-      #TEST
+      # TEST
       def parse_route route_data
         route_string = route_data[:route]
         options      = route_data[:options]
@@ -79,7 +83,7 @@ module Telegram
         bot_name, command = segments
 
         bot_name = bot_name.to_sym if bot_name
-        command  = command.to_sym if command
+        command  = command.to_sym  if command
 
         endpoint = options[:to]
         controller_name, action_name = endpoint.to_s.split ENDPOINT_DELIMETER, 2
@@ -96,6 +100,7 @@ module Telegram
       end
 
 
+      # TEST
       # get command name from payload
       def extract_command_from payload
         command_str = payload.text

data/lib/telegram/rails/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stanislav E. Govorov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: telegram-bot-ruby