aptible-resource 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f938de116c53f45b2033e06ae7a293aca0c0f7
-  data.tar.gz: dc977779622c227070d3cd09f58c91d9883baa8f
+  metadata.gz: 3f853b404f5592c14f4604e6338d0c6f6e563540
+  data.tar.gz: 749de9d4d56f4c106595206d1fe287ec0151331d
 SHA512:
-  metadata.gz: 8d37e852b758d7e3300bca70bbc8c80338fdb0ef489199f3fb965ed4c8a5ec6b0a063f5091b349d556d9fdc2797e15529ada77caa121736c8874e58a3d91c73e
-  data.tar.gz: 7191b315d2d20abf449f3215e7b2907e77b0f67a2d65631b2c0cce686b5a2bebeb72a44ee1d4b91d0674137b04778d7da4d8d3d7146f54657b37ae1e0a31bc00
+  metadata.gz: eaedd3c259edab267e029a7b5a908b6dad516561cd0a884775f4a993cb249414b2cf34535fbfdc8c3ab85ca656bfe7a0ae5d71f0f5fa8cd8892336b1a439ab9f
+  data.tar.gz: a5358768fbac108d5863074a0b13d0fb42e4febc13efc9cb1402118ed12b7e7dd8f3cb560c45cc7bfb31415c91ad5e0a87064ee37edc5b3350a73122f4fea026

data/aptible-resource.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   # HyperResource dependencies
   spec.add_dependency 'uri_template', '>= 0.5.2'
-  spec.add_dependency 'faraday',      '>= 0.8.6'
+  spec.add_dependency 'faraday',      '~> 0.9.2'
   spec.add_dependency 'json'
 
   spec.add_dependency 'fridge'
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.0'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'webmock'
 end

data/lib/aptible/resource/base.rb

@@ -12,6 +12,9 @@ require 'aptible/resource/adapter'
 require 'aptible/resource/errors'
 require 'aptible/resource/boolean'
 
+# Open errors that make sense
+require 'aptible/resource/ext/faraday'
+
 module Aptible
   module Resource
     # rubocop:disable ClassLength
@@ -41,9 +44,9 @@ module Aptible
         return [] unless resource
         if resource.links.key?('next')
           options[:href] = resource.links['next'].href
-          resource.send(basename).entries + all(options)
+          resource.entries + all(options)
         else
-          resource.send(basename).entries
+          resource.entries
         end
       end
       # rubocop: enable AbcSize
@@ -126,7 +129,9 @@ module Aptible
           if (memoized = instance_variable_get("@#{relation}"))
             memoized
           elsif links[relation]
-            instance_variable_set("@#{relation}", links[relation].entries)
+            depaginated = self.class.all(href: links[relation].base_href,
+                                         headers: headers)
+            instance_variable_set("@#{relation}", depaginated)
           end
         end
       end

data/lib/aptible/resource/ext/faraday.rb

@@ -0,0 +1,5 @@
+Faraday::Adapter::NetHttp.class_eval do |cls|
+  # Work around https://github.com/lostisland/faraday/issues/561 by treating
+  # connection timeouts as... timeouts.
+  cls::NET_HTTP_EXCEPTIONS.delete Net::OpenTimeout if defined?(Net::OpenTimeout)
+end

data/lib/aptible/resource/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Resource
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/lib/hyper_resource/modules/http.rb

@@ -78,12 +78,18 @@ class HyperResource
         }.to_json)
         return Thread.current[key] if Thread.current[key]
 
-        fc = Faraday.new(self.faraday_options.merge(:url => url))
-        fc.headers.merge!('User-Agent' => "HyperResource #{HyperResource::VERSION}")
-        fc.headers.merge!(self.headers || {})
-        if ba=self.auth[:basic]
-          fc.basic_auth(*ba)
+        fc = Faraday.new(self.faraday_options.merge(:url => url)) do |builder|
+          builder.headers.merge!('User-Agent' => "HyperResource #{HyperResource::VERSION}")
+          builder.headers.merge!(self.headers || {})
+          if (ba = self.auth[:basic])
+            builder.basic_auth(*ba)
+          end
+
+          builder.request :url_encoded
+          builder.request :retry
+          builder.adapter Faraday.default_adapter
         end
+
         Thread.current[key] = fc
       end
 

