pechkin 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd4c9f29fc1cdab78ad9ed5d17bc91d639aaf3a07f1c8f1b2a5bd05ab5caed9
-  data.tar.gz: 14355bfc12a1115b9fb7d233f91c974fd6d0ac698a344668dc24a9e6d7b83306
+  metadata.gz: 27d78c857bcd762e9b36cbaa234120e6caa91b67604344f1602e0e64bcffe7c0
+  data.tar.gz: 1bfcf6b1b346efd49f02f47995f561825b8bdffdf8dd193a586c37d30855d9ad
 SHA512:
-  metadata.gz: ca47776e42575d2c4bd78a106f5e83de71f70f373de6585937b9d02329e95fb9795e8375a8582b5795ee74a328363fc0abcf44205ada5a8b85bd02ca17866d45
-  data.tar.gz: 81af7a2be13345042b6e3a8846f170317b3b373f59bb49450ebaa648f2e3afe26382c913d4ae29f31c5529582344f302b28129478901e6437d587e5d6eee09d3
+  metadata.gz: cea8fa824f2bbcf23f75612d528fbab474c9ac1ad9e0c860301100e5e44d030e137f2d2456438ac7a42c220c03d06406462c2bf0f886575bf72ec970898cffd2
+  data.tar.gz: 5bd402593bca10b7a3b92d88e217a06847539f1b90e2225f2c4643b1c6f18db86c3826ae50f7dcc2eb447a01d6969d68d7ad1e73608b5f3cc64aab43df9d36c4

data/lib/pechkin.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'logger'
 
 require_relative 'pechkin/cli'
 require_relative 'pechkin/api'
@@ -9,7 +10,12 @@ module Pechkin # :nodoc:
     def run
       options = CLI.parse(ARGV)
       configuration = Config.new(options.config_file)
-      Rack::Server.start(app: Pechkin.create(configuration),
+      log_dir = options.log_dir
+      app = Pechkin.create(configuration)
+      if log_dir
+        app.logger = ::Logger.new(File.join(log_dir, 'pechkin.log'), 'daily')
+      end
+      Rack::Server.start(app: app,
                          Port: options.port || configuration.port,
                          pid: options.pid_file)
     end

data/lib/pechkin/api.rb

@@ -18,6 +18,7 @@ module Pechkin # :nodoc:
         bot_token = bots[chanel_desc['bot']]
         chat_ids = chanel_desc['chat_ids']
         bot = Telegram::Chanel.new(bot_token, chat_ids)
+        bot.logger = logger
         resource chanel_name do
           create_chanel(bot, chanel_desc)
         end
@@ -26,18 +27,36 @@ module Pechkin # :nodoc:
 
     def create_chanel(bot, chanel_desc)
       chanel_desc['messages'].each do |message_name, message_desc|
-        post message_name do
-          template = message_desc['template']
-          opts = { markup: 'HTML' }.update(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)
-          # If message description contains any variables will merge them with
-          # received parameters.
-          params = message_desc['variables'].merge(params) if message_desc.key?('variables')
-          bot.send_message(template, params, opts)
+        generate_endpoint(bot, message_name, message_desc)
+      end
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def generate_endpoint(bot, message_name, message_desc)
+      params do
+        # TODO: Can't extract this code to method because this block is
+        # evaluated in separate scope
+        (message_desc['filters'] || []).each do |field, filter|
+          filter.match(%r{^/(.*)/$}) do |m|
+            requires field.to_sym, type: String, regexp: Regexp.new(m[1])
+          end
         end
       end
+      post message_name do
+        template = message_desc['template']
+        opts = { markup: 'HTML' }.update(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)
+        logger.info "Received message #{params.to_json}"
+        logger.info "Will render template file #{template}"
+        # If message description contains any variables will merge them with
+        # received parameters.
+        params = (message_desc['variables'] || {}).merge(params)
+
+        bot.send_message(template, params, opts)
+      end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 
@@ -52,16 +71,21 @@ module Pechkin # :nodoc:
     rescue JSON::JSONError => _error
       params
     end
+
+    def logger
+      PechkinAPI.logger
+    end
+  end
+
+  # Base class for all pechkin apps
+  class PechkinAPI < Grape::API
+    extend Generator
+    helpers Helpers
   end
 
   class << self
     def create(config)
-      klazz = Class.new(Grape::API) do
-        extend Generator
-        helpers Helpers
-      end
-
-      klazz.configure(config)
+      Class.new(PechkinAPI).configure(config)
     end
   end
 end

data/lib/pechkin/telegram.rb

@@ -12,19 +12,28 @@ module Pechkin
     end
     # Creates object which can send messages to assigned chanels
     class Chanel
+      attr_accessor :logger
+
       def initialize(bot_token, chat_ids)
         @bot_token = bot_token
         @chat_ids = chat_ids
         @chat_ids = [chat_ids] unless chat_ids.is_a?(Array)
+        @logger = ::Logger.new(STDOUT)
       end
 
       def send_message(message, data, options)
         text = Message.new(data).render(message)
-        @chat_ids.map do |chat|
-          params = options.update(text: text, chat_id: chat)
-          response = send_data('sendMessage', params)
-          [response.code, response.body]
-        end
+        logger.warn 'Resulting text is empty' if text.empty?
+        results = @chat_ids.map { |id| send_message_to_id(id, text, options) }
+        process_results(message, results)
+      end
+
+      private
+
+      def send_message_to_id(chat_id, text, options)
+        params = options.update(text: text, chat_id: chat_id)
+        response = send_data('sendMessage', params)
+        [chat_id, response.code.to_i, response.body]
       end
 
       def send_data(method, data = {})
@@ -32,6 +41,18 @@ module Pechkin
         Net::HTTP.post_form(url, data)
       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
+
       def method_url(method)
         "https://api.telegram.org/bot#{@bot_token}/#{method}"
       end

data/lib/pechkin/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.5'
 description: 
 email: ilya.arkhanhelsky at gmail.com
 executables: