Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade to the latest common #159

Merged
merged 1 commit into from
Aug 7, 2018
Merged

chore: upgrade to the latest common #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,035 changes: 1,602 additions & 1,433 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"pretest": "npm run compile"
},
"dependencies": {
"@google-cloud/common": "^0.20.3",
"@google-cloud/common": "^0.21.0",
"@google-cloud/paginator": "^0.1.0",
"@google-cloud/promisify": "^0.3.0",
"arrify": "^1.0.0",
"big.js": "^5.1.2",
Expand Down
11 changes: 6 additions & 5 deletions src/dataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

'use strict';

import * as common from '@google-cloud/common';
import {ServiceObject} from '@google-cloud/common';
import {paginator} from '@google-cloud/paginator';
import {promisifyAll} from '@google-cloud/promisify';
import * as extend from 'extend';
import * as is from 'is';
Expand Down Expand Up @@ -205,7 +206,7 @@ function Dataset(bigQuery, id, options) {
setMetadata: true,
};

common.ServiceObject.call(this, {
ServiceObject.call(this, {
parent: bigQuery,
baseUrl: '/datasets',
id: id,
Expand Down Expand Up @@ -237,7 +238,7 @@ function Dataset(bigQuery, id, options) {
});
}

util.inherits(Dataset, common.ServiceObject);
util.inherits(Dataset, ServiceObject);

/**
* Run a query as a job. No results are immediately returned. Instead, your
Expand Down Expand Up @@ -548,7 +549,7 @@ Dataset.prototype.getTables = function(options, callback) {
* this.end();
* });
*/
Dataset.prototype.getTablesStream = common.paginator.streamify('getTables');
Dataset.prototype.getTablesStream = paginator.streamify('getTables');

/**
* Run a query scoped to your dataset.
Expand Down Expand Up @@ -611,7 +612,7 @@ Dataset.prototype.table = function(id, options) {
*
* These methods can be auto-paginated.
*/
common.paginator.extend(Dataset, ['getTables']);
paginator.extend(Dataset, ['getTables']);

/*! Developer Documentation
*
Expand Down
9 changes: 5 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import * as arrify from 'arrify';
import * as Big from 'big.js';
import * as common from '@google-cloud/common';
import {promisifyAll} from '@google-cloud/promisify';
import {paginator} from '@google-cloud/paginator';
import * as extend from 'extend';
var format = require('string-format-obj');
import * as is from 'is';
Expand Down Expand Up @@ -850,7 +851,7 @@ BigQuery.prototype.createQueryJob = function(options, callback) {
* this.end();
* });
*/
BigQuery.prototype.createQueryStream = common.paginator.streamify(
BigQuery.prototype.createQueryStream = paginator.streamify(
'queryAsStream_'
);

Expand Down Expand Up @@ -1109,7 +1110,7 @@ BigQuery.prototype.getDatasets = function(options, callback) {
* this.end();
* });
*/
BigQuery.prototype.getDatasetsStream = common.paginator.streamify(
BigQuery.prototype.getDatasetsStream = paginator.streamify(
'getDatasets'
);

Expand Down Expand Up @@ -1245,7 +1246,7 @@ BigQuery.prototype.getJobs = function(options, callback) {
* this.end();
* });
*/
BigQuery.prototype.getJobsStream = common.paginator.streamify('getJobs');
BigQuery.prototype.getJobsStream = paginator.streamify('getJobs');

/**
* Create a reference to an existing job.
Expand Down Expand Up @@ -1393,7 +1394,7 @@ BigQuery.prototype.queryAsStream_ = function(query, callback) {
*
* These methods can be auto-paginated.
*/
common.paginator.extend(BigQuery, ['getDatasets', 'getJobs']);
paginator.extend(BigQuery, ['getDatasets', 'getJobs']);

/*! Developer Documentation
*
Expand Down
5 changes: 3 additions & 2 deletions src/job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import * as common from '@google-cloud/common';
import {promisifyAll} from '@google-cloud/promisify';
import {paginator} from '@google-cloud/paginator';
import * as extend from 'extend';
import * as is from 'is';
import * as util from 'util';
Expand Down Expand Up @@ -428,7 +429,7 @@ Job.prototype.getQueryResults = function(options, callback) {
* }))
* .pipe(fs.createWriteStream('./test/testdata/testfile.json'));
*/
Job.prototype.getQueryResultsStream = common.paginator.streamify(
Job.prototype.getQueryResultsStream = paginator.streamify(
'getQueryResultsAsStream_'
);

Expand Down Expand Up @@ -478,7 +479,7 @@ Job.prototype.poll_ = function(callback) {
*
* These methods can be auto-paginated.
*/
common.paginator.extend(Job, ['getQueryResults']);
paginator.extend(Job, ['getQueryResults']);

/*! Developer Documentation
*
Expand Down
5 changes: 3 additions & 2 deletions src/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import * as arrify from 'arrify';
import * as Big from 'big.js';
import * as common from '@google-cloud/common';
import {paginator} from '@google-cloud/paginator';
import {promisifyAll} from '@google-cloud/promisify';
var duplexify = require('duplexify');
import * as extend from 'extend';
Expand Down Expand Up @@ -1103,7 +1104,7 @@ Table.prototype.createQueryStream = function(query) {
* this.end();
* });
*/
Table.prototype.createReadStream = common.paginator.streamify('getRows');
Table.prototype.createReadStream = paginator.streamify('getRows');

/**
* Load data into your table from a readable stream of JSON, CSV, or
Expand Down Expand Up @@ -1817,7 +1818,7 @@ Table.prototype.setMetadata = function(metadata, callback) {
*
* These methods can be auto-paginated.
*/
common.paginator.extend(Table, ['getRows']);
paginator.extend(Table, ['getRows']);

/*! Developer Documentation
*
Expand Down
28 changes: 15 additions & 13 deletions test/dataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,20 @@ var fakePfy = extend({}, pfy, {

var extended = false;
var fakePaginator = {
extend: function(Class, methods) {
if (Class.name !== 'Dataset') {
return;
}
methods = arrify(methods);
assert.strictEqual(Class.name, 'Dataset');
assert.deepStrictEqual(methods, ['getTables']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
paginator: {
extend: function(Class, methods) {
if (Class.name !== 'Dataset') {
return;
}
methods = arrify(methods);
assert.strictEqual(Class.name, 'Dataset');
assert.deepStrictEqual(methods, ['getTables']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
}
};

function FakeServiceObject() {
Expand All @@ -74,9 +76,9 @@ describe('BigQuery/Dataset', function() {
before(function() {
Dataset = proxyquire('../src/dataset', {
'@google-cloud/common': {
paginator: fakePaginator,
ServiceObject: FakeServiceObject,
},
'@google-cloud/paginator': fakePaginator,
'@google-cloud/promisify': fakePfy,
});
Table = require('../src/table');
Expand Down
30 changes: 16 additions & 14 deletions test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,21 @@ var mergeSchemaWithRowsOverride;

var extended = false;
var fakePaginator = {
extend: function(Class, methods) {
if (Class.name !== 'BigQuery') {
return;
}

methods = arrify(methods);
assert.strictEqual(Class.name, 'BigQuery');
assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
paginator: {
extend: function(Class, methods) {
if (Class.name !== 'BigQuery') {
return;
}

methods = arrify(methods);
assert.strictEqual(Class.name, 'BigQuery');
assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
}
};

function FakeService() {
Expand All @@ -119,9 +121,9 @@ describe('BigQuery', function() {
'./table': FakeTable,
'@google-cloud/common': {
Service: FakeService,
paginator: fakePaginator,
util: fakeUtil,
},
'@google-cloud/paginator': fakePaginator,
'@google-cloud/promisify': fakePfy,
});
BigQueryCached = extend({}, BigQuery);
Expand Down
30 changes: 16 additions & 14 deletions test/job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,20 @@ var fakePfy = extend({}, pfy, {

var extended = false;
var fakePaginator = {
extend: function(Class, methods) {
if (Class.name !== 'Job') {
return;
}

methods = arrify(methods);
assert.deepStrictEqual(methods, ['getQueryResults']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
paginator: {
extend: function(Class, methods) {
if (Class.name !== 'Job') {
return;
}

methods = arrify(methods);
assert.deepStrictEqual(methods, ['getQueryResults']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
}
};

describe('BigQuery/Job', function() {
Expand All @@ -69,9 +71,9 @@ describe('BigQuery/Job', function() {
before(function() {
Job = proxyquire('../src/job.js', {
'@google-cloud/common': {
Operation: FakeOperation,
paginator: fakePaginator,
Operation: FakeOperation
},
'@google-cloud/paginator': fakePaginator,
'@google-cloud/promisify': fakePfy,
});
});
Expand Down
28 changes: 15 additions & 13 deletions test/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,21 @@ var fakePfy = extend({}, pfy, {

var extended = false;
var fakePaginator = {
extend: function(Class, methods) {
if (Class.name !== 'Table') {
return;
}
paginator: {
extend: function(Class, methods) {
if (Class.name !== 'Table') {
return;
}

methods = arrify(methods);
assert.strictEqual(Class.name, 'Table');
assert.deepStrictEqual(methods, ['getRows']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
methods = arrify(methods);
assert.strictEqual(Class.name, 'Table');
assert.deepStrictEqual(methods, ['getRows']);
extended = true;
},
streamify: function(methodName) {
return methodName;
},
}
};

var fakeUuid = extend(true, {}, uuid);
Expand Down Expand Up @@ -119,9 +121,9 @@ describe('BigQuery/Table', function() {
uuid: fakeUuid,
'@google-cloud/common': {
ServiceObject: FakeServiceObject,
paginator: fakePaginator,
util: fakeUtil,
},
'@google-cloud/paginator': fakePaginator,
'@google-cloud/promisify': fakePfy,
});

Expand Down