kapellmeister 0.9.9.rc2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d59e28eecf6117e627cd0108f64e27db9331837d972d8ae9911041e7dd1c03f
-  data.tar.gz: 6717303f7fbce49b91927ab5021312f3fe2ea761a8dcd07883d290cd91839d87
+  metadata.gz: eb7b158329d4dfbb447e55ad06cc9ec60c133fbb20f3fa8de4974e5f807c32af
+  data.tar.gz: 8e0a71af6badbb6f41327893c18a8eee1fcff3e0638b2823be50233bd30ef756
 SHA512:
-  metadata.gz: 3296052e14e0aaf0b0553930be4ad02e8ffa102a13968fde326c1bd358274940b4afbfe2abc28a3bfc5e4cb6a60fa723d7739a1d0a332e4e303514bff2c41c44
-  data.tar.gz: d2d0a331dc45c3e084f9c46c5fb36f75dd067d6ec140c2f00a5f7f0e9f6676bc15e5100d192e23242163e4b954fa53c92506b9e96b1ae6c2fe39fd61f1a73df0
+  metadata.gz: 4d79f2670f5e910f6288b5e891e7cba1901cb975307f58f01410a8a611d8e73215c073db52add6d566fe8142bdc88190ad16b816cde61bfd2f7ae7f5c92e2978
+  data.tar.gz: 11b6fdd130aac37875a597db56df1064ecb94ed61393325c807f1ac4a7868c68939fdfed2fd28caefd3f1c04bbbee4714dc2d6cd917b0986ea2e76f8b8836d86

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 gem 'dry-schema'
 gem 'faraday'
 gem 'faraday-follow_redirects'
-gem 'faraday-cookie_jar'
+gem 'faraday-multipart'
 gem 'faraday-typhoeus'
 
 # debug

data/README.md

@@ -4,9 +4,9 @@
 ## Использование
 
 Добавьте kapellmeister в свой Gemfile:
-На данный момент послденяя версия 0.9.8 (Проект находится в стадии тестирования работоспособности, beta-test)
+На данный момент последняя версия 0.10.0 (Проект находится в стадии тестирования работоспособности, beta-test)
 ```ruby
-gem 'kapellmeister', '~> 0.9.8'
+gem 'kapellmeister', '~> 0.10.0'
 ```
 
 ### Добавьте новую конфигурацию для стороннего API:
@@ -58,7 +58,10 @@ foo:                     => Обёртка для метода
   bar:                   => Наименование метода
     scheme:              => Описание схемы
       method: POST       => Тип запроса (* обязательный параметр!)
-      use_wrapper: true  => Обёрнуть ли метод для обеспечения уникальности. По умолчанию true
+      wrappers:          => Обёрнуть ли имя метода и/или реальный путь для обеспечения уникальности. По умолчанию true для метода, и false для пути
+        all: true        => Можно передать ключ all, который отработает и за обёртку метода и за обёртку пути с одним значением
+        name: true       => Этот ключ отвечает за обёртку имени метода, приоритетней над all (по умолчанию true)
+        path: false      => Этот ключ отвечает за обёртку пути, приоритетней над all (по умолчанию false)
       path: buz          => Настоящий путь (роут). Если параметра нет, то путь будет взят из наименования метода.
       body:              => Dry-scheme (из набора гемов DRY) для проверки параметров. Если параметра нет, то проверки не будет.
       query_params:      => Описание query-параметров. Если параметра нет, то подстановки параметров не будет.
@@ -82,7 +85,7 @@ body: DrySchema
 `query_params` — Если для запроса требуется query-параметры.
 Работают как массивы, так и руби-хэши.
 Если этот ключ не существует, то подстановки параметров и их проверки не будет.
-For example:
+Пример:
 
 ```yaml
 query_params:
@@ -134,9 +137,9 @@ This template-service allows you to define http requests to a third party throug
 ## Usage
 
 Add kapellmeister to your Gemfile:
-At the moment, the latest version is 0.9.8 (The project is in the stage of performance testing, beta-test)
+At the moment, the latest version is 0.10.0 (The project is in the stage of performance testing, beta-test)
 ```ruby
