hal-client 2.4.0 → 2.5.0

data/lib/hal_client/version.rb

@@ -1,3 +1,3 @@
 class HalClient
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/hal_client.rb

@@ -19,9 +19,13 @@ class HalClient
   #     prepended to the `Accept` header field of each request.
   #   :content_type - a single content type that should be
   #     prepended to the `Content-Type` header field of each request.
+  #   :headers - a hash of other headers to send on each request.
   def initialize(options={})
-    @default_accept = options.fetch(:accept, 'application/hal+json')
-    @default_content_type = options.fetch(:content_type, 'application/hal+json')
+    accept       = options.fetch(:accept, 'application/hal+json')
+    content_type = options.fetch(:content_type, 'application/hal+json')
+    headers      = options.fetch(:headers, {})
+
+    @headers = {accept: accept, content_type: content_type}.merge(headers)
   end
 
   # Returns a `Representation` of the resource identified by `url`.
@@ -50,17 +54,19 @@ class HalClient
 
   protected
 
-  attr_reader :default_accept, :default_content_type
+  attr_reader :headers
 
+  # Exclude headers that shouldn't go with a GET
   def get_options(overrides)
-    { accept: default_accept }.merge overrides
+    @cleansed_get_options ||= headers.dup.tap do |get_headers|
+      get_headers.delete(:content_type)
+    end
+
+    @cleansed_get_options.merge overrides
   end
 
   def post_options(overrides)
-    {
-      accept: default_accept,
-      content_type: default_content_type
-    }.merge overrides
+    headers.merge(overrides)
   end
 
   module EntryPointCovenienceMethods

data/spec/hal_client_spec.rb

@@ -37,6 +37,28 @@ describe HalClient do
           to have_been_made
       end
     end
+
+    context "explicit content type" do
+      subject(:client) { HalClient.new content_type: 'custom' }
+      it "does not send the content type header" do
+        expect(request.with(headers: {'Accept' => 'application/hal+json'})).to have_been_made
+      end
+    end
+
+    context "other headers" do
+      let(:headers) { {"Authorization" => "Bearer f73c04b0970f1deb6005fab53edd1708"} }
+      subject(:client) { HalClient.new headers: headers }
+      it "sends the supplied header" do
+        expect(request.with(headers: headers)).to have_been_made
+      end
+    end
+
+    context "header overrides" do
+      let!(:return_val) { client.get "http://example.com/foo", { "DummyHeader" => "Test" } }
+      it "sends the supplied header" do
+        expect(request.with(headers: { "DummyHeader" => "Test" })).to have_been_made
+      end
+    end
   end
 
   describe ".get(<url>)" do
@@ -83,6 +105,14 @@ describe HalClient do
       end
     end
 
+    context "other headers" do
+      let(:headers) { {"Authorization" => "Bearer f73c04b0970f1deb6005fab53edd1708"} }
+      subject(:client) { HalClient.new headers: headers }
+      it "sends the supplied header" do
+        expect(post_request.with(headers: headers)).to have_been_made
+      end
+    end
+
     context "with no response body" do
       subject { empty_post_request }
       let!(:return_val) { client.post "http://example.com/foo", nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal-client
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1767932783931261453
+      hash: 1272540946785022860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1767932783931261453
+      hash: 1272540946785022860
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23