aptible-resource 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8763d2caea0e00ee89256be017ffc5276aef0e80
-  data.tar.gz: 5bd0eef4af8fe6bf6e20cbbae9023f5fbfdb461a
+SHA256:
+  metadata.gz: 4eeb9d01868528de4be4cb015abbb22c9710086bf2d880c075997a60475f06ba
+  data.tar.gz: 6b1f04a38239649c91bc77f930c4d862ea7d068c7c4f77c36684699fed726925
 SHA512:
-  metadata.gz: 79805e68facedfce6282d7f0f945b07df459478929a01ada4e6b76f5c88e20ac8ddacfa25bb51cbfc9a11953591aed06cd7c6976cfb709d0cfb40957607c4113
-  data.tar.gz: 2deab0f8a6ca743f987e9beffe1e7ddfccb0c9287cfa853a82be74b6d822da3bee1eae08e7bdcbe8aa0e84d7c5a79a6bc1c9cf9e885d45b28ca89c8cf50ef9da
+  metadata.gz: 87b33183877986d2b1fc2ae9975a256bd361efb0c95f94a7e8d1cd145c36bebd8e3c185fcff32ed394f46076484c65743861004128a52419a5e7fe7541dd35b0
+  data.tar.gz: 90aaa5a7269f47379ed9e8bf7b23e510a3da41072ad7ad7a16a6f8e8ad9332cc473b367a354f88b5743d671230a317425858f42d63b9da95bb120ac1675d51de

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @dawenster

data/.travis.yml

@@ -1,8 +1,7 @@
 sudo: false
 
 rvm:
-  - "2.0"
-  - "2.1"
   - "2.2"
   - "2.3"
-  - jruby-9.1.13.0
+  - "2.6"
+  - "2.7"

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '~> 4.0'
-
 # Specify your gem's dependencies in aptible-resource.gemspec
 gemspec

data/README.md

@@ -49,7 +49,5 @@ This gem depends on a vendored version of [HyperResource](https://github.com/gam
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2014 [Aptible](https://www.aptible.com) and contributors.
-
-[<img src="https://s.gravatar.com/avatar/9b58236204e844e3181e43e05ddb0809?s=60" style="border-radius: 50%;" alt="@sandersonet" />](https://github.com/sandersonet)
+Copyright (c) 2019 [Aptible](https://www.aptible.com) and contributors.
 

data/aptible-resource.gemspec

@@ -1,5 +1,6 @@
 # encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'English'
@@ -20,18 +21,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # HyperResource dependencies
-  spec.add_dependency 'uri_template', '>= 0.5.2'
-  spec.add_dependency 'faraday',      '>= 0.9.2', '< 0.14'
-  spec.add_dependency 'json'
-
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'fridge'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_dependency 'gem_config', '~> 0.3.1'
+  spec.add_dependency 'httpclient', '~> 2.8'
+  spec.add_dependency 'json'
+  spec.add_dependency 'uri_template', '>= 0.5.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '< 11.0'
+  spec.add_development_dependency 'rspec', '~> 2.0'
   spec.add_development_dependency 'webmock', '~> 2.3.2'
 end

data/lib/aptible/resource/adapter.rb

@@ -6,6 +6,7 @@ module Aptible
           return nil unless object
 
           return nil unless (type = object['_type'])
+
           if type.respond_to?(:camelize)
             type.camelize
           else

data/lib/aptible/resource/base.rb

@@ -5,7 +5,7 @@ require 'active_support/core_ext'
 require 'date'
 
 # Require vendored HyperResource
-$LOAD_PATH.unshift File.expand_path('../..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('..', __dir__)
 require 'hyper_resource'
 
 require 'aptible/resource/adapter'
@@ -15,12 +15,14 @@ require 'aptible/resource/boolean'
 module Aptible
   module Resource
     # rubocop:disable ClassLength
+    # rubocop:disable DuplicateMethods
     class Base < HyperResource
       attr_accessor :errors
       attr_reader :token
 
       def self.get_data_type_from_response(response)
         return nil unless response && response.body
+
         adapter.get_data_type_from_object(adapter.deserialize(response.body))
       end
 
@@ -79,6 +81,7 @@ module Aptible
         new(options).find_by_url(url)
       rescue HyperResource::ClientError => e
         return nil if e.response.status == 404
+
         raise e
       end
 
@@ -182,6 +185,7 @@ module Aptible
 
         define_method iterator_method do |&block|
           next enum_for(iterator_method) if block.nil?
+
           send(relation).each(&block)
         end
       end
@@ -224,16 +228,7 @@ module Aptible
         end
       end
 
-      def self.faraday_options
-        # Default Faraday options. May be overridden by passing
-        # faraday_options to the initializer.
-        {
-          request: {
-            open_timeout: 10
-          }
-        }
-      end
-
+      # rubocop:disable ReturnInVoidContext
       def initialize(options = {})
         return super(options) unless options.is_a?(Hash)
 
@@ -241,6 +236,7 @@ module Aptible
         super(options)
         self.token = options[:token] if options[:token]
       end
+      # rubocop:enable ReturnInVoidContext
 
       def populate_default_options!(options)
         options[:root] ||= root_url
@@ -305,7 +301,7 @@ module Aptible
         # Already deleted
         raise unless e.response.status == 404
       rescue HyperResource::ResponseError
-        # HyperResource/Faraday choke on empty response bodies
+        # HyperResource chokes on empty response bodies
         nil
       end
 
@@ -327,5 +323,6 @@ module Aptible
       end
     end
     # rubocop:enable ClassLength
+    # rubocop:enable DuplicateMethods
   end
 end

data/lib/aptible/resource/default_retry_coordinator.rb

@@ -5,11 +5,27 @@ module Aptible
 
       IDEMPOTENT_METHODS = [
         # Idempotent as per RFC
-        :delete, :get, :head, :options, :put,
+        'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT',
+
         # Idempotent on our APIs
-        :patch
+        'PATCH'
+      ].freeze
+
+      RETRY_ERRORS = [
+        # Ancestor for Errno::X
+        SystemCallError,
+
+        # Might be caused by e.g. DNS failure
+        SocketError,
+
+        # HTTPClient transfer error
+        HTTPClient::TimeoutError,
+        HTTPClient::KeepAliveDisconnected,
+        HTTPClient::BadResponseError,
+
+        # Bad response
+        HyperResource::ServerError
       ].freeze
-      RETRY_ERRORS = [Faraday::Error, HyperResource::ServerError].freeze
 
       def initialize(resource)
         @resource = resource
@@ -19,9 +35,12 @@ module Aptible
       def retry?(method, err)
         # rubocop:disable Style/CaseEquality
         return false unless RETRY_ERRORS.any? { |c| c === err }
+
         return false unless IDEMPOTENT_METHODS.include?(method)
+
         retry_in = retry_schedule.shift
         return false if retry_in.nil?
+
         sleep retry_in
         true
         # rubocop:enable Style/CaseEquality

data/lib/aptible/resource/errors.rb

@@ -1,6 +1,7 @@
 module Aptible
   module Resource
     class Errors
+      # rubocop:disable DuplicateMethods
       attr_accessor :status_code, :messages, :full_messages
 
       def self.from_exception(exception)
@@ -23,6 +24,7 @@ module Aptible
       def any?
         full_messages.any?
       end
+      # rubocop:enable DuplicateMethods
     end
   end
 end

data/lib/aptible/resource/null_retry_coordinator.rb

@@ -1,10 +1,9 @@
 module Aptible
   module Resource
     class NullRetryCoordinator
-      def initialize(_)
-      end
+      def initialize(___); end
 
-      def retry?(_, _)
+      def retry?(___, ____)
         false
       end
     end

data/lib/aptible/resource/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Resource
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/lib/aptible/resource.rb

@@ -3,6 +3,7 @@ require 'aptible/resource/base'
 require 'aptible/resource/default_retry_coordinator'
 require 'aptible/resource/null_retry_coordinator'
 require 'gem_config'
+require 'logger'
 
 module Aptible
   module Resource
@@ -18,6 +19,10 @@ module Aptible
       has :user_agent,
           classes: [String],
           default: "aptible-resource #{Aptible::Resource::VERSION}"
+
+      has :logger,
+          classes: [Logger],
+          default: Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
     end
 
     class << self
@@ -37,6 +42,7 @@ module Aptible
       def retry_coordinator_class
         override = Thread.current[RETRY_COORDINATOR_OVERRIDE]
         return override if override
+
         configuration.retry_coordinator_class
       end
     end

data/lib/hyper_resource/exceptions.rb

@@ -10,7 +10,7 @@ class HyperResource
   end
 
   class ResponseError < Exception
-    ## The +Faraday::Response+ object which led to this exception.
+    ## The +HTTPClient::Message+ object which led to this exception.
     attr_accessor :response
 
     ## The deserialized response body which led to this exception.

data/lib/hyper_resource/link.rb

@@ -53,7 +53,7 @@ class HyperResource::Link
 
   ## If we were called with a method we don't know, load this resource
   ## and pass the message along.  This achieves implicit loading.
-  def method_missing(method, *args)
-    self.get.send(method, *args)
+  def method_missing(method, *args, &block)
+    self.get.send(method, *args, &block)
   end
 end

data/lib/hyper_resource/modules/http/wrap_errors.rb

@@ -1,7 +1,7 @@
 class HyperResource
   module Modules
     module HTTP
-      class WrapErrors < Faraday::Middleware
+      module WrapErrors
         class WrappedError < StandardError
           attr_reader :method, :err
 
@@ -10,12 +10,6 @@ class HyperResource
             @err = err
           end
         end
-
-        def call(env)
-          @app.call(env)
-        rescue StandardError => e
-          raise WrappedError.new(env.method, e)
-        end
       end
     end
   end

data/lib/hyper_resource/modules/http.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require 'httpclient'
 require 'uri'
 require 'json'
 require 'digest/md5'
@@ -11,11 +11,42 @@ class HyperResource
       # things over and over again.
       MAX_COORDINATOR_RETRIES = 16
 
+      CONTENT_TYPE_HEADERS = {
+        'Content-Type' => 'application/json; charset=utf-8'
+      }.freeze
+
+      class << self
+        attr_reader :http_client
+
+        def initialize_http_client!
+          @http_client = HTTPClient.new.tap do |c|
+            c.cookie_manager = nil
+            c.connect_timeout = 30
+            c.send_timeout = 45
+            c.receive_timeout = 30
+            c.keep_alive_timeout = 15
+            c.ssl_config.set_default_paths
+          end
+        end
+      end
+
+      # We use this accessor / initialize as opposed to a simple constant
+      # because during specs, Webmock stubs the HTTPClient class, but that's
+      # happens after we initialized  the constant (we could work around that
+      # by loading Webmock first, but this is just as simple.
+      initialize_http_client!
+
       ## Loads and returns the resource pointed to by +href+.  The returned
       ## resource will be blessed into its "proper" class, if
       ## +self.class.namespace != nil+.
       def get
-        execute_request { faraday_connection.get(href || '') }
+        execute_request('GET') do |uri, headers|
+          HTTP.http_client.get(
+            uri,
+            follow_redirect: true,
+            header: headers
+          )
+        end
       end
 
       ## By default, calls +post+ with the given arguments. Override to
@@ -28,8 +59,13 @@ class HyperResource
       ## the response resource.
       def post(attrs = nil)
         attrs ||= attributes
-        execute_request do
-          faraday_connection.post { |req| req.body = adapter.serialize(attrs) }
+
+        execute_request('POST') do |uri, headers|
+          HTTP.http_client.post(
+            uri,
+            body: adapter.serialize(attrs),
+            header: headers.merge(CONTENT_TYPE_HEADERS)
+          )
         end
       end
 
@@ -44,8 +80,13 @@ class HyperResource
       ## instead.
       def put(attrs = nil)
         attrs ||= attributes
-        execute_request do
-          faraday_connection.put { |req| req.body = adapter.serialize(attrs) }
+
+        execute_request('PUT') do |uri, headers|
+          HTTP.http_client.put(
+            uri,
+            body: adapter.serialize(attrs),
+            header: headers.merge(CONTENT_TYPE_HEADERS)
+          )
         end
       end
 
@@ -54,49 +95,62 @@ class HyperResource
       ## uses those instead.
       def patch(attrs = nil)
         attrs ||= attributes.changed_attributes
-        execute_request do
-          faraday_connection.patch { |req| req.body = adapter.serialize(attrs) }
+
+        execute_request('PATCH') do |uri, headers|
+          HTTP.http_client.patch(
+            uri,
+            body: adapter.serialize(attrs),
+            header: headers.merge(CONTENT_TYPE_HEADERS)
+          )
         end
       end
 
       ## DELETEs this resource's href, and returns the response resource.
       def delete
-        execute_request { faraday_connection.delete }
-      end
-
-      ## Returns a raw Faraday connection to this resource's URL, with proper
-      ## headers (including auth).
-      def faraday_connection(url = nil)
-        url ||= URI.join(root, href)
-
-        Faraday.new(faraday_options.merge(url: url)) do |builder|
-          builder.headers.merge!(headers || {})
-          builder.headers['User-Agent'] = Aptible::Resource.configuration
-                                                           .user_agent
-
-          if (ba = auth[:basic])
-            builder.basic_auth(*ba)
-          end
-
-          builder.use WrapErrors # This has to be first!
-          builder.request :url_encoded
-          builder.adapter Faraday.default_adapter
+        execute_request('DELETE') do |uri, headers|
+          HTTP.http_client.delete(uri, header: headers)
         end
       end
 
       private
 
-      def execute_request
+      def execute_request(method)
         raise 'execute_request needs a block!' unless block_given?
         retry_coordinator = Aptible::Resource.retry_coordinator_class.new(self)
 
+        uri = URI.join(root, href)
+
+        h = headers || {}
+        h['User-Agent'] = Aptible::Resource.configuration.user_agent
+
         n_retry = 0
 
         begin
+          t0 = Time.now
+
           begin
-            finish_up(yield)
-          rescue HyperResource::ResponseError => e
-            raise WrapErrors::WrappedError.new(e.response.env.method, e)
+            res = yield(uri, h)
+            entity = finish_up(res)
+          rescue StandardError => e
+            Aptible::Resource.configuration.logger.info([
+              method,
+              uri,
+              "(#{n_retry})",
+              "#{(Time.now - t0).round(2)}s",
+              "ERR[#{e.class}: #{e}]"
+            ].join(' '))
+
+            raise WrapErrors::WrappedError.new(method, e)
+          else
+            Aptible::Resource.configuration.logger.info([
+              method,
+              uri,
+              "(#{n_retry})",
+              "#{(Time.now - t0).round(2)}s",
+              res.status
+            ].join(' '))
+
+            entity
           end
         rescue WrapErrors::WrappedError => e
           n_retry += 1
@@ -121,18 +175,23 @@ class HyperResource
         elsif status / 100 == 3
           raise 'HyperResource does not handle redirects'
         elsif status / 100 == 4
-          raise HyperResource::ClientError.new(status.to_s,
-                                               response: response,
-                                               body: body)
+          raise HyperResource::ClientError.new(
+            status.to_s,
+            response: response,
+            body: body
+          )
         elsif status / 100 == 5
-          raise HyperResource::ServerError.new(status.to_s,
-                                               response: response,
-                                               body: body)
-
+          raise HyperResource::ServerError.new(
+            status.to_s,
+            response: response,
+            body: body
+          )
         else ## 1xx? really?
-          raise HyperResource::ResponseError.new("Got status #{status}, wtf?",
-                                                 response: response,
-                                                 body: body)
+          raise HyperResource::ResponseError.new(
+            "Got status #{status}, wtf?",
+            response: response,
+            body: body
+          )
 
         end
 

data/lib/hyper_resource/modules/internal_attributes.rb

@@ -26,7 +26,6 @@ module HyperResource::Modules
           :headers,          ## e.g. {'Accept' => 'application/vnd.example+json'}
           :namespace,        ## e.g. 'ExampleAPI', or the class ExampleAPI itself
           :adapter,          ## subclass of HR::Adapter
-          :faraday_options   ## e.g. {:request => {:timeout => 30}}
         ]
       end
 
@@ -37,7 +36,6 @@ module HyperResource::Modules
           :headers,
           :namespace,
           :adapter,
-          :faraday_options,
           :token,
 
           :request,

data/lib/hyper_resource.rb

@@ -46,9 +46,6 @@ public
   ## [headers] Headers to send along with requests for this resource (as
   ##           well as its eventual child resources, if any).
   ##
-  ## [faraday_options] Configuration passed to +Faraday::Connection.initialize+,
-  ##                   such as +{request: {timeout: 30}}+.
-  ##
   def initialize(opts={})
     return init_from_resource(opts) if opts.kind_of?(HyperResource)
 
@@ -58,8 +55,6 @@ public
     self.namespace  = opts[:namespace] || self.class.namespace
     self.headers    = DEFAULT_HEADERS.merge(self.class.headers || {}).
                                       merge(opts[:headers]     || {})
-    self.faraday_options = opts[:faraday_options] ||
-                               self.class.faraday_options || {}
 
     ## There's a little acrobatics in getting Attributes, Links, and Objects
     ## into the correct subclass.
@@ -130,14 +125,14 @@ public
   ## in this resource.  Returns nil on failure.
   def [](i)
     get unless loaded
-    self.objects.first[1][i] rescue nil
+    self.objects.first[1][i]
   end
 
   ## Iterates over the objects in the first collection of embedded objects
   ## in this resource.
   def each(&block)
     get unless loaded
-    self.objects.first[1].each(&block) rescue nil
+    self.objects.first[1].each(&block)
   end
 
   #### Magic
@@ -199,7 +194,6 @@ public
                    :auth            => self.auth,
                    :headers         => self.headers,
                    :namespace       => self.namespace,
-                   :faraday_options => self.faraday_options,
                    :token           => self.token,
                    :href            => href)
   end
@@ -253,7 +247,6 @@ public
     self.class.response_class(self.response, self.namespace)
   end
 
-
   ## Inspects the given Faraday::Response, and returns a string describing
   ## this resource's data type.
   ##

data/spec/aptible/resource/base_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+# rubocop:disable BlockLength
+# rubocop:disable InterpolationCheck
 describe Aptible::Resource::Base do
   let(:hyperresource_exception) { HyperResource::ResponseError.new('403') }
   let(:error_response) { double 'Faraday::Response' }
@@ -36,6 +38,7 @@ describe Aptible::Resource::Base do
           calls << u
           page = pages[u]
           raise "Accessed unexpected URL #{u}" if page.nil?
+
           page
         end
       end
@@ -52,16 +55,31 @@ describe Aptible::Resource::Base do
   end
 
   describe '.find' do
-    it 'should call find_by_url' do
-      url = '/mainframes/42'
-      expect(Api::Mainframe).to receive(:find_by_url).with url, {}
-      Api::Mainframe.find(42)
+    it 'should find' do
+      stub_request(
+        :get, 'https://resource.example.com/mainframes/42'
+      ).to_return(body: { id: 42 }.to_json, status: 200)
+
+      m = Api::Mainframe.find(42)
+      expect(m.id).to eq(42)
+    end
+
+    it 'should find with query params' do
+      stub_request(
+        :get, 'https://resource.example.com/mainframes/42?test=123'
+      ).to_return(body: { id: 42 }.to_json, status: 200)
+
+      m = Api::Mainframe.find(42, test: 123)
+      expect(m.id).to eq(42)
     end
 
-    it 'should call find_by_url with query params' do
-      url = '/mainframes/42?test=123'
-      expect(Api::Mainframe).to receive(:find_by_url).with url, test: 123
-      Api::Mainframe.find(42, test: 123)
+    it 'should return an instance of the correct class' do
+      stub_request(
+        :get, 'https://resource.example.com/mainframes/42'
+      ).to_return(body: { id: 42 }.to_json, status: 200)
+
+      m = Api::Mainframe.find(42)
+      expect(m).to be_a(Api::Mainframe)
     end
   end
 
@@ -72,7 +90,7 @@ describe Aptible::Resource::Base do
 
       before do
         collection.stub(:entries) { [mainframe] }
-        collection.stub(:links) { Hash.new }
+        collection.stub(:links) { {} }
         Api::Mainframe.any_instance.stub(:find_by_url) { collection }
       end
 
@@ -254,7 +272,7 @@ describe Aptible::Resource::Base do
       HyperResource.any_instance.stub(:put) { raise hyperresource_exception }
       begin
         subject.update!({})
-      rescue
+      rescue StandardError
         # Allow errors to be populated and tested
         nil
       end
@@ -453,7 +471,7 @@ describe Aptible::Resource::Base do
   end
 
   context 'configuration' do
-    subject { Api.new(root: 'http://foo.com') }
+    subject { Api.new(root: 'http://example.com') }
 
     def configure_new_coordinator(&block)
       Aptible::Resource.configure do |config|
@@ -468,7 +486,7 @@ describe Aptible::Resource::Base do
       it 'should not retry if the proc returns false' do
         configure_new_coordinator { define_method(:retry?) { |_, _e| false } }
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401).then
           .to_return(body: { status: 'ok' }.to_json, status: 200)
 
@@ -479,7 +497,7 @@ describe Aptible::Resource::Base do
       it 'should retry if the proc returns true' do
         configure_new_coordinator { define_method(:retry?) { |_, _e| true } }
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401).then
           .to_return(body: { error: 'foo' }.to_json, status: 401).then
           .to_return(body: { status: 'ok' }.to_json, status: 200)
@@ -494,7 +512,7 @@ describe Aptible::Resource::Base do
           define_method(:retry?) { |_, _e| failures += 1 || true }
         end
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401).then
           .to_return(body: { status: 'ok' }.to_json, status: 200).then
           .to_return(body: { error: 'foo' }.to_json, status: 401)
@@ -505,7 +523,7 @@ describe Aptible::Resource::Base do
       end
 
       it 'should not retry with the default proc' do
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401).then
           .to_return(body: { status: 'ok' }.to_json, status: 200)
 
@@ -522,7 +540,7 @@ describe Aptible::Resource::Base do
           define_method(:retry?) { |_, e| (exception = e) && false }
         end
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401)
 
         expect { subject.get.body }
@@ -544,11 +562,11 @@ describe Aptible::Resource::Base do
           end
         end
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .with(headers: { 'Authorization' => /foo/ })
           .to_return(body: { error: 'foo' }.to_json, status: 401)
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .with(headers: { 'Authorization' => /bar/ })
           .to_return(body: { status: 'ok' }.to_json, status: 200)
 
@@ -563,7 +581,7 @@ describe Aptible::Resource::Base do
           define_method(:retry?) { |_, _e| n += 1 || true }
         end
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .to_return(body: { error: 'foo' }.to_json, status: 401)
 
         expect { subject.get.body }
@@ -579,7 +597,7 @@ describe Aptible::Resource::Base do
           config.user_agent = 'foo ua'
         end
 
-        stub_request(:get, 'foo.com')
+        stub_request(:get, 'example.com')
           .with(headers: { 'User-Agent' => 'foo ua' })
           .to_return(body: { status: 'ok' }.to_json, status: 200)
 
