Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Implement resource mapper for the file resource store (#142)

Browse Source 
* move file mapping logic to resourcemapper

* make filestore dependent of resource mapper

* set default contenttype

* refactor fileresourcemapper

* fix map function

* refactor

* add normalized parser

* refactor unit test

* fix metadata problem

* refactor names

* reverse change

* add getters

* add comments

* add comments, move code

* change text/turtle to constant

* add changes

* add requested changes

* add more requested changes

* add more requested changes

* more changes
This commit is contained in:
Freya
2020-09-11 17:08:53 +02:00
committed by GitHub
parent e9983d5837
commit 383da24601
8 changed files with 219 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/unit/storage/ExtensionBasedMapper.test.ts Normal file
View File

@@ -0,0 +1,21 @@
import { RuntimeConfig } from '../../../src/init/RuntimeConfig';
import { ExtensionBasedMapper } from '../../../src/storage/ExtensionBasedMapper';
describe('An ExtensionBasedMapper', (): void => {
const base = 'http://test.com/';
const rootFilepath = 'uploads/';
const resourceMapper = new ExtensionBasedMapper(new RuntimeConfig({ base, rootFilepath }));
it('returns the correct url of a file.', async(): Promise<void> => {
let result = resourceMapper.mapFilePathToUrl(`${rootFilepath}test.txt`);
expect(result).toEqual(`${base}test.txt`);
result = resourceMapper.mapFilePathToUrl(`${rootFilepath}image.jpg`);
expect(result).toEqual(`${base}image.jpg`);
});
it('errors when filepath does not contain rootFilepath.', async(): Promise<void> => {
expect((): string => resourceMapper.mapFilePathToUrl('random/test.txt')).toThrow(Error);
expect((): string => resourceMapper.mapFilePathToUrl('test.txt')).toThrow(Error);
});
});

22
test/unit/storage/FileResourceStore.test.ts
View File

@@ -8,6 +8,7 @@ import streamifyArray from 'streamify-array';
import { RuntimeConfig } from '../../../src/init/RuntimeConfig';
import { Representation } from '../../../src/ldp/representation/Representation';
import { RepresentationMetadata } from '../../../src/ldp/representation/RepresentationMetadata';
import { ExtensionBasedMapper } from '../../../src/storage/ExtensionBasedMapper';
import { FileResourceStore } from '../../../src/storage/FileResourceStore';
import { INTERNAL_QUADS } from '../../../src/util/ContentTypes';
import { ConflictHttpError } from '../../../src/util/errors/ConflictHttpError';
@@ -50,7 +51,7 @@ describe('A FileResourceStore', (): void => {
jest.clearAllMocks();
store = new FileResourceStore(
new RuntimeConfig({ base, rootFilepath }),
new ExtensionBasedMapper(new RuntimeConfig({ base, rootFilepath })),
new InteractionController(),
new MetadataController(),
);
@@ -218,7 +219,7 @@ describe('A FileResourceStore', (): void => {
raw: [],
dateTime: stats.mtime,
byteSize: stats.size,
contentType: 'text/plain; charset=utf-8',
contentType: 'text/plain',
},
});
await expect(arrayifyStream(result.data)).resolves.toEqual([ rawData ]);
@@ -426,17 +427,6 @@ describe('A FileResourceStore', (): void => {
expect(fsPromises.access as jest.Mock).toBeCalledTimes(1);
});
it('errors when mapping a filepath that does not match the rootFilepath of the store.', async(): Promise<void> => {
expect((): any => {
// eslint-disable-next-line dot-notation
store['mapFilepathToUrl']('http://wrong.com/wrong');
}).toThrowError();
expect((): any => {
// eslint-disable-next-line dot-notation
store['mapFilepathToUrl'](`${base}file.txt`);
}).toThrowError();
});
it('undoes metadata file creation when resource creation fails.', async(): Promise<void> => {
// Mock the fs functions.
(fsPromises.mkdir as jest.Mock).mockReturnValueOnce(true);
@@ -483,13 +473,12 @@ describe('A FileResourceStore', (): void => {
expect(fsPromises.mkdir as jest.Mock).toBeCalledWith(joinPath(rootFilepath, 'myContainer/'), { recursive: true });
});
it('returns no contentType when unknown for representation.', async(): Promise<void> => {
it('returns default contentType when unknown for representation.', async(): Promise<void> => {
// Mock the fs functions.
stats.isFile = jest.fn((): any => true);
(fsPromises.lstat as jest.Mock).mockReturnValueOnce(stats);
(fs.createReadStream as jest.Mock).mockReturnValueOnce(streamifyArray([ rawData ]));
(fs.createReadStream as jest.Mock).mockReturnValueOnce(new Readable()
.destroy(new Error('Metadata file does not exist.')));
(fs.createReadStream as jest.Mock).mockImplementationOnce((): any => new Error('Metadata file does not exist.'));
const result = await store.getRepresentation({ path: `${base}.htaccess` });
expect(result).toEqual({
@@ -497,6 +486,7 @@ describe('A FileResourceStore', (): void => {
data: expect.any(Readable),
metadata: {
raw: [],
contentType: 'application/octet-stream',
dateTime: stats.mtime,
byteSize: stats.size,
},