Merge pull request #86 from proppy/fix-defaultparams

Fix defaultparams
googleapis · Sep 4, 2013 · bb18e92 · bb18e92
2 parents 642b1ab + 3ede4c2
commit bb18e92
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -16,7 +16,6 @@
 
 var Request = require('./requests.js').Request;
 var BatchRequest = require('./requests.js').BatchRequest;
-var utils = require('./utils.js');
 
 /**
  * Constructs a new client with given API name and version.
@@ -91,11 +90,9 @@ Client.prototype.generateHelper_ = function(methodMeta) {
  * @return {Request} New Request object constructed with given args.
  */
 Client.prototype.newRequest = function(methodMetada, params, opt_resource) {
-  if (this.defaultParams) {
-    params = utils.extend(utils.extend({}, this.defaultParams), params);
-  }
-  return new Request(this.apiMeta, methodMetada, params, opt_resource)
-      .withAuthClient(this.authClient);
+
+  return new Request(this.apiMeta, methodMetada, params, opt_resource,
+                     this.defaultParams).withAuthClient(this.authClient);
 };
 
 /**

diff --git a/lib/requests.js b/lib/requests.js
@@ -16,10 +16,12 @@
 
 var BatchParser = require('./exp/batchparser'),
     DefaultTransporter = require('./transporters.js'),
+    utils = require('./utils.js'),
     querystring = require('querystring'),
     url = require('url'),
     util = require('util');
 
+
 function BaseRequest(apiMeta) {
   this.transporter = new DefaultTransporter();
   this.authClient = null;
@@ -127,7 +129,7 @@ BaseRequest.prototype.handleResponse = function(opt_fn) {
  * @param {object=} opt_resource Optional resource.
  */
 function Request(
-  apiMeta, methodMeta, opt_params, opt_body) {
+  apiMeta, methodMeta, opt_params, opt_body, opt_defaultParams) {
   Request.super_.call(this);
   this.apiMeta = apiMeta;
   this.methodMeta = methodMeta;
@@ -140,6 +142,10 @@ function Request(
     this.params = opt_params || {};
     this.body = opt_body;
   }
+  if (opt_defaultParams) {
+    this.params = utils.extend(utils.extend({}, opt_defaultParams),
+                               this.params);
+  }
 }
 
 /**

diff --git a/tests/test.clients.js b/tests/test.clients.js
@@ -89,4 +89,17 @@ describe('Clients', function() {
       });
   });
 
+  it('should be able to add defaultParams on new requests with no params and a body', function(done) {
+    new googleapis.GoogleApis()
+      .discover('plus', 'v1')
+      .execute(function(err, client) {
+        var req =
+            client.plus.withDefaultParams({a: 1, b: 'foo'}).newRequest('doIt', {has_body: true});
+        assert.equal(1, req.params.a);
+        assert.equal('foo', req.params.b);
+        assert.equal(undefined, req.params.body);
+        assert.equal(true, req.body.has_body);
+        done();
+      });
+  });
 });