data/spec/aptible/resource/base_spec.rb

@@ -31,7 +31,7 @@ describe Aptible::Resource::Base do
     let(:collection) { double 'Api' }
 
     before do
-      collection.stub(:mainframes) { [mainframe] }
+      collection.stub(:entries) { [mainframe] }
       collection.stub(:links) { Hash.new }
       Api::Mainframe.any_instance.stub(:find_by_url) { collection }
     end
@@ -51,7 +51,7 @@ describe Aptible::Resource::Base do
       Api::Mainframe.all(options)
     end
 
-    describe 'when paginated' do
+    context 'when paginated' do
       before do
         page = double('page')
         allow(page).to receive(:href).and_return(
@@ -210,6 +210,8 @@ describe Aptible::Resource::Base do
     before { Api.has_many :mainframes }
     before { subject.stub(:loaded) { true } }
     before { subject.stub(:links) { { mainframes: mainframes_link } } }
+    before { mainframes_link.stub(:entries) { [mainframe] } }
+    before { mainframes_link.stub(:base_href) { '/mainframes' } }
 
     describe '#create_#{relation}' do
       it 'should populate #errors in the event of an error' do
@@ -253,6 +255,14 @@ describe Aptible::Resource::Base do
         expect(subject.create_mainframe!({})).to eq mainframe
       end
     end
+
+    describe '#{relation}s' do
+      it 'should defer to self.class.all' do
+        expect(subject.class).to receive(:all).with(href: '/mainframes',
+                                                    headers: subject.headers)
+        subject.mainframes
+      end
+    end
   end
 
   context '.field' do

data/spec/aptible/resource/network_spec.rb

@@ -1,17 +1,49 @@
 require 'spec_helper'
 
-describe Aptible::Resource::Base, slow: true do
-  subject { Api.new(root: 'http://10.255.255.1/') }
-
-  it 'should time out by default after a reasonable delay' do
-    # Faraday throws different kinds of errors depending on whether
-    # Net::OpenTimeout is defined, so let's check for this
-    # https://github.com/lostisland/faraday/issues/561
-    e = Faraday::Error::TimeoutError
-    e = Faraday::Error::ConnectionFailed if defined? Net::OpenTimeout
-
-    expect do
-      Timeout.timeout(15) { subject.all }
-    end.to raise_error(e, 'execution expired')
+# With webmock (fake connections), to check how we handle timeouts.
+describe Aptible::Resource::Base do
+  let(:body) { { 'hello' => '1' } }
+  let(:json_body) { JSON.unparse(body) }
+  let(:domain) { 'api.aptible.com' }
+
+  subject { Api.new(root: "http://#{domain}") }
+
+  context 'with mock connections' do
+    around do |example|
+      WebMock.disable_net_connect!
+      example.run
+      WebMock.allow_net_connect!
+    end
+
+    it 'should retry timeout errors' do
+      stub_request(:get, domain)
+        .to_timeout.then
+        .to_timeout.then
+        .to_return(body: json_body)
+
+      expect(subject.get.body).to eq(body)
+    end
+
+    it 'should not retry POSTs' do
+      stub_request(:post, domain)
+        .to_timeout.then
+        .to_return(body: json_body)
+
+      expect { subject.post }.to raise_error(Faraday::TimeoutError)
+    end
+  end
+
+  context 'without connections' do
+    it 'default to 10 seconds of timeout and retry 3 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(3).times
+        .and_raise(Net::OpenTimeout)
+
+      expect { subject.all }.to raise_error(Faraday::Error::TimeoutError)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -12,3 +12,7 @@ end
 
 # Require library up front
 require 'aptible/resource'
+
+# Webmock
+require 'webmock/rspec'
+WebMock.allow_net_connect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-resource
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Foundation classes for Aptible resource server gems
 email:
 - frank@macreery.com
@@ -171,6 +185,7 @@ files:
 - lib/aptible/resource/base.rb
 - lib/aptible/resource/boolean.rb
 - lib/aptible/resource/errors.rb
+- lib/aptible/resource/ext/faraday.rb
 - lib/aptible/resource/version.rb
 - lib/hyper_resource.rb
 - lib/hyper_resource/adapter.rb
@@ -210,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foundation classes for Aptible resource server gems