ddy_remote_resource 1.0.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53853b2bc923849611145a783562290e1f352db4
-  data.tar.gz: 68fe3d657f0635f6ce22131cd6d61b356b005c49
+SHA256:
+  metadata.gz: d0032d56e8df7f6e90e146abb65b29a41a59a63e39747c6b0b7585c02f577069
+  data.tar.gz: 4454b9226626e5a2028dc871c83d15347da8a373d104e641810c3f002e8e94c0
 SHA512:
-  metadata.gz: 36a1aac2f46e915fc618f9d3dddfca865c9682845c017069bf6fb7508d0b7429f0eb98e950bf62f18d1cae9790fa11b01407a4e66110d7ea5a03298bd0efd599
-  data.tar.gz: 2ccaff6087c60d3629fd94889fd7d50c34b9c07fa822c0a0eeb1ce4f98ada89a220200a1cfb774f7dfeb7db30ee317d21f07e7734c4715f9355f5e6e03585db1
+  metadata.gz: 327330942d08e782894d10b46be1c6a6fc560f4cab2a4f7bb77a2b2958853ad929a024ccc00c560a3672e48c55a5844e9064e9c7fc00ae9839228d904038f2b6
+  data.tar.gz: f6d6b6c025c695cd68f4697b9a001046d54a29b32f51aabbec187ff9359bf32da6db83510cc5a3a251729159100e06b11054986a009d55386ece26e5f372ed8b

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea/
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.3

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.5.3

data/lib/remote_resource.rb

@@ -2,6 +2,7 @@ require 'active_support/all'
 require 'active_model'
 require 'virtus'
 require 'typhoeus'
+require 'request_store'
 
 require_relative 'extensions/ethon/easy/queryable'
 

data/lib/remote_resource/base.rb

@@ -23,16 +23,17 @@ module RemoteResource
       attr_writer :destroyed, :persisted, :success
 
       class_attribute :root_element, instance_accessor: false
+      class_attribute :json_spec, instance_accessor: false
 
       attribute :id
     end
 
     def self.global_headers=(headers)
-      Thread.current[:global_headers] = headers
+      RequestStore.store[:global_headers] = headers
     end
 
     def self.global_headers
-      Thread.current[:global_headers] ||= {}
+      RequestStore.store[:global_headers] ||= {}
     end
 
     module ClassMethods
@@ -42,15 +43,15 @@ module RemoteResource
       end
 
       def threaded_connection_options
-        Thread.current[threaded_connection_options_thread_name] ||= {}
+        RequestStore.store[threaded_connection_options_thread_name] ||= {}
       end
 
       def with_connection_options(connection_options = {})
         begin
-          Thread.current[threaded_connection_options_thread_name] = threaded_connection_options.merge(connection_options)
+          RequestStore.store[threaded_connection_options_thread_name] = threaded_connection_options.merge(connection_options)
           yield
         ensure
-          Thread.current[threaded_connection_options_thread_name] = nil
+          RequestStore.store[threaded_connection_options_thread_name] = nil
         end
       end
 

data/lib/remote_resource/connection_options.rb

@@ -1,7 +1,7 @@
 module RemoteResource
   class ConnectionOptions
 
-    AVAILABLE_OPTIONS = [:site, :headers, :default_headers, :version, :path_prefix, :path_postfix, :collection_prefix, :extension, :collection, :collection_name, :root_element].freeze
+    AVAILABLE_OPTIONS = [:site, :headers, :default_headers, :version, :path_prefix, :path_postfix, :collection_prefix, :extension, :collection, :collection_name, :root_element, :json_spec].freeze
 
     attr_reader :base_class
 

data/lib/remote_resource/request.rb

@@ -14,6 +14,9 @@ module RemoteResource
 
     DEFAULT_EXTENSION = '.json'.freeze
 
+    DEFAULT_CONNECT_TIMEOUT = 30
+    DEFAULT_READ_TIMEOUT = 120
+
     attr_reader :resource, :resource_klass, :http_action, :attributes
 
     def initialize(resource, http_action, attributes = {}, connection_options = {})
