my_target_api 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d534ef71d8b0aa864eb79ac1fec77fdd085dad3
-  data.tar.gz: 6b499fa889d1a6641cf2b95b9f8f421e8ac60d0c
+  metadata.gz: f8a2de4571899340aa8c1e6e6c099c0a6b75e7e6
+  data.tar.gz: f1453fac44237e86a82ff18f54d9bc1a1ca4f706
 SHA512:
-  metadata.gz: 4a9fa61da044dec259415c7e8582c5ec35eb8d09fceb99a7f30ddaee5fc0fbfc84fd84351517f2dc54710c113a55bc81b70500f5023587178fe2ce4065e4321e
-  data.tar.gz: 111b8db8d84a8a55ca127f9b6881809f884f646ca49d9080db0880dccefaedf434df2b3c16405557f4086de5124b7b84c4845e7295a1fb15dcfe4cb839fc384f
+  metadata.gz: 43618ed32e7313aa0c300391d619e448ed56102429766559f91ed0a4056587b35147fc773d4a293854a521c9f61d2fd9a0b9fbef7f41affff3b3e8b0075aa398
+  data.tar.gz: 9be00939ad2371270df68d053ac5d586a2dab12a09f4e1043e6c24377a4c1562bed461e1daabdfa4b4f3802e12a12f0fa0a4bc9439ff002d19c391585844bb56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_target_api (2.0.6)
+    my_target_api (2.0.7)
       json (~> 2.0, >= 2.0.0)
       rest-client (~> 2.0, >= 2.0.0)
 

data/README.md

@@ -99,7 +99,7 @@ def read_active_campaigns
 
 rescue MyTargetApi::RequestError => e
 
-  puts e.message, e.params, e.response, e.backtrace
+  puts e.message, e.method, e.url, e.params, e.response, e.backtrace
   # You can access the original exception
   puts e.original_exception&.message, e.original_exception&.backtrace
 

data/lib/my_target_api/request.rb

@@ -14,7 +14,7 @@ class MyTargetApi
     end
 
     def get(url, params = {}, headers = {})
-      response = with_exception_handling(params) do
+      response = with_exception_handling('GET', url, params) do
         NetClient.get(url, headers.merge(query(params)))
       end
 
@@ -22,7 +22,7 @@ class MyTargetApi
     end
 
     def post(url, params = {}, headers = {})
-      response = with_exception_handling(params) do
+      response = with_exception_handling('POST', url, params) do
         NetClient.post(url, params, headers)
       end
 
@@ -30,7 +30,7 @@ class MyTargetApi
     end
 
     def delete(url, params = {}, headers = {})
-      response = with_exception_handling(params) do
+      response = with_exception_handling('DELETE', url, params) do
         NetClient.delete(url, headers.merge(query(params)))
       end
 
@@ -38,7 +38,7 @@ class MyTargetApi
     end
 
     def upload(url, content, params = {}, headers = {})
-      response = with_exception_handling(params) do
+      response = with_exception_handling('POST', 'url', params) do
         NetClient.post(
           url,
           content,
@@ -65,24 +65,27 @@ class MyTargetApi
       response.body
     end
 
-    def with_exception_handling(params)
+    def with_exception_handling(method, url, params)
       response = yield
       log_response(response)
-      raise_with_params(params: params, response: response) if response.code >= 400
+      if response.code >= 400
+        raise_with_params(method: method, url: url, params: params, response: response)
+      end
       response
     rescue NetClient::Exception => e
       original_exception = e.original_exception
       logger << "#{original_exception.class.name} #{original_exception.message}"
-      raise_with_params(params: params, original_exception: original_exception)
+      raise_with_params(method: method, url: url, params: params,
+                        original_exception: original_exception)
     end
 
     def log_response(response)
       logger << ResponseFormatter.new(response).format
     end
 
-    def raise_with_params(params:, response: nil, original_exception: nil)
-      result = MyTargetApi::RequestError.new(params: params,
-                                             response: response,
+    def raise_with_params(method:, url:, params:, response: nil, original_exception: nil)
+      result = MyTargetApi::RequestError.new(method: method, url: url,
+                                             params: params, response: response,
                                              original_exception: original_exception)
       result.set_backtrace(caller)
       raise result

data/lib/my_target_api/request_error.rb

@@ -4,18 +4,16 @@ class MyTargetApi
   # Error for request
   class RequestError < StandardError
 
-    attr_reader :params, :original_exception, :response
+    attr_reader :method, :url, :params, :original_exception, :response
 
-    def initialize(params:, original_exception: nil, response: nil)
+    def initialize(method:, url:, params:, original_exception: nil, response: nil)
+      @method = method
+      @url = url
       @params = params
       @response = response
       @original_exception = original_exception
 
-      message =
-        "#{(response ? "#{response.code}: #{response.body}. " : '')}"\
-        'Inspect #params, #response and #original_exception for more details'
-
-      super(message)
+      super(response ? "#{response.code}: #{response.body}" : 'No response')
     end
 
   end

data/lib/my_target_api/version.rb

@@ -2,6 +2,6 @@
 
 class MyTargetApi
 
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 
 end

data/spec/request_spec.rb

@@ -84,9 +84,7 @@ describe MyTargetApi::Request do
         .to_return(body: 'Unknown resource', status: 404)
 
       expect { subject.get('https://target.my.com/api/v1/wrong_path.json') }
-        .to raise_error(MyTargetApi::RequestError,
-                        '404: Unknown resource. Inspect #params, #response and #original_exception'\
-                        ' for more details')
+        .to raise_error(MyTargetApi::RequestError, '404: Unknown resource')
     end
 
     it 'sets authorization header' do
@@ -163,9 +161,7 @@ describe MyTargetApi::Request do
       )
 
       expect { request.get('https://target.my.com/api/v1/request.json') }
-        .to raise_error(MyTargetApi::RequestError,
-                        '404: Unknown resource. Inspect #params, #response and #original_exception'\
-                        ' for more details')
+        .to raise_error(MyTargetApi::RequestError, '404: Unknown resource')
 
       expect(logger).to(have_received(:<<).with(<<~LOG))
         GET https://target.my.com/api/v1/request.json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_target_api
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - OneRetarget.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json