hyperclient 0.9.3 → 2.0.0

data/test/hyperclient/link_test.rb

@@ -11,12 +11,12 @@ module Hyperclient
       describe prop do
         it 'returns the property value' do
           link = Link.new('key', { prop => 'value' }, entry_point)
-          link.send("_#{prop}").must_equal 'value'
+          _(link.send("_#{prop}")).must_equal 'value'
         end
 
         it 'returns nil if the property is not present' do
           link = Link.new('key', {}, entry_point)
-          link.send("_#{prop}").must_be_nil
+          _(link.send("_#{prop}")).must_be_nil
         end
       end
     end
@@ -25,13 +25,13 @@ module Hyperclient
       it 'returns true if the link is templated' do
         link = Link.new('key', { 'templated' => true }, entry_point)
 
-        link._templated?.must_equal true
+        _(link._templated?).must_equal true
       end
 
       it 'returns false if the link is not templated' do
         link = Link.new('key', {}, entry_point)
 
-        link._templated?.must_equal false
+        _(link._templated?).must_equal false
       end
     end
 
@@ -39,13 +39,13 @@ module Hyperclient
       it 'returns a list of required variables' do
         link = Link.new('key', { 'href' => '/orders{?id,owner}', 'templated' => true }, entry_point)
 
-        link._variables.must_equal %w[id owner]
+        _(link._variables).must_equal %w[id owner]
       end
 
       it 'returns an empty array for untemplated links' do
         link = Link.new('key', { 'href' => '/orders' }, entry_point)
 
-        link._variables.must_equal []
+        _(link._variables).must_equal []
       end
     end
 
@@ -53,41 +53,41 @@ module Hyperclient
       describe 'required argument' do
         it 'builds a Link with the templated URI representation' do
           link = Link.new('key', { 'href' => '/orders/{id}', 'templated' => true }, entry_point)
-          link._expand(id: '1')._url.must_equal '/orders/1'
+          _(link._expand(id: '1')._url).must_equal '/orders/1'
         end
 
         it 'expands an uri template without variables' do
           link = Link.new('key', { 'href' => '/orders/{id}', 'templated' => true }, entry_point)
-          link._expand._url.must_equal '/orders/'
-          link._url.must_equal '/orders/'
+          _(link._expand._url).must_equal '/orders/'
+          _(link._url).must_equal '/orders/'
         end
       end
 
       describe 'query string argument' do
         it 'builds a Link with the templated URI representation' do
           link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
-          link._expand(id: '1')._url.must_equal '/orders?id=1'
+          _(link._expand(id: '1')._url).must_equal '/orders?id=1'
         end
 
         it 'expands an uri template without variables' do
           link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
-          link._expand._url.must_equal '/orders'
-          link._url.must_equal '/orders'
+          _(link._expand._url).must_equal '/orders'
+          _(link._url).must_equal '/orders'
         end
 
         it 'does not expand unknown variables' do
           link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
-          link._expand(unknown: '1')._url.must_equal '/orders'
+          _(link._expand(unknown: '1')._url).must_equal '/orders'
         end
 
         it 'only expands known variables' do
           link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
-          link._expand(unknown: '1', id: '2')._url.must_equal '/orders?id=2'
+          _(link._expand(unknown: '1', id: '2')._url).must_equal '/orders?id=2'
         end
 
         it 'only expands templated links' do
           link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => false }, entry_point)
-          link._expand(id: '1')._url.must_equal '/orders{?id}'
+          _(link._expand(id: '1')._url).must_equal '/orders{?id}'
         end
       end
     end
@@ -96,36 +96,36 @@ module Hyperclient
       it 'expands an uri template without variables' do
         link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
 
-        link._url.must_equal '/orders'
+        _(link._url).must_equal '/orders'
       end
 
       it 'expands an uri template with variables' do
         link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, id: 1)
 
-        link._url.must_equal '/orders?id=1'
+        _(link._url).must_equal '/orders?id=1'
       end
 
       it 'does not expand an uri template with unknown variables' do
         link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, unknown: 1)
 
-        link._url.must_equal '/orders'
+        _(link._url).must_equal '/orders'
       end
 
       it 'only expands known variables in a uri template' do
         link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, unknown: 1, id: 2)
 
-        link._url.must_equal '/orders?id=2'
+        _(link._url).must_equal '/orders?id=2'
       end
 
       it 'returns the link when no uri template' do
         link = Link.new('key', { 'href' => '/orders' }, entry_point)
-        link._url.must_equal '/orders'
+        _(link._url).must_equal '/orders'
       end
 
       it 'aliases to_s to _url' do
         link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, id: 1)
 
-        link.to_s.must_equal '/orders?id=1'
+        _(link.to_s).must_equal '/orders?id=1'
       end
     end
 
@@ -151,7 +151,7 @@ module Hyperclient
           stub.get('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._get.must_be_kind_of Resource
+        _(link._get).must_be_kind_of Resource
       end
 
       it 'raises exceptions by default' do
@@ -161,7 +161,7 @@ module Hyperclient
           stub.get('http://api.example.org/productions/1') { [400, {}, nil] }
         end
 
-        -> { link._get }.must_raise Faraday::ClientError
+        _(-> { link._get }).must_raise Faraday::ClientError
       end
     end
 
@@ -173,7 +173,7 @@ module Hyperclient
           stub.options('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._options.must_be_kind_of Resource
+        _(link._options).must_be_kind_of Resource
       end
     end
 
@@ -185,7 +185,7 @@ module Hyperclient
           stub.head('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._head.must_be_kind_of Resource
+        _(link._head).must_be_kind_of Resource
       end
     end
 
@@ -197,7 +197,7 @@ module Hyperclient
           stub.delete('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._delete.must_be_kind_of Resource
+        _(link._delete).must_be_kind_of Resource
       end
     end
 
@@ -209,7 +209,7 @@ module Hyperclient
           stub.post('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._post('foo' => 'bar').must_be_kind_of Resource
+        _(link._post('foo' => 'bar')).must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
@@ -217,7 +217,7 @@ module Hyperclient
           stub.post('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._post.must_be_kind_of Resource
+        _(link._post).must_be_kind_of Resource
       end
     end
 
@@ -229,7 +229,7 @@ module Hyperclient
           stub.put('http://api.example.org/productions/1', '{"foo":"bar"}') { [200, {}, nil] }
         end
 
-        link._put('foo' => 'bar').must_be_kind_of Resource
+        _(link._put('foo' => 'bar')).must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
@@ -237,7 +237,7 @@ module Hyperclient
           stub.put('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._put.must_be_kind_of Resource
+        _(link._put).must_be_kind_of Resource
       end
     end
 
@@ -249,7 +249,7 @@ module Hyperclient
           stub.patch('http://api.example.org/productions/1', '{"foo":"bar"}') { [200, {}, nil] }
         end
 
-        link._patch('foo' => 'bar').must_be_kind_of Resource
+        _(link._patch('foo' => 'bar')).must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
@@ -257,7 +257,7 @@ module Hyperclient
           stub.patch('http://api.example.org/productions/1') { [200, {}, nil] }
         end
 
-        link._patch.must_be_kind_of Resource
+        _(link._patch).must_be_kind_of Resource
       end
     end
 
@@ -265,8 +265,8 @@ module Hyperclient
       it 'outputs a custom-friendly output' do
         link = Link.new('key', { 'href' => '/productions/1' }, 'foo')
 
-        link.inspect.must_include 'Link'
-        link.inspect.must_include '"href"=>"/productions/1"'
+        _(link.inspect).must_include 'Link'
+        _(link.inspect).must_include '"href"=>"/productions/1"'
       end
     end
 
@@ -279,8 +279,8 @@ module Hyperclient
             stub.get('http://api.example.org/orders') { [200, {}, { '_embedded' => { 'orders' => [{ 'id' => 1 }] } }] }
           end
 
-          resource.orders._embedded.orders.first.id.must_equal 1
-          resource.orders.first.id.must_equal 1
+          _(resource.orders._embedded.orders.first.id).must_equal 1
+          _(resource.orders.first.id).must_equal 1
         end
 
         it 'can handle false values in the response' do
@@ -290,7 +290,7 @@ module Hyperclient
             stub.get('http://api.example.org/orders') { [200, {}, { 'any' => false }] }
           end
 
-          resource.orders.any.must_equal false
+          _(resource.orders.any).must_equal false
         end
 
         it "doesn't delegate when link key doesn't match" do
@@ -300,8 +300,8 @@ module Hyperclient
             stub.get('http://api.example.org/orders') { [200, {}, { '_embedded' => { 'orders' => [{ 'id' => 1 }] } }] }
           end
 
-          resource.foos._embedded.orders.first.id.must_equal 1
-          resource.foos.first.must_be_nil
+          _(resource.foos._embedded.orders.first.id).must_equal 1
+          _(resource.foos.first).must_be_nil
         end
 
         it 'backtracks when navigating links' do
@@ -311,7 +311,7 @@ module Hyperclient
             stub.get('http://api.example.org/page2') { [200, {}, { '_links' => { 'next' => { 'href' => 'http://api.example.org/page3' } } }] }
           end
 
-          resource.next._links.next._url.must_equal 'http://api.example.org/page3'
+          _(resource.next._links.next._url).must_equal 'http://api.example.org/page3'
         end
       end
 
@@ -335,18 +335,18 @@ module Hyperclient
         end
 
         it 'raises an error when the method does not exist in the resource' do
-          -> { link.this_method_does_not_exist }.must_raise NoMethodError
+          _(-> { link.this_method_does_not_exist }).must_raise NoMethodError
         end
 
         it 'responds to missing methods' do
           resource.expects(:respond_to?).with('orders').returns(false)
           resource.expects(:respond_to?).with('embedded').returns(true)
-          link.respond_to?(:embedded).must_equal true
+          _(link.respond_to?(:embedded)).must_equal true
         end
 
         it 'does not delegate to_ary to resource' do
           resource.expects(:to_ary).never
-          [[link, link]].flatten.must_equal [link, link]
+          _([[link, link]].flatten).must_equal [link, link]
         end
       end
     end

data/test/hyperclient/resource_collection_test.rb

@@ -14,21 +14,21 @@ module Hyperclient
     end
 
     it 'is a collection' do
-      ResourceCollection.ancestors.must_include Collection
+      _(ResourceCollection.ancestors).must_include Collection
     end
 
     it 'initializes the collection with resources' do
-      resources.must_respond_to :author
-      resources.must_respond_to :episodes
+      _(resources).must_respond_to :author
+      _(resources).must_respond_to :episodes
     end
 
     it 'returns resource objects for each resource' do
-      resources.author.must_be_kind_of Resource
+      _(resources.author).must_be_kind_of Resource
     end
 
     it 'also builds arras of resource' do
-      resources.episodes.must_be_kind_of Array
-      resources.episodes.first.must_be_kind_of Resource
+      _(resources.episodes).must_be_kind_of Array
+      _(resources.episodes.first).must_be_kind_of Resource
     end
   end
 end

data/test/hyperclient/resource_test.rb

@@ -29,7 +29,7 @@ module Hyperclient
 
         resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-        resource._response.must_equal mock_response
+        _(resource._response).must_equal mock_response
       end
 
       it 'does not mutate the response.body' do
@@ -38,7 +38,7 @@ module Hyperclient
 
         resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-        resource._response.body.must_equal body
+        _(resource._response.body).must_equal body
       end
 
       describe 'with an empty body in response' do
@@ -47,23 +47,24 @@ module Hyperclient
 
           resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-          resource._response.must_equal mock_response
+          _(resource._response).must_equal mock_response
         end
       end
 
       describe 'with an invalid representation' do
         it 'raises an InvalidRepresentationError' do
-          proc { Resource.new('invalid representation data', entry_point) }.must_raise InvalidRepresentationError
+          _(proc { Resource.new('invalid representation data', entry_point) }).must_raise InvalidRepresentationError
         end
       end
     end
 
     describe '_links' do
       it '_expand' do
-        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } }, entry_point)
-        resource._links.orders._expand(id: 1)._url.must_equal '/orders/1'
-        resource.orders._expand(id: 1)._url.must_equal '/orders/1'
-        resource.orders(id: 1)._url.must_equal '/orders/1'
+        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } },
+                                entry_point)
+        _(resource._links.orders._expand(id: 1)._url).must_equal '/orders/1'
+        _(resource.orders._expand(id: 1)._url).must_equal '/orders/1'
+        _(resource.orders(id: 1)._url).must_equal '/orders/1'
       end
     end
 
@@ -74,84 +75,84 @@ module Hyperclient
 
       describe 'links' do
         it 'returns a LinkCollection' do
-          resource._links.must_be_kind_of LinkCollection
+          _(resource._links).must_be_kind_of LinkCollection
         end
       end
 
       describe 'attributes' do
         it 'returns a Attributes' do
-          resource._attributes.must_be_kind_of Attributes
+          _(resource._attributes).must_be_kind_of Attributes
         end
       end
 
       describe 'embedded' do
         it 'returns a ResourceCollection' do
-          resource._embedded.must_be_kind_of ResourceCollection
+          _(resource._embedded).must_be_kind_of ResourceCollection
         end
       end
 
       describe 'method_missing' do
         it 'delegates to attributes' do
           resource._attributes.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to links' do
           resource._links.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to embedded' do
           resource._embedded.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to attributes, links, embedded' do
           resource._attributes.expects('respond_to?').with('foo').returns(false)
           resource._links.expects('respond_to?').with('foo').returns(false)
           resource._embedded.expects('respond_to?').with('foo').returns(false)
-          -> { resource.foo }.must_raise NoMethodError
+          _(-> { resource.foo }).must_raise NoMethodError
         end
 
         it 'delegates []' do
           resource._attributes.expects(:foo).returns('bar')
-          resource['foo'].must_equal 'bar'
+          _(resource['foo']).must_equal 'bar'
         end
 
         describe '#fetch' do
           it 'returns the value for keys that exist' do
             resource._attributes.expects(:foo).returns('bar')
 
-            resource.fetch('foo').must_equal 'bar'
+            _(resource.fetch('foo')).must_equal 'bar'
           end
 
           it 'raises an error for missing keys' do
-            proc { resource.fetch('missing key') }.must_raise KeyError
+            _(proc { resource.fetch('missing key') }).must_raise KeyError
           end
 
           describe 'with a default value' do
             it 'returns the value for keys that exist' do
               resource._attributes.expects(:foo).returns('bar')
-              resource.fetch('foo', 'default value').must_equal 'bar'
+              _(resource.fetch('foo', 'default value')).must_equal 'bar'
             end
 
             it 'returns the default value for missing keys' do
-              resource.fetch('missing key', 'default value').must_equal 'default value'
+              _(resource.fetch('missing key', 'default value')).must_equal 'default value'
             end
           end
 
           describe 'with a block' do
             it 'returns the value for keys that exist' do
               resource._attributes.expects(:foo).returns('bar')
-              resource.fetch('foo') { 'default value' }.must_equal 'bar'
+              _(resource.fetch('foo') { 'default value' }).must_equal 'bar'
             end
 
             it 'returns the value from the block' do
-              resource.fetch('z') { 'go fish!' }.must_equal 'go fish!'
+              _(resource.fetch('z') { 'go fish!' }).must_equal 'go fish!'
             end
 
             it 'returns the value with args from the block' do
-              resource.fetch('z') { |el| "go fish, #{el}" }.must_equal 'go fish, z'
+              _(resource.fetch('z') { |el| "go fish, #{el}" }).must_equal 'go fish, z'
             end
           end
         end
@@ -179,7 +180,7 @@ module Hyperclient
         end
 
         it 'proxies to the response object' do
-          resource._success?.must_equal true
+          _(resource._success?).must_equal true
         end
       end
 
@@ -189,7 +190,7 @@ module Hyperclient
         end
 
         it 'returns nil' do
-          resource._success?.must_be_nil
+          _(resource._success?).must_be_nil
         end
       end
     end
@@ -205,7 +206,7 @@ module Hyperclient
         end
 
         it 'proxies to the response object' do
-          resource._status.must_equal 200
+          _(resource._status).must_equal 200
         end
       end
 
@@ -215,7 +216,7 @@ module Hyperclient
         end
 
         it 'returns nil' do
-          resource._status.must_be_nil
+          _(resource._status).must_be_nil
         end
       end
     end

data/test/hyperclient_test.rb

@@ -13,30 +13,29 @@ describe Hyperclient do
       let(:client) do
         Hyperclient.new('http://api.example.org') do |client|
           client.connection(default: true) do |conn|
-            conn.use Faraday::Request::OAuth
+            conn.use Faraday::Request::Instrumentation
           end
           client.headers['Access-Token'] = 'token'
         end
       end
 
       it 'creates a Faraday connection with the default and additional headers' do
-        client.headers['Content-Type'].must_equal 'application/hal+json'
-        client.headers['Accept'].must_equal 'application/hal+json,application/json'
-        client.headers['Access-Token'].must_equal 'token'
+        _(client.headers['Content-Type']).must_equal 'application/hal+json'
+        _(client.headers['Accept']).must_equal 'application/hal+json,application/json'
+        _(client.headers['Access-Token']).must_equal 'token'
       end
 
       it 'creates a Faraday connection with the entry point url' do
-        client.connection.url_prefix.to_s.must_equal 'http://api.example.org/'
+        _(client.connection.url_prefix.to_s).must_equal 'http://api.example.org/'
       end
 
       it 'creates a Faraday connection with the default block plus any additional handlers' do
         handlers = client.connection.builder.handlers
-        handlers.must_include Faraday::Request::OAuth
-        handlers.must_include Faraday::Response::RaiseError
-        handlers.must_include FaradayMiddleware::FollowRedirects
-        handlers.must_include FaradayMiddleware::EncodeHalJson
-        handlers.must_include FaradayMiddleware::ParseHalJson
-        handlers.must_include Faraday::Adapter::NetHttp
+        _(handlers).must_include Faraday::Request::Instrumentation
+        _(handlers).must_include Faraday::Response::RaiseError
+        _(handlers).must_include Faraday::FollowRedirects::Middleware
+        _(handlers).must_include Faraday::HalJson::Request
+        _(handlers).must_include Faraday::HalJson::Response
       end
     end
   end

data/test/test_helper.rb

@@ -1,13 +1,36 @@
 $LOAD_PATH << 'lib'
 
+if ENV['COVERAGE']
+  require 'simplecov'
+  require 'simplecov-lcov'
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.report_with_single_file = true
+    c.lcov_file_name = 'lcov.info'
+    c.single_report_path = 'coverage/lcov.info'
+  end
+  SimpleCov.start do
+    add_filter '/test/'
+    add_filter '/features/'
+  end
+end
+
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/setup'
+require 'minitest/unit'
+require 'mocha/minitest'
 require 'json'
 
-MiniTest::Test.class_eval do
+require 'faraday'
+require 'faraday/request/instrumentation'
+
+MiniTest::Assertions.class_eval do
   def stub_request(conn, adapter_class = Faraday::Adapter::Test, &stubs_block)
     adapter_handler = conn.builder.handlers.find { |h| h.klass < Faraday::Adapter }
-    conn.builder.swap(adapter_handler, adapter_class, &stubs_block)
+    if adapter_handler
+      conn.builder.swap(adapter_handler, adapter_class, &stubs_block)
+    else
+      conn.builder.adapter adapter_class, &stubs_block
+    end
   end
 end