-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
sundry fixes and improvements #8
Merged
Merged
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
7902fcd
remove unnecessary await statement (fix issue #2)
jmartin-sul 691c8b4
fix map statement to save entity RDF to correct filename, and to retu…
jmartin-sul a287c1c
add copyright statement and LICENSE file (fixes #5)
jmartin-sul cf83dcb
add config package dependency, along with default configuration
jmartin-sul 5d687c2
make the export functionality more easily runnable as a single comman…
jmartin-sul 5a2176c
start adding tests (connects to #6)
jmartin-sul dbbe381
test getGroupRDF.sinopiaClient()
jmartin-sul fc92916
make export base directory configurable, and don't assume it exists a…
jmartin-sul d8fb11b
add test for basic success case of getGroupRDF.downloadAllRdfForGroup()
jmartin-sul b384e80
add eslint scripts and configuration, clean up a bit of lint discover…
jmartin-sul b444c03
add circleci configuration
jmartin-sul 7277245
improved help text and logging
jmartin-sul 4963232
bump version
jmartin-sul 0ae8465
fix jest-cov and jest-ci script defs
jmartin-sul 1e9eaf5
add copyright statement
jmartin-sul b75240f
prevent flappy test results while files are written too quicly
jmartin-sul File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"presets": [ | ||
"@babel/preset-env" | ||
], | ||
"plugins": [ | ||
"@babel/plugin-transform-runtime", | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
# Copyright 2019 Stanford University see LICENSE file | ||
# CircleCI 2.0 configuration file | ||
|
||
defaults: &defaults | ||
docker: | ||
- image: circleci/node:10.15.3 | ||
working_directory: ~/sinopia_exporter | ||
|
||
version: 2 | ||
jobs: | ||
dependencies: | ||
<<: *defaults | ||
steps: | ||
- run: | ||
name: update-npm | ||
command: 'sudo npm install -g npm@5' | ||
- checkout | ||
- restore_cache: | ||
key: dependency-cache-prod-{{ checksum "package.json" }} | ||
- run: npm install --only=production | ||
- save_cache: | ||
key: dependency-cache-prod-{{ checksum "package.json" }} | ||
paths: | ||
- node_modules | ||
- restore_cache: | ||
key: dependency-cache-ci-{{ checksum "package.json" }} | ||
- run: npm install # including CI/Test dependencies | ||
- save_cache: | ||
key: dependency-cache-ci-{{ checksum "package.json" }} | ||
paths: | ||
- node_modules | ||
build: | ||
<<: *defaults | ||
steps: | ||
- checkout | ||
- setup_remote_docker | ||
- restore_cache: | ||
key: dependency-cache-ci-{{ checksum "package.json" }} | ||
- run: | ||
name: Run linter (eslint) | ||
command: npm run eslint | ||
- run: | ||
name: Setup Code Climate test-reporter | ||
command: | | ||
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter | ||
chmod +x ./cc-test-reporter | ||
- run: | ||
name: Run jest unit tests | ||
command: | | ||
./cc-test-reporter before-build | ||
npm run jest-ci | ||
./cc-test-reporter after-build --exit-code $? | ||
|
||
workflows: | ||
version: 2 | ||
build: | ||
jobs: | ||
- dependencies | ||
- build: | ||
requires: | ||
- dependencies |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
// Copyright 2019 Stanford University see Apache2.txt for license | ||
module.exports = { | ||
plugins: [ | ||
"import", | ||
"jest", | ||
"security" | ||
], | ||
extends: [ | ||
"eslint:recommended", | ||
"plugin:node/recommended", | ||
"plugin:import/errors", | ||
"plugin:import/warnings", | ||
"plugin:security/recommended", | ||
"plugin:jest/recommended" | ||
], | ||
env: { | ||
"es6": true, | ||
"jest": true, | ||
"node": true | ||
}, | ||
parserOptions: { | ||
ecmaVersion: 2019, | ||
sourceType: "module" | ||
}, | ||
overrides: [ | ||
{ | ||
"files": ["src/**/*.js", | ||
"__mocks__/**/*.js", | ||
"__tests__/**/*.js"], | ||
"rules": { | ||
// Indent `case` statements within `switch` blocks | ||
"indent": ["error", 2, { | ||
"SwitchCase": 1 | ||
}], | ||
// See https://github.com/mysticatea/eslint-plugin-node/blob/master/docs/rules/no-unsupported-features/es-syntax.md | ||
// rule supposedly matches ECMA version with node | ||
// we get: "Import and export declarations are not supported yet" | ||
"node/no-unsupported-features/es-syntax": "off", | ||
// Avoiding: "warning Found fs.readFileSync with non literal argument ..." | ||
"security/detect-non-literal-fs-filename": "off", | ||
// Avoiding: "warning Found non-literal argument to RegExp Constructor" | ||
"security/detect-non-literal-regexp": "off", | ||
// this is a CLI tool; we DO want to send output to console | ||
"no-console": "off", | ||
// allow unused variables that begin with underscore | ||
"no-unused-vars": [ | ||
"error", | ||
{ | ||
"argsIgnorePattern": "^_" | ||
} | ||
] | ||
} | ||
}, | ||
{ | ||
// We aren't concerned about this in our tests, see: | ||
// https://github.com/nodesecurity/eslint-plugin-security#detect-object-injection | ||
// https://github.com/nodesecurity/eslint-plugin-security/blob/master/docs/the-dangers-of-square-bracket-notation.md | ||
// https://security.stackexchange.com/questions/170648/variable-assigned-to-object-injection-sink-security-detect-object-injection | ||
// specifically, the variables in square brackets do not come from user input | ||
files: [ | ||
'__tests__/**/*.js' | ||
], | ||
rules: { | ||
'security/detect-object-injection': 'off', | ||
} | ||
}, | ||
{ | ||
// Allow skipped tests in test suite | ||
files: [ | ||
'__tests__/**/*.js' | ||
], | ||
rules: { | ||
'jest/no-disabled-tests': 'off', | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
Apache License | ||
|
||
Version 2.0, January 2004 | ||
|
||
http://www.apache.org/licenses/ | ||
|
||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION | ||
|
||
1. Definitions. | ||
|
||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. | ||
|
||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. | ||
|
||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. | ||
|
||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. | ||
|
||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. | ||
|
||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. | ||
|
||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). | ||
|
||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. | ||
|
||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." | ||
|
||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. | ||
|
||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. | ||
|
||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. | ||
|
||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: | ||
|
||
You must give any other recipients of the Work or Derivative Works a copy of this License; and | ||
You must cause any modified files to carry prominent notices stating that You changed the files; and | ||
You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and | ||
If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. | ||
|
||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. | ||
|
||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. | ||
|
||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. | ||
|
||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. | ||
|
||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. | ||
|
||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
import config from 'config' | ||
import fs from 'fs' | ||
import * as getGroupRDF from '../src/getGroupRDF' | ||
import SinopiaServer from 'sinopia_server' | ||
|
||
const groupResources = { 'group1': ['resource1', 'resource2', 'resource3'] } | ||
const resourceContent = { 'resource1': 'resource1content', 'resource2': 'resource2content', 'resource3': 'resource3content' } | ||
|
||
const mockSinopiaClient = jest.fn() | ||
mockSinopiaClient.apiClient = jest.fn() // need this field present so sinopiaClient() function can set .basePath on it. | ||
mockSinopiaClient.getGroupWithHttpInfo = async (groupName) => { return (!groupResources[groupName] ? null : { response: { body: {contains: groupResources[groupName] } } }) } | ||
mockSinopiaClient.getResourceWithHttpInfo = async (groupName, resourceName) => { return (!groupResources[groupName] ? null : { response: { text: resourceContent[resourceName] } }) } | ||
|
||
jest.spyOn(SinopiaServer, 'LDPApi').mockImplementation(() => mockSinopiaClient) | ||
|
||
describe('getGroupRDF', () => { | ||
describe('sinopiaClient', () => { | ||
it('returns a client that is properly configured', () => { | ||
expect(getGroupRDF.sinopiaClient().apiClient.basePath).toEqual(config.get('trellis.basePath')) | ||
}) | ||
}) | ||
|
||
describe('getResourceTextFromServer', () => { | ||
it('retrieves the specified resource from the server and returns the RDF as text', async () => { | ||
expect(await getGroupRDF.getResourceTextFromServer('group1', 'resource2')).toEqual('resource2content') | ||
}) | ||
}) | ||
|
||
describe('downloadAllRdfForGroup', () => { | ||
it('retrieves the RDF resources for the specified group, and saves the RDF text (on file per resource, in a dated sub-directory)', async () => { | ||
const dlDateLowerBound = new Date() | ||
await getGroupRDF.downloadAllRdfForGroup('group1') | ||
const dlDateUpperBound = new Date() | ||
|
||
// assume we just want the latest output dir in the export base dir, since we should be the only ones writing there | ||
const exportBaseDirContents = fs.readdirSync(`./${config.get('exportBasePath')}`) | ||
const groupDirName = exportBaseDirContents[exportBaseDirContents.length-1] | ||
|
||
// RDF for group exported to subdirectory with name like 'group1_2019-08-05T01:34:13.143Z' | ||
const groupDirDate = new Date(/^group1_(.*)$/.exec(groupDirName)[1]) | ||
// .toBeGreaterThan and .toBeLessThan only work for numbers | ||
expect(dlDateLowerBound < groupDirDate && groupDirDate < dlDateUpperBound).toBeTruthy() | ||
|
||
const groupDirPath = `./${config.get('exportBasePath')}/${groupDirName}` | ||
const groupDirContents = fs.readdirSync(groupDirPath) | ||
expect(groupDirContents).toEqual(['complete.log', 'resource1', 'resource2', 'resource3']) | ||
|
||
expect(fs.readFileSync(`${groupDirPath}/resource1`).toString()).toEqual('resource1content') | ||
expect(fs.readFileSync(`${groupDirPath}/resource2`).toString()).toEqual('resource2content') | ||
expect(fs.readFileSync(`${groupDirPath}/resource3`).toString()).toEqual('resource3content') | ||
const completionLogText = fs.readFileSync(`${groupDirPath}/complete.log`).toString() | ||
// completion log text should have date, should fall between group dir creation and downloadAllRdfForGroup resolving | ||
const completionLogDate = new Date(/^completed export of group1 at (.*)$/.exec(completionLogText)[1]) | ||
expect(groupDirDate <= completionLogDate && completionLogDate <= dlDateUpperBound).toBeTruthy() | ||
}) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#!/usr/bin/env bash | ||
|
||
npx babel-node src/cli/exportAndSave.js $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"trellis": { | ||
"basePath": "https://trellis.sinopia.io" | ||
}, | ||
"exportBasePath": "./exported_rdf" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"trellis": { | ||
"basePath": "https://trellis.sinopia.test" | ||
}, | ||
"exportBasePath": "./test_exported_rdf" | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think line 2 is sorta obvious, but 🤷
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this was actually copypasta from the sinopia_acl circle config that i ripped off, but happy to remove if it irks you.