telegram_workflow 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd8db5bb9937c5ae2154339550dc286f10e94c4b8290419ba9795d3e92a0f23
-  data.tar.gz: 26e421252440cbc137c6b25529e1c6cb8746aa63df41afc212724cd5229b8cc5
+  metadata.gz: c96cb2e0a64ca84710249746fba7e205101fa03d3708f154e7b9532133c550f6
+  data.tar.gz: edf5c725fb5100eea709c375657026cc80d3e16075de537422f55604dea150b7
 SHA512:
-  metadata.gz: 827dae61b2e7a63b2f4a36809e72fb79e67e619c8ec3570b11b6a1a1f0fdecb19d445a5ac91005ca3020d2baea9c8eb145311e59f449c411c023b09679be8978
-  data.tar.gz: 83d320d61b074092d6bf6a7783d73a88bed3b04f0ba83e2261108bbf5fc80760694d25736ff01693a4c3f81ce3fe7ed816ebb5298400cb19a3a39fa70255a718
+  metadata.gz: fb13268c4f33b5add25b82ccc628199aaec2571e57e8731f88b417c5727bb9c9d7639d860a7f6ef9af09110ba12a39db5c4d2ebbd777ea40e2f54c39d0d893ae
+  data.tar.gz: 5cdeb13d1098f17784dfdca787e2f73a0c8d8ee6cd704d42c5894b3de4b714b2cf1118ffbcd2f3391aa0e977b8a1c7806b3b3f606cf51e85e3df6074b6a61204

data/lib/telegram_workflow.rb

@@ -1,4 +1,5 @@
 require "http"
+require "retryable"
 
 module TelegramWorkflow
   module Stores

data/lib/telegram_workflow/client.rb

@@ -129,7 +129,9 @@ class TelegramWorkflow::Client
   end
 
   def make_request(action, params)
-    response = ::HTTP.post("#{@api_url}/#{action}", json: { chat_id: @chat_id, **params })
+    response = ::Retryable.retryable(tries: 3, on: HTTP::ConnectionError) do
+      ::HTTP.post("#{@api_url}/#{action}", json: { chat_id: @chat_id, **params })
+    end
 
     if response.code != 200
       raise TelegramWorkflow::Errors::ApiError, response.parse["description"]

data/lib/telegram_workflow/params.rb

@@ -70,4 +70,8 @@ class TelegramWorkflow::Params
     match = /\A\/(startgroup|start) (?<payload>.+)\z/.match(message_text)
     match["payload"] if match
   end
+
+  def to_h
+    @params
+  end
 end

data/lib/telegram_workflow/version.rb

@@ -1,3 +1,3 @@
 module TelegramWorkflow
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/telegram_workflow/workflow.rb

@@ -7,7 +7,7 @@ class TelegramWorkflow::Workflow
     @logger = TelegramWorkflow.config.logger
 
     if @params.start?
-      @session.clear
+      set_current_action(TelegramWorkflow.config.start_action)
     end
 
     chat_id = @session.read(:chat_id) || @session.write(:chat_id, @params.chat_id)
@@ -19,7 +19,7 @@ class TelegramWorkflow::Workflow
     shared_step_result = current_action.shared
 
     if shared_step_result == :__continue
-      @logger.info "[TelegramWorkflow] Processing by #{current_action.class.name}##{current_step}"
+      log_request
       current_action.public_send(current_step) # setup callbacks
       current_action.__run_on_message # run a callback
     else
@@ -43,6 +43,14 @@ class TelegramWorkflow::Workflow
 
   private
 
+  def log_request
+    @logger.info "[TelegramWorkflow] Processing by #{current_action.class.name}##{current_step}"
+
+    if TelegramWorkflow.config.webhook_url.nil?
+      @logger.info "[TelegramWorkflow] Parameters: #{@params.to_h}"
+    end
+  end
+
   def current_action
     @current_action ||= begin
       action_class = if action = @session.read(:current_action)

data/telegram_workflow.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
 
   spec.add_dependency "http"
+  spec.add_dependency "retryable"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "activesupport", "~> 5.2.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Roman Samoilov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement