my_target_api 1.2.4 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332efd986b48d1eb9282a1d9f279af9a73c0d68c
-  data.tar.gz: d5c0aaed3310f3916c89efe27429eeeceee0a613
+  metadata.gz: 4254318b97e9d1f594438694a31a6511ea9461fc
+  data.tar.gz: 69e005cf224551553abdc2c047d84b278a3f3e70
 SHA512:
-  metadata.gz: e76f8ff06d6cf4babe4d373a4b16f8205741f2d5f271f8cd435018775036b37444384519d36dcdcaac36abcfcb5f8f41d6e0969362e7dc769a6d5b4b49906e23
-  data.tar.gz: 711ddc0150a890da7c0e31ca94dfa4227e3139cc009e6eec8ca5cce194e0d15ec61d0207035b497355b0a8d4aaf3bf67d6c6e8f292ef17061d260dceb9c60ec4
+  metadata.gz: '08db4857b6fb49cacdc2050356b43aa94b3998fb2a8f0d31fc133e12554b07d190e0a370363b9b8bc5dfa88a53717c91b449b0ba5de5d1254dab65bfd3e93c38'
+  data.tar.gz: '08966200b98a7df2bfc4fee600650072ee52343e5ff3f83b987a450cd915901ee88b2273aea35e67b6a40f66e50020a75ee68ac35e66b713f14207d5aa12fe3b'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_target_api (1.2.4)
+    my_target_api (2.0.1)
       json (~> 2.0, >= 2.0.0)
       rest-client (~> 2.0, >= 2.0.0)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
+    ast (2.4.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -24,17 +24,18 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     netrc (0.11.0)
-    parallel (1.13.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (12.3.2)
+    regexp_parser (1.7.1)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -48,19 +49,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.54.0)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.7.0)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -70,12 +75,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (~> 2.1.4)
   my_target_api!
   rake (~> 12.3.0, >= 12.3.0)
   rspec (~> 3.7.0, >= 3.7.0)
-  rubocop (~> 0.54.0)
+  rubocop (~> 0.89.1)
   webmock (~> 2.3.2, >= 2.3.2)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```
-gem 'my_target_api', '~> 1.2.4'
+gem 'my_target_api', '~> 2.0.1'
 ```
 
 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
@@ -96,19 +97,18 @@ def read_active_campaigns
 
   campaigns_resource.read(status: 'active')
 
-rescue MyTargetApi::RequestError, MyTargetApi::ConnectionError => e
+rescue MyTargetApi::RequestError => e
 
-  puts e.message, e.backtrace
+  puts e.message, e.params, e.response, e.backtrace
   # You can access the original exception
-  puts e.original_exception.message, e.original_exception.backtrace
+  puts e.original_exception&.message, e.original_exception&.backtrace
 
 end
 ```
 
- Name | Description 
+ Name | Description
 ---|---
  `MyTargetApi::RequestError` | Request didn't succeed
- `MyTargetApi::ConnectionError` | Connection didn't succeed
 
 ## Testing
 

data/lib/my_target_api.rb

@@ -7,9 +7,9 @@ class MyTargetApi
 
   autoload :Resource, 'my_target_api/resource'
   autoload :Request, 'my_target_api/request'
-
-  autoload :ConnectionError, 'my_target_api/connection_error'
   autoload :RequestError, 'my_target_api/request_error'
+  autoload :NetClient, 'my_target_api/net_client'
+  autoload :LogRequestParametersDecorator, 'my_target_api/log_request_parameters_decorator'
 
   def initialize(access_token, options = {})
     @access_token = access_token
@@ -44,7 +44,14 @@ class MyTargetApi
   attr_reader :access_token, :options
 
   def request_object
-    Request.new(logger: options[:logger], access_token: access_token)
+    @_request_object ||= begin
+      options = {
+        logger: self.options[:logger],
+        access_token: access_token,
+        headers: self.options[:headers]
+      }
+      LogRequestParametersDecorator.new(Request.new(options), options)
+    end
   end
 
 end

data/lib/my_target_api/log_request_parameters_decorator.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'json'
+require_relative './response_formatter'
+require_relative './net_client'
+
+class MyTargetApi
+  # Requests
+  class LogRequestParametersDecorator
+
+    def initialize(origin, options = {})
+      @origin = origin
+      @options = options
+    end
+
+    def get(url, params = {})
+      log_hash(method: 'Request#get', url: url, params: params)
+
+      origin.get(url, params)
+    end
+
+    def post(url, params = {})
+      log_hash(method: 'Request#post', url: url, params: params)
+
+      origin.post(url, params)
+    end
+
+    def delete(url, params = {})
+      log_hash(method: 'Request#delete', url: url, params: params)
+
+      origin.delete(url, params)
+    end
+
+    def upload(url, content, params = {})
+      log_hash(method: 'Request#upload', url: url, params: params, content: 'no logging')
+
+      origin.upload(url, content, params)
+    end
+
+    private
+
+    attr_reader :origin, :options
+
+    def log_hash(hash)
+      log(hash.map do |key, value|
+        "#{key}: #{value.is_a?(String) ? value : value.inspect}"
+      end.join("\n"))
+    end
+
+    def log(message)
+      options[:logger] << message if options[:logger]
+    end
+
+  end
+end

data/lib/my_target_api/net_client.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'rest-client'
+
+class MyTargetApi
+  # Requests
+  class NetClient
+
+    # NetClient response
+    class Response
+
+      def initialize(body, code, headers)
+        @body = body
+        @code = code
+        @headers = headers
+      end
+
+      attr_reader :body, :code, :headers
+
+    end
+
+    # NetClient exception
+    class Exception < StandardError
+
+      def initialize(exception, message)
+        @original_exception = exception
+
+        super(message)
+      end
+
+      attr_reader :original_exception
+
+    end
+
+    class << self
+
+      def get(*args)
+        RestClient.get(*args) { |response, &block| process_response(response, &block) }
+      rescue StandardError => e
+        raise(Exception.new(e, e.message).tap { e.set_backtrace(caller) })
+      end
+
+      def post(*args)
+        RestClient.post(*args) { |response, &block| process_response(response, &block) }
+      rescue StandardError => e
+        raise(Exception.new(e, e.message).tap { e.set_backtrace(caller) })
+      end
+
+      def delete(*args)
+        RestClient.delete(*args) { |response, &block| process_response(response, &block) }
+      rescue StandardError => e
+        raise(Exception.new(e, e.message).tap { e.set_backtrace(caller) })
+      end
+
+      private
+
+      def process_response(response, &block)
+        result =
+          case response.code
+          when 200..207, 400..599
+            response
+          else
+            response.return!(&block)
+          end
+        Response.new(result.body, result.code, format_headers(result.headers))
+      rescue StandardError => e
+        raise(Exception.new(e, e.message).tap { e.set_backtrace(caller) })
+      end
+
+      def format_headers(headers)
+        headers.map do |key, value|
+          [key.to_s.split('_').map(&:capitalize).join('-'), value]
+        end.to_h
+      end
+
+    end
+
+  end
+end

data/lib/my_target_api/request.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'rest-client'
+require_relative './response_formatter'
+require_relative './net_client'
 
 class MyTargetApi
   # Requests
@@ -12,41 +13,35 @@ class MyTargetApi
     end
 
     def get(url, params = {})
-      log_hash(method: 'Request#get', url: url, params: params)
-
-      response = with_exception_handling do
-        RestClient.get(url, headers.merge(query(params)))
+      response = with_exception_handling(params) do
+        NetClient.get(url, headers.merge(query(params)))
       end
 
       process_response(response)
     end
 
     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)
+      response = with_exception_handling(params) do
+        NetClient.post(url, body_parameters(params), headers)
       end
 
       process_response(response)
     end
 
     def delete(url, params = {})
-      log_hash(method: 'Request#delete', url: url, params: params)
-
-      response = with_exception_handling do
-        RestClient.delete(url, headers.merge(query(params)))
+      response = with_exception_handling(params) do
+        NetClient.delete(url, headers.merge(query(params)))
       end
 
       process_response(response)
     end
 
     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.merge(query(params)).merge(content_type: 'application/octet-stream')
+      response = with_exception_handling(params) do
+        NetClient.post(
+          url,
+          content,
+          headers.merge(query(params)).merge('Content-Type' => 'application/octet-stream')
         )
       end
 
@@ -68,9 +63,9 @@ class MyTargetApi
     end
 
     def individual_body_parameters(params)
-      params.map do |name, value|
-        [name, value.is_a?(Array) || value.is_a?(Hash) ? value.to_json : value]
-      end.to_h
+      params.transform_values do |value|
+        value.is_a?(Array) || value.is_a?(Hash) ? value.to_json : value
+      end
     end
 
     def query(params)
@@ -78,7 +73,11 @@ class MyTargetApi
     end
 
     def headers
-      { Authorization: "Bearer #{access_token}" }
+      if access_token
+        optional_headers.merge('Authorization' => "Bearer #{access_token}")
+      else
+        optional_headers
+      end
     end
 
     def process_response(response)
@@ -87,38 +86,33 @@ class MyTargetApi
       response.body
     end
 
-    def with_exception_handling
+    def with_exception_handling(params)
       response = yield
-      log(response)
+      log_response(response)
+      raise_with_params(params: params, response: response) if response.code >= 400
       response
-    rescue RestClient::ExceptionWithResponse => e
-      log_rest_client_exception(e)
-      raise MyTargetApi::RequestError, e
-    rescue RestClient::Exception => e
-      log("#{e.class.name} #{e.message}")
-      raise MyTargetApi::RequestError, e
-    rescue SocketError => e
-      raise MyTargetApi::ConnectionError, e
+    rescue NetClient::Exception => e
+      original_exception = e.original_exception
+      log("#{original_exception.class.name} #{original_exception.message}")
+      raise_with_params(params: params, original_exception: original_exception)
     end
 
-    def log_rest_client_exception(exception)
-      log_message =
-        <<-LOG
-        RestClient exception
-          Class: #{exception.class}
-          Message: #{exception.message}
-          HTTP Code: #{exception.http_code}
-          HTTP Body: #{exception.http_body}
-          HTTP headers: #{exception.http_headers}
-        LOG
+    def log_response(response)
+      log(ResponseFormatter.new(response).format)
+    end
 
-      log(log_message)
+    def headers_to_string(headers)
+      headers.map do |name, value|
+        "#{name}: #{value}"
+      end.join("\n")
     end
 
-    def log_hash(hash)
-      log(hash.map do |key, value|
-        "#{key}: #{value.is_a?(String) ? value : value.inspect}"
-      end.join("\n"))
+    def raise_with_params(params:, response: nil, original_exception: nil)
+      result = MyTargetApi::RequestError.new(params: params,
+                                             response: response,
+                                             original_exception: original_exception)
+      result.set_backtrace(caller)
+      raise result
     end
 
     def log(message)
@@ -129,5 +123,9 @@ class MyTargetApi
       options[:access_token]
     end
 
+    def optional_headers
+      options[:headers] || {}
+    end
+
   end
 end

data/lib/my_target_api/request_error.rb

@@ -4,24 +4,18 @@ class MyTargetApi
   # Error for request
   class RequestError < StandardError
 
-    attr_reader :original_exception
+    attr_reader :params, :original_exception, :response
 
-    def initialize(exception)
-      @original_exception = exception
-      super build_message exception
-    end
+    def initialize(params:, original_exception: nil, response: nil)
+      @params = params
+      @response = response
+      @original_exception = original_exception
 
-    private
+      message =
+        "#{(response ? "#{response.code}: #{response.body}. " : '')}"\
+        'Inspect #params, #response and #original_exception for more details'
 
-    def build_message(exception)
-      body = JSON.parse exception.response
-      if body['error']
-        "#{body['error']} : #{body['error_description']}"
-      else
-        body.map { |field, error| "#{field}: #{error}" }.join(', ')
-      end
-    rescue StandardError
-      exception.response
+      super(message)
     end
 
   end

data/lib/my_target_api/response_formatter.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'json'
+
+class MyTargetApi
+  # Format response
+  class ResponseFormatter
+
+    def initialize(response)
+      @response = response
+    end
+
+    def format
+      headers = response.headers.empty? ? ' No headers' : "\n#{headers_in_lines}"
+      body = response.body.to_s == '' ? ' No body' : "\n#{response.body}"
+      <<~RESPONSE
+        HTTP Code: #{response.code}
+        HTTP Body:#{body}
+        HTTP Headers:#{headers}
+      RESPONSE
+    end
+
+    private
+
+    attr_reader :response
+
+    def headers_in_lines
+      headers.map do |name, value|
+        "#{name}: #{value}"
+      end.join("\n")
+    end
+
+    def headers
+      @_headers ||= response.headers
+    end
+
+  end
+end

data/lib/my_target_api/version.rb

@@ -2,6 +2,6 @@
 
 class MyTargetApi
 
-  VERSION = '1.2.4'
+  VERSION = '2.0.2'
 
 end

data/my_target_api.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   DESC
   spec.homepage      = 'https://github.com/resivalex/my_target_api'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.files         = Dir['**/*']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -26,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json', '~> 2.0', '>= 2.0.0'
   spec.add_runtime_dependency 'rest-client', '~> 2.0', '>= 2.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
   spec.add_development_dependency 'rake', '~> 12.3.0', '>= 12.3.0'
   spec.add_development_dependency 'rspec', '~> 3.7.0', '>= 3.7.0'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rubocop', '~> 0.89.1'
   spec.add_development_dependency 'webmock', '~> 2.3.2', '>= 2.3.2'
 end

data/spec/net_client_spec.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'my_target_api'
+
+describe MyTargetApi::NetClient do
+  describe '#post' do
+    it 'OK' do
+      stub_request(:post, 'https://api.com')
+        .with(body: 'param1=1&param2[two]=2')
+        .to_return(body: 'body')
+
+      expect(
+        MyTargetApi::NetClient.post('https://api.com', param1: 1, param2: { two: 2 }).body
+      ).to eq('body')
+    end
+
+    it 'Content-Type' do
+      stub_request(:post, 'https://api.com')
+        .with(body: 'payload',
+              headers: { 'Content-Type' => 'application/octet-stream' })
+        .to_return(body: '{}')
+
+      expect(
+        MyTargetApi::NetClient.post('https://api.com',
+                                    'payload',
+                                    'Content-Type' => 'application/octet-stream').body
+      ).to eq('{}')
+    end
+  end
+
+  describe '#get' do
+    it 'OK' do
+      stub_request(:get, 'https://api.com?p=3').to_return(body: 'body')
+
+      expect(MyTargetApi::NetClient.get('https://api.com', params: { p: 3 }).body).to eq('body')
+    end
+
+    it 'Content-Type' do
+      stub_request(:get, 'https://api.com/?param1=1&param2%5Btwo%5D=2')
+        .with(headers: { 'Content-Type' => 'application/octet-stream' })
+        .to_return(body: '{}')
+
+      expect(MyTargetApi::NetClient.get(
+        'https://api.com',
+        params: { param1: 1, param2: { two: 2 } },
+        'Content-Type' => 'application/octet-stream'
+      ).body).to eq('{}')
+    end
+
+    it ':content_type' do
+      stub_request(:get, 'https://api.com')
+        .with(headers: { 'Content-Type' => 'application/octet-stream' })
+        .to_return(body: 'abc')
+
+      expect(
+        MyTargetApi::NetClient.get('https://api.com', content_type: 'application/octet-stream').body
+      ).to eq('abc')
+    end
+
+    it 'Headers' do
+      stub_request(:get, 'https://api.com?p=3')
+        .to_return(body: 'body', headers: { 'app-version' => '344354325' })
+
+      result = MyTargetApi::NetClient.get('https://api.com', params: { p: 3 })
+
+      expect(result.body).to eq('body')
+      expect(result.code).to eq(200)
+      expect(result.headers).to eq('App-Version' => '344354325')
+    end
+
+    it '404' do
+      stub_request(:get, 'https://api.com').to_return(body: 'not found', status: 404)
+
+      result = MyTargetApi::NetClient.get('https://api.com', {})
+
+      expect(result.body).to eq('not found')
+      expect(result.code).to eq(404)
+    end
+
+    it '301' do
+      stub_request(:get, 'https://api.com')
+        .to_return(body: 'not found', status: 301, headers: { 'Location' => 'https://api2.com' })
+      stub_request(:get, 'https://api2.com/').to_return(body: 'OK', status: 200)
+
+      result = MyTargetApi::NetClient.get('https://api.com', {})
+
+      expect(result.body).to eq('OK')
+      expect(result.code).to eq(200)
+    end
+  end
+
+  describe '#delete' do
+    it 'OK' do
+      stub_request(:delete, 'https://api.com').to_return(body: 'body')
+
+      expect(MyTargetApi::NetClient.delete('https://api.com', {}).body).to eq('body')
+    end
+
+    it 'Content-Type' do
+      stub_request(:delete, 'https://api.com/?param1=1&param2%5Btwo%5D=2')
+        .with(headers: { 'Content-Type' => 'application/octet-stream' })
+        .to_return(body: '{}')
+
+      expect(MyTargetApi::NetClient.delete(
+        'https://api.com',
+        params: { param1: 1, param2: { two: 2 } },
+        'Content-Type' => 'application/octet-stream'
+      ).body).to eq('{}')
+    end
+
+    it '404' do
+      stub_request(:delete, 'https://api.com').to_return(body: 'not found', status: 404)
+
+      result = MyTargetApi::NetClient.delete('https://api.com', {})
+
+      expect(result.body).to eq('not found')
+      expect(result.code).to eq(404)
+    end
+  end
+end

data/spec/request_spec.rb

@@ -3,8 +3,6 @@
 require 'my_target_api'
 
 describe MyTargetApi::Request do
-  let(:access_token) { 'myTarget token' }
-
   let(:request) { MyTargetApi::Request.new }
 
   describe 'myTarget request types' do
@@ -16,41 +14,69 @@ describe MyTargetApi::Request do
 
   describe 'request something' do
     it 'return parsed json' do
-      stub_request(:post, 'https://target.my.com/api/v1/campaigns.json')
-        .to_return(body: '{"name": "Campaign 1"}')
+      allow(MyTargetApi::NetClient).to(
+        receive(:post).and_return(double(code: 200, body: '{"name": "Campaign 1"}', headers: {}))
+      )
+
+      result = subject.post('https://target.my.com/api/v1/campaigns.json')
 
-      expect(subject.post('https://target.my.com/api/v1/campaigns.json'))
-        .to eq('name' => 'Campaign 1')
+      expect(MyTargetApi::NetClient).to(
+        have_received(:post).with('https://target.my.com/api/v1/campaigns.json', '{}', {})
+      )
+
+      expect(result).to eq('name' => 'Campaign 1')
     end
 
     it 'pass parameters by url in get' do
-      stub_request(:get, 'https://target.my.com/api/v1/vk_groups.json?q=unfound')
-        .to_return(body: '[]')
+      allow(MyTargetApi::NetClient)
+        .to receive(:get).and_return(double(code: 200, body: '[]', headers: {}))
+
+      result = subject.get('https://target.my.com/api/v1/vk_groups.json', q: 'unfound')
 
-      expect(subject.get('https://target.my.com/api/v1/vk_groups.json', q: 'unfound'))
-        .to eq([])
+      expect(MyTargetApi::NetClient).to(
+        have_received(:get).with('https://target.my.com/api/v1/vk_groups.json',
+                                 params: { q: 'unfound' })
+      )
+      expect(result).to eq([])
     end
 
     it 'deletes object' do
-      stub_request(:delete, 'https://target.my.com/api/v1/remarketing_context_phrases/53.json')
-        .to_return(body: '[{ "success": true }]')
+      allow(MyTargetApi::NetClient).to(
+        receive(:delete).and_return(double(code: 200, body: '[{ "success": true }]', headers: {}))
+      )
 
-      expect(
-        subject.delete('https://target.my.com/api/v1/remarketing_context_phrases/53.json')
-      ).to eq([{ 'success' => true }])
+      result = subject.delete('https://target.my.com/api/v1/remarketing_context_phrases/53.json')
+
+      expect(MyTargetApi::NetClient).to(
+        have_received(:delete).with(
+          'https://target.my.com/api/v1/remarketing_context_phrases/53.json',
+          params: {}
+        )
+      )
+      expect(result).to eq([{ 'success' => true }])
     end
 
     it 'uploads raw content' do
-      stub_request(:post, 'https://target.my.com/api/v2/search_phrases.json?name=list')
-        .to_return(body: '{"id": 123, "name": "list"}')
-
-      expect(
-        subject.upload(
+      allow(MyTargetApi::NetClient).to(
+        receive(:post)
+          .and_return(double(code: 200, body: '{"id": 123, "name": "list"}', headers: {}))
+      )
+
+      result = subject.upload(
+        'https://target.my.com/api/v2/search_phrases.json',
+        "phrase\nfirst\nsecond",
+        name: 'list'
+      )
+
+      expect(MyTargetApi::NetClient).to(
+        have_received(:post).with(
           'https://target.my.com/api/v2/search_phrases.json',
           "phrase\nfirst\nsecond",
-          name: 'list'
+          'Content-Type' => 'application/octet-stream',
+          params: { name: 'list' }
         )
-      ).to eq('id' => 123, 'name' => 'list')
+      )
+      expect(result).to eq('id' => 123, 'name' => 'list')
     end
 
     it 'raises exception on bad statuses' do
@@ -58,7 +84,28 @@ 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, 'Unknown resource')
+        .to raise_error(MyTargetApi::RequestError,
+                        '404: Unknown resource. Inspect #params, #response and #original_exception'\
+                        ' for more details')
+    end
+
+    it 'sets authorization header' do
+      allow(MyTargetApi::NetClient).to(
+        receive(:get).and_return(double(code: 200,
+                                        body: 'response body',
+                                        headers: {}))
+      )
+
+      request = MyTargetApi::Request.new(access_token: 'my_target_token')
+      request.get('https://target.my.com/api/v1/some_path.json')
+
+      expect(MyTargetApi::NetClient).to(
+        have_received(:get).with(
+          'https://target.my.com/api/v1/some_path.json',
+          'Authorization' => 'Bearer my_target_token',
+          params: {}
+        )
+      )
     end
   end
 
@@ -67,11 +114,61 @@ describe MyTargetApi::Request do
     let(:request) { MyTargetApi::Request.new(logger: logger) }
 
     it 'pass parameters by url in get' do
-      stub_request(:get, 'https://target.my.com/api/v1/request.json')
-        .to_return(body: '[]')
+      logger = double('Logger double', '<<': nil)
+      options = { logger: logger }
+      request = MyTargetApi::LogRequestParametersDecorator.new(
+        MyTargetApi::Request.new(options), options
+      )
+      allow(MyTargetApi::NetClient).to(
+        receive(:get).and_return(double(code: 200,
+                                        body: 'response body',
+                                        headers: {}))
+      )
 
-      expect(logger).to(receive(:<<))
       request.get('https://target.my.com/api/v1/request.json')
+
+      expect(logger).to(have_received(:<<).with("method: Request#get\n"\
+        "url: https://target.my.com/api/v1/request.json\n"\
+        'params: {}'))
+      expect(logger).to(have_received(:<<).with(<<~LOG))
+        HTTP Code: 200
+        HTTP Body:
+        response body
+        HTTP Headers: No headers
+      LOG
+    end
+
+    it '404' do
+      logger = double('Logger double', '<<': nil)
+      options = { logger: logger }
+      request = MyTargetApi::LogRequestParametersDecorator.new(
+        MyTargetApi::Request.new(options), options
+      )
+      allow(MyTargetApi::NetClient).to(
+        receive(:get).and_return(
+          double(
+            body: 'Unknown resource',
+            code: 404,
+            headers: { 'Header': 'Value' }
+          )
+        )
+      )
+
+      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')
+
+      expect(logger).to(have_received(:<<).with("method: Request#get\n"\
+        "url: https://target.my.com/api/v1/request.json\n"\
+        'params: {}'))
+      expect(logger).to(have_received(:<<).with(<<~LOG))
+        HTTP Code: 404
+        HTTP Body:
+        Unknown resource
+        HTTP Headers:
+        Header: Value
+      LOG
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_target_api
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.2
 platform: ruby
 authors:
 - OneRetarget.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.89.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.89.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -153,12 +153,15 @@ files:
 - LICENSE.txt
 - README.md
 - lib/my_target_api.rb
-- lib/my_target_api/connection_error.rb
+- lib/my_target_api/log_request_parameters_decorator.rb
+- lib/my_target_api/net_client.rb
 - lib/my_target_api/request.rb
 - lib/my_target_api/request_error.rb
 - lib/my_target_api/resource.rb
+- lib/my_target_api/response_formatter.rb
 - lib/my_target_api/version.rb
 - my_target_api.gemspec
+- spec/net_client_spec.rb
 - spec/request_spec.rb
 - spec/resource_spec.rb
 - spec/root_spec.rb
@@ -175,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,6 +191,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client for myTarget API
 test_files:
+- spec/net_client_spec.rb
 - spec/request_spec.rb
 - spec/resource_spec.rb
 - spec/root_spec.rb

data/lib/my_target_api/connection_error.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class MyTargetApi
-  # Error class
-  class ConnectionError < StandardError
-
-    attr_reader :original_exception
-
-    def initialize(exception)
-      @original_exception = exception
-      @exception = exception
-    end
-
-    def message
-      @exception.message
-    end
-
-  end
-end