pechkin 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2166aaacd30bc05dfd296593e02d22cc097d5106dd7dad58572650d4580b6342
-  data.tar.gz: fcc1bd8cb27ad1d4d7758574b1ee33706aac3d76c033fb7b3558b9a46fc3ff0d
+  metadata.gz: c09b7bf36267e573df915d23e6151a6ea001ce2a807fb4859d07b09f051d6c09
+  data.tar.gz: 6a7740e99df749f0a049162eaeff88f9d1e91f6cf6656df6559f51c9994dcbf9
 SHA512:
-  metadata.gz: 63f33140ef49b37016263d006ef0ae7b0dd7773b5d865584a8eb9f784b498e1998b0218120105be6337db739f9e1daaf44b333d0a490f33b153591dba2168421
-  data.tar.gz: 7c80b47d54c900718b9defb2533b45d35597ba2db15bc66f944f96ca7f8a09a57573761628171505846f7dfc4ded42483fffd993e7bda587f7925ebe6974f9d3
+  metadata.gz: 5d04a31b930b50e3667cd566ab8bd42fe3be462a98432d375ae851f121adbd321fbd0198acbd6edeb6e1694dca1918d1e7c1d31683e8fecfe287bc23775037ec
+  data.tar.gz: 64dc0d47c19686d613f652366024b55a495e4a124cdd46a6f72c1e543a5f0739682e00147496dd972e3f772517b3b76458bd27a406b35d8b8731f565bcdca860

data/lib/pechkin.rb

@@ -2,6 +2,9 @@ require 'rack'
 require 'logger'
 
 require_relative 'pechkin/cli'
+require_relative 'pechkin/message'
+require_relative 'pechkin/connector'
+require_relative 'pechkin/channel'
 require_relative 'pechkin/api'
 require_relative 'pechkin/config'
 

data/lib/pechkin/api.rb

@@ -1,5 +1,4 @@
 require 'grape'
-require_relative 'telegram'
 require 'json'
 
 module Pechkin # :nodoc:
@@ -10,29 +9,43 @@ module Pechkin # :nodoc:
       resource base_path do
         create_chanels(config['chanels'], config['bots'])
       end
+
       self
     end
 
     def create_chanels(chanels, bots)
       chanels.each do |chanel_name, chanel_desc|
-        bot_token = bots[chanel_desc['bot']]
+        bot = bots[chanel_desc['bot']]
+        connector = create_connector(bot, chanel_name)
+
         chat_ids = chanel_desc['chat_ids']
-        bot = Telegram::Chanel.new(bot_token, chat_ids)
-        bot.logger = logger
+        channel = Chanel.new(connector, chat_ids)
+        channel.logger = logger
         resource chanel_name do
-          create_chanel(bot, chanel_desc)
+          create_chanel(channel, chanel_desc)
         end
       end
     end
 
-    def create_chanel(bot, chanel_desc)
+    def create_connector(bot, channel_name)
+      case bot['connector']
+      when 'tg', 'telegram'
+        TelegramConnector.new(bot['token'])
+      when 'slack'
+        SlackConnector.new(bot['token'])
+      else
+        raise 'Unknown connector ' + bot['connector'] + ' for ' + channel_name
+      end
+    end
+
+    def create_chanel(channel, chanel_desc)
       chanel_desc['messages'].each do |message_name, message_desc|
-        generate_endpoint(bot, message_name, message_desc)
+        generate_endpoint(channel, message_name, message_desc)
       end
     end
 
     # rubocop:disable Metrics/AbcSize
-    def generate_endpoint(bot, message_name, message_desc)
+    def generate_endpoint(channel, message_name, message_desc)
       params do
         # TODO: Can't extract this code to method because this block is
         # evaluated in separate scope
@@ -44,7 +57,7 @@ module Pechkin # :nodoc:
       end
       post message_name do
         template = message_desc['template']
-        opts = { markup: 'HTML' }.update(message_desc['options'] || {})
+        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)
@@ -54,7 +67,7 @@ module Pechkin # :nodoc:
         # received parameters.
         params = (message_desc['variables'] || {}).merge(params)
 
-        bot.send_message(template, params, opts)
+        channel.send_message(template, params, opts)
       end
       # rubocop:enable Metrics/AbcSize
     end
@@ -68,7 +81,7 @@ module Pechkin # :nodoc:
         JSON.parse(body) # Try parse body as json. If it possible will return as
         # params
       end
-    rescue JSON::JSONError => _error
+    rescue JSON::JSONError => _e
       params
     end
 

data/lib/pechkin/channel.rb

@@ -0,0 +1,34 @@
+module Pechkin
+  # Creates object which can send messages to assigned chanels
+  class Chanel
+    attr_accessor :logger
+
+    def initialize(connector, channel_list)
+      @connector = connector
+      @channel_list = channel_list
+      @channel_list = [channel_list] unless channel_list.is_a?(Array)
+      @logger = ::Logger.new(STDOUT)
+    end
+
+    def send_message(message, data, options)
+      text = Message.new(data).render(message)
+      logger.warn 'Resulting text is empty' if text.empty?
+      results = @channel_list.map { |id| @connector.send_message(id, text, options) }
+      process_results(message, results)
+    end
+
+    private
+
+    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
+end

data/lib/pechkin/connector.rb

@@ -0,0 +1,57 @@
+require 'open-uri'
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Pechkin
+  # Base connector
+  class Connector
+    def send_message(chat, message, options); 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
+
+  class TelegramConnector < Connector #:nodoc:
+    def initialize(bot_token)
+      @bot_token = bot_token
+    end
+
+    def send_message(chat_id, message, options = {})
+      options = { markup: 'HTML' }.update(options)
+      params = options.update(chat_id: chat_id, text: message)
+
+      response = post_data(method_url('sendMessage'), params)
+      [chat_id, response.code.to_i, response.body]
+    end
+
+    private
+
+    def method_url(method)
+      "https://api.telegram.org/bot#{@bot_token}/#{method}"
+    end
+  end
+
+  class SlackConnector < Connector # :nodoc:
+    def initialize(bot_token)
+      @headers = { 'Authorization' => "Bearer #{bot_token}" }
+    end
+
+    def send_message(chat, message, options)
+      params = options.update(channel: chat, text: message)
+      url = 'https://slack.com/api/chat.postMessage'
+      response = post_data(url, params, headers: @headers)
+
+      [chat, response.code.to_i, response.body]
+    end
+  end
+end

data/lib/pechkin/message.rb

@@ -0,0 +1,8 @@
+module Pechkin
+  # Easy way to render erb template
+  class Message < OpenStruct
+    def render(template_file)
+      ERB.new(IO.read(template_file)).result(binding)
+    end
+  end
+end

data/lib/pechkin/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-11-13 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'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -48,9 +48,11 @@ files:
 - bin/pechkin
 - lib/pechkin.rb
 - lib/pechkin/api.rb
+- lib/pechkin/channel.rb
 - lib/pechkin/cli.rb
 - lib/pechkin/config.rb
-- lib/pechkin/telegram.rb
+- lib/pechkin/connector.rb
+- lib/pechkin/message.rb
 - lib/pechkin/version.rb
 homepage: https://github.com/iarkhanhelsky/pechkin
 licenses:
@@ -71,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Web service to proxy webhooks to Telegram Bot API

data/lib/pechkin/telegram.rb

@@ -1,61 +0,0 @@
-require 'erb'
-require 'open-uri'
-require 'net/http'
-
-module Pechkin
-  module Telegram
-    # Easy way to render erb template
-    class Message < OpenStruct
-      def render(template_file)
-        ERB.new(IO.read(template_file)).result(binding)
-      end
-    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)
-        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 = {})
-        url = URI.parse(method_url(method))
-        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
-    end
-  end
-end