-gem 'kapellmeister', '~> 0.9.6'
+gem 'kapellmeister', '~> 0.10.0'
 ```
 
 ### Add a new configuration for the third-party API:
@@ -186,7 +189,10 @@ foo:                     => Wrapper of the method
   bar:                   => Name of the method
     scheme:              => Description of the scheme
       method: POST       => Request type (* required)
-      use_wrapper: true  => Whether to wrap the method to ensure uniqueness. By default, true
+      wrappers:          => Whether to wrap the method name and/or the actual path to ensure uniqueness. By default, true for the method, and false for the path
+        all: true        => You can pass the 'all' key, which will work for both the method wrapper and the path wrapper with one value
+        name: true       => This key is responsible for wrapping the method name, which takes precedence over 'all' key (true by default)
+        path: false      => This key is responsible for wrapping the path, taking precedence over 'all' key (false by default)
       path: buz          => The real path (route). If there is no parameter, the path will be taken from the method name.
       body:              => Dry-scheme (from the set of DRY gems) to check the parameters. If there is no parameter, then there'll be no verification.
       query_params:      => Description of the query parameters. If there is no parameter, then there'll be no parameter substitution.
@@ -260,4 +266,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Copyright
 
-Copyright (c) 2022 Denis Arushanov aka DarkWater
+Copyright (c) 2024 Denis Arushanov aka DarkWater

data/kapellmeister.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '~> 2.10'
   gem.add_dependency 'faraday-cookie_jar', '~> 0.0.7'
   gem.add_dependency 'faraday-follow_redirects', '~> 0.3.0'
+  gem.add_dependency 'faraday-multipart', '~> 1.0.0'
   gem.add_dependency 'faraday-typhoeus', '~> 1.1.0'
 
   gem.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.2'

data/lib/kapellmeister/base.rb

@@ -47,14 +47,35 @@ end
 
 def mapping(deep_key, deep_value, key, scheme)
   old_path = deep_value[:path].presence || deep_key.to_s
-  name = old_path.split('/').map { |part| part.gsub(/%<.*?>/, '') }.reject(&:empty?)
-  deep_value[:path] = [key, old_path].join('/')
+  name = old_path.to_s.split('/').map { |part| part.gsub(/%<.*?>/, '') }.reject(&:empty?)
+  use_name_wrapper, use_path_wrapper = use_wrappers?(deep_value.delete(:wrappers))
 
-  use_wrapper = deep_value.key?(:use_wrapper) ? deep_value[:use_wrapper] : true
-  new_key = if name.size == 1
+  deep_value[:path] = use_path_wrapper ? [key, old_path].join('/') : old_path
+  new_key = if name.size == 1 && !use_name_wrapper
               deep_key
             else
-              use_wrapper ? [name.first.presence || key, deep_key].join('_').to_sym : deep_key
+              use_name_wrapper ? [key, deep_key].join('_').to_sym : deep_key
             end
   scheme[new_key] = deep_value
 end
+
+def use_wrappers?(wrappers)
+  default = [true, false]
+  return default if wrappers.nil?
+
+  if wrappers.key?(:all)
+    all = to_bool!(wrappers[:all])
+    default = [all, all]
+  else
+    default = [to_bool!(wrappers[:name]), default[1]] if wrappers.key?(:name)
+    default = [default[0], to_bool!(wrappers[:path])] if wrappers.key?(:path)
+  end
+
+  default
+end
+
+def to_bool!(value)
+  convert_options = { 'true' => true, true => true, 'false' => false, false => false }
+
+  convert_options[value]
+end

data/lib/kapellmeister/dispatcher.rb

@@ -1,4 +1,6 @@
 require 'faraday/follow_redirects'
+require 'faraday/typhoeus'
+require 'faraday/multipart'
 require_relative 'requests_extension'
 
 class Kapellmeister::Dispatcher
@@ -40,6 +42,7 @@ class Kapellmeister::Dispatcher
     additional_headers = data.delete(:headers) || {}
     requests_data = data.delete(:request) || {}
     data_json = data.blank? ? '' : data.to_json
+    additional_headers['Content-Length'] = requests_data.merge(data).to_s.bytesize
 
     generated_connection = connection(additional_headers: additional_headers, requests_data: requests_data) # rubocop:disable Style/HashSyntax (for support ruby 2.4+)
 
@@ -53,9 +56,9 @@ class Kapellmeister::Dispatcher
   end
 
   def connection(additional_headers:, requests_data:)
-    @connection ||= ::Faraday.new(url: configuration.url,
-                                  headers: headers_generate(**additional_headers),
-                                  request: requests_generate(**requests_data)) do |faraday|
+    request = requests_generate(**requests_data)
+    headers = headers_generate(**additional_headers)
+    @connection ||= ::Faraday.new(url: configuration.url, headers: headers, request: request) do |faraday| # rubocop:disable Style/HashSyntax (for support ruby 2.4+)
       faraday.request :json, content_type: 'application/json; charset=utf-8'
       faraday.request :multipart
       faraday.response :logger, logger

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.9.9.rc2'.freeze
+  VERSION = '0.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapellmeister
 version: !ruby/object:Gem::Version
-  version: 0.9.9.rc2
+  version: 0.10.0
 platform: ruby
 authors:
 - DarkWater
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday-typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: