eezee 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f079b720f19b24847fb76fa83c1f574fac64babeaa84c64647570e7e43f37c
-  data.tar.gz: cc9f2f39e6e6e62d318fd1bd83efb828803838cbdab593c72f058c794f941a76
+  metadata.gz: 0c5f98dff776c1b37d51964cb1fce7c6a1e68623a7e13dc210bfc5d85d16c12f
+  data.tar.gz: ce22ed7f4753802de69b1479e18a0cc93f6dee6e6073c319c15e90549670ea42
 SHA512:
-  metadata.gz: 274f2aa489f88193b05481084f06445130f5a9d1ddac9ec813712ce95c09fcdb280834a1a85fdb5816a0955c14d174f68ee68ecbe1f979ac252a0cc166efd953
-  data.tar.gz: bee96de51df0aa33613c561d4857b0e85a4644ed38816ea9765541f9c5cd9dd311351ca8f00c0a1ff969640e4a867299f658ef904a5ad9043416448ebe166690
+  metadata.gz: b55295915cab2a6a44a0df55b6f6b8081373accfec020d655170374a04d53661708172788318a814d88e9412f6b76c6165c723a81620b690069a90e294a8fa64
+  data.tar.gz: 1c0fc574d0fcaf3f11a24013fc6b69912ffa832d5748bccbede924ecdd107bdc4b86d017e2b0e767f55cbed1b8061badd078115f0aa5aea8be022f030c43d71d

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+### 1.0.15
+
+* Append uri in error log and message
+
+### 1.0.14
+
+* Add ddtrace support
+* Add changelog

data/README.md

@@ -179,7 +179,8 @@ Here are the list of available options and about them:
 | `raise_error` | No | `false` | If you want that Eezee raises an error if the request has wasn't successful. See more in [Errors](#errors) | `true` |
 | `logger` | No | `false` | If you want to log the request, response, and error | `true` |
 | `url_encoded` | No | `false` | If you want to send request body as form_url_encoded | `true` |
-
+| `preserve_url_params` | No | `false` | The query params will be preserved if the url or path has a nested param like `:character_id` this value will be not replaced | `true` |
+| `ddtrace` | No | `nil` | Support for [DataDog apm](http://gems.datadoghq.com/trace/docs/#Faraday) | `{}` |
 
 ### Services
 

data/lib/eezee/client/requester.rb

@@ -28,7 +28,7 @@ module Eezee
           .tap  { |response| request.after!(request, response, nil) }
       rescue Faraday::Error => e
         response = Eezee::Response.new(e)
-        error = Eezee::RequestErrorFactory.build(response)
+        error = Eezee::RequestErrorFactory.build(request, response)
         error.log if request.logger
         return response if rescue_faraday_error?(request, response, error)
 
@@ -72,14 +72,19 @@ module Eezee
 
       def build_faraday_client(request)
         Faraday.new(request.uri) do |config|
-          config.request :url_encoded if request.url_encoded
-          config.use(Faraday::Response::RaiseError) if request.raise_error
-          config.headers = request.headers if request.headers
-          config.options[:open_timeout] = request.open_timeout if request.open_timeout
-          config.options[:timeout] = request.timeout if request.timeout
-          config.adapter(Faraday.default_adapter)
+          faraday_client_options!(config, request)
         end
       end
+
+      def faraday_client_options!(config, request)
+        config.request :url_encoded if request.url_encoded
+        config.use(Faraday::Response::RaiseError) if request.raise_error
+        config.headers = request.headers if request.headers
+        config.options[:open_timeout] = request.open_timeout if request.open_timeout
+        config.options[:timeout] = request.timeout if request.timeout
+        config.adapter(Faraday.default_adapter)
+        config.use(:ddtrace, request.ddtrace) if request.ddtrace.any?
+      end
     end
   end
 end

data/lib/eezee/configuration.rb

@@ -19,7 +19,10 @@ module Eezee
     end
 
     def request_by(request, options)
-      Request.new((request&.attributes || {}).merge(options || {}))
+      Marshal.dump(request&.attributes || {})
+             .then { |dumped| Marshal.load(dumped) } # rubocop:disable Security/MarshalLoad
+             .then { |attrs| attrs.merge(options || {}) }
+             .then { |attrs| Request.new(attrs) }
     end
   end
 end

data/lib/eezee/errors/request_error.rb

@@ -2,9 +2,10 @@
 
 module Eezee
   class RequestError < Error
-    attr_reader :response
+    attr_reader :response, :request
 
-    def initialize(response)
+    def initialize(request = nil, response = nil)
+      @request = request
       @response = response
       super(build_message)
     end
@@ -16,7 +17,7 @@ module Eezee
     private
 
     def build_message
-      "CODE: #{@response.code} - BODY: #{@response.body.to_json}"
+      "CODE: #{@response&.code} - URI: #{@request&.uri} - BODY: #{@response&.body&.to_json}"
     end
   end
 

data/lib/eezee/request.rb

@@ -16,6 +16,8 @@ module Eezee
       timeout
       url
       url_encoded
+      preserve_url_params
+      ddtrace
     ].freeze
 
     DEFAULT = {
@@ -24,7 +26,9 @@ module Eezee
       params: {},
       payload: {},
       raise_error: false,
-      url_encoded: false
+      url_encoded: false,
+      preserve_url_params: false,
+      ddtrace: {}
     }.freeze
 
     attr_accessor(*(ACCESSORS | %i[uri method]))
@@ -56,7 +60,7 @@ module Eezee
       validate!
       build_urn!
       handle_query_params!
-      handle_urn_params!
+      handle_urn_params! unless @preserve_url_params
     end
 
     def hook!(hook, params)

data/lib/eezee/request_error_factory.rb

@@ -3,10 +3,10 @@
 module Eezee
   class RequestErrorFactory
     class << self
-      def build(response)
+      def build(request, response)
         return TimeoutError.new(response) if response.timeout?
 
-        find_by_code(response.code).new(response)
+        find_by_code(response.code).new(request, response)
       end
 
       private

data/lib/eezee/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eezee
-  VERSION = '1.0.10'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eezee
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.15
 platform: ruby
 authors:
 - linqueta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +233,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - lib/eezee.rb
@@ -261,7 +256,7 @@ homepage: https://github.com/linqueta/eezee
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -277,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The easiest HTTP client for Ruby
 test_files: []