@@ -41,7 +44,7 @@ module RemoteResource
     def perform
       SUPPORTED_HTTP_METHODS.include?(http_action) || raise(RemoteResource::HTTPMethodUnsupported, "Requested HTTP method=#{http_action.to_s} is NOT supported, the HTTP action MUST be a supported HTTP action=#{SUPPORTED_HTTP_METHODS.join(', ')}")
 
-      connection_response = connection.public_send(http_action, request_url, params: query, body: body, headers: headers)
+      connection_response = connection.public_send(http_action, request_url, params: query, body: body, headers: headers, **timeout_options)
       response            = RemoteResource::Response.new(connection_response, connection_options.merge(request: self, connection_request: connection_response.request))
 
       if response.success? || response.unprocessable_entity?
@@ -76,7 +79,7 @@ module RemoteResource
     def body
       @body ||= begin
         if [:put, :patch, :post].include?(http_action)
-          JSON.generate(attributes)
+          attributes.to_json
         else
           nil
         end
@@ -84,12 +87,20 @@ module RemoteResource
     end
 
     def attributes
-      root_element = connection_options[:root_element]
-
-      if root_element.present?
-        { root_element => @attributes }
+      if connection_options[:json_spec] == :json_api
+        if @attributes
+          { data: { id: @attributes[:id], type: resource_klass.name.demodulize, attributes: @attributes.except(:id) } }
+        else
+          { data: {} }
+        end
       else
-        @attributes || {}
+        root_element = connection_options[:root_element]
+
+        if root_element.present?
+          { root_element => @attributes }
+        else
+          @attributes || {}
+        end
       end
     end
 
@@ -106,33 +117,62 @@ module RemoteResource
     def conditional_headers
       headers = {}
       headers = headers.merge(DEFAULT_CONTENT_TYPE) if body.present?
-      headers = headers.merge({ 'X-Request-Id' => Thread.current[:request_id] }) if Thread.current[:request_id].present?
+      headers = headers.merge({ 'X-Request-Id' => RequestStore.store[:request_id] }) if RequestStore.store[:request_id].present?
       headers
     end
 
+    def timeout_options
+      connecttimeout = connection_options[:connecttimeout].presence || DEFAULT_CONNECT_TIMEOUT
+      timeout = connection_options[:timeout].presence || DEFAULT_READ_TIMEOUT
+
+      { connecttimeout: connecttimeout, timeout: timeout }
+    end
+
     private
 
     def raise_http_error(request, response)
+      # Special case if a request has a time out, as Typhoeus does not set a 408 response_code
+      raise RemoteResource::HTTPRequestTimeout.new(request, response) if response.timed_out?
+
       case response.try(:response_code)
-      when 301, 302, 303, 307 then raise RemoteResource::HTTPRedirectionError.new(request, response)
-      when 400 then raise RemoteResource::HTTPBadRequest.new(request, response)
-      when 401 then raise RemoteResource::HTTPUnauthorized.new(request, response)
-      when 403 then raise RemoteResource::HTTPForbidden.new(request, response)
-      when 404 then raise RemoteResource::HTTPNotFound.new(request, response)
-      when 405 then raise RemoteResource::HTTPMethodNotAllowed.new(request, response)
-      when 406 then raise RemoteResource::HTTPNotAcceptable.new(request, response)
-      when 408 then raise RemoteResource::HTTPRequestTimeout.new(request, response)
-      when 409 then raise RemoteResource::HTTPConflict.new(request, response)
-      when 410 then raise RemoteResource::HTTPGone.new(request, response)
-      when 418 then raise RemoteResource::HTTPTeapot.new(request, response)
-      when 444 then raise RemoteResource::HTTPNoResponse.new(request, response)
-      when 494 then raise RemoteResource::HTTPRequestHeaderTooLarge.new(request, response)
-      when 495 then raise RemoteResource::HTTPCertError.new(request, response)
-      when 496 then raise RemoteResource::HTTPNoCert.new(request, response)
-      when 497 then raise RemoteResource::HTTPToHTTPS.new(request, response)
-      when 499 then raise RemoteResource::HTTPClientClosedRequest.new(request, response)
-      when 400..499 then raise RemoteResource::HTTPClientError.new(request, response)
-      when 500..599 then raise RemoteResource::HTTPServerError.new(request, response)
+      when 301, 302, 303, 307 then
+        raise RemoteResource::HTTPRedirectionError.new(request, response)
+      when 400
+        raise RemoteResource::HTTPBadRequest.new(request, response)
+      when 401
+        raise RemoteResource::HTTPUnauthorized.new(request, response)
+      when 403
+        raise RemoteResource::HTTPForbidden.new(request, response)
+      when 404
+        raise RemoteResource::HTTPNotFound.new(request, response)
+      when 405
+        raise RemoteResource::HTTPMethodNotAllowed.new(request, response)
+      when 406
+        raise RemoteResource::HTTPNotAcceptable.new(request, response)
+      when 408
+        raise RemoteResource::HTTPRequestTimeout.new(request, response)
+      when 409
+        raise RemoteResource::HTTPConflict.new(request, response)
+      when 410
+        raise RemoteResource::HTTPGone.new(request, response)
+      when 418
+        raise RemoteResource::HTTPTeapot.new(request, response)
+      when 444
+        raise RemoteResource::HTTPNoResponse.new(request, response)
+      when 494
+        raise RemoteResource::HTTPRequestHeaderTooLarge.new(request, response)
+      when 495
+        raise RemoteResource::HTTPCertError.new(request, response)
+      when 496
+        raise RemoteResource::HTTPNoCert.new(request, response)
+      when 497
+        raise RemoteResource::HTTPToHTTPS.new(request, response)
+      when 499
+        raise RemoteResource::HTTPClientClosedRequest.new(request, response)
+      when 400..499
+        raise RemoteResource::HTTPClientError.new(request, response)
+      when 500..599
+        raise RemoteResource::HTTPServerError.new(request, response)
       else
         raise RemoteResource::HTTPError.new(request, response)
       end

data/lib/remote_resource/response.rb

@@ -16,6 +16,10 @@ module RemoteResource
       @connection_response.success?
     end
 
+    def timed_out?
+      @connection_response.timed_out?
+    end
+
     def unprocessable_entity?
       response_code == 422
     end
@@ -44,19 +48,29 @@ module RemoteResource
 
     def attributes
       @attributes ||= begin
-        root_element = @connection_options[:root_element].to_s
-        data         = nil
-
-        if root_element.present?
-          data = parsed_body.try(:key?, root_element) && parsed_body[root_element]
+        if @connection_options[:json_spec] == :json_api
+          data = parsed_body.fetch("data", {})
+          if data.is_a?(Array)
+            data.map { |row| row["attributes"].merge({ "id" => row["id"] }) }
+          elsif data.key?("attributes")
+            data["attributes"].merge({ "id" => data["id"] })
+          else
+            data
+          end
         else
-          data = parsed_body
-        end
+          root_element = @connection_options[:root_element].to_s
 
-        if data.is_a?(Array)
-          data
-        else
-          data.presence || {}
+          if root_element.present?
+            data = parsed_body.try(:key?, root_element) && parsed_body[root_element]
+          else
+            data = parsed_body
+          end
+
+          if data.is_a?(Array)
+            data
+          else
+            data.presence || {}
+          end
         end
       end
     end

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/remote_resource.gemspec

@@ -6,8 +6,8 @@ require 'remote_resource/version'
 Gem::Specification.new do |spec|
   spec.name          = 'ddy_remote_resource'
   spec.version       = RemoteResource::VERSION
-  spec.authors       = ['Jan van der Pas']
-  spec.email         = ['jvanderpas@digidentity.eu']
+  spec.authors       = ['Digidentity', 'Jan van der Pas']
+  spec.email         = ['development@digidentity.com']
   spec.summary       = %q{RemoteResource, a gem to use resources with REST services.}
   spec.description   = %q{RemoteResource, a gem to use resources with REST services. A replacement for ActiveResource gem.}
   spec.homepage      = ''
@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'terminal-notifier-guard', '~> 1.6'
 
-  spec.add_runtime_dependency 'activesupport', '>= 4.1', '< 6'
-  spec.add_runtime_dependency 'activemodel', '>= 4.1', '< 6'
+  spec.add_runtime_dependency 'activesupport', '>= 4.1', '< 7'
+  spec.add_runtime_dependency 'activemodel', '>= 4.1', '< 7'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.4'
   spec.add_runtime_dependency 'mime-types', '~> 3.0'
   spec.add_runtime_dependency 'ethon', '~> 0.7', '>= 0.7.1'
   spec.add_runtime_dependency 'typhoeus', '~> 0.7', '>= 0.7.0'
+  spec.add_runtime_dependency 'request_store', '~> 1.4.1'
 end

data/spec/integration/create_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe '.create' do
 
     let!(:expected_request) do
       mock_request = stub_request(:post, 'https://www.example.com/posts.json')
-      mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers)
+      mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers)
       mock_request.to_return(status: 201, body: JSON.generate(response_body))
       mock_request
     end
@@ -81,7 +81,7 @@ RSpec.describe '.create' do
 
     let!(:expected_request) do
       mock_request = stub_request(:post, 'https://www.example.com/posts.json')
-      mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
+      mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
       mock_request.to_return(status: 201, body: JSON.generate(response_body))
       mock_request
     end
@@ -114,7 +114,7 @@ RSpec.describe '.create' do
 
     let!(:expected_request) do
       mock_request = stub_request(:post, 'https://www.example.com/posts.json')
-      mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers)
+      mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers)
       mock_request.to_return(status: 422, body: JSON.generate(response_body))
       mock_request
     end

data/spec/integration/save_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe '#save' do
     describe 'default behaviour' do
       let!(:expected_request) do
         mock_request = stub_request(:patch, 'https://www.example.com/posts/12.json')
-        mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers)
+        mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers)
         mock_request.to_return(status: 200, body: JSON.generate(response_body))
         mock_request
       end
@@ -77,7 +77,7 @@ RSpec.describe '#save' do
     describe 'with connection_options[:headers]' do
       let!(:expected_request) do
         mock_request = stub_request(:patch, 'https://www.example.com/posts/12.json')
-        mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
+        mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
         mock_request.to_return(status: 200, body: JSON.generate(response_body))
         mock_request
       end
@@ -111,7 +111,7 @@ RSpec.describe '#save' do
 
       let!(:expected_request) do
         mock_request = stub_request(:patch, 'https://www.example.com/posts/12.json')
-        mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers)
+        mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers)
         mock_request.to_return(status: 422, body: JSON.generate(response_body))
         mock_request
       end
@@ -148,7 +148,7 @@ RSpec.describe '#save' do
     describe 'with a 500 response' do
       let!(:expected_request) do
         mock_request = stub_request(:patch, 'https://www.example.com/posts/12.json')
-        mock_request.with(query: nil, body: JSON.generate(expected_request_body), headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
+        mock_request.with(query: nil, body: expected_request_body.to_json, headers: expected_default_headers.merge({ 'X-Pseudonym' => 'pseudonym' }))
         mock_request.to_return(status: 500)
         mock_request
       end

data/spec/lib/remote_resource/base_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe RemoteResource::Base do
     end
 
     it 'sets the name of Thread variable with the implemented class' do
-      expect(dummy_class.threaded_connection_options).to eql Thread.current['remote_resource.dummy.threaded_connection_options']
+      expect(dummy_class.threaded_connection_options).to eql RequestStore.store['remote_resource.dummy.threaded_connection_options']
     end
   end
 

data/spec/lib/remote_resource/connection_options_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe RemoteResource::ConnectionOptions do
   end
 
   let(:dummy_class) { RemoteResource::ConnectionOptionsDummy }
-  let(:dummy)       { dummy_class.new }
+  let(:dummy) { dummy_class.new }
 
   let(:connection_options) { described_class.new dummy_class }
 
@@ -59,8 +59,8 @@ RSpec.describe RemoteResource::ConnectionOptions do
   describe '#merge' do
     let(:custom_connection_options) do
       {
-        site: 'https://dummy.foobar.com',
-        version: '/api/v2',
+        site:         'https://dummy.foobar.com',
+        version:      '/api/v2',
         root_element: :test_dummy_api
       }
     end
@@ -91,7 +91,8 @@ RSpec.describe RemoteResource::ConnectionOptions do
         collection_prefix: '/parent/:parent_id',
         collection:        true,
         collection_name:   nil,
-        root_element:      :test_dummy
+        root_element:      :test_dummy,
+        json_spec:         nil
       }
     end
 

