kapellmeister 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4469ce7f200030e5215269a415737eeb448029bac1e0ea60f238ab9d68eefd6d
-  data.tar.gz: 4a9387ea59601ed6b2413cae95b4dd4b05690492c331a4ed2d7f18f191b04a32
+  metadata.gz: 923b108fbce0c08cee2eb79bf46fb2741a61d1e833f1ffc01fcad0d18bbae972
+  data.tar.gz: 2dc7915c615149b8a7c5c1ff8a84960e212ffba27e65f2a29f45fd3b6ed174f8
 SHA512:
-  metadata.gz: b3ed10ab1cf0c69d4e0a18aadb3f9b124d7b1f35040dfc67f89e96d931b1226f7aa2f81bd557998d3176912cd2a2a75ed0d9bd4b39cc18596c679b3bb14cc971
-  data.tar.gz: 3c3ad070259adcb1ba6ec7ac4bcc68a1faa9266bfb5ec50919bd93266698564d04849a43b2bea8afd0ce1ce13e35b30868d2fddce512617166e538cd71dbddb9
+  metadata.gz: 4011c6602baf6895abcb1ec4468dcdcd27ea987a56e5a4c4d6395f8ed523f020771b07e785bdfbbf2477696b31c4b5045c11042344548b3727fc1cc374918fdd
+  data.tar.gz: 3c4df81ba7e805659df36374c384e52f788d1d4a4309fac1b5da09eea099d5a9c6d26a3d58088e73c4ea0aa431cba8a93154aee9c65d8b7bfc091adca12ce62a

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

@@ -7,7 +7,7 @@ module <%= class_name %>
     delegate <%= initialize_signatures.map { |k| ":#{k}" }.join(', ') %>, to: :configuration
 
     def ssl
-      @ssl ||= true
+      @ssl ||= (Rails.try(:env) || ENV['APP_ENV']) != 'development'
     end
   end
 end

data/lib/kapellmeister/dispatcher.rb

@@ -1,15 +1,35 @@
 require 'faraday_middleware'
+require_relative './requests_extension'
 
 class Kapellmeister::Dispatcher
+  include Kapellmeister::RequestsExtension
+  delegate :request_processing, to: Kapellmeister::RequestsExtension
+
+  def initialize
+    self.class.module_parent.requests.each(&request_processing)
+  end
+
   def self.inherited(base)
     super
-    base.extend(Kapellmeister::RequestsExtension)
-
-    delegate :report, :configuration, :logger, to: base.module_parent
+    delegate :report, :logger, to: base.module_parent
   end
 
   FailedResponse = Struct.new(:success?, :response, :payload)
 
+  def headers
+    {}
+  end
+
+  def request_options
+    {}
+  end
+
+  def configuration
+    self.class.module_parent.configuration
+  end
+
+  private
+
   def connection_by(method_name, path, data = {})
     additional_headers = data.delete(:headers) || {}
     requests_data = data.delete(:request) || {}
@@ -23,20 +43,10 @@ class Kapellmeister::Dispatcher
     failed_response(details: e.message)
   end
 
-  def headers
-    {}
-  end
-
-  def request_options
-    {}
-  end
-
-  private
-
   def connection(additional_headers:, requests_data:)
-    ::Faraday.new(url: configuration.url,
-                  headers: headers_generate(**additional_headers),
-                  request: requests_generate(**requests_data)) do |faraday|
+    @connection ||= ::Faraday.new(url: configuration.url,
+                                  headers: headers_generate(**additional_headers),
+                                  request: requests_generate(**requests_data)) do |faraday|
       faraday.request :json, content_type: 'application/json; charset=utf-8'
       faraday.request :multipart
       faraday.response :logger, logger

data/lib/kapellmeister/requests_extension.rb

@@ -10,17 +10,13 @@ module Kapellmeister::RequestsExtension
 
           full_path = generate_full_path(path, data)
 
-          new.connection_by(method, full_path, data)
+          connection_by(method, full_path, data)
         }.call(**request_data)
       end
     end
   rescue NoMethodError
     raise "You need to define #{self} class with connection_by method"
   end
-
-  def self.extended(base)
-    base.module_parent.requests.each(&request_processing)
-  end
 end
 
 def generate_full_path(original_path, data)

data/lib/kapellmeister/responder.rb

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

data/lib/kapellmeister/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapellmeister
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema