my_target_api 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6baa9baf7e866577e83fe5678ae32c1250c6b2f6
-  data.tar.gz: a06f4dff789ccff62b7954583c0eab81fb8250d4
+  metadata.gz: f9f3188adcf480c8c732b25cba9d6ff3ed917e82
+  data.tar.gz: b952a49b44aad9f0c8cf0c581c449e06dbc02262
 SHA512:
-  metadata.gz: 275bd343d50db2df8ea22434f502b8f4aa95990e99dbd16384597c79ef9736d12ebc7a0da0849e43bab1f38c02597bcb22972c5936f280f7fe615a452899a967
-  data.tar.gz: 89640a388f2bb98564fc048a3c0daaaea5da79eb6eab2eefa4bb347215995bdfcf17f2679c8fcd5fb1dd0f6639925536ac71e697785874488d19a6493fb4ab15
+  metadata.gz: f0441c39f4b4dd63fc8b4ecf9542024c8575041d2fbee0654323ba5a47e34e298cb346158decb33f76499293a722bf5526cf1fb639d998ba0a9976b47b0868fe
+  data.tar.gz: 110e86dc4f466f507d0ec690d705f32183357ce80eba4d8f57e6f9ed560eacef549a4477bc93aad287c007302ef3a5f458c866367cd9513fbbe6de388ee5475d

data/Gemfile.lock

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

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```
-gem 'my_target_api', '~> 1.2.1'
+gem 'my_target_api', '~> 1.2.6'
 ```
 
 Or install from command line:
@@ -43,6 +43,7 @@ Name | Default value | Description
 ---|---|---
 `:v` | 1 | API version
 `:logger` |   | An object to log requests and exceptions. The object must respond to `<<` method
+`:headers` | | Headers hash to pass with request
 
 ### Create, Read, Update, Delete
 
@@ -60,7 +61,7 @@ remarketing_counters_resource.delete(id: 343434) # => [{ 'success' => true }]
 
 #### Options
 
- Name | Default value | Description 
+ Name | Default value | Description
 ---|---|---
  `:id` |   | Resource ID. Optional for Read, required for Update and Delete
  `:id_param_key` | `:id` | Option key for resource ID
@@ -105,7 +106,7 @@ rescue MyTargetApi::RequestError, MyTargetApi::ConnectionError => e
 end
 ```
 
- Name | Description 
+ Name | Description
 ---|---
  `MyTargetApi::RequestError` | Request didn't succeed
  `MyTargetApi::ConnectionError` | Connection didn't succeed

data/lib/my_target_api.rb

@@ -24,19 +24,19 @@ class MyTargetApi
   end
 
   def get_request(url, params)
-    request_object.get(url, params.merge(access_token: access_token))
+    request_object.get(url, params)
   end
 
   def post_request(url, params)
-    request_object.post(url, params.merge(access_token: access_token))
+    request_object.post(url, params)
   end
 
   def delete_request(url, params)
-    request_object.delete(url, params.merge(access_token: access_token))
+    request_object.delete(url, params)
   end
 
   def upload_request(url, content, params)
-    request_object.upload(url, content, params.merge(access_token: access_token))
+    request_object.upload(url, content, params)
   end
 
   private
@@ -44,7 +44,7 @@ class MyTargetApi
   attr_reader :access_token, :options
 
   def request_object
-    Request.new(logger: options[:logger])
+    Request.new(logger: options[:logger], access_token: access_token, headers: options[:headers])
   end
 
 end

data/lib/my_target_api/request.rb

@@ -14,8 +14,8 @@ class MyTargetApi
     def get(url, params = {})
       log_hash(method: 'Request#get', url: url, params: params)
 
-      response = with_exception_handling do
-        RestClient.get(url, headers(params).merge(query(params)))
+      response = with_exception_handling(params) do
+        RestClient.get(url, headers.merge(query(params)))
       end
 
       process_response(response)
@@ -24,8 +24,8 @@ class MyTargetApi
     def post(url, params = {})
       log_hash(method: 'Request#post', url: url, params: params)
 
-      response = with_exception_handling do
-        RestClient.post(url, body_parameters(params), headers(params))
+      response = with_exception_handling(params) do
+        RestClient.post(url, body_parameters(params), headers)
       end
 
       process_response(response)
@@ -34,8 +34,8 @@ class MyTargetApi
     def delete(url, params = {})
       log_hash(method: 'Request#delete', url: url, params: params)
 
-      response = with_exception_handling do
-        RestClient.delete(url, headers(params).merge(query(params)))
+      response = with_exception_handling(params) do
+        RestClient.delete(url, headers.merge(query(params)))
       end
 
       process_response(response)
@@ -44,8 +44,10 @@ class MyTargetApi
     def upload(url, content, params = {})
       log_hash(method: 'Request#upload', url: url, params: params, content: 'no logging')
 
-      response = with_exception_handling do
-        RestClient.post(url, content, headers(params).merge(query(params)))
+      response = with_exception_handling(params) do
+        RestClient.post(
+          url, content, headers.merge(query(params)).merge(content_type: 'application/octet-stream')
+        )
       end
 
       process_response(response)
@@ -57,7 +59,6 @@ class MyTargetApi
 
     def body_parameters(params)
       result_params = params.dup
-      result_params.delete(:access_token)
 
       if result_params.values.any? { |param| param.is_a? IO } || result_params[:grant_type]
         individual_body_parameters(result_params)
@@ -72,18 +73,15 @@ class MyTargetApi
       end.to_h
     end
 
-    def header_parameters(params)
-      result_params = params.dup
-      result_params.delete(:access_token)
-      result_params
-    end
-
     def query(params)
-      { params: header_parameters(params) }
+      { params: params }
     end
 
-    def headers(params)
-      { Authorization: "Bearer #{params[:access_token]}" }
+    def headers
+      {
+        Authorization: "Bearer #{access_token}",
+        **optional_headers
+      }
     end
 
     def process_response(response)
@@ -92,16 +90,16 @@ class MyTargetApi
       response.body
     end
 
-    def with_exception_handling
+    def with_exception_handling(params)
       response = yield
       log(response)
       response
     rescue RestClient::ExceptionWithResponse => e
       log_rest_client_exception(e)
-      raise MyTargetApi::RequestError, e
+      raise_with_params(e, params)
     rescue RestClient::Exception => e
       log("#{e.class.name} #{e.message}")
-      raise MyTargetApi::RequestError, e
+      raise_with_params(e, params)
     rescue SocketError => e
       raise MyTargetApi::ConnectionError, e
     end
@@ -115,11 +113,17 @@ class MyTargetApi
           HTTP Code: #{exception.http_code}
           HTTP Body: #{exception.http_body}
           HTTP headers: #{exception.http_headers}
-        LOG
+      LOG
 
       log(log_message)
     end
 
+    def raise_with_params(e, params)
+      result = MyTargetApi::RequestError.new(e, params)
+      result.set_backtrace(caller)
+      raise result
+    end
+
     def log_hash(hash)
       log(hash.map do |key, value|
         "#{key}: #{value.is_a?(String) ? value : value.inspect}"
@@ -130,5 +134,13 @@ class MyTargetApi
       options[:logger] << message if options[:logger]
     end
 
+    def access_token
+      options[:access_token]
+    end
+
+    def optional_headers
+      options[:headers] || {}
+    end
+
   end
 end

data/lib/my_target_api/request_error.rb

@@ -5,9 +5,11 @@ class MyTargetApi
   class RequestError < StandardError
 
     attr_reader :original_exception
+    attr_reader :params
 
-    def initialize(exception)
+    def initialize(exception, params)
       @original_exception = exception
+      @params = params
       super build_message exception
     end
 

data/lib/my_target_api/version.rb

@@ -2,6 +2,6 @@
 
 class MyTargetApi
 
-  VERSION = '1.2.1'
+  VERSION = '1.2.6'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_target_api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - OneRetarget.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json