pechkin 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa8abd425ad6a776104aabeeb6916d4b8b4d77ae0f0d7e24b75f102bb70b016
-  data.tar.gz: 1b5b43910b029f8553f54ddfa5d70a7195b2db86d35a38ba1fcffc37521b7d4b
+  metadata.gz: c18e97f32b4fe42a3bd649c43563abc81a13fe49d5c2332f54129b1babc61767
+  data.tar.gz: bcc9dcdbccc1041ed9377b1e4bbce4113a6820ca798efceeefc9476b30eb8499
 SHA512:
-  metadata.gz: d636b920cb207c03ce1f96ceeb47ec478214743e0ef4f49895c07982fcf68d2b724d4006058ef00de6903c986c6f40e8678ebbb7ccdaa681d6b552cfb70111a1
-  data.tar.gz: 5254cb1f323cb46af16b889d82ffd565a9a0f30e5665cc6c5487e59926f25e66b8a573e004ffcf4c2a34b8f17187b0e67443ef5bf5ffec3b8e2a68e079557def
+  metadata.gz: 7d567c46d62df87a39e701f086c51a753616cb3e1acc104829675a1d091a9907110ed1e807f0253782b125a55017918c2ddedf3716ad58af77b0a96296c26a4e
+  data.tar.gz: b7add41faa2da882200c5a47fe4a847a97ea3df7a8c9cb69796e200405e7a3a19fd49cf0e21776484a46dc713ca8312bfce86ab2230c003c9325c4d86ddab526

data/lib/pechkin/{configuration/model.rb → bot.rb}

@@ -1,4 +1,3 @@
 module Pechkin
   Bot = Struct.new(:token, :connector, :name, keyword_init: true)
-  Channel = Struct.new(:chat_ids, :connector, :messages, keyword_init: true)
 end

data/lib/pechkin/channel.rb

@@ -1,59 +1,3 @@
 module Pechkin
-  # Creates object which can send messages to assigned chanels
-  class Chanel
-    attr_accessor :logger
-
-    def initialize(connector, channel_list, logger = ::Logger.new($stdout))
-      @connector = connector
-      @channel_list = channel_list
-      @channel_list = [channel_list] unless channel_list.is_a?(Array)
-      @logger = logger
-    end
-
-    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 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|
-        logger.error "#{message} => #{chat}[HTTP #{code}]: #{body}"
-      end
-
-      {
-        successful: success.map(&:first),
-        errors: error
-      }
-    end
-  end
+  Channel = Struct.new(:chat_ids, :connector, :messages, keyword_init: true)
 end

data/lib/pechkin/configuration/configuration_loader_channels.rb

@@ -61,14 +61,53 @@ module Pechkin
         message_config = YAML.safe_load(IO.read(file))
         name = File.basename(file, '.yml')
 
-        message_config['template'] = get_template(message_config['template']) if message_config.key?('template')
-
-        messages[name] = message_config
+        # Dirty workaround. I need to recursively load templates. When doing it
+        # we looking for {'template': '...path to template..' } objects. But we
+        # don't want to force user write something like:
+        #   text:
+        #     template: '... path to main template...'
+        # because it's too mouthful for such common case.
+        #
+        # So now we pull main template out, then load everyting else. Then put
+        # it back.
+        template = nil
+        if message_config.key?('template')
+          template = get_template(message_config['template'])
+          message_config.delete('template')
+        end
+
+        message_config = load_templates(message_config)
+        message_config['template'] = template unless template.nil?
+
+        messages[name] = Message.new(message_config)
       end
 
       messages
     end
 
+    def load_templates(object)
+      case object
+      when String
+        object
+      when Array
+        object.map { |o| load_templates(o) }
+      when Hash
+        if object.key?('template')
+          msg = 'When using template only 1 KV pair allowed'
+          raise ConfigurationError, msg unless object.size == 1
+
+          # Replace whole object with created template.
+          get_template(object['template'])
+        else
+          r = {}
+          object.each { |k, v| r[k] = load_templates(v) }
+          r
+        end
+      else
+        object
+      end
+    end
+
     def get_template(path)
       msg = "Can't find template: #{path}"
       raise ConfigurationError, msg unless @views.key?(path)

