kapellmeister 0.7.3 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63a59e324e6fd25a43b163b8db3a826b617cff0101f4cb001f1825f7fc9fc06
-  data.tar.gz: 38a102e6272a99813bf78181e7aa7aded4e3ab22864059c3582f0297d0263884
+  metadata.gz: d6af7aa9d66f3270add6706341c7f7d108fbc28445bbfc246ae90fd1d8f2c32b
+  data.tar.gz: accaecadc8c8c8bd854cd45533e4bf4c8e8af43eaa20f0ddff1eec960ed25332
 SHA512:
-  metadata.gz: d05effbadfaba1923440b05ca4875d501a5fe281899b34c0c6fea5998e260159286d72f17800cea730b36fdff72c80409f3ce6d6059a504de6fb0fa92b990ddf
-  data.tar.gz: 2be64d2e49d7f78b51075a6477020bad5441f8edeb20e5ecc0ccdab8bf5cc9ee8978b11cf01efb6d0945e89db40cc39f828ff678b65424e27744abf3326d0794
+  metadata.gz: 59fd772844ade2b572f52b28077b7da6d75ae2b5408f1a29e57a45d9669dfed0f77bbf0244de439cc71dacc99f168f373f1348db7c43966b7fb5e3a2d4225f2e
+  data.tar.gz: f76a05897c0e35d82a103fbb1ac0797ee75f64549e3c12f75d2250c4449c8881fa4d4938dca4468e0c373dae0d5f93e0e8efc51066350ed89ea1ed5db5193a4e

data/lib/kapellmeister/dispatcher.rb

@@ -2,11 +2,13 @@ require 'faraday_middleware'
 require_relative './requests_extension'
 
 class Kapellmeister::Dispatcher
-  include Kapellmeister::RequestsExtension
-  delegate :request_processing, to: Kapellmeister::RequestsExtension
+  def self.new(**args)
+    main_klass = self.module_parent.name.delete('::')
 
-  def initialize
-    self.class.module_parent.requests.each(&request_processing)
+    self.module_parent.requests.each do |request|
+      self.include Kapellmeister::RequestsExtension.request_processing(main_klass, request)
+    end
+    super(**args)
   end
 
   def self.inherited(base)

data/lib/kapellmeister/requests_extension.rb

@@ -1,12 +1,19 @@
 module Kapellmeister::RequestsExtension
-  def self.request_processing
-    proc do |name, request_data|
+  def self.request_processing(klass, (name, request_data))
+    mod = if Object.const_defined?("#{self}::#{klass}InstanceMethods")
+            const_get("#{self}::#{klass}InstanceMethods")
+          else
+            const_set("#{klass}InstanceMethods", Module.new)
+          end
+
+    mod.module_eval do
       define_method name do |data = {}|
-        proc { |method:, path:, body: {}, query_params: {}, mock: ''|
+        proc { |method:, path: nil, body: {}, query_params: {}, mock: ''|
           if (Rails.try(:env) || ENV.fetch('APP_ENV', nil)) == 'test'
             return ::Kapellmeister::Base.routes_scheme_parse(mock)
           end
 
+          data = query_params.compact_blank.merge(data) if data.is_a?(Hash)
           valid_body?(data, body)
           valid_query?(data, query_params)
 
@@ -16,6 +23,8 @@ module Kapellmeister::RequestsExtension
         }.call(**request_data)
       end
     end
+
+    mod
   rescue NoMethodError
     raise "You need to define #{self} class with connection_by method"
   end
@@ -23,10 +32,15 @@ end
 
 def generate_full_path(original_path, data)
   path = generate_path(original_path, data)
-  [path, data.delete(:query_params)&.to_query].compact_blank!.join('?')
+  query = data.delete(:query_params)&.to_query
+  return "?#{query}" unless path
+
+  [path, query].compact_blank!.join('?')
 end
 
 def generate_path(original_path, data)
+  return nil unless original_path
+
   original_path.split('/').map do |part|
     next part unless part.include? '%<'
 

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.9.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapellmeister
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.9.1
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema