pechkin 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21153645eb45d32b113d2c95191e79ac5568a10829b3989ccc9f75da7b53bf9e
-  data.tar.gz: d80b4bbbeb7e4bdfeb251e358bb0a9c99d50eae96c5078b688bce5e12a3c73e3
+  metadata.gz: 6a2ecda5dd85e6cb2dd48ccb18eb1966559fa8d6539239b1e6def0377324c765
+  data.tar.gz: 9be0c8e01ceec5f0e19f2c44a9a7d10a2c09c32ddcec26d5fba5d43f808eaec2
 SHA512:
-  metadata.gz: 30e9654efb5c1a11c4816feb51fc494be1251e106a2fac682be9cb68738faec6e8b45c747329f90cff226ef1fe9df2c097bb0083c79d57d55b020982773dd0b8
-  data.tar.gz: 62d6113f5ef1aedfe36c3eb86bc619d7cbac2cd9e54a37f64cbd293b1856efe47ba572bdf25efcc2a20f7b1affbbffe8cc2e74ad9784091cc69f7fa232ebe19b
+  metadata.gz: 2bdf5bd548de267c3cfc9a7a45be9a451df75bf288e9403dfe1ed9e3f748318fd1acd85f5070f310890b5947b3f478ea4cdab817b8cba9902cf5f23ad35cd431
+  data.tar.gz: c18c214ef31484ccc3dd79af5c55270f1fdcea84ee198e7ef5c3adc39b76496914ba703bc2d5e7f45beec62fb25dd71942cdf323a82b02a35d641a6aec420d6c

data/lib/pechkin.rb

@@ -14,8 +14,6 @@ require_relative 'pechkin/handler'
 require_relative 'pechkin/message_matcher'
 require_relative 'pechkin/message_template'
 require_relative 'pechkin/connector'
-require_relative 'pechkin/connector_slack'
-require_relative 'pechkin/connector_telegram'
 require_relative 'pechkin/channel'
 require_relative 'pechkin/configuration'
 require_relative 'pechkin/substitute'

data/lib/pechkin/app/app.rb

@@ -34,9 +34,10 @@ module Pechkin
       response(err.code, data)
     end
 
-    def process_unhandled_error(_req, err)
+    def process_unhandled_error(req, err)
       data = { status: 'error', message: err.message }
       logger.error("#{err.message}\n\t" + err.backtrace.join("\n\t"))
+      logger.error(req.body.read)
       response(503, data)
     end
   end

data/lib/pechkin/configuration/configuration_loader.rb

@@ -13,9 +13,9 @@ module Pechkin
     def create_connector(bot)
       case bot.connector
       when 'tg', 'telegram'
-        TelegramConnector.new(bot.token, bot.name)
+        Connector::Telegram.new(bot.token, bot.name)
       when 'slack'
-        SlackConnector.new(bot.token, bot.name)
+        Connector::Slack.new(bot.token, bot.name)
       else
         raise 'Unknown connector ' + bot.connector + ' for ' + bot.name
       end

data/lib/pechkin/connector.rb

@@ -4,26 +4,6 @@ require 'uri'
 require 'json'
 require 'cgi'
 
-module Pechkin
-  # Base connector
-  class Connector
-    def send_message(chat, message, message_desc); end
-
-    def preview(chats, message, _message_desc)
-      "Connector: #{self.class.name}; Chats: #{chats.join(', ')}\n" \
-      "Message:\n#{message}"
-    end
-
-    def post_data(url, data, headers: {})
-      uri = URI.parse(url)
-      headers = { 'Content-Type' => 'application/json' }.merge(headers)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = url.start_with?('https://')
-
-      request = Net::HTTP::Post.new(uri.request_uri, headers)
-      request.body = data.to_json
-
-      http.request(request)
-    end
-  end
-end
+require_relative 'connector/base'
+require_relative 'connector/slack'
+require_relative 'connector/telegram'

data/lib/pechkin/connector/base.rb

@@ -0,0 +1,29 @@
+module Pechkin
+  module Connector
+    # Base connector
+    class Base
+      DEFAULT_HEADERS = {
+        'Content-Type' => 'application/json; charset=UTF-8'
+      }.freeze
+
+      def send_message(chat, message, message_desc); end
+
+      def preview(chats, message, _message_desc)
+        "Connector: #{self.class.name}; Chats: #{chats.join(', ')}\n" \
+        "Message:\n#{message}"
+      end
+
+      def post_data(url, data, headers: {})
+        uri = URI.parse(url)
+        headers = DEFAULT_HEADERS.merge(headers)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = url.start_with?('https://')
+
+        request = Net::HTTP::Post.new(uri.request_uri, headers)
+        request.body = data.to_json
+
+        http.request(request)
+      end
+    end
+  end
+end

data/lib/pechkin/connector/slack.rb

@@ -0,0 +1,30 @@
+module Pechkin
+  module Connector
+    class Slack < Connector::Base # :nodoc:
+      attr_reader :name
+
+      def initialize(bot_token, name)
+        @headers = { 'Authorization' => "Bearer #{bot_token}" }
+        @name = name
+      end
+
+      def send_message(channel, message, message_desc)
+        text = CGI.unescape_html(message)
+
+        attachments = message_desc['slack_attachments'] || {}
+
+        if text.strip.empty? && attachments.empty?
+          return { channel: channel, code: 400,
+                   response: 'Internal error: message is empty' }
+        end
+
+        params = { channel: channel, text: text, attachments: attachments }
+
+        url = 'https://slack.com/api/chat.postMessage'
+        response = post_data(url, params, headers: @headers)
+
+        { channel: channel, code: response.code.to_i, response: response.body }
+      end
+    end
+  end
+end

data/lib/pechkin/connector/telegram.rb

@@ -0,0 +1,26 @@
+module Pechkin
+  module Connector
+    class Telegram < Connector::Base # :nodoc:
+      attr_reader :name
+
+      def initialize(bot_token, name)
+        @bot_token = bot_token
+        @name = name
+      end
+
+      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)
+        { chat_id: chat_id, code: response.code.to_i, response: response.body }
+      end
+
+      private
+
+      def method_url(method)
+        "https://api.telegram.org/bot#{@bot_token}/#{method}"
+      end
+    end
+  end
+end

data/lib/pechkin/handler.rb

@@ -11,7 +11,7 @@ module Pechkin
       @logger = Logger.new(IO::NULL)
       @stdout = stdout
       @stderr = stderr
-      @message_matcher = MessageMatcher.new
+      @message_matcher = MessageMatcher.new(@logger)
     end
 
     # Handles message request. Each request has three parameters: channel id,
@@ -35,7 +35,7 @@ module Pechkin
       if message_allowed?(message_config, data)
         chats.map { |chat| connector.send_message(chat, text, message_config) }
       else
-        logger.info "#{channel_id}/#{msg_id}: " \
+        logger.warn "#{channel_id}/#{msg_id}: " \
                     "Skip sending message. Because it's not allowed"
         []
       end

data/lib/pechkin/message_matcher.rb

@@ -10,6 +10,13 @@ module Pechkin
   class MessageMatcher
     KEY_ALLOW = 'allow'.freeze
     KEY_FORBID = 'forbid'.freeze
+
+    attr_reader :logger
+
+    def initialize(logger)
+      @logger = logger
+    end
+
     # Checks data object against allow / forbid rule sets in message
     # configuration. If data object matches rules it means we can process this
     # data and send message.
@@ -23,10 +30,10 @@ module Pechkin
 
       if message_config.key?(KEY_ALLOW)
         rules = message_config[KEY_ALLOW]
-        rules.any? { |r| check_rule(r, data) }
+        rules.any? { |r| check_rule(r, r, data) }
       elsif message_config.key?(KEY_FORBID)
         rules = message_config[KEY_FORBID]
-        rules.all? { |r| !check_rule(r, data) }
+        rules.all? { |r| !check_rule(r, r, data) }
       else
         true
       end