data/lib/pechkin/configuration.rb

@@ -1,6 +1,5 @@
 require 'yaml'
 
-require_relative 'configuration/model'
 require_relative 'configuration/configuration_loader'
 require_relative 'configuration/configuration_loader_bots'
 require_relative 'configuration/configuration_loader_channels'

data/lib/pechkin/handler.rb

@@ -95,13 +95,8 @@ module Pechkin
     def prepare_message(channel_id, msg_id, data)
       channel_config = fetch_channel(channel_id)
       # Find message and try substitute values to message parameters.
-      message_config = substitute(data, fetch_message(channel_config, msg_id))
-
-      data = (message_config['variables'] || {}).merge(data)
-      template = message_config['template']
-
-      text = ''
-      text = template.render(data) unless template.nil?
+      message = fetch_message(channel_config, msg_id)
+      message_config, text = message.prepare(data)
 
       [channel_config, message_config, text]
     end

data/lib/pechkin/message.rb

@@ -0,0 +1,64 @@
+module Pechkin
+  # Message object
+  #
+  # TBD
+  class Message
+    def initialize(message)
+      @message = message
+    end
+
+    def prepare(data)
+      data = (@message['variables'] || {}).merge(data)
+      # Find message and try substitute values to message parameters.
+      message_config = render(data, substitute(data, @message))
+      text = ''
+      text = message_config.delete('template') if message_config.key?('template')
+
+      [message_config, text]
+    end
+
+    def to_h
+      Marshal.load(Marshal.dump(@message))
+    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 render(data, message_desc)
+      render_recursive(data, message_desc)
+    end
+
+    def render_recursive(data, object)
+      case object
+      when MessageTemplate
+        object.render(data)
+      when Array
+        object.map { |o| render_recursive(data, o) }
+      when Hash
+        r = {}
+        object.each { |k, v| r[k] = render_recursive(data, v) }
+        r
+      else
+        object
+      end
+    end
+  end
+end

data/lib/pechkin/version.rb

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

data/lib/pechkin.rb

@@ -8,13 +8,15 @@ require 'htauth'
 require 'base64'
 
 require_relative 'pechkin/cli'
+require_relative 'pechkin/bot'
+require_relative 'pechkin/channel'
+require_relative 'pechkin/message'
 require_relative 'pechkin/command'
 require_relative 'pechkin/exceptions'
 require_relative 'pechkin/handler'
 require_relative 'pechkin/message_matcher'
 require_relative 'pechkin/message_template'
 require_relative 'pechkin/connector'
-require_relative 'pechkin/channel'
 require_relative 'pechkin/configuration'
 require_relative 'pechkin/substitute'
 require_relative 'pechkin/prometheus_utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htauth
@@ -81,6 +81,7 @@ files:
 - lib/pechkin/app/app_error.rb
 - lib/pechkin/app/request_handler.rb
 - lib/pechkin/auth.rb
+- lib/pechkin/bot.rb
 - lib/pechkin/channel.rb
 - lib/pechkin/cli.rb
 - lib/pechkin/command.rb
@@ -95,13 +96,13 @@ files:
 - lib/pechkin/configuration/configuration_loader_bots.rb
 - lib/pechkin/configuration/configuration_loader_channels.rb
 - lib/pechkin/configuration/configuration_loader_views.rb
-- lib/pechkin/configuration/model.rb
 - lib/pechkin/connector.rb
 - lib/pechkin/connector/base.rb
 - lib/pechkin/connector/slack.rb
 - lib/pechkin/connector/telegram.rb
 - lib/pechkin/exceptions.rb
 - lib/pechkin/handler.rb
+- lib/pechkin/message.rb
 - lib/pechkin/message_matcher.rb
 - lib/pechkin/message_template.rb
 - lib/pechkin/prometheus_utils.rb