kapellmeister 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2bf7cc575b579cafe9ff8f500407e25275220340498dea77ff27d18ec73e35
-  data.tar.gz: 36476a2563dfcac9ad129188b050b3fc212b3cd8ff9b5b5546ee10afc845ebd6
+  metadata.gz: 3f6050eee5b66fbd57d701c5c4af3cd6bc1ee34089d1a0aaa7cf90c7fed12fa3
+  data.tar.gz: 47d525ef9f511166657c397257b8989ca02dc6637c360c39a0354c355fa1a595
 SHA512:
-  metadata.gz: b62e680f94423d0822ff0a784702b023712ebf313bb40b38634808a4eb2e2d03affb5027e3d064942ba5fa475068ec42d746a9ac053d14d975923a3f85960fba
-  data.tar.gz: bca17d751f762904131e458423e342eea9e56b521ef6ab869d45d5ff8746aa0519c8dc501d9cf76e4372df8be6205f8559f119c6de8c4ab07ba7b0745f36126c
+  metadata.gz: 4471a0c7b78d03d30e3b61f977d81272aa434bb46c35d5f90bb310667cb2f913a2ba0797699401c8dfee6092fcec58c88643b396c0ba80ff46a9c31fa7b598fc
+  data.tar.gz: 200139ca7b308fe988c74a9047484b8ed95c78b62cedbba5ff1fd848e40b1d9e8c2fb3f6b6fe06bcfceadc0906bbbdfe7173ae3c652f20616811f804a9bc97aa

data/Gemfile

@@ -4,6 +4,7 @@ ruby '3.1.1'
 
 gemspec
 
+gem 'dry-schema'
 gem 'faraday'
 gem 'faraday_middleware'
 gem 'faraday-cookie_jar'

data/kapellmeister.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.4.2'
 
+  gem.add_dependency 'dry-schema', '~> 1.9.1'
   gem.add_dependency 'faraday', '~> 1.0'
   gem.add_dependency 'faraday-cookie_jar', '~> 0.0.7'
   gem.add_dependency 'faraday_middleware', '~> 1.2'

data/lib/generators/kapellmeister/add_service_generator.rb

@@ -50,3 +50,8 @@ module Kapellmeister
     end
   end
 end
+
+# ROUTES = Dir['app/lib/yandex_taxi/route_scheme/**/*.yml'].each_with_object({}) do |file, result|
+#   routes = ::Kapellmeister::Base.routes_scheme_parse(file)
+#   result.merge!(routes)
+# end

data/lib/generators/kapellmeister/templates/lib/third_party/configuration.rb.tt

@@ -11,6 +11,6 @@ class <%= class_name %>::Configuration
 
     https = ssl.presence || true
 
-    "URI::HTTP#{https.to_b ? 'S' : ''}".build(host:, path: [path, version].join('/'))
+    "URI::HTTP#{https.to_b ? 'S' : ''}".constantize.build(host:, path: [path, version].join('/'))
   end
 end

data/lib/generators/kapellmeister/templates/lib/third_party/routes.yml.tt

@@ -2,10 +2,11 @@
 #   foo:                    => Wrapper for method
 #     bar:                  => Method name
 #       scheme:             => Scheme description
-#         method: POST      => Request type
-#         use_wrapper: true => Default true
-#         path: buz         => Real path
-#         mock:             => Mock for development
-#           token: blablabla
+#         method: POST      => Request type (* required)
+#         use_wrapper: true => Default true (* required)
+#         path: buz         => Real path (* required)
+#         body:             => Dry schema for checking parameters. If key doesn't exist nothing happens
+#         query:            => Query params. If key doesn't exist nothing happens
+#         mock:             => Structure or Path to mock file for tests. If key doesn't exist nothing happens
 #
 # Client.foo_bar { a: 'b' } => POST http://host/foo/buz DATA: { a: 'b' }

data/lib/kapellmeister/base.rb

@@ -26,14 +26,18 @@ module Kapellmeister::Base
   end
 
   def self.routes_scheme_parse(path)
-    YAML.safe_load(ERB.new(File.read(path)).result, aliases: true, permitted_classes: [Time]).deep_symbolize_keys
+    template = ERB.new(File.read(path)).result
+    YAML.safe_load(template, aliases: true, permitted_classes: [Symbol, Date, Time]).deep_symbolize_keys
+  rescue Errno::ENOENT => e
+    warn "No such file or directory", path
+    {}
   end
 end
 
 def generate_routes(json_scheme)
-  json_scheme.each_with_object({}) do |(key, value), scheme|
+  json_scheme.dup.each_with_object({}) do |(key, value), scheme|
     scheme[key] = value.delete(:scheme) if (value.is_a?(Hash) && value.key?(:scheme)) || value.is_a?(String)
-    next if value.length.zero?
+    next if value.nil? || value.length.zero?
 
     generate_routes(value).map { |deep_key, deep_value| mapping(deep_key, deep_value, key, scheme) }
   end

data/lib/kapellmeister/dispatcher.rb

@@ -10,22 +10,15 @@ class Kapellmeister::Dispatcher
 
   FailedResponse = Struct.new(:success?, :response, :payload)
 
-  def connection_by(method, path, data = {})
-    headers_params = data.delete(:headers) || {}
+  def connection_by(method_name, path, data = {}, query = {})
+    additional_headers = data.delete(:headers) || {}
     requests_data = data.delete(:request) || {}
 
-    generated_connection = connection(additional_headers: headers_params, requests_data:)
+    generated_connection = connection(additional_headers:, requests_data:)
 
-    case method.upcase.to_sym
-    when :GET
-      process generated_connection.get([path, data.to_query].compact_blank!.join('?'))
-    when :POST
-      process generated_connection.post(path, data.to_json)
-    when :PUT
-      process generated_connection.put(path, data.to_json)
-    else
-      raise "Library can't process method #{method} yet"
-    end
+    process generated_connection.run_request(method_name.downcase.to_sym, path, data.to_json, additional_headers)
+  rescue NoMethodError, NameError, RuntimeError
+    raise "Library can't process method #{method_name} yet"
   rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
     failed_response(details: e.message)
   end
@@ -44,7 +37,7 @@ class Kapellmeister::Dispatcher
     ::Faraday.new(url: configuration.url,
                   headers: headers_generate(**additional_headers),
                   request: requests_generate(**requests_data)) do |faraday|
-      faraday.request :json, content_type: 'application/json'
+      faraday.request :json, content_type: 'application/json; charset=utf-8'
       faraday.request :multipart
       faraday.response :logger, logger
       faraday.response :json, content_type: 'application/json; charset=utf-8'
@@ -56,7 +49,7 @@ class Kapellmeister::Dispatcher
 
   def headers_generate(**additional)
     {
-      accept: 'application/json, text/plain, */*',
+      accept: 'application/json, text/plain, */*, charset=utf-8',
       **additional,
       **headers
     }

data/lib/kapellmeister/requests_extension.rb

@@ -2,16 +2,15 @@ module Kapellmeister::RequestsExtension
   def self.request_processing
     proc do |name, request_data|
       define_method name do |data = {}|
-        proc { |method:, path:, mock:| # rubocop:disable Lint/UnusedBlockArgument:
-          # return mock if ENV['APP_ENV'] == 'development'
+        proc { |method:, path:, body: {}, query: {}, mock: ''|
+          return ::Kapellmeister::Base.routes_scheme_parse(mock) if (Rails.try(:env) || ENV['APP_ENV']) == 'test'
 
-          path = path.split('/').map do |part|
-            next part unless part.include? '%<'
+          valid_body?(data, body)
+          valid_query?(data, query)
 
-            data.delete(part.match(/%<(.*)>/).to_a.last.to_sym)
-          end.join('/')
+          full_path = generate_full_path(path, data)
 
-          new.connection_by(method, path, data)
+          new.connection_by(method, full_path, data)
         }.call(**request_data)
       end
     end
@@ -23,3 +22,41 @@ module Kapellmeister::RequestsExtension
     base.module_parent.requests.each(&request_processing)
   end
 end
+
+def generate_full_path(original_path, data)
+  path = generate_path(original_path, data)
+  [path, data.delete(:query)&.to_query].compact_blank!.join('?')
+end
+
+def generate_path(original_path, data)
+  original_path.split('/').map do |part|
+    next part unless part.include? '%<'
+
+    data.delete(part.match(/%<(.*)>/).to_a.last.to_sym)
+  end.join('/')
+end
+
+def valid_body?(data, body)
+  return if body.blank? || body.is_a?(Hash)
+
+  schema = Object.const_get(body).schema
+  result = schema.(data)
+  return data if result.success?
+
+  raise ArgumentError, result.errors.to_h
+end
+
+def valid_query?(data, query)
+  return if query.blank?
+  required_keys = query.keys
+
+  from_data = data.slice(*required_keys)
+  data.except!(*required_keys)
+  data[:query] ||= {}
+  data[:query] = data[:query].to_h.merge!(from_data)
+
+  diffirent_keys = data[:query].transform_keys(&:to_sym)
+  return if required_keys.all? { |key| diffirent_keys.has_key? key.to_sym }
+
+  raise ArgumentError, "query params needs keys #{required_keys}"
+end

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kapellmeister
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement