Skip to content

Commit

Permalink
feat: Use ldp: prefix in container representations.
Browse files Browse the repository at this point in the history
  • Loading branch information
RubenVerborgh authored and joachimvh committed Jan 12, 2021
1 parent f66096a commit ba42861
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
18 changes: 13 additions & 5 deletions src/storage/DataAccessorBasedStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '../util/PathUtil';
import { parseQuads } from '../util/QuadUtil';
import { generateResourceQuads } from '../util/ResourceUtil';
import { CONTENT_TYPE, HTTP, LDP, PIM, RDF } from '../util/Vocabularies';
import { CONTENT_TYPE, HTTP, LDP, PIM, RDF, VANN } from '../util/Vocabularies';
import type { DataAccessor } from './accessors/DataAccessor';
import type { ResourceStore } from './ResourceStore';

Expand Down Expand Up @@ -63,10 +63,18 @@ export class DataAccessorBasedStore implements ResourceStore {

// In the future we want to use getNormalizedMetadata and redirect in case the identifier differs
const metadata = await this.accessor.getMetadata(identifier);

return this.isExistingContainer(metadata) ?
new BasicRepresentation(metadata.quads(), metadata, INTERNAL_QUADS) :
new BasicRepresentation(await this.accessor.getData(identifier), metadata);
let representation: Representation;

if (this.isExistingContainer(metadata)) {
// Generate a container representation from the metadata
const data = metadata.quads();
metadata.addQuad(LDP.terms.namespace, VANN.terms.preferredNamespacePrefix, 'ldp');
representation = new BasicRepresentation(data, metadata, INTERNAL_QUADS);
} else {
// Retrieve a document representation from the accessor
representation = new BasicRepresentation(await this.accessor.getData(identifier), metadata);
}
return representation;
}

public async addResource(container: ResourceIdentifier, representation: Representation): Promise<ResourceIdentifier> {
Expand Down
11 changes: 11 additions & 0 deletions test/integration/LdpHandlerWithoutAuth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ describe.each(stores)('An LDP handler without auth using %s', (name, { storeUrn,
await teardown();
});

it('can read a folder listing.', async():
Promise<void> => {
const response = await resourceHelper.getResource(`${BASE}/`);
expect(response.statusCode).toBe(200);
expect(response.getHeaders()).toHaveProperty('content-type', 'text/turtle');

const data = response._getData().toString();
expect(data).toContain(`<${BASE}/> a ldp:Container`);
expect(response.getHeaders().link).toContain(`<${LDP.Container}>; rel="type"`);
});

it('can add a file to the store, read it and delete it.', async():
Promise<void> => {
// POST
Expand Down

0 comments on commit ba42861

Please sign in to comment.