allow headers to override

docs/index.html

@@ -174,6 +174,12 @@ <h3>Meta</h3>
         <h4 id="uri-encoded">URI-encoded bucket/keys</h4>
 
         <p>An option (<code>Meta</code> property) <code>encodeUri</code> can be set to <code>true</code> when you want to have your bucket and key URI-encoded. The default is <code>false</code> because <code>Meta</code> is implementation-agnostic, and this only makes sense for HTTP clients.</p>
+
+        <h4 id="headers">HTTP headers</h4>
+
+        <p>You can pass in a <code>headers</code> options that will override any previously set header. Useful to set other headers if you have a reverse proxy sitting between node and Riak. <em>Use with caution</em>.</p>
+
+        <pre><code>db.get('flights', 'KLM-5034', { headers: { Authorization: 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==' } })</code></pre>
 
         <h4>Content detection</h4>
 

spec/test_http_meta.coffee

@@ -43,18 +43,24 @@ vows.describe('Meta for HTTP').addBatch(
       assert.equal meta.contentType, 'text/rtf'
       assert.equal meta.path, '/riak/bucket/key'
 
-  'a meta with some properties':
+  'a meta with some properties and headers':
     topic: ->
       meta = new Meta 'bucket', 'key', {
         links: [{ bucket: 'test', key: 'doc%2$@', tag: 'next' }]
         fire: true
+        overridable: true
+        headers: { Authorization: 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==', 'X-Riak-Meta-overridable': 'yes!' }
       }
       meta.toHeaders()
 
     'parses them correctly': (headers) ->
       assert.notEqual headers.statusCode?
       assert.equal headers['X-Riak-Meta-fire'], 'true'
       assert.equal headers['Link'], '</riak/test/doc%252%24%40>; riaktag="next"'
+
+    'overrides them correctly': (headers) ->
+      assert.equal headers['X-Riak-Meta-overridable'], 'yes!'
+      assert.equal headers['Authorization'], 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=='
 
   'a meta partly loaded with POST response headers':
     topic: ->

src/http_client.coffee

@@ -198,9 +198,9 @@ class HttpClient extends Client
   # private
 
   execute: (verb, meta, callback) ->
-
+    
     meta.method = verb.toUpperCase()
-    meta.headers = meta.toHeaders()
+    meta.headers = meta.toHeaders()    
     Client.log "#{meta.method} #{meta.path}", meta
 
     request = http.request meta, (response) =>

src/http_meta.coffee

@@ -65,6 +65,7 @@ class Meta extends CoreMeta
     # ignored info: binary, raw, url, path
 
   toHeaders: ->
+
     headers = {}
 
     # remove client id if there's no vclock
@@ -89,7 +90,11 @@ class Meta extends CoreMeta
       # don't send chunked data at least until riak #278 gets fixed or we can stream the req body
       headers['Content-Length'] =
         if @data instanceof Buffer then @data.length else Buffer.byteLength(@data)
-
+
+    if @headers
+      for k of @headers then headers[k] = @headers[k]
+      delete @headers
+
     return headers
 
   doEncodeUri: (component = '') ->

src/meta.coffee

@@ -8,7 +8,7 @@ class Meta
     if arguments.length is 1 and bucket instanceof Object
       options = bucket # (in case the first arg is an object)
       [bucket, key] = [options.bucket, options.key]
-
+      
     @load options      
     @bucket = bucket
     @key = key    
@@ -93,7 +93,7 @@ class Meta
     options.links = [options.links] if options?.links and not Array.isArray(options.links)
 
     @usermeta = options?.usermeta or {} # get previous usermeta
-    @usermeta = Utils.mixin true, @usermeta, defaults, this, options
+    @usermeta = Utils.mixin true, @usermeta, defaults, this, options    
     delete @usermeta.usermeta # remove old, mixed-in usermeta
 
     props = Utils.uniq Meta.riakProperties
@@ -106,10 +106,7 @@ class Meta
         this[key] = value
       else
         delete this[key]
-
-    # remove useless props that are not popped out and remain in usermeta
-    delete @usermeta.headers
-    delete @usermeta.agent
+
 
   # Pull the value at the given key from the given object, and then removes
   # it from the object.
@@ -163,6 +160,7 @@ Meta.riakProperties = [
   'range'
   'contentRange'
   'acceptRanges'
+  'headers' # http, we want to keep these so that users can override headers
 ]
 
 # Defaults for Meta properties