hyperclient 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743f6bc67f84cca3d8e2994ad47a38d7e031a300
-  data.tar.gz: 689b06b2eb057ca7bd28e74071ecca60ba954344
+  metadata.gz: 0fef7b6957e239321aff88f157c57b669cdaa388
+  data.tar.gz: 5e1fc8350dbd97205743d716146a4b148202034e
 SHA512:
-  metadata.gz: 17ea7ceb37ecc125395b13d37caf7e134b7b9ef1e21ee258a1d92309f2cc3fadbe398916c3642b50cda8ccd62260b57d5eea3b38f786c4c03a2fea5a97f6e1f2
-  data.tar.gz: 1f5b27c757676834dfb1aaa33741b7be19ce09e9822c869f4ecabcaceeaac868799eb96a92e0b4ecdc0290e807a0fc6fff6cba924f2270ef0e01204cb8e08e77
+  metadata.gz: 8f005fb328d44e78d11d443184361a8709422977c10a574ef98d8a21694acb72930058ca05075d06baa5290be17502060f5efe09b9d604264f2d9f8a26ec9171
+  data.tar.gz: 7c587f7c4abfc82e571b3dc8a3b571521d13c077a84d12aca7497777b894630b648adf87e296e2f3f2d4806c3ed31a91152d8ced262f0dc9305a8f6814485da0

data/CHANGELOG.md

@@ -1,6 +1,9 @@
-### Next
+### 0.7.0 (February 23, 2015)
 
-* Your contribution here.
+This version introduces several backwards incompatible changes. See [UPGRADING](UPGRADING.md) for details.
+
+* [#80](https://github.com/codegram/hyperclient/pull/80): Faraday options can be passed to the connection on initialization - [@koenpunt](https://github.com/koenpunt).
+* [#81](https://github.com/codegram/hyperclient/pull/81): The default Content-Type is now `application/hal+json` - [@koenpunt](https://github.com/koenpunt).
 
 ### 0.6.1 (October 17, 2014)
 

data/Gemfile

@@ -13,4 +13,4 @@ gem 'redcarpet'
 gem 'yard', '~> 0.8'
 gem 'yard-tomdoc'
 gem 'simplecov', require: false
-gem 'rubocop', '~> 0.26.0', require: false
+gem 'rubocop', '~> 0.27.0', require: false

data/README.md

@@ -1,8 +1,10 @@
 # Hyperclient
 
-[![Build Status](https://secure.travis-ci.org/codegram/hyperclient.png)](http://travis-ci.org/codegram/hyperclient)
-[![Dependency Status](https://gemnasium.com/codegram/hyperclient.png)](http://gemnasium.com/codegram/hyperclient)
-[![Code Climate](https://codeclimate.com/github/codegram/hyperclient.png)](https://codeclimate.com/github/codegram/hyperclient)
+[![Gem Version](http://img.shields.io/gem/v/hyperclient.svg)](http://badge.fury.io/rb/hyperclient)
+[![Build Status](http://img.shields.io/travis/codegram/hyperclient.svg)](https://travis-ci.org/codegram/hyperclient)
+[![Dependency Status](https://gemnasium.com/codegram/hyperclient.svg)](https://gemnasium.com/codegram/hyperclient)
+[![Code Climate](https://codeclimate.com/github/codegram/hyperclient.svg)](https://codeclimate.com/github/codegram/hyperclient)
+[![Coverage Status](https://img.shields.io/coveralls/codegram/hyperclient.svg)](https://coveralls.io/r/codegram/hyperclient?branch=master)
 
 Hyperclient is a Hypermedia API client written in Ruby. It fully supports [JSON HAL](http://stateless.co/hal_specification.html).
 
@@ -20,7 +22,7 @@ require 'hyperclient'
 api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api')
 ```
 
-By default, Hyperclient adds `application/json` as `Content-Type` and `Accept` headers. It will also send requests as JSON and parse JSON responses. Specify additional headers or authentication if necessary.
+By default, Hyperclient adds `application/hal+json` as `Content-Type` and `Accept` headers. It will also send requests as JSON and parse JSON responses. Specify additional headers or authentication if necessary.
 
 ```ruby
 api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
@@ -38,6 +40,24 @@ api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
 end
 ```
 
+You can pass options to the Faraday connection block in the `connection` block:
+
+```ruby
+api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
+  client.connection(ssl: { verify: false }) do |conn|
+    conn.use Faraday::Request::OAuth
+  end
+end
+```
+
+Or when using the default connection configuration you can use `faraday_options`:
+
+```ruby
+api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
+  client.faraday_options = { ssl: { verify: false } }
+end
+```
+
 You can build a new Faraday connection block without inheriting default middleware by specifying `default: false` in the `connection` block.
 
 ```ruby
@@ -170,6 +190,7 @@ describe Acme::Api do
   let(:client) do
     Hyperclient.new('http://example.org/api') do |client|
       client.connection(default: false) do |conn|
+        conn.request :json
         conn.response :json
         conn.use Faraday::Adapter::Rack, app
       end

data/UPGRADING.md

@@ -1,6 +1,19 @@
 Upgrading Hyperclient
 =====================
 
+### Upgrading to >= 0.7.0
+
+#### Changes in default headers
+
+The default `Content-Type` is now `application/hal+json` and the `Accept` header includes `application/hal+json` as well.
+If your API only accepts `application/json` as Content-Type, you can override the default headers in the client initialization block as such:
+
+```rb
+Hyperclient.new('https://api.example.org/') do |client|
+  client.headers = { 'Content-Type' => 'application/json', 'Accept' => 'application/json,application/hal+json' }
+end
+```
+
 ### Upgrading to >= 0.6.0
 
 #### Changes in HTTP Error Handling

data/features/steps/default_config.rb

@@ -6,7 +6,9 @@ class Spinach::Features::DefaultConfig < Spinach::FeatureSteps
   end
 
   step 'the request should have been sent with the correct JSON headers' do
-    assert_requested :get, 'api.example.org', headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
+    assert_requested :get, 'api.example.org', headers: {
+      'Content-Type' => 'application/hal+json', 'Accept' => 'application/hal+json,application/json'
+    }
   end
 
   step 'I send some data to the API' do

data/features/support/api.rb

@@ -5,9 +5,9 @@ module API
   include Spinach::Fixtures
 
   before do
-    stub_request(:any, %r{api.example.org*}).to_return(body: root_response, headers: { 'Content-Type' => 'application/json' })
-    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response, headers: { 'Content-Type' => 'application/json' })
-    stub_request(:get, 'api.example.org/posts/1').to_return(body: post_response, headers: { 'Content-Type' => 'application/json' })
+    stub_request(:any, %r{api.example.org*}).to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/1').to_return(body: post_response, headers: { 'Content-Type' => 'application/hal+json' })
   end
 
   def api

data/hyperclient.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '~> 0.8'
   gem.add_dependency 'futuroscope', '>= 0.0.10'
   gem.add_dependency 'faraday_middleware', '~> 0.9'
+  gem.add_dependency 'faraday_hal_middleware', '~> 0.0.1'
   gem.add_dependency 'uri_template', '~> 0.5'
   gem.add_dependency 'net-http-digest_auth', '~> 1.2'
   gem.add_dependency 'faraday-digestauth', '~> 0.2'

data/lib/hyperclient/entry_point.rb

@@ -1,5 +1,6 @@
 require 'hyperclient/link'
 require 'faraday_middleware'
+require 'faraday_hal_middleware'
 require_relative '../faraday/connection'
 
 module Hyperclient
@@ -20,7 +21,7 @@ module Hyperclient
   #  client = Hyperclient::EntryPoint.new('http://my.api.org')
   #
   #  client = Hyperclient::EntryPoint.new('http://my.api.org') do |entry_point|
-  #    entry_point.connection(default: true) do |conn|
+  #    entry_point.connection do |conn|
   #      conn.use Faraday::Request::OAuth
   #    end
   #    entry_point.headers['Access-Token'] = 'token'
@@ -47,22 +48,31 @@ module Hyperclient
     #  default   - Set to true to reuse default Faraday connection options.
     #
     # Returns a Faraday::Connection.
-    def connection(options = { default: true }, &block)
+    def connection(options = {}, &block)
+      @faraday_options ||= options.dup
       if block_given?
         fail ConnectionAlreadyInitializedError if @connection
-        if options[:default]
+        if @faraday_options.delete(:default) == false
+          @faraday_block = block
+        else
           @faraday_block = lambda do |conn|
             default_faraday_block.call conn
             block.call conn
           end
-        else
-          @faraday_block = block
         end
       else
-        @connection ||= Faraday.new(_url, { headers: headers }, &faraday_block)
+        @connection ||= Faraday.new(_url, faraday_options, &faraday_block)
       end
     end
 
+    # Public: Headers included with every API request.
+    #
+    # Returns a Hash.
+    def headers
+      return @connection.headers if @connection
+      @headers ||= default_headers
+    end
+
     # Public: Set headers.
     #
     # value    - A Hash containing headers to include with every API request.
@@ -71,12 +81,19 @@ module Hyperclient
       @headers = value
     end
 
-    # Public: Headers included with every API request.
+    # Public: Options passed to Faraday
     #
     # Returns a Hash.
-    def headers
-      return @connection.headers if @connection
-      @headers ||= default_headers
+    def faraday_options
+      (@faraday_options ||= {}).merge(headers: headers)
+    end
+
+    # Public: Set Faraday connection options.
+    #
+    # value    - A Hash containing options to pass to Faraday
+    def faraday_options=(value)
+      fail ConnectionAlreadyInitializedError if @connection
+      @faraday_options = value
     end
 
     # Public: Faraday block used with every API request.
@@ -109,8 +126,8 @@ module Hyperclient
       lambda do |conn|
         conn.use Faraday::Response::RaiseError
         conn.use FaradayMiddleware::FollowRedirects
-        conn.request :json
-        conn.response :json, content_type: /\bjson$/
+        conn.request :hal_json
+        conn.response :hal_json, content_type: /\bjson$/
         conn.adapter :net_http
       end
     end
@@ -120,7 +137,7 @@ module Hyperclient
     #
     # Returns a Hash.
     def default_headers
-      { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
+      { 'Content-Type' => 'application/hal+json', 'Accept' => 'application/hal+json,application/json' }
     end
   end
 end

data/lib/hyperclient/version.rb

@@ -1,3 +1,3 @@
 module Hyperclient
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/test/hyperclient/entry_point_test.rb

@@ -14,8 +14,8 @@ module Hyperclient
         end
 
         it 'creates a Faraday connection with the default headers' do
-          entry_point.headers['Content-Type'].must_equal 'application/json'
-          entry_point.headers['Accept'].must_equal 'application/json'
+          entry_point.headers['Content-Type'].must_equal 'application/hal+json'
+          entry_point.headers['Accept'].must_equal 'application/hal+json,application/json'
         end
 
         it 'can update headers after a connection has been constructed' do
@@ -35,8 +35,8 @@ module Hyperclient
           handlers = entry_point.connection.builder.handlers
           handlers.must_include Faraday::Response::RaiseError
           handlers.must_include FaradayMiddleware::FollowRedirects
-          handlers.must_include FaradayMiddleware::EncodeJson
-          handlers.must_include FaradayMiddleware::ParseJson
+          handlers.must_include FaradayMiddleware::EncodeHalJson
+          handlers.must_include FaradayMiddleware::ParseHalJson
           handlers.must_include Faraday::Adapter::NetHttp
         end
 
@@ -57,74 +57,122 @@ module Hyperclient
         end
       end
     end
-  end
 
-  describe 'custom' do
-    let(:entry_point) do
-      EntryPoint.new 'http://my.api.org' do |entry_point|
-        entry_point.connection(default: false) do |conn|
-          conn.request :json
-          conn.response :json, content_type: /\bjson$/
-          conn.adapter :net_http
+    describe 'faraday_options' do
+      let(:entry_point) do
+        EntryPoint.new 'http://my.api.org' do |entry_point|
+          entry_point.faraday_options = { proxy: 'http://my.proxy:8080' }
         end
+      end
 
-        entry_point.headers = {
-          'Content-Type' => 'application/foobar',
-          'Accept' => 'application/foobar'
-        }
+      describe 'connection' do
+        it 'creates a Faraday connection with the entry point url' do
+          entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+        end
+
+        it 'creates a Faraday connection with the default headers' do
+          entry_point.headers['Content-Type'].must_equal 'application/hal+json'
+          entry_point.headers['Accept'].must_equal 'application/hal+json,application/json'
+        end
+
+        it 'creates a Faraday connection with options' do
+          entry_point.connection.proxy.must_be_kind_of Faraday::ProxyOptions
+          entry_point.connection.proxy.uri.to_s.must_equal 'http://my.proxy:8080'
+        end
       end
     end
 
-    describe 'connection' do
-      it 'creates a Faraday connection with the entry point url' do
-        entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+    describe 'options' do
+      let(:entry_point) do
+        EntryPoint.new 'http://my.api.org' do |entry_point|
+          entry_point.connection(proxy: 'http://my.proxy:8080')
+        end
       end
 
-      it 'creates a Faraday connection with non-default headers' do
-        entry_point.headers['Content-Type'].must_equal 'application/foobar'
-        entry_point.headers['Accept'].must_equal 'application/foobar'
-      end
+      describe 'connection' do
+        it 'creates a Faraday connection with the entry point url' do
+          entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+        end
+
+        it 'creates a Faraday connection with the default headers' do
+          entry_point.headers['Content-Type'].must_equal 'application/hal+json'
+          entry_point.headers['Accept'].must_equal 'application/hal+json,application/json'
+        end
 
-      it 'creates a Faraday connection with the default block' do
-        handlers = entry_point.connection.builder.handlers
-        handlers.wont_include Faraday::Response::RaiseError
-        handlers.wont_include FaradayMiddleware::FollowRedirects
-        handlers.must_include FaradayMiddleware::EncodeJson
-        handlers.must_include FaradayMiddleware::ParseJson
-        handlers.must_include Faraday::Adapter::NetHttp
+        it 'creates a Faraday connection with options' do
+          entry_point.connection.proxy.must_be_kind_of Faraday::ProxyOptions
+          entry_point.connection.proxy.uri.to_s.must_equal 'http://my.proxy:8080'
+        end
       end
     end
-  end
 
-  describe 'inherited' do
-    let(:entry_point) do
-      EntryPoint.new 'http://my.api.org' do |entry_point|
-        entry_point.connection(default: true) do |conn|
-          conn.use Faraday::Request::OAuth
+    describe 'custom' do
+      let(:entry_point) do
+        EntryPoint.new 'http://my.api.org' do |entry_point|
+          entry_point.connection(default: false) do |conn|
+            conn.request :json
+            conn.response :json, content_type: /\bjson$/
+            conn.adapter :net_http
+          end
+
+          entry_point.headers = {
+            'Content-Type' => 'application/foobar',
+            'Accept' => 'application/foobar'
+          }
         end
-        entry_point.headers['Access-Token'] = 'token'
       end
-    end
 
-    describe 'connection' do
-      it 'creates a Faraday connection with the default and additional headers' do
-        entry_point.headers['Content-Type'].must_equal 'application/json'
-        entry_point.headers['Accept'].must_equal 'application/json'
-        entry_point.headers['Access-Token'].must_equal 'token'
+      describe 'connection' do
+        it 'creates a Faraday connection with the entry point url' do
+          entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+        end
+
+        it 'creates a Faraday connection with non-default headers' do
+          entry_point.headers['Content-Type'].must_equal 'application/foobar'
+          entry_point.headers['Accept'].must_equal 'application/foobar'
+        end
+
+        it 'creates a Faraday connection with the default block' do
+          handlers = entry_point.connection.builder.handlers
+          handlers.wont_include Faraday::Response::RaiseError
+          handlers.wont_include FaradayMiddleware::FollowRedirects
+          handlers.must_include FaradayMiddleware::EncodeJson
+          handlers.must_include FaradayMiddleware::ParseJson
+          handlers.must_include Faraday::Adapter::NetHttp
+        end
       end
+    end
 
-      it 'creates a Faraday connection with the entry point url' do
-        entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+    describe 'inherited' do
+      let(:entry_point) do
+        EntryPoint.new 'http://my.api.org' do |entry_point|
+          entry_point.connection do |conn|
+            conn.use Faraday::Request::OAuth
+          end
+          entry_point.headers['Access-Token'] = 'token'
+        end
       end
 
-      it 'creates a Faraday connection with the default block plus any additional handlers' do
-        handlers = entry_point.connection.builder.handlers
-        handlers.must_include Faraday::Request::OAuth
-        handlers.must_include Faraday::Response::RaiseError
-        handlers.must_include FaradayMiddleware::FollowRedirects
-        handlers.must_include FaradayMiddleware::EncodeJson
-        handlers.must_include FaradayMiddleware::ParseJson
-        handlers.must_include Faraday::Adapter::NetHttp
+      describe 'connection' do
+        it 'creates a Faraday connection with the default and additional headers' do
+          entry_point.headers['Content-Type'].must_equal 'application/hal+json'
+          entry_point.headers['Accept'].must_equal 'application/hal+json,application/json'
+          entry_point.headers['Access-Token'].must_equal 'token'
+        end
+
+        it 'creates a Faraday connection with the entry point url' do
+          entry_point.connection.url_prefix.to_s.must_equal 'http://my.api.org/'
+        end
+
+        it 'creates a Faraday connection with the default block plus any additional handlers' do
+          handlers = entry_point.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
+        end
       end
     end
   end

data/test/hyperclient/link_test.rb

@@ -108,7 +108,10 @@ module Hyperclient
         Resource.expects(:new)
 
         link = Link.new('key', { 'href' => '/' }, entry_point)
-        stub_request(:get, 'http://api.example.org/').to_return(body: {})
+
+        stub_request(entry_point.connection) do |stub|
+          stub.get('http://api.example.org/') { [200, {}, nil] }
+        end
 
         link._resource
       end
@@ -124,14 +127,20 @@ module Hyperclient
       it 'sends a GET request with the link url' do
         link = Link.new('key', { 'href' => '/productions/1' }, entry_point)
 
-        stub_request(:get, 'http://api.example.org/productions/1').to_return(body: nil)
+        stub_request(entry_point.connection) do |stub|
+          stub.get('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._get.must_be_kind_of Resource
       end
 
       it 'raises exceptions by default' do
         link = Link.new('key', { 'href' => '/productions/1' }, entry_point)
 
-        stub_request(:get, 'http://api.example.org/productions/1').to_return(status: 400)
+        stub_request(entry_point.connection) do |stub|
+          stub.get('http://api.example.org/productions/1') { [400, {}, nil] }
+        end
+
         lambda { link._get }.must_raise Faraday::ClientError
       end
     end
@@ -140,7 +149,10 @@ module Hyperclient
       it 'sends a OPTIONS request with the link url' do
         link = Link.new('key', { 'href' => '/productions/1' }, entry_point)
 
-        stub_request(:options, 'http://api.example.org/productions/1').to_return(body: nil)
+        stub_request(entry_point.connection) do |stub|
+          stub.options('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._options.must_be_kind_of Resource
       end
     end
@@ -148,7 +160,11 @@ module Hyperclient
     describe '_head' do
       it 'sends a HEAD request with the link url' do
         link = Link.new('key', { 'href' => '/productions/1' }, entry_point)
-        stub_request(:head, 'http://api.example.org/productions/1').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.head('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._head.must_be_kind_of Resource
       end
     end
@@ -156,7 +172,11 @@ module Hyperclient
     describe '_delete' do
       it 'sends a DELETE request with the link url' do
         link = Link.new('key', { 'href' => '/productions/1' }, entry_point)
-        stub_request(:delete, 'http://api.example.org/productions/1').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.delete('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._delete.must_be_kind_of Resource
       end
     end
@@ -165,12 +185,20 @@ module Hyperclient
       let(:link) { Link.new('key', { 'href' => '/productions/1' }, entry_point) }
 
       it 'sends a POST request with the link url and params' do
-        stub_request(:post, 'http://api.example.org/productions/1').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.post('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._post('foo' => 'bar').must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
-        stub_request(:post, 'http://api.example.org/productions/1').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.post('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._post.must_be_kind_of Resource
       end
     end
@@ -179,12 +207,20 @@ module Hyperclient
       let(:link) { Link.new('key', { 'href' => '/productions/1' }, entry_point) }
 
       it 'sends a PUT request with the link url and params' do
-        stub_request(:put, 'http://api.example.org/productions/1').with(body: '{"foo":"bar"}').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.put('http://api.example.org/productions/1', '{"foo":"bar"}') { [200, {}, nil] }
+        end
+
         link._put('foo' => 'bar').must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
-        stub_request(:put, 'http://api.example.org/productions/1').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.put('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._put.must_be_kind_of Resource
       end
     end
@@ -193,12 +229,19 @@ module Hyperclient
       let(:link) { Link.new('key', { 'href' => '/productions/1' }, entry_point) }
 
       it 'sends a PATCH request with the link url and params' do
-        stub_request(:patch, 'http://api.example.org/productions/1').with(body: '{"foo":"bar"}').to_return(body: nil)
+
+        stub_request(entry_point.connection) do |stub|
+          stub.patch('http://api.example.org/productions/1', '{"foo":"bar"}') { [200, {}, nil] }
+        end
+
         link._patch('foo' => 'bar').must_be_kind_of Resource
       end
 
       it 'defaults params to an empty hash' do
-        stub_request(:patch, 'http://api.example.org/productions/1').to_return(body: nil)
+        stub_request(entry_point.connection) do |stub|
+          stub.patch('http://api.example.org/productions/1') { [200, {}, nil] }
+        end
+
         link._patch.must_be_kind_of Resource
       end
     end
@@ -216,14 +259,22 @@ module Hyperclient
       describe 'delegation' do
         it 'delegates when link key matches' do
           resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders' } } }, entry_point)
-          stub_request(:get, 'http://api.example.org/orders').to_return(body: { '_embedded' => { 'orders' => [{ 'id' => 1 }] } })
+
+          stub_request(entry_point.connection) do |stub|
+            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
         end
 
         it "doesn't delegate when link key doesn't match" do
           resource = Resource.new({ '_links' => { 'foos' => { 'href' => '/orders' } } }, entry_point)
-          stub_request(:get, 'http://api.example.org/orders').to_return(body: { '_embedded' => { 'orders' => [{ 'id' => 1 }] } })
+
+          stub_request(entry_point.connection) do |stub|
+            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_equal nil
         end
@@ -231,8 +282,11 @@ module Hyperclient
 
       describe 'resource' do
         before do
-          stub_request(:get, 'http://myapi.org/orders')
-            .to_return(body: '{"resource": "This is the resource"}')
+
+          stub_request(entry_point.connection) do |stub|
+            stub.get('http://myapi.org/orders') { [200, {}, '{"resource": "This is the resource"}'] }
+          end
+
           Resource.stubs(:new).returns(resource)
         end
 

data/test/hyperclient_test.rb

@@ -20,8 +20,8 @@ describe Hyperclient do
       end
 
       it 'creates a Faraday connection with the default and additional headers' do
-        client.headers['Content-Type'].must_equal 'application/json'
-        client.headers['Accept'].must_equal 'application/json'
+        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
 
@@ -34,8 +34,8 @@ describe Hyperclient do
         handlers.must_include Faraday::Request::OAuth
         handlers.must_include Faraday::Response::RaiseError
         handlers.must_include FaradayMiddleware::FollowRedirects
-        handlers.must_include FaradayMiddleware::EncodeJson
-        handlers.must_include FaradayMiddleware::ParseJson
+        handlers.must_include FaradayMiddleware::EncodeHalJson
+        handlers.must_include FaradayMiddleware::ParseHalJson
         handlers.must_include Faraday::Adapter::NetHttp
       end
     end

data/test/test_helper.rb

@@ -5,6 +5,14 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'turn'
-require 'webmock/minitest'
 require 'json'
 require 'pry'
+
+MiniTest::Unit::TestCase.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)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperclient
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Oriol Gual
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday_hal_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''