kapellmeister 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6050eee5b66fbd57d701c5c4af3cd6bc1ee34089d1a0aaa7cf90c7fed12fa3
-  data.tar.gz: 47d525ef9f511166657c397257b8989ca02dc6637c360c39a0354c355fa1a595
+  metadata.gz: 4469ce7f200030e5215269a415737eeb448029bac1e0ea60f238ab9d68eefd6d
+  data.tar.gz: 4a9387ea59601ed6b2413cae95b4dd4b05690492c331a4ed2d7f18f191b04a32
 SHA512:
-  metadata.gz: 4471a0c7b78d03d30e3b61f977d81272aa434bb46c35d5f90bb310667cb2f913a2ba0797699401c8dfee6092fcec58c88643b396c0ba80ff46a9c31fa7b598fc
-  data.tar.gz: 200139ca7b308fe988c74a9047484b8ed95c78b62cedbba5ff1fd848e40b1d9e8c2fb3f6b6fe06bcfceadc0906bbbdfe7173ae3c652f20616811f804a9bc97aa
+  metadata.gz: b3ed10ab1cf0c69d4e0a18aadb3f9b124d7b1f35040dfc67f89e96d931b1226f7aa2f81bd557998d3176912cd2a2a75ed0d9bd4b39cc18596c679b3bb14cc971
+  data.tar.gz: 3c3ad070259adcb1ba6ec7ac4bcc68a1faa9266bfb5ec50919bd93266698564d04849a43b2bea8afd0ce1ce13e35b30868d2fddce512617166e538cd71dbddb9

data/kapellmeister.gemspec

@@ -27,7 +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 'dry-schema', '~> 1.7'
   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/templates/lib/third_party/configuration.rb.tt

@@ -9,7 +9,9 @@ class <%= class_name %>::Configuration
   def url
     raise "No given host to #{self.class.name}" unless host
 
-    https = ssl.presence || true
+    https = true
+    https = ssl unless ssl.nil?
+    https = <%= class_name %>.ssl unless <%= class_name %>.ssl.nil?
 
     "URI::HTTP#{https.to_b ? 'S' : ''}".constantize.build(host:, path: [path, version].join('/'))
   end

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

@@ -6,7 +6,7 @@
 #         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
+#         query_params:     => 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

@@ -28,8 +28,8 @@ module Kapellmeister::Base
   def self.routes_scheme_parse(path)
     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
+  rescue Errno::ENOENT
+    warn 'No such file or directory', path
     {}
   end
 end

data/lib/kapellmeister/dispatcher.rb

@@ -10,14 +10,14 @@ class Kapellmeister::Dispatcher
 
   FailedResponse = Struct.new(:success?, :response, :payload)
 
-  def connection_by(method_name, path, data = {}, query = {})
+  def connection_by(method_name, path, data = {})
     additional_headers = data.delete(:headers) || {}
     requests_data = data.delete(:request) || {}
 
-    generated_connection = connection(additional_headers:, requests_data:)
+    generated_connection = connection(additional_headers: additional_headers, requests_data: requests_data) # rubocop:disable Style/HashSyntax (for support ruby 2.4+)
 
     process generated_connection.run_request(method_name.downcase.to_sym, path, data.to_json, additional_headers)
-  rescue NoMethodError, NameError, RuntimeError
+  rescue NameError, RuntimeError
     raise "Library can't process method #{method_name} yet"
   rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
     failed_response(details: e.message)
@@ -49,7 +49,7 @@ class Kapellmeister::Dispatcher
 
   def headers_generate(**additional)
     {
-      accept: 'application/json, text/plain, */*, charset=utf-8',
+      # accept: 'application/json, text/plain, */*, charset=utf-8',
       **additional,
       **headers
     }

data/lib/kapellmeister/requests_extension.rb

@@ -2,11 +2,11 @@ module Kapellmeister::RequestsExtension
   def self.request_processing
     proc do |name, request_data|
       define_method name do |data = {}|
-        proc { |method:, path:, body: {}, query: {}, mock: ''|
+        proc { |method:, path:, body: {}, query_params: {}, mock: ''|
           return ::Kapellmeister::Base.routes_scheme_parse(mock) if (Rails.try(:env) || ENV['APP_ENV']) == 'test'
 
           valid_body?(data, body)
-          valid_query?(data, query)
+          valid_query?(data, query_params)
 
           full_path = generate_full_path(path, data)
 
@@ -25,7 +25,7 @@ end
 
 def generate_full_path(original_path, data)
   path = generate_path(original_path, data)
-  [path, data.delete(:query)&.to_query].compact_blank!.join('?')
+  [path, data.delete(:query_params)&.to_query].compact_blank!.join('?')
 end
 
 def generate_path(original_path, data)
@@ -52,11 +52,11 @@ def valid_query?(data, query)
 
   from_data = data.slice(*required_keys)
   data.except!(*required_keys)
-  data[:query] ||= {}
-  data[:query] = data[:query].to_h.merge!(from_data)
+  data[:query_params] ||= {}
+  data[:query_params] = data[:query_params].to_h.merge!(from_data)
 
-  diffirent_keys = data[:query].transform_keys(&:to_sym)
+  diffirent_keys = data[:query_params].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}"
+  raise ArgumentError, "Query params needs keys #{required_keys}"
 end

data/lib/kapellmeister/responder.rb

@@ -12,7 +12,7 @@ class Kapellmeister::Responder
   def result
     error = !/2\d{2}/.match?(status.to_s)
 
-    Result.new(!error, parsed_body, { status: }.merge(payload))
+    Result.new(!error, parsed_body, { status: status }.merge(payload)) # rubocop:disable Style/HashSyntax (for support ruby 2.4+)
   rescue JSON::ParserError => e
     Result.new(false, e)
   end

data/lib/kapellmeister/version.rb

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

metadata

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