pechkin 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e695894f50c29133f8399871c1dc8f1c8bdb9a489771ffe79c8bff0e8dc2afa
-  data.tar.gz: bf863d530c1169f1416e8d267fc7a81543e5b4d70d254c3fe969c366f914f601
+  metadata.gz: b4d225464fc987cff4a7df181e175e4756c60ccc9982582d7906b4f85b194f3d
+  data.tar.gz: 5ca5b0e4c4aacf29e38a51a12217494539f5ef4a31f1eedaf799fc0170f9eb40
 SHA512:
-  metadata.gz: bf403faa6d076ff2773e4dbfcedd80e364a396c873d5b23f2835883267e582e0d57306f93aee5556c1c7134f863101f61552b90efab632e5d75ea637aa630385
-  data.tar.gz: 1960f894872b5112156aa893b9a38869f7ccc455ebe9104cf1f3bfe371c97035e54667dde86c7cb4d238802248d763f5550f0cd6a1ae6b510076748100493848
+  metadata.gz: f23b61d62cc9fbf3df9d4e578080147f9de3717f8e924d71329778674dcfa21a0bccd46b45e32d33c9ac30eb515d82b9cceeca2af34da1dea210414f20e6d8b3
+  data.tar.gz: ddc485f1678e2a4d4b6ab61f655dbaf69e7fbeb5e1dcc1ae338f2b039f6f77c4cdad6d7d1bfb828c7087c128d09a47e93cb40eb17b7c9a2aba455bef1ff5cdde

data/lib/pechkin.rb

@@ -7,6 +7,7 @@ require_relative 'pechkin/connector'
 require_relative 'pechkin/channel'
 require_relative 'pechkin/api'
 require_relative 'pechkin/config'
+require_relative 'pechkin/substitute'
 
 module Pechkin # :nodoc:
   class << self

data/lib/pechkin/api.rb

@@ -16,6 +16,9 @@ module Pechkin # :nodoc:
     def create_chanels(chanels, bots)
       chanels.each do |chanel_name, chanel_desc|
         bot = bots[chanel_desc['bot']]
+
+        raise "'#{chanel_desc['bot']}' not found." unless bot
+
         connector = create_connector(bot, chanel_name)
 
         chat_ids = chanel_desc['chat_ids']
@@ -57,7 +60,6 @@ module Pechkin # :nodoc:
       end
       post message_name do
         template = message_desc['template']
-        opts = message_desc['options'] || {}
         # Some services will send json, but without correct content-type, then
         # params will be parsed weirdely. So we try parse request body as json
         params = ensure_json(request.body.read, params)
@@ -67,7 +69,7 @@ module Pechkin # :nodoc:
         # received parameters.
         params = (message_desc['variables'] || {}).merge(params)
 
-        channel.send_message(template, params, opts)
+        channel.send_message(template, params, message_desc)
       end
       # rubocop:enable Metrics/AbcSize
     end

data/lib/pechkin/channel.rb

@@ -10,15 +10,40 @@ module Pechkin
       @logger = ::Logger.new(STDOUT)
     end
 
-    def send_message(message, data, options)
-      text = Message.new(data).render(message)
+    def send_message(message, data, message_desc)
+      text = message.nil? ? '' : Message.new(data).render(message)
+
+      message_desc = substitute(data, message_desc)
+
       logger.warn 'Resulting text is empty' if text.empty?
-      results = @channel_list.map { |id| @connector.send_message(id, text, options) }
+      results = @channel_list.map do |id|
+        @connector.send_message(id, text, message_desc)
+      end
+
       process_results(message, results)
     end
 
     private
 
+    def substitute(data, message_desc)
+      substitute_recursive(Substitute.new(data), message_desc)
+    end
+
+    def substitute_recursive(substitutions, object)
+      case object
+      when String
+        substitutions.process(object)
+      when Array
+        object.map { |o| substitute_recursive(substitutions, o) }
+      when Hash
+        r = {}
+        object.each { |k, v| r[k] = substitute_recursive(substitutions, v) }
+        r
+      else
+        object
+      end
+    end
+
     def process_results(message, results)
       success, error = results.partition { |_chat, code, _body| code < 400 }
       error.each do |chat, code, body|

data/lib/pechkin/connector.rb

@@ -7,9 +7,10 @@ require 'cgi'
 module Pechkin
   # Base connector
   class Connector
-    def send_message(chat, message, options); end
+    def send_message(chat, message, message_desc); end
 
     def post_data(url, data, headers: {})
+      puts data.inspect
       uri = URI.parse(url)
       headers = { 'Content-Type' => 'application/json' }.merge(headers)
       http = Net::HTTP.new(uri.host, uri.port)
@@ -27,8 +28,8 @@ module Pechkin
       @bot_token = bot_token
     end
 
-    def send_message(chat_id, message, options = {})
-      options = { markup: 'HTML' }.update(options)
+    def send_message(chat_id, message, message_desc)
+      options = { parse_mode: message_desc['telegram_parse_mode'] || 'HTML' }
       params = options.update(chat_id: chat_id, text: message)
 
       response = post_data(method_url('sendMessage'), params)
@@ -47,12 +48,17 @@ module Pechkin
       @headers = { 'Authorization' => "Bearer #{bot_token}" }
     end
 
-    def send_message(chat, message, options)
+    def send_message(chat, message, message_desc)
       text = CGI.unescape_html(message)
 
-      return [chat, 'not sent: empty', ''] if text.strip.empty?
+      attachments = message_desc['slack_attachments'] || {}
+
+      if text.strip.empty? && attachments.empty?
+        return [chat, 400, 'not sent: empty']
+      end
+
+      params = { channel: chat, text: text, attachments: attachments }
 
-      params = options.update(channel: chat, text: text)
       url = 'https://slack.com/api/chat.postMessage'
       response = post_data(url, params, headers: @headers)
 

data/lib/pechkin/substitute.rb

@@ -0,0 +1,24 @@
+module Pechkin # :nodoc:
+  # Replaces ${:varname:} patterns inside strings. All posible substitutions are
+  # provided through constructor.
+  #
+  # Complex templating and text fromatting (like float numbers formatting) is
+  # not a goal. We do not aim to implement new templating engine here. Just
+  # simple stuff.
+  class Substitute
+    # @param substitutions [Hash] hash of possible substitutions for replacement
+    def initialize(substitutions)
+      @substitutions = substitutions
+    end
+
+    def process(string)
+      string.gsub(/\$\{([A-Za-z0-9_]+)\}/) do |m|
+        key = m[2..-2]
+
+        value = @substitutions[key] || @substitutions[key.to_sym]
+
+        (value || m).to_s
+      end
+    end
+  end
+end

data/lib/pechkin/version.rb

@@ -1,7 +1,7 @@
 module Pechkin
   # Keeps actual version
   module Version
-    VERSION = [0, 1, 3].freeze
+    VERSION = [0, 2, 0].freeze
     class << self
       def version_string
         VERSION.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -53,6 +53,7 @@ files:
 - lib/pechkin/config.rb
 - lib/pechkin/connector.rb
 - lib/pechkin/message.rb
+- lib/pechkin/substitute.rb
 - lib/pechkin/version.rb
 homepage: https://github.com/iarkhanhelsky/pechkin
 licenses: