nxt_http_client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e92672fe6aa4fc0e1a28cbe7384c7208823ddc240d08ab27d7d8d9a185396571
-  data.tar.gz: 65dd6b57b39e9c32a3e21a22b4b25052bfb0b95e65f4b6289923db4aab55324a
+  metadata.gz: 5bdc0b6838780fe319613c5269ea5c0077cbc3ba621b69203d0902c15943c27f
+  data.tar.gz: 02fb6a39d21c5aa8661ddc591eee8324bf044898143f133b6f0478751a1726c0
 SHA512:
-  metadata.gz: 5d76732a3495541363cf8e1000d1ac20a5c07a0898589a91634c0b024c198dc1cd59adcf134664761e6c1b9497299fb6b37e4a434ef132671f4fac7b24cc8e73
-  data.tar.gz: 2cc16bc548581db1696626c7ff98307b0685de525be4f690881cbcf3af6483c67d342f3859d0498aecaa96a45a9aff46f50cb45be3dea3526e7fbfe6c1239ef6
+  metadata.gz: f157b49c5dc97c40650235d8828fb2f1e5d7917b65f3a42ca8ab6a517b621c6a89e747143ce782d50ecef8bb7f7c2bf1726f0daee7d78b321988758748a61d5b
+  data.tar.gz: 52086988a87eda709d21fa1114388411ee26e1d019366647199b039362073ff771c86064be3bc268bbce8edf9aab1dce7ad3e6aa78eed5c9ac76cdea6b9cb173

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nxt_http_client (0.1.7)
+    nxt_http_client (0.1.8)
       activesupport (~> 5.2)
       typhoeus
 

data/README.md

@@ -33,6 +33,7 @@ class MyClient < NxtHttpClient
       method: :get,
       followlocation: true
     }
+    defaults.x_request_id_proc = -> { ('a'..'z').to_a.shuffle.take(10).join } # defaults to -> { SecureRandom.uuid } 
   end
   
   register_response_handler do |handler|
@@ -41,8 +42,11 @@ class MyClient < NxtHttpClient
     end
   end
   
-  before_fire do |request|
-    # Will be called before fire  
+  before_fire do |request, handler|
+    # Will be called before fire
+    handler.on!(200) do |response|
+      # reconfigure your handler before fire
+    end
   end
   
   after_fire do |request, result, response|
@@ -70,7 +74,8 @@ end
 
 ### register_defaults
 
-Register default request options on the class level.
+Register default request options on the class level. Available options are `request_options` that are passed directly to 
+the underlying Typhoeus Request. Then there is `base_url` and `x_request_id_proc`. 
 
 ### register_response_handler
 

data/lib/nxt_http_client.rb

@@ -3,6 +3,7 @@ require 'typhoeus'
 
 require 'nxt_http_client/version'
 require 'nxt_http_client/response_handler'
+require 'nxt_http_client/default_config'
 require 'nxt_http_client/client_dsl'
 require 'nxt_http_client/client'
 

data/lib/nxt_http_client/client.rb

@@ -4,10 +4,10 @@ module NxtHttpClient
     CACHE_STRATEGIES = %w[global thread]
 
     def build_request(url, **opts)
-      base_url = opts.delete(:base_url) || self.class.base_url
+      base_url = opts.delete(:base_url) || default_config.base_url
       url = [base_url, url].reject(&:blank?).join('/').gsub(/([^https?:]\/\/)/, '/')
 
-      opts = self.class.default_request_options.with_indifferent_access.deep_merge(opts.with_indifferent_access)
+      opts = default_config.request_options.with_indifferent_access.deep_merge(opts.with_indifferent_access)
       opts[:headers] ||= {}
 
       if opts[:cache] ||= false
@@ -37,7 +37,7 @@ module NxtHttpClient
       request = build_request(url, opts.except(:response_handler))
 
       before_fire_callback = self.class.before_fire_callback
-      before_fire_callback && instance_exec(request, &before_fire_callback)
+      before_fire_callback && instance_exec(request, response_handler, &before_fire_callback)
 
       if response_handler.callbacks['headers']
         request.on_headers do |response|
@@ -77,5 +77,9 @@ module NxtHttpClient
     def dup_handler_from_class
       self.class.response_handler.dup
     end
+
+    def default_config
+      self.class.default_config
+    end
   end
 end

data/lib/nxt_http_client/client_dsl.rb

@@ -1,60 +1,52 @@
-module ClientDsl
-
-  def register_defaults(opts = defaults, &block)
-    @defaults = opts
-    @defaults.tap { |d| block.call(d) }
-    @defaults
-  end
-
-  def before_fire(&block)
-    @before_fire_callback = block
-  end
-
-  def before_fire_callback
-    @before_fire_callback
-  end
-
-  def after_fire(&block)
-    @after_fire_callback = block
-  end
-
-  def after_fire_callback
-    @after_fire_callback
-  end
-
-  def defaults
-    @defaults ||= OpenStruct.new
-  end
-
-  def base_url
-    @base_url ||= (defaults.base_url || '')
-  end
-
-  def default_request_options
-    @default_request_options ||= (defaults.request_options || ActiveSupport::HashWithIndifferentAccess.new)
-  end
-
-  def register_response_handler(handler = nil, &block)
-    @response_handler = handler
-    @response_handler ||= dup_handler_from_ancestor_or_new
-    @response_handler.configure(&block) if block_given?
-    @response_handler
-  end
-
-  def response_handler
-    @response_handler
-  end
-
-  def dup_handler_from_ancestor_or_new
-    handler_from_ancestor = ancestors[1].instance_variable_get(:@response_handler)
-    handler_from_ancestor && handler_from_ancestor.dup || NxtHttpClient::ResponseHandler.new
-  end
-
-  def inherited(child)
-    child.instance_variable_set(:@response_handler, @response_handler.dup)
-    child.instance_variable_set(:@base_url, @base_url)
-    child.instance_variable_set(:@before_fire_callback, @before_fire_callback.dup)
-    child.instance_variable_set(:@after_fire_callback, @after_fire_callback.dup)
-    child.instance_variable_set(:@defaults, OpenStruct.new(**@defaults.to_h.deep_dup))
+module NxtHttpClient
+  module ClientDsl
+    def register_defaults(opts = {}, &block)
+      @default_config ||= DefaultConfig.new(**opts)
+      @default_config.tap { |d| block.call(d) }
+      @default_config
+    end
+
+    def before_fire(&block)
+      @before_fire_callback = block
+    end
+
+    def before_fire_callback
+      @before_fire_callback
+    end
+
+    def after_fire(&block)
+      @after_fire_callback = block
+    end
+
+    def after_fire_callback
+      @after_fire_callback
+    end
+
+    def default_config
+      @default_config ||= DefaultConfig.new
+    end
+
+    def register_response_handler(handler = nil, &block)
+      @response_handler = handler
+      @response_handler ||= dup_handler_from_ancestor_or_new
+      @response_handler.configure(&block) if block_given?
+      @response_handler
+    end
+
+    def response_handler
+      @response_handler
+    end
+
+    def dup_handler_from_ancestor_or_new
+      handler_from_ancestor = ancestors[1].instance_variable_get(:@response_handler)
+      handler_from_ancestor && handler_from_ancestor.dup || NxtHttpClient::ResponseHandler.new
+    end
+
+    def inherited(child)
+      child.instance_variable_set(:@response_handler, @response_handler.dup)
+      child.instance_variable_set(:@before_fire_callback, @before_fire_callback.dup)
+      child.instance_variable_set(:@after_fire_callback, @after_fire_callback.dup)
+      child.instance_variable_set(:@default_config, DefaultConfig.new(**default_config.to_h.deep_dup))
+    end
   end
 end

data/lib/nxt_http_client/default_config.rb

@@ -0,0 +1,11 @@
+module NxtHttpClient
+  CONFIGURABLE_OPTIONS = %i[request_options base_url x_request_id_proc]
+
+  DefaultConfig = Struct.new('DefaultConfig', *CONFIGURABLE_OPTIONS) do
+    def initialize(request_options: ActiveSupport::HashWithIndifferentAccess.new, base_url: '', x_request_id_proc: -> { SecureRandom.uuid })
+      self.request_options = request_options
+      self.base_url = base_url
+      self.x_request_id_proc = x_request_id_proc
+    end
+  end
+end

data/lib/nxt_http_client/version.rb

@@ -1,3 +1,3 @@
 module NxtHttpClient
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nxt_http_client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Andreas Robecke
@@ -173,6 +173,7 @@ files:
 - lib/nxt_http_client.rb
 - lib/nxt_http_client/client.rb
 - lib/nxt_http_client/client_dsl.rb
+- lib/nxt_http_client/default_config.rb
 - lib/nxt_http_client/response_handler.rb
 - lib/nxt_http_client/version.rb
 - nxt_http_client.gemspec