data/spec/lib/remote_resource/request_spec.rb

@@ -18,10 +18,10 @@ RSpec.describe RemoteResource::Request do
   end
 
   let(:dummy_class) { RemoteResource::RequestDummy }
-  let(:dummy)       { dummy_class.new id: '12' }
+  let(:dummy) { dummy_class.new id: '12' }
 
-  let(:resource)           { dummy_class }
-  let(:http_action)        { :get }
+  let(:resource) { dummy_class }
+  let(:http_action) { :get }
   let(:connection_options) { {} }
   let(:attributes) do
     { name: 'Mies' }
@@ -68,6 +68,7 @@ RSpec.describe RemoteResource::Request do
 
     let(:block_connection_options) do
       {
+        json_spec:    'From .with_connection_options',
         root_element: 'From .with_connection_options',
         version:      'From .with_connection_options',
         path_prefix:  'From .with_connection_options'
@@ -85,6 +86,7 @@ RSpec.describe RemoteResource::Request do
       {
         site:              'From Klass.site',
         root_element:      'From connection_options[]',
+        json_spec:         'From .with_connection_options',
         version:           'From .with_connection_options',
         path_prefix:       'From .with_connection_options',
         path_postfix:      'From connection_options[]',
@@ -166,7 +168,9 @@ RSpec.describe RemoteResource::Request do
       let(:expected_connection_options) { request.connection_options }
 
       it 'makes a GET request with the connection_options[:params] as query' do
-        expect(connection).to receive(:get).with(expected_request_url, params: expected_params, body: expected_body, headers: expected_headers).and_call_original
+        expect(connection).to receive(:get).with(expected_request_url, params: expected_params,
+                                                 body: expected_body, headers: expected_headers,
+                                                 connecttimeout: 30, timeout: 120).and_call_original
         request.perform
       end
 
@@ -189,7 +193,9 @@ RSpec.describe RemoteResource::Request do
       let(:expected_connection_options) { request.connection_options }
 
       it 'makes a PUT request with the attributes as body' do
-        expect(connection).to receive(:put).with(expected_request_url, params: expected_params, body: expected_body, headers: expected_headers).and_call_original
+        expect(connection).to receive(:put).with(expected_request_url, params: expected_params,
+                                                 body: expected_body, headers: expected_headers,
+                                                 connecttimeout: 30, timeout: 120).and_call_original
         request.perform
       end
 
@@ -212,7 +218,9 @@ RSpec.describe RemoteResource::Request do
       let(:expected_connection_options) { request.connection_options }
 
       it 'makes a PATCH request with the attributes as body' do
-        expect(connection).to receive(:patch).with(expected_request_url, params: expected_params, body: expected_body, headers: expected_headers).and_call_original
+        expect(connection).to receive(:patch).with(expected_request_url, params: expected_params,
+                                                   body: expected_body, headers: expected_headers,
+                                                   connecttimeout: 30, timeout: 120).and_call_original
         request.perform
       end
 
@@ -235,7 +243,9 @@ RSpec.describe RemoteResource::Request do
       let(:expected_connection_options) { request.connection_options }
 
       it 'makes a POST request with the attributes as body' do
-        expect(connection).to receive(:post).with(expected_request_url, params: expected_params, body: expected_body, headers: expected_headers).and_call_original
+        expect(connection).to receive(:post).with(expected_request_url, params: expected_params,
+                                                  body: expected_body, headers: expected_headers,
+                                                  connecttimeout: 30, timeout: 120).and_call_original
         request.perform
       end
 
@@ -258,7 +268,9 @@ RSpec.describe RemoteResource::Request do
       let(:expected_connection_options) { request.connection_options }
 
       it 'makes a DELETE request with the connection_options[:params] as query' do
-        expect(connection).to receive(:delete).with(expected_request_url, params: expected_params, body: expected_body, headers: expected_headers).and_call_original
+        expect(connection).to receive(:delete).with(expected_request_url, params: expected_params,
+                                                    body: expected_body, headers: expected_headers,
+                                                    connecttimeout: 30, timeout: 120).and_call_original
         request.perform
       end
 
@@ -270,7 +282,7 @@ RSpec.describe RemoteResource::Request do
       let(:expected_request_url) { '' }
 
       it 'raises the RemoteResource::HTTPMethodUnsupported error' do
-        expect{ request.perform }.to raise_error RemoteResource::HTTPMethodUnsupported, 'Requested HTTP method=foo is NOT supported, the HTTP action MUST be a supported HTTP action=get, put, patch, post, delete'
+        expect { request.perform }.to raise_error RemoteResource::HTTPMethodUnsupported, 'Requested HTTP method=foo is NOT supported, the HTTP action MUST be a supported HTTP action=get, put, patch, post, delete'
       end
     end
   end
@@ -367,7 +379,7 @@ RSpec.describe RemoteResource::Request do
 
       context 'when connection_options does NOT include collection_options' do
         it 'raises error' do
-          expect{ request.request_url }.to raise_error(RemoteResource::CollectionOptionKeyError)
+          expect { request.request_url }.to raise_error(RemoteResource::CollectionOptionKeyError)
         end
       end
     end
@@ -473,6 +485,30 @@ RSpec.describe RemoteResource::Request do
         end
       end
     end
+
+    context 'when connection_options[:json_spec] == :json_api' do
+      let(:connection_options) do
+        { json_spec: :json_api }
+      end
+
+      let(:attributes) do
+        { id: 1, name: 'Mies', featured: true, labels: [1, '2', 'three'] }
+      end
+
+      it 'returns the given attributes wrapped in the json api spec' do
+        expect(request.attributes).to eql({ data: { id: 1, type: "RequestDummy", attributes: { name: 'Mies', featured: true, labels: [1, '2', 'three'] } } })
+      end
+
+      context 'and there are NO given attributes' do
+        let(:attributes) do
+          nil
+        end
+
+        it 'returns nil wrapped in the connection_options[:root_element]' do
+          expect(request.attributes).to eql({ data: {} })
+        end
+      end
+    end
   end
 
   describe '#headers' do
@@ -506,7 +542,7 @@ RSpec.describe RemoteResource::Request do
       end
 
       before { RemoteResource::Base.global_headers = { 'User-Agent' => 'From RemoteResource::Base.global_headers', 'X-Locale' => 'From RemoteResource::Base.global_headers' } }
-      after  { RemoteResource::Base.global_headers = nil }
+      after { RemoteResource::Base.global_headers = nil }
 
       it 'returns the default headers while overwriting the headers according to the correct precedence' do
         expect(request.headers).to eql expected_headers
@@ -540,13 +576,13 @@ RSpec.describe RemoteResource::Request do
         end
       end
 
-      context 'when Thread.current[:request_id] is present' do
+      context 'when RequestStore.store[:request_id] is present' do
         before do
-          Thread.current[:request_id] = 'CASCADING-REQUEST-ID'
+          RequestStore.store[:request_id] = 'CASCADING-REQUEST-ID'
         end
 
         after do
-          Thread.current[:request_id] = nil
+          RequestStore.store[:request_id] = nil
         end
 
         let(:expected_headers) do
@@ -560,9 +596,36 @@ RSpec.describe RemoteResource::Request do
     end
   end
 
+  describe '#timeout_options' do
+    it 'is not given by default' do
+      expect(request.connection_options).not_to include :connecttimeout, :timeout
+    end
+
+    context 'with custom timeouts' do
+      let(:connection_options) do
+        { connecttimeout: 1, timeout: 2 }
+      end
+
+      it 'sets the timeouts from connection_options' do
+        aggregate_failures do
+          expect(request.connection_options[:connecttimeout]).to eq 1
+          expect(request.connection_options[:timeout]).to eq 2
+        end
+      end
+    end
+  end
+
   describe '#raise_http_error' do
-    let(:connection_response) { instance_double(Typhoeus::Response, request: instance_double(Typhoeus::Request)) }
-    let(:response)            { RemoteResource::Response.new(connection_response, connection_options) }
+    let(:connection_response) { instance_double(Typhoeus::Response, request: instance_double(Typhoeus::Request), timed_out?: false) }
+    let(:response) { RemoteResource::Response.new(connection_response, connection_options) }
+
+    context 'when the response has timed out' do
+      let(:connection_response) { instance_double(Typhoeus::Response, request: instance_double(Typhoeus::Request), timed_out?: true) }
+
+      it 'raises a RemoteResource::HTTPRequestTimeout' do
+        expect { request.send(:raise_http_error, request, response) }.to raise_error RemoteResource::HTTPRequestTimeout
+      end
+    end
 
     context 'when the response code is 301, 302, 303 or 307' do
       response_codes = [301, 302, 303, 307]

data/spec/lib/remote_resource/response_spec.rb

@@ -14,14 +14,14 @@ RSpec.describe RemoteResource::Response do
   end
 
   let(:dummy_class) { RemoteResource::ResponseDummy }
-  let(:dummy)       { dummy_class.new(id: '12') }
+  let(:dummy) { dummy_class.new(id: '12') }
 
   let(:connection_options) do
     { collection: true }
   end
-  let(:request)             { RemoteResource::Request.new(dummy_class, :post, { name: 'Mies' }, connection_options) }
+  let(:request) { RemoteResource::Request.new(dummy_class, :post, { name: 'Mies' }, connection_options) }
   let(:connection_response) { Typhoeus::Response.new(mock: true, code: 201, body: { id: 12, name: 'Mies' }.to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
-  let(:connection_request)  { Typhoeus::Request.new('http://www.foobar.com/response_dummies.json', method: :post, body: { name: 'Mies' }.to_json, headers: { 'Content-Type' => 'application/json' }) }
+  let(:connection_request) { Typhoeus::Request.new('http://www.foobar.com/response_dummies.json', method: :post, body: { name: 'Mies' }.to_json, headers: { 'Content-Type' => 'application/json' }) }
 
   let(:response) { described_class.new(connection_response, connection_options.merge(request: request, connection_request: connection_request)) }
 
@@ -156,6 +156,36 @@ RSpec.describe RemoteResource::Response do
         expect(response.attributes).to eql({})
       end
     end
+
+    context 'with the json_api spec' do
+      let(:connection_options) do
+        { root_element: :data, json_spec: :json_api }
+      end
+
+      context "single response" do
+        let(:connection_response) { Typhoeus::Response.new(mock: true, code: 201, body: { data: { id: 12, attributes: { name: 'Mies' } } }.to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+        it 'parses the attributes from the nested hash' do
+          expect(response.attributes).to eql({ 'id' => 12, 'name' => 'Mies' })
+        end
+      end
+
+      context "empty response" do
+        let(:connection_response) { Typhoeus::Response.new(mock: true, code: 204, body: {}.to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+        it 'parses the attributes from the nested hash' do
+          expect(response.attributes).to eql({})
+        end
+      end
+
+      context "collection response" do
+        let(:connection_response) { Typhoeus::Response.new(mock: true, code: 201, body: { data: [{ id: 12, attributes: { name: 'Mies' } }] }.to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+        it 'parses the attributes from the nested hash' do
+          expect(response.attributes).to eql(['id' => 12, 'name' => 'Mies'])
+        end
+      end
+    end
   end
 
   describe '#errors' do

data/spec/lib/remote_resource/version_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
 RSpec.describe RemoteResource::VERSION do
-  it { is_expected.to eql '1.0.4' }
+  it { is_expected.to eql '1.2.0' }
 end
-
-

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.2.0
 platform: ruby
 authors:
+- Digidentity
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +118,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +128,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +138,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,7 +148,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -222,10 +223,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 description: RemoteResource, a gem to use resources with REST services. A replacement
   for ActiveResource gem.
 email:
-- jvanderpas@digidentity.eu
+- development@digidentity.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -306,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: RemoteResource, a gem to use resources with REST services.