@@ -43,35 +50,42 @@ module Pechkin
     # Check rule object against data. Rules are checked recursievly, i.e. we
     # can take one field in rule and check it separately as new rule. If all
     # fields are passed check then whole rule passed.
-    def check_rule(rule, data)
-      if rule.is_a?(Hash)
-        check_hash_rule(rule, data)
-      elsif rule.is_a?(Array)
-        check_array_rule(rule, data)
-      elsif rule.is_a?(String)
-        check_string_rule(rule, data)
-      else
-        rule.eql?(data)
+    def check_rule(top_rule, sub_rule, data)
+      result = if sub_rule.is_a?(Hash)
+                 check_hash_rule(top_rule, sub_rule, data)
+               elsif sub_rule.is_a?(Array)
+                 check_array_rule(top_rule, sub_rule, data)
+               elsif sub_rule.is_a?(String)
+                 check_string_rule(top_rule, sub_rule, data)
+               else
+                 sub_rule.eql?(data)
+               end
+
+      unless result
+        logger.info "Expected #{sub_rule.to_json} got #{data.to_json} when" \
+                    " checking #{top_rule.to_json}"
       end
+
+      result
     end
 
-    def check_hash_rule(hash, data)
+    def check_hash_rule(top_rule, hash, data)
       return false unless data.is_a?(Hash)
 
       hash.all? do |key, value|
-        data.key?(key) && check_rule(value, data[key])
+        data.key?(key) && check_rule(top_rule, value, data[key])
       end
     end
 
-    def check_array_rule(array, data)
+    def check_array_rule(top_rule, array, data)
       return false unless data.is_a?(Array)
 
       # Deep array check needs to be done against all elements so we zip arrays
       # to pair each rule with data element
-      array.zip(data).all? { |r, d| check_rule(r, d) }
+      array.zip(data).all? { |r, d| check_rule(top_rule, r, d) }
     end
 
-    def check_string_rule(str, data)
+    def check_string_rule(_top_rule, str, data)
       str.eql? data
     end
   end

data/lib/pechkin/version.rb

@@ -1,7 +1,7 @@
 module Pechkin
   # Keeps actual version
   module Version
-    VERSION = [1, 3, 1].freeze
+    VERSION = [1, 3, 2].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: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htauth
@@ -97,8 +97,9 @@ files:
 - lib/pechkin/configuration/configuration_loader_views.rb
 - lib/pechkin/configuration/model.rb
 - lib/pechkin/connector.rb
-- lib/pechkin/connector_slack.rb
-- lib/pechkin/connector_telegram.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_matcher.rb

data/lib/pechkin/connector_slack.rb

@@ -1,28 +0,0 @@
-module Pechkin # :nodoc:
-  class SlackConnector < Connector # :nodoc:
-    attr_reader :name
-
-    def initialize(bot_token, name)
-      @headers = { 'Authorization' => "Bearer #{bot_token}" }
-      @name = name
-    end
-
-    def send_message(channel, message, message_desc)
-      text = CGI.unescape_html(message)
-
-      attachments = message_desc['slack_attachments'] || {}
-
-      if text.strip.empty? && attachments.empty?
-        return { channel: channel, code: 400,
-                 response: 'Internal error: message is empty' }
-      end
-
-      params = { channel: channel, text: text, attachments: attachments }
-
-      url = 'https://slack.com/api/chat.postMessage'
-      response = post_data(url, params, headers: @headers)
-
-      { channel: channel, code: response.code.to_i, response: response.body }
-    end
-  end
-end

data/lib/pechkin/connector_telegram.rb

@@ -1,24 +0,0 @@
-module Pechkin
-  class TelegramConnector < Connector #:nodoc:
-    attr_reader :name
-
-    def initialize(bot_token, name)
-      @bot_token = bot_token
-      @name = name
-    end
-
-    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)
-      { chat_id: chat_id, code: response.code.to_i, response: response.body }
-    end
-
-    private
-
-    def method_url(method)
-      "https://api.telegram.org/bot#{@bot_token}/#{method}"
-    end
-  end
-end