Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 changes: 2 additions & 1 deletion lib/visitorMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ const repo = {

const user = {
_type: 'user',
repos: collection(repo)
repos: collection(repo),
events: collection(event)
};

const org = {
Expand Down
2 changes: 1 addition & 1 deletion providers/fetcher/githubFetcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class GitHubFetcher {
teams: { tokenTraits: ['admin'] },
team: { tokenTraits: ['admin'] },
members: { tokenTraits: ['admin'] },
events: { tokenTraits: ['admin'] },
events: { tokenTraits: [['admin'], ['public']] },
collaborators: { tokenTraits: ['admin'], headers: { Accept: 'application/vnd.github.korra-preview' } },
reviews: { headers: { Accept: 'application/vnd.github.black-cat-preview+json' } },
review: { headers: { Accept: 'application/vnd.github.black-cat-preview+json' } },
Expand Down
1 change: 1 addition & 0 deletions providers/fetcher/githubProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class GitHubProcessor {
request.linkSiblings('urn:users');

this._addCollection(request, 'repos', 'repo');
this._addCollection(request, 'events', null, document.events_url.replace('{/privacy}', ''));
return document;
}

Expand Down
9 changes: 7 additions & 2 deletions routes/requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ function buildRequestFromSpec(spec) {
let crawlType = null;
let crawlUrl = 'https://api.github.com/';
if (spec.indexOf('/') > -1) {
crawlType = 'repo';
crawlUrl += 'repos/' + spec;
if(spec.slice(0, 6)==="users/") {
crawlType = 'user';
crawlUrl += spec;
} else {
crawlType = 'repo';
crawlUrl += 'repos/' + spec;
}
} else {
crawlType = 'org';
crawlUrl += 'orgs/' + spec;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/crawlerTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ describe('Crawler whole meal deal', () => {
const request = new Request('user', 'http://test.com/users/user1');
request.policy = TraversalPolicy.reload('user');
normal.requests = [request];
crawler.fetcher.responses = [createResponse({ id: 42, repos_url: 'http://test.com/users/user1/repos' })];
crawler.fetcher.responses = [createResponse({ id: 42, repos_url: 'http://test.com/users/user1/repos', events_url: 'http://test.com/users/user1/events' })];
return Q.try(() => { return crawler.processOne({ name: 'test' }); }).then(
() => {
expect(normal.pop.callCount).to.be.equal(1);
Expand Down
5 changes: 4 additions & 1 deletion test/unit/gitHubProcessorTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ describe('User processing', () => {
_metadata: { links: {} },
id: 9,
repos_url: 'http://repos',
events_url: 'http://events',
};

const processor = new GitHubProcessor();
Expand All @@ -187,12 +188,14 @@ describe('User processing', () => {
const links = {
self: { href: 'urn:user:9', type: 'resource' },
siblings: { href: 'urn:users', type: 'collection' },
repos: { href: 'urn:user:9:repos', type: 'collection' }
repos: { href: 'urn:user:9:repos', type: 'collection' },
events: {href: 'urn:user:9:events', type: 'collection'}
}
expectLinks(document._metadata.links, links);

const expected = [
{ type: 'repos', url: 'http://repos', qualifier: 'urn:user:9', path: '/repos' },
{ type: 'events', url: 'http://events', qualifier: 'urn:user:9', path: '/events'},
];
expectQueued(queue, expected);
});
Expand Down
6 changes: 4 additions & 2 deletions test/unit/processingTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Simple processing', () => {
.then(processOne)
.then(checkDoc.bind(null, 'org', 'urn:org:1', 4))
.then(processOne)
.then(checkDoc.bind(null, 'user', 'urn:user:1', 1))
.then(checkDoc.bind(null, 'user', 'urn:user:1', 2))
.then(processOne)
.then(checkDoc.bind(null, 'repos', 'urn:org:1:repos:page:1', 0))
.then(processOne)
Expand All @@ -29,7 +29,7 @@ describe('Simple processing', () => {
.then(processOne)
.then(checkDoc.bind(null, 'repos', 'urn:org:1:repos:page:1', 0))
.then(processOne)
.then(checkDoc.bind(null, 'user', 'urn:user:2', 1)) // queued as a member of the org
.then(checkDoc.bind(null, 'user', 'urn:user:2', 2)) // queued as a member of the org
.then(processOne)
.then(checkDoc.bind(null, 'team', 'urn:team:20', 2))
.then(processOne)
Expand Down Expand Up @@ -133,6 +133,7 @@ const resources = {
"id": 1,
"url": "https://api.github.com/users/test",
"repos_url": "https://api.github.com/users/test/repos",
"events_url": "https://api.github.com/users/test/events",
}
},
'https://api.github.com/users/user2': {
Expand All @@ -141,6 +142,7 @@ const resources = {
"id": 2,
"url": "https://api.github.com/users/user2",
"repos_url": "https://api.github.com/users/user2/repos",
"events_url": "https://api.github.com/users/user2/events",
}
},
'https://api.github.com/users/user2/repos': {
Expand Down