pechkin 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd7554b43eb0ac8fa2fdb0fc9d02d31b4acf859c1b66a9470c1fdbd524d0eef
-  data.tar.gz: 224c8857ae9b72a48b91c8342040f9866d30a285a7f6e8595bf27e577f44bdd2
+  metadata.gz: 41f0579677371d43215ee3c53c0e9eb1b4e02206bdbf1b1bc1d4898cbd58c981
+  data.tar.gz: 127385b4694d80fdbbe733bc646ee3b5922db83119912afb6e50f6de84b29e9f
 SHA512:
-  metadata.gz: 623290e1546eb766cb844203af31e8f3708016199f4b1771e55c468cb252d21ecd874452795dc8417ba06d3be3e096526b3ad6c96826c84fa8189cd522e61ecb
-  data.tar.gz: 61f56c2dc2b400cced01460d977ee216d2c546be2935b3ce968f08c0266ad29d5915b14ea6601ca31f1497f984aba8eb9a1b4cfbbb27f5d358d44f49bd81157a
+  metadata.gz: 670ffbaf73bbfefbe54ca3f0a1d06d863c3548f41e35c2580e48644f0967009af8818f20fcc5d0256bd59509817a581e322a5140f870e47c62cf30572e3796aa
+  data.tar.gz: 5059e3fd4354f996692013a819e879a61ccf943737c2d7ed824beb8b5095ce940c5b3b700a10e53044694924e277614db3816bb9370a3098c00b8d867bb823fc

data/lib/pechkin/app/app.rb

@@ -2,7 +2,7 @@ module Pechkin
   # Rack application to handle requests
   class App
     DEFAULT_CONTENT_TYPE = { 'Content-Type' => 'application/json' }.freeze
-    DEFAULT_HEADERS = {}.merge(DEFAULT_CONTENT_TYPE).freeze
+    DEFAULT_HEADERS = {}.merge(DEFAULT_CONTENT_TYPE)
 
     attr_accessor :handler, :logger
 
@@ -12,6 +12,12 @@ module Pechkin
 
     def call(env)
       req = Rack::Request.new(env)
+
+      # Stub for favicon.ico
+      if req.path_info == '/favicon.ico'
+        return response(405, '') # Return empty response 405 Method Not Allowed
+      end
+
       result = RequestHandler.new(handler, req, logger).handle
       response(200, result)
     rescue AppError => e
@@ -23,7 +29,7 @@ module Pechkin
     private
 
     def response(code, body)
-      [code.to_s, DEFAULT_HEADERS, [body.to_json]]
+      [code.to_s, DEFAULT_HEADERS.dup, [body.to_json]]
     end
 
     def proces_app_error(req, err)

data/lib/pechkin/app/request_handler.rb

@@ -2,7 +2,7 @@ module Pechkin
   # Http requests handler. We need fresh instance per each request. To keep
   # internal state isolated
   class RequestHandler
-    REQ_PATH_PATTERN = %r{^/(.+)/([^/]+)/?$}.freeze
+    REQ_PATH_PATTERN = %r{^/(.+)/([^/]+)/?$}
 
     attr_reader :req, :handler,
                 :channel_id, :message_id,
@@ -23,7 +23,8 @@ module Pechkin
       raise AppError.message_not_found unless message?
 
       data = parse_data(req.body.read)
-      handler.handle(channel_id, message_id, data).each do |i|
+      # handler.handle() requires keyword arguments
+      handler.handle(channel_id, message_id, **data).each do |i|
         logger.info "Sent #{channel_id}/#{message_id}: #{i.to_json}"
       end
     end

data/lib/pechkin/cli.rb

@@ -102,6 +102,15 @@ module Pechkin
     opt :pid_file, names: ['-p', '--pid-file [FILE]'],
                    desc: 'Path to output PID file'
 
+    opt :server_workers, names: ['--min-threads [SERVER_WORKERS]'], default: 2, type: Integer,
+                         desc: 'Server workers count. Default: 1'
+
+    opt :min_threads, names: ['--min-threads [MIN_THREADS]'], default: 5, type: Integer,
+                      desc: 'Min threads count. Default: 5'
+
+    opt :max_threads, names: ['--max-threads [MAX_THREADS]'], default: 20, type: Integer,
+                      desc: 'Max threads count. Default: 20'
+
     opt :log_dir, names: ['--log-dir [DIR]'],
                   desc: 'Path to log directory. Output will be writen to'  \
                         'pechkin.log file. If not specified will write to ' \

data/lib/pechkin/command/run_server.rb

@@ -1,3 +1,5 @@
+require 'puma/configuration'
+
 module Pechkin
   module Command
     # Start pechkin HTTP server
@@ -7,10 +9,17 @@ module Pechkin
       end
 
       def execute
-        Rack::Server.start(app: AppBuilder.new.build(handler, options),
-                           Host: options.bind_address,
-                           Port: options.port,
-                           pid: options.pid_file)
+        # Configure Puma server instead config.ru
+        puma_config = Puma::Configuration.new do |user_config|
+          user_config.bind "tcp://#{options.bind_address}:#{options.port}"
+          user_config.workers options.server_workers # Set number of workers
+          user_config.threads options.min_threads, options.max_threads # Set max and min threads
+          user_config.app AppBuilder.new.build(handler, options)
+        end
+
+        # Run Puma server with configuration
+        launcher = Puma::Launcher.new(puma_config)
+        launcher.run
       end
     end
   end

data/lib/pechkin/command/send_data.rb

@@ -27,7 +27,7 @@ module Pechkin
 
       def read_data(data)
         d = if data.start_with?('@')
-              file = data[1..-1]
+              file = data[1..]
               raise "File not found #{file}" unless File.exist?(file)
 
               IO.read(file)

data/lib/pechkin/configuration/configuration_loader_views.rb

@@ -18,7 +18,7 @@ module Pechkin
       raise ConfigurationError, "'#{views_dir}' is not a directory" unless File.directory?(views_dir)
 
       Dir["#{views_dir}/**/*.erb"].each do |f|
-        relative_path = f["#{views_dir}/".length..-1]
+        relative_path = f["#{views_dir}/".length..]
         views[relative_path] = MessageTemplate.new(IO.read(f))
       end
     end

data/lib/pechkin/message_template.rb

@@ -18,9 +18,8 @@ module Pechkin
       if MessageTemplate::ERB_INITIALIZE_KEYWORD_ARGUMENTS # Ruby 2.6+
         @erb_template = ERB.new(erb, trim_mode: '-')
       else
-        safe_level = nil
         trim_mode = '-'
-        @erb_template = ERB.new(erb, safe_level, trim_mode)
+        @erb_template = ERB.new(erb, trim_mode: trim_mode)
       end
     end
 

data/lib/pechkin/version.rb

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

data/lib/pechkin.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'rack'
+require 'puma'
 require 'logger'
 require 'prometheus/middleware/collector'
 require 'prometheus/middleware/exporter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htauth
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: powerpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.2.2
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 3.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 3.0.8
 description: 
 email: ilya.arkhanhelsky at gmail.com
 executables:
@@ -118,16 +132,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Web service to proxy webhooks to Telegram Bot API