@@ -589,22 +607,22 @@ describe Aptible::Resource::Base do
   end
 
   context 'token' do
-    subject { Api.new(root: 'http://foo.com', token: 'bar') }
+    subject { Api.new(root: 'http://example.com', token: 'bar') }
 
     before do
-      stub_request(:get, 'foo.com/')
+      stub_request(:get, 'example.com/')
         .with(headers: { 'Authorization' => /Bearer (bar|foo)/ })
         .to_return(body: {
-          _links: { some: { href: 'http://foo.com/some' },
-                    mainframes: { href: 'http://foo.com/mainframes' } },
+          _links: { some: { href: 'http://example.com/some' },
+                    mainframes: { href: 'http://example.com/mainframes' } },
           _embedded: { best_mainframe: { _type: 'mainframe', status: 'ok' } }
         }.to_json, status: 200)
 
-      stub_request(:get, 'foo.com/some')
+      stub_request(:get, 'example.com/some')
         .with(headers: { 'Authorization' => /Bearer (bar|foo)/ })
         .to_return(body: { status: 'ok' }.to_json, status: 200)
 
-      stub_request(:get, 'foo.com/mainframes')
+      stub_request(:get, 'example.com/mainframes')
         .with(headers: { 'Authorization' => /Bearer (bar|foo)/ })
         .to_return(body: { _embedded: {
           mainframes: [{ status: 'ok' }]
@@ -646,4 +664,87 @@ describe Aptible::Resource::Base do
       expect(m.token).to eq('bar')
     end
   end
+
+  context 'lazy fetching' do
+    subject { Api.new(root: 'http://foo.com') }
+
+    it 'should support enumerable methods' do
+      index = {
+        _links: {
+          some_items: { href: 'http://foo.com/some_items' }
+        }
+      }
+
+      some_items = {
+        _embedded: {
+          some_items: [
+            { id: 1, handle: 'foo' },
+            { id: 2, handle: 'bar' },
+            { id: 3, handle: 'qux' }
+          ]
+        }
+      }
+
+      stub_request(:get, 'foo.com')
+        .to_return(body: index.to_json, status: 200)
+
+      stub_request(:get, 'foo.com/some_items')
+        .to_return(body: some_items.to_json, status: 200)
+
+      bar = subject.some_items.find { |m| m.id == 2 }
+      expect(bar.handle).to eq('bar')
+    end
+  end
+
+  describe '_type' do
+    subject { Api.new(root: 'http://example.com', token: 'bar') }
+
+    it 'uses the correct class for an expected linked instance' do
+      stub_request(:get, 'example.com/')
+        .to_return(body: {
+          _links: {
+            worst_mainframe: { href: 'http://example.com/mainframes/123' }
+          }
+        }.to_json, status: 200)
+
+      stub_request(:get, 'example.com/mainframes/123')
+        .to_return(body: { _type: 'mainframe', id: 123 }.to_json, status: 200)
+
+      expect(subject.worst_mainframe).to be_a(Api::Mainframe)
+    end
+
+    it 'uses the correct class for an unexpected linked instance' do
+      stub_request(:get, 'example.com/')
+        .to_return(body: {
+          _links: {
+            some: { href: 'http://example.com/mainframes/123' }
+          }
+        }.to_json, status: 200)
+
+      stub_request(:get, 'example.com/mainframes/123')
+        .to_return(body: { _type: 'mainframe', id: 123 }.to_json, status: 200)
+
+      expect(subject.some.get).to be_a(Api::Mainframe)
+    end
+
+    it 'uses the correct class for an expected embedded instance' do
+      stub_request(:get, 'example.com/')
+        .to_return(body: {
+          _embedded: { best_mainframe: { _type: 'mainframe', id: 123 } }
+        }.to_json, status: 200)
+
+      expect(subject.best_mainframe).to be_a(Api::Mainframe)
+    end
+
+    it 'uses the correct class for an unexpected embedded instance' do
+      stub_request(:get, 'example.com/')
+        .to_return(body: {
+          _embedded: { some: { _type: 'mainframe', id: 123 } }
+        }.to_json, status: 200)
+
+      expect(subject.some).to be_a(Api::Mainframe)
+    end
+  end
 end
+# rubocop:enable InterpolationCheck
+# rubocop:enable BlockLength

data/spec/aptible/resource/retry_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 # With webmock (fake connections), to check how we handle timeouts.
+# rubocop:disable BlockLength
 describe Aptible::Resource::Base do
   let(:body) do
     { 'hello' => '1', '_links' => { 'self' => { 'href' => href } } }
@@ -136,15 +137,6 @@ describe Aptible::Resource::Base do
         expect(subject.get.body).to eq(body)
       end
 
-      it 'should retry timeout errors (Net::OpenTimeout)' do
-        stub_request(:get, href)
-          .to_raise(Net::OpenTimeout).then
-          .to_raise(Net::OpenTimeout).then
-          .to_return(body: json_body)
-
-        expect(subject.get.body).to eq(body)
-      end
-
       it 'should retry connection errors' do
         stub_request(:get, href)
           .to_raise(Errno::ECONNREFUSED).then
@@ -159,30 +151,10 @@ describe Aptible::Resource::Base do
           .to_timeout.then
           .to_return(body: json_body)
 
-        expect { subject.post }.to raise_error(Faraday::ConnectionFailed)
-      end
-    end
-
-    context 'without connections' do
-      around do |example|
-        WebMock.allow_net_connect!
-        example.run
-        WebMock.disable_net_connect!
-      end
-
-      it 'default to 10 seconds of timeout and retries 4 times' do
-        # This really relies on how exactly MRI implements Net::HTTP open
-        # timeouts
-        skip 'MRI implementation-specific' if RUBY_PLATFORM == 'java'
-
-        expect(Timeout).to receive(:timeout)
-          .with(10, Net::OpenTimeout)
-          .exactly(4).times
-          .and_raise(Net::OpenTimeout)
-
-        expect { subject.get }.to raise_error(Faraday::ConnectionFailed)
-        expect(sleeps.size).to eq(3)
+        expect { subject.post }
+          .to raise_error(HTTPClient::TimeoutError)
       end
     end
   end
 end
+# rubocop:enable BlockLength

data/spec/fixtures/api.rb

@@ -4,6 +4,7 @@ class Api < Aptible::Resource::Base
   has_many :mainframes
   embeds_many :embedded_mainframes
   embeds_one :best_mainframe
+  has_one :worst_mainframe
 
   def namespace
     'Api'

data/spec/fixtures/mainframe.rb

@@ -3,3 +3,4 @@ require_relative 'api'
 # rubocop:disable ClassAndModuleChildren
 class Api::Mainframe < Api
 end
+# rubocop:enable ClassAndModuleChildren

data/spec/fixtures/token.rb

@@ -3,3 +3,4 @@ require_relative 'api'
 # rubocop:disable ClassAndModuleChildren
 class Api::Token < Api
 end
+# rubocop:enable ClassAndModuleChildren

data/spec/spec_helper.rb

@@ -18,6 +18,8 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!
 
 RSpec.configure do |config|
+  config.before(:suite) { HyperResource::Modules::HTTP.initialize_http_client! }
+
   config.before { Aptible::Resource.configuration.reset }
   config.before { WebMock.reset! }
 

metadata

@@ -1,127 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: aptible-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uri_template
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: fridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: fridge
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem_config
+  name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aptible-tasks
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -238,7 +227,7 @@ homepage: https://github.com/aptible/aptible-resource
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,9 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Foundation classes for Aptible resource server gems
 test_files: