hal-client 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e97fd75dd9bb812c2cdf28bcd0a9a316a94bb71
-  data.tar.gz: d260178d87921fe2031ae62a33952cdbbc7019a7
+  metadata.gz: 4c738c6f35a8c627363d55bde0e10116bf46eb1b
+  data.tar.gz: 32b562905f475064e94fbf2128222292dc44bc4c
 SHA512:
-  metadata.gz: 6cd9c0e7192d66633ec12c0409a4cde8a8b6fb413965671f7590dd9bc77778399da2be2cc229567066a422d317c94eab89e7822869744ade921be700ee1c14f3
-  data.tar.gz: 77e05a49bc31a09950cce202d93936e9eea97c1776229b3d7c43f89e647bafa5618d97a3f099693622f295eecdac0c9cfe55cd3fc751564a1e3f1db60d5ad85c
+  metadata.gz: cf65e375001c9c167d557fe6345c58cdb07d5d70d63da052d7ce82392f9805002cbe6e91c703879fbe3f3c7cede65a2c88a74cf0943fa7fd4e825ad52541a263
+  data.tar.gz: 6749283d49cc6f3aa0ae7f37e5aeda09c08ad875d4206a8250fbac21200ca7afc09e42a6388bdd392bb8e667b88b574751771f1d6275e92892d725a663b9a9c9

data/.gitignore

@@ -18,3 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/examples.txt

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -6,4 +6,7 @@ rvm:
   - "2.1.0"
   - "2.2.0"
   - rbx-2.7
-  
+
+matrix:
+  allow_failures:
+  - rvm: rbx-2.7

data/hal-client.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta"
+  spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "webmock", ["~> 1.17", ">= 1.17.4"]
   spec.add_development_dependency "rspec-collection_matchers"
+  spec.add_development_dependency "pry"
 end

data/lib/hal_client/links_section.rb

@@ -2,6 +2,13 @@ class HalClient
 
   # Encapsulates a "_links" section.
   class LinksSection
+
+    NO_RELATED_RESOURCE = ->(link_rel) {
+      raise KeyError, "No resources are related via `#{link_rel}`"
+    }
+
+    private_constant :NO_RELATED_RESOURCE
+
     # section - json hash for the links section
     # base_url - base URL with which to resolve relative URLs
     def initialize(section, opts={} )
@@ -27,9 +34,7 @@ class HalClient
     # Raises KeyError if the specified link_rel is not present and no
     # default_value or default_proc are provided.
     def hrefs(link_rel, &default_proc)
-      default_proc ||= ->(link_rel){
-        raise KeyError, "No resources are related via `#{link_rel}`"
-      }
+      default_proc ||= NO_RELATED_RESOURCE
 
       return default_proc.call(link_rel) unless section.key? link_rel
 

data/lib/hal_client/representation.rb

@@ -15,6 +15,20 @@ class HalClient
     # https://tools.ietf.org/html/draft-kelly-json-hal-07#section-4.1
     RESERVED_PROPERTIES = ['_links', '_embedded'].freeze
 
+    NO_RELATED_RESOURCE = ->(link_rel) {
+      raise KeyError, "No resources are related via `#{link_rel}`"
+    }
+
+    NO_EMBED_FOUND = ->(link_rel) {
+      raise KeyError, "#{link_rel} embed not found"
+    }
+
+    NO_LINK_FOUND = ->(link_rel, _options) {
+      raise KeyError, "#{link_rel} link not found"
+    }
+
+    private_constant :NO_RELATED_RESOURCE, :NO_EMBED_FOUND, :NO_LINK_FOUND
+
     # Create a new Representation
     #
     # options - name parameters
@@ -145,11 +159,7 @@ class HalClient
     #
     # link_rel - The link rel of interest
     def related?(link_rel)
-      _ = related link_rel
-      true
-
-    rescue KeyError
-      false
+      !!(linked(link_rel) { false } || embedded(link_rel) { false })
     end
     alias_method :has_related?, :related?
 
@@ -166,9 +176,7 @@ class HalClient
     # Raises KeyError if the specified link does not exist
     #   and no default_proc is provided.
     def related(link_rel, options = {}, &default_proc)
-      default_proc ||= ->(link_rel){
-        raise KeyError, "No resources are related via `#{link_rel}`"
-      }
+      default_proc ||= NO_RELATED_RESOURCE
 
       embedded = embedded(link_rel) { nil }
       linked = linked(link_rel, options) { nil }
@@ -231,9 +239,7 @@ class HalClient
     # Raises KeyError if the specified link does not exist
     #   and no default_proc is provided.
     def raw_related_hrefs(link_rel, &default_proc)
-      default_proc ||= ->(link_rel){
-        raise KeyError, "No resources are related via `#{link_rel}`"
-      }
+      default_proc ||= NO_RELATED_RESOURCE
 
       embedded = embedded(link_rel) { nil }
       linked = links.hrefs(link_rel) { nil }
@@ -346,23 +352,19 @@ class HalClient
     end
 
     def embedded(link_rel, &default_proc)
-      default_proc ||= ->(link_rel) {
-        fail KeyError, "#{link_rel} embed not found"
-      }
+      default_proc ||= NO_EMBED_FOUND
 
       relations = embedded_section.fetch(link_rel) { MISSING }
       return default_proc.call(link_rel) if relations == MISSING
 
       (boxed relations).map{|it| Representation.new hal_client: hal_client, parsed_json: it}
 
-    rescue InvalidRepresentationError => err
+    rescue InvalidRepresentationError
       fail InvalidRepresentationError, "/_embedded/#{jpointer_esc(link_rel)} is not a valid representation"
     end
 
-    def linked(link_rel, options, &default_proc)
-      default_proc ||= ->(link_rel,_options) {
-        fail KeyError, "#{link_rel} link not found"
-      }
+    def linked(link_rel, options = {}, &default_proc)
+      default_proc ||= NO_LINK_FOUND
 
       relations = links.hrefs(link_rel) { MISSING }
       return default_proc.call(link_rel, options) if relations == MISSING
@@ -376,7 +378,7 @@ class HalClient
           end }
         .map {|href| Representation.new href: href, hal_client: hal_client }
 
-    rescue InvalidRepresentationError => err
+    rescue InvalidRepresentationError
       fail InvalidRepresentationError, "/_links/#{jpointer_esc(link_rel)} is not a valid link"
     end
 

data/lib/hal_client/version.rb

@@ -1,3 +1,3 @@
 class HalClient
-  VERSION = "3.16.0"
+  VERSION = "3.17.0"
 end

data/lib/hal_client.rb

@@ -44,6 +44,7 @@ class HalClient
     @base_client ||= options[:base_client]
     @logger = options.fetch(:logger, NullLogger.new)
     @timeout = options.fetch(:timeout, Float::INFINITY)
+    @base_client_with_headers = {}
 
     default_message_request_headers.set('Accept', options[:accept]) if
       options[:accept]
@@ -185,7 +186,7 @@ class HalClient
       begin
         Representation.new(hal_client: self, parsed_json: MultiJson.load(resp.to_s),
                            href: location)
-      rescue MultiJson::ParseError, InvalidRepresentationError => e
+      rescue MultiJson::ParseError, InvalidRepresentationError
         if location
           # response doesn't have a HAL body but we know what resource
           # was created so we can be helpful.
@@ -213,13 +214,9 @@ class HalClient
   # options
   #   :override_headers -
   def client_for_get(options={})
-    override_headers = options[:override_headers]
+    headers = default_message_request_headers.merge(options[:override_headers])
 
-    if !override_headers
-      @client_for_get ||= base_client.with_headers(default_message_request_headers)
-    else
-      client_for_get.with_headers(override_headers)
-    end
+    base_client_with_headers(headers)
   end
 
   # Returns the HTTP client to be used to make post requests.
@@ -227,19 +224,24 @@ class HalClient
   # options
   #   :override_headers -
   def client_for_post(options={})
-    override_headers = options[:override_headers]
+    headers = default_entity_and_message_request_headers.merge(options[:override_headers])
 
-    if !override_headers
-      @client_for_post ||=
-        base_client.with_headers(default_entity_and_message_request_headers)
-    else
-      client_for_post.with_headers(override_headers)
-    end
+    base_client_with_headers(headers)
   end
 
   # Returns an HTTP client.
   def base_client
-    @base_client ||= HTTP::Client.new(follow: true)
+    @base_client ||= begin
+      logger.debug 'Created base_client'
+      HTTP::Client.new(follow: true)
+    end
+  end
+
+  def base_client_with_headers(headers)
+    @base_client_with_headers[headers.to_h] ||= begin
+      logger.debug { "Created base_client with headers #{headers.inspect}" }
+      base_client.with_headers(headers)
+    end
   end
 
   attr_reader :default_entity_request_headers, :default_message_request_headers
@@ -249,10 +251,6 @@ class HalClient
       default_message_request_headers.merge(default_entity_request_headers)
   end
 
-  def default_entity_request_headers
-    @default_entity_request_headers
-  end
-
   def entity_header_field?(field_name)
     [:content_type, /^content-type$/i].any?{|pat| pat === field_name}
   end

data/spec/hal_client/collection_spec.rb

@@ -1,8 +1,6 @@
-require_relative "../spec_helper"
-
 require 'hal_client/collection'
 
-describe HalClient::Collection do
+RSpec.describe HalClient::Collection do
   # BACKGROUND
 
   shared_context "multi-item, multi-page" do
@@ -81,7 +79,7 @@ describe HalClient::Collection do
     context do
       include_context "multi-item, multi-page"
 
-      specify { expect { collection.count }.to raise_exception }
+      specify { expect { collection.count }.to raise_exception(NotImplementedError) }
     end
   end
 

data/spec/hal_client/curie_resolver_spec.rb

@@ -1,8 +1,6 @@
-require_relative "../spec_helper"
-
 require 'hal_client/curie_resolver'
 
-describe HalClient::CurieResolver do
+RSpec.describe HalClient::CurieResolver do
   describe "#new" do
     it "takes an array of curie definitions" do
       expect(described_class.new([f_ns, b_ns])).to be_kind_of described_class

data/spec/hal_client/link_spec.rb

@@ -1,10 +1,8 @@
 require 'hal-client'
 
-require_relative "../spec_helper"
-
 require "hal_client/link"
 
-describe HalClient::Link do
+RSpec.describe HalClient::Link do
 
   subject(:link) { described_class.new(rel: rel_1, target: repr_1) }
 

data/spec/hal_client/links_section_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require 'hal-client'
 
-describe HalClient::LinksSection, "namespaces embedded" do
+RSpec.describe HalClient::LinksSection, "namespaces embedded" do
   subject(:section) {
     described_class.new(raw_section,
                         base_url: Addressable::URI.parse("http://example.com/foo"))
@@ -21,7 +20,7 @@ describe HalClient::LinksSection, "namespaces embedded" do
 
   specify { expect(section.hrefs(fully_qualified_second_rel))
             .to contain_exactly "http://example.com/bar", "http://example.com/baz" }
-  
+
   specify { expect(section.hrefs("ns2:second"))
     .to contain_exactly "http://example.com/bar", "http://example.com/baz" }
 
@@ -56,7 +55,7 @@ describe HalClient::LinksSection, "namespaces embedded" do
   end
 end
 
-describe HalClient::LinksSection, "invalid" do
+RSpec.describe HalClient::LinksSection, "invalid" do
   subject(:section) {
     described_class.new(raw_section,
                         base_url: Addressable::URI.parse("http://example.com/"))
@@ -69,4 +68,4 @@ describe HalClient::LinksSection, "invalid" do
     { "bareurl" => "http://example.com/boom" }
   }
 
-end
+end

data/spec/hal_client/representation_editor_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../spec_helper"
 require "hal_client/representation_editor"
 
 RSpec.describe HalClient::RepresentationEditor do

data/spec/hal_client/representation_set_spec.rb

@@ -1,14 +1,12 @@
-require_relative '../spec_helper'
-
 require 'hal_client'
 require 'hal_client/representation'
 require 'hal_client/representation_set'
 
-describe HalClient::RepresentationSet do
+RSpec.describe HalClient::RepresentationSet do
   describe "#new" do
     let!(:return_val) { described_class.new([foo_repr, bar_repr]) }
-    it { should be_kind_of described_class }
-    it { should have(2).items }
+    it { is_expected.to be_kind_of described_class }
+    it { is_expected.to have(2).items }
   end
 
   subject(:repr_set) { described_class.new([foo_repr, bar_repr]) }
@@ -41,25 +39,25 @@ describe HalClient::RepresentationSet do
   describe "#related" do
     context "single target in each member" do
       subject(:returned_val) { repr_set.related("spouse") }
-      it { should include_representation_of "http://example.com/foo-spouse" }
-      it { should include_representation_of "http://example.com/bar-spouse" }
-      it { should have(2).items }
+      it { is_expected.to include_representation_of "http://example.com/foo-spouse" }
+      it { is_expected.to include_representation_of "http://example.com/bar-spouse" }
+      it { is_expected.to have(2).items }
     end
 
     context "multiple targets" do
       subject(:returned_val) { repr_set.related("sibling") }
-      it { should include_representation_of "http://example.com/foo-brother" }
-      it { should include_representation_of "http://example.com/foo-sister" }
-      it { should include_representation_of "http://example.com/bar-brother" }
-      it { should have(3).items }
+      it { is_expected.to include_representation_of "http://example.com/foo-brother" }
+      it { is_expected.to include_representation_of "http://example.com/foo-sister" }
+      it { is_expected.to include_representation_of "http://example.com/bar-brother" }
+      it { is_expected.to have(3).items }
     end
 
     context "templated" do
       subject(:returned_val) { repr_set.related("cousin", distance: "first") }
-      it { should include_representation_of "http://example.com/foo-first-cousin" }
-      it { should include_representation_of "http://example.com/bar-paternal-first-cousin" }
-      it { should include_representation_of "http://example.com/bar-maternal-first-cousin" }
-      it { should have(3).items }
+      it { is_expected.to include_representation_of "http://example.com/foo-first-cousin" }
+      it { is_expected.to include_representation_of "http://example.com/bar-paternal-first-cousin" }
+      it { is_expected.to include_representation_of "http://example.com/bar-maternal-first-cousin" }
+      it { is_expected.to have(3).items }
     end
   end
 

data/spec/hal_client/representation_spec.rb

@@ -1,8 +1,6 @@
-require_relative "../spec_helper"
-
 require "hal_client/representation"
 
-describe HalClient::Representation do
+RSpec.describe HalClient::Representation do
   let(:raw_repr) { <<-HAL }
 { "prop1": 1
   ,"prop2": 2
@@ -176,12 +174,12 @@ HAL
   describe "#fetch" do
     context "for existent property" do
       subject { repr.fetch "prop1" }
-      it { should eq 1 }
+      it { is_expected.to eq 1 }
     end
 
     context "for existent link" do
       subject { repr.fetch "link1" }
-      it { should have(1).item }
+      it { is_expected.to have(1).item }
       it "includes related resource representation" do
         expect(subject.first.href).to eq "http://example.com/bar"
       end
@@ -189,7 +187,7 @@ HAL
 
     context "for existent embedded" do
       subject { repr.fetch "embed1" }
-      it { should have(1).item }
+      it { is_expected.to have(1).item }
       it "includes related resource representation" do
         expect(subject.first.href).to eq "http://example.com/baz"
       end
@@ -203,63 +201,63 @@ HAL
 
     context "non-existent item w/ default value" do
       subject { repr.fetch "wat", "whatevs" }
-      it { should eq "whatevs" }
+      it { is_expected.to eq "whatevs" }
     end
 
     context "non-existent item w/ default value generator" do
       subject { repr.fetch("wat"){|key| key+"gen" } }
-      it { should eq "watgen" }
+      it { is_expected.to eq "watgen" }
     end
   end
 
   describe "#[]" do
     context "for existent property" do
       subject { repr["prop1"] }
-      it { should eq 1 }
+      it { is_expected.to eq 1 }
     end
 
     context "for existent link" do
       subject { repr["link1"] }
-      it { should have(1).item }
-      it { should include_representation_of "http://example.com/bar" }
+      it { is_expected.to have(1).item }
+      it { is_expected.to include_representation_of "http://example.com/bar" }
     end
 
     context "for existent embedded" do
       subject { repr["embed1"] }
-      it { should have(1).item }
-      it { should include_representation_of "http://example.com/baz" }
+      it { is_expected.to have(1).item }
+      it { is_expected.to include_representation_of "http://example.com/baz" }
     end
 
     context "non-existent item w/o default" do
       subject { repr["wat"] }
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 
   describe "#related" do
     context "for existent link" do
       subject { repr.related "link1" }
-      it { should have(1).item }
-      it { should include_representation_of "http://example.com/bar" }
+      it { is_expected.to have(1).item }
+      it { is_expected.to include_representation_of "http://example.com/bar" }
     end
 
     context "for existent compound link" do
       subject { repr.related "link3" }
-      it { should have(2).item }
-      it { should include_representation_of "http://example.com/link3-a" }
-      it { should include_representation_of "http://example.com/link3-b" }
+      it { is_expected.to have(2).item }
+      it { is_expected.to include_representation_of "http://example.com/link3-a" }
+      it { is_expected.to include_representation_of "http://example.com/link3-b" }
     end
 
     context "for existent templated link" do
       subject { repr.related "templated", name: "bob" }
-      it { should have(1).item }
-      it { should include_representation_of "http://example.com/people?name=bob"  }
+      it { is_expected.to have(1).item }
+      it { is_expected.to include_representation_of "http://example.com/people?name=bob"  }
     end
 
     context "for existent embedded" do
       subject { repr.related "embed1" }
-      it { should have(1).item }
-      it { should include_representation_of "http://example.com/baz" }
+      it { is_expected.to have(1).item }
+      it { is_expected.to include_representation_of "http://example.com/baz" }
     end
 
     context "non-existent item w/o default" do
@@ -319,17 +317,17 @@ HAL
 
     describe "#related return value" do
       subject(:return_val) { repr.related("http://example.com/rels/bar") }
-      it { should include_representation_of "http://example.com/bar" }
+      it { is_expected.to include_representation_of "http://example.com/bar" }
     end
 
     describe "#[] return value" do
       subject(:return_val) { repr["http://example.com/rels/bar"] }
-      it { should include_representation_of "http://example.com/bar" }
+      it { is_expected.to include_representation_of "http://example.com/bar" }
     end
 
     describe "#related_hrefs return value" do
       subject(:return_val) { repr.related_hrefs("http://example.com/rels/bar") }
-      it { should include "http://example.com/bar" }
+      it { is_expected.to include "http://example.com/bar" }
     end
   end
 
@@ -347,17 +345,17 @@ HAL
 
     describe "#related return value " do
       subject(:return_val) { repr.related("http://example.com/rels/embed1") }
-      it { should include_representation_of "http://example.com/embed1" }
+      it { is_expected.to include_representation_of "http://example.com/embed1" }
     end
 
     describe "#[] return value " do
       subject(:return_val) { repr["http://example.com/rels/embed1"] }
-      it { should include_representation_of "http://example.com/embed1" }
+      it { is_expected.to include_representation_of "http://example.com/embed1" }
     end
 
     describe "#related_hrefs return value " do
       subject(:return_val) { repr.related_hrefs("http://example.com/rels/embed1") }
-      it { should include "http://example.com/embed1" }
+      it { is_expected.to include "http://example.com/embed1" }
     end
   end
 
@@ -409,8 +407,8 @@ HAL
   end
 
   context "non-collection" do
-    specify { expect{repr.as_enum}.to raise_error }
-    specify { expect{repr.to_enum}.to raise_error }
+    specify { expect{repr.as_enum}.to raise_error(HalClient::NotACollectionError) }
+    specify { expect{repr.to_enum}.to raise_error(HalClient::NotACollectionError) }
   end
 
   # Background
@@ -473,7 +471,7 @@ HAL
 
 end
 
-describe HalClient::Representation, "w/o hal_client" do
+RSpec.describe HalClient::Representation, "w/o hal_client" do
   subject(:repr) { described_class.new(parsed_json: MultiJson.load(raw_repr)) }
 
   specify { expect(subject.href).to eq "http://example.com/foo" }

data/spec/hal_client_spec.rb

@@ -1,17 +1,17 @@
-require_relative "./spec_helper"
 require "hal_client"
+require 'http'
 
-describe HalClient do
+RSpec.describe HalClient do
   describe ".new()" do
     subject { HalClient.new }
-    it { should be_kind_of HalClient }
+    it { is_expected.to be_kind_of HalClient }
   end
 
   subject(:client) { HalClient.new }
 
   describe '.new w/ custom accept' do
     subject { HalClient.new(accept: "application/vnd.myspecialmediatype") }
-    it { should be_kind_of HalClient }
+    it { is_expected.to be_kind_of HalClient }
   end
 
   describe "#get(<url>)" do
@@ -24,7 +24,7 @@ describe HalClient do
 
     describe "request" do
       subject { request }
-      it("should have been made") { should have_been_made }
+      it("should have been made") { is_expected.to have_been_made }
 
       it "sends accept header" do
         expect(request.with(headers: {'Accept' => /application\/hal\+json/i})).
@@ -87,6 +87,43 @@ describe HalClient do
       end
     end
 
+    context "client reuse" do
+      let(:return_val) { nil }
+      let(:base_client) { instance_double('HTTP::Client') }
+      let(:real_client) { HTTP::Client.new }
+      subject(:client) { HalClient.new(base_client: base_client) }
+
+      it 'creates a base client with headers' do
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0')
+
+          real_client
+        end
+
+        client.get "http://example.com/foo"
+      end
+
+      it 'reuses base client with headers instances' do
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0', 'Foo' => 'Bar')
+
+          real_client
+        end.once
+
+        client.get("http://example.com/foo", 'Foo' => 'Bar')
+
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0', 'Hello' => 'World')
+
+          real_client
+        end.once
+
+        client.get("http://example.com/foo", 'Hello' => 'World')
+
+        client.get("http://example.com/foo", 'Foo' => 'Bar')
+        client.get("http://example.com/foo", 'Hello' => 'World')
+      end
+    end
   end
 
   context "server takes too long" do
@@ -173,7 +210,7 @@ describe HalClient do
 
     describe "request" do
       subject { request }
-      it("should have been made") { should have_been_made }
+      it("should have been made") { is_expected.to have_been_made }
 
       it "sends accept header" do
         expect(request.with(headers: {'Accept' => /application\/hal\+json/})).
@@ -211,7 +248,7 @@ describe HalClient do
     describe "request" do
       before do return_val end
       subject { post_request }
-      it("should have been made") { should have_been_made }
+      it("should have been made") { is_expected.to have_been_made }
 
       it "sends content type header" do
         expect(post_request.with(headers: {'Content-Type' => 'application/hal+json'})).
@@ -223,7 +260,7 @@ describe HalClient do
       let(:return_val) { client.post url, post_data, "Content-Type" => "text/plain" }
       before do return_val end
       subject { post_request }
-      it("should have been made") { should have_been_made }
+      it("should have been made") { is_expected.to have_been_made }
 
       it "sends content type header" do
         expect(post_request.with(headers: {'Content-Type' => 'text/plain'})).
@@ -280,6 +317,43 @@ describe HalClient do
         expect(logger.info_entries.first).to include "http://example.com/foo"
       end
     end
+
+    context "client reuse" do
+      let(:base_client) { instance_double('HTTP::Client') }
+      let(:real_client) { HTTP::Client.new }
+      subject(:client) { HalClient.new(base_client: base_client) }
+
+      it 'creates a base client with headers' do
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0')
+
+          real_client
+        end
+
+        client.post(url, post_data)
+      end
+
+      it 'reuses base client with headers instances' do
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0', 'Foo' => 'Bar')
+
+          real_client
+        end.once
+
+        client.post(url, post_data, 'Foo' => 'Bar')
+
+        expect(base_client).to receive(:with_headers) do |headers|
+          expect(headers.to_h).to include('Accept' => 'application/hal+json;q=0', 'Hello' => 'World')
+
+          real_client
+        end.once
+
+        client.post(url, post_data, 'Hello' => 'World')
+
+        client.post(url, post_data, 'Foo' => 'Bar')
+        client.post(url, post_data, 'Hello' => 'World')
+      end
+    end
   end
 
   describe ".post(<url>)" do
@@ -291,7 +365,7 @@ describe HalClient do
 
     describe "request" do
       subject { post_request }
-      it("should have been made") { should have_been_made }
+      it("should have been made") { is_expected.to have_been_made }
 
       it "sends accept header" do
         expect(post_request.with(headers: {'Content-Type' => 'application/hal+json'})).

data/spec/spec_helper.rb

@@ -1,6 +1,78 @@
+# This file was generated by the `rspec --init` command.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4.
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended.
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the n slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 5
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+end
+
+# hal_client-specific additions
+
 $LOAD_PATH << Pathname(__FILE__).dirname + "../lib"
 
-require 'rspec'
 require 'webmock/rspec'
 require 'multi_json'
 require 'rspec/collection_matchers'
@@ -9,4 +81,4 @@ require 'support/custom_matchers'
 
 RSpec.configure do |config|
   config.include CustomMatchers
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hal-client
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: An easy to use interface for REST APIs that use HAL.
 email:
 - pezra@barelyenough.org
@@ -136,6 +150,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -198,4 +213,3 @@ test_files:
 - spec/hal_client_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
-has_rdoc: