Merge pull request #10 from zenodraft/9-upserting-date-precision

upserting date precision
zenodraft · Jun 30, 2021 · 5644867 · 5644867
2 parents 9cbadf8 + 5dba83c
commit 5644867
Show file tree

Hide file tree

Showing 39 changed files with 146 additions and 1,371 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# `zenodraft/action@0.9.0` PRERELEASE
+# `zenodraft/action@0.9.1` PRERELEASE
 
 Automates drafting depositions on Zenodo or Zenodo Sandbox.
 
@@ -34,7 +34,7 @@ jobs:
                 from repository file .zenodo.json
           env:
             ZENODO_SANDBOX_ACCESS_TOKEN: ${{ secrets.ZENODO_SANDBOX_ACCESS_TOKEN }}
-          uses: zenodraft/action@0.9.0
+          uses: zenodraft/action@0.9.1
           with:
             collection: 1234567
             metadata: .zenodo.json

diff --git a/lib/upserting.js b/lib/upserting.js
@@ -125,7 +125,19 @@ const upsert_prereserved_doi = (upsert_location, prereserved_doi) => {
 };
 exports.upsert_prereserved_doi = upsert_prereserved_doi;
 const write_cff_file = (cff) => {
-    const cffstr = yaml.dump(cff, { sortKeys: false });
+    let cffstr = yaml.dump(cff, { sortKeys: false });
+    // replace full precision dates with just YYYY-MM-DD before writing to file
+    const regexes = [
+        new RegExp('(?<k>date-accessed): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-downloaded): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-published): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-released): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-end): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-start): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g')
+    ];
+    for (const regex of regexes) {
+        cffstr = cffstr.replace(regex, '$<k>: $<v>');
+    }
     fs.writeFileSync('CITATION.cff', cffstr, 'utf8');
     return;
 };
diff --git a/node_modules/zenodraft/README.md b/node_modules/zenodraft/README.md
diff --git a/node_modules/zenodraft/assets/autocomplete.sh b/node_modules/zenodraft/assets/autocomplete.sh
diff --git a/node_modules/zenodraft/dist/cli.js b/node_modules/zenodraft/dist/cli.js
diff --git a/node_modules/zenodraft/dist/cli.mjs b/node_modules/zenodraft/dist/cli.mjs
diff --git a/node_modules/zenodraft/package.json b/node_modules/zenodraft/package.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@actions/github": "^5.0.0",
     "js-yaml": "^4.1.0",
     "typescript": "^4.3.2",
-    "zenodraft": "git+https://github.com/zenodraft/zenodraft.git#0.9.0"
+    "zenodraft": "0.9.1"
   },
   "description": "GitHub action to automate making draft depositions on Zenodo or Zenodo Sandbox",
   "homepage": "https://github.com/zenodraft/action#readme",
@@ -33,7 +33,7 @@
     "test": "jest --config jest.config.js",
     "transpile": "tsc -p tsconfig.json"
   },
-  "version": "0.9.0",
+  "version": "0.9.1",
   "devDependencies": {
     "@types/jest": "^26.0.23",
     "@types/js-yaml": "^4.0.1",

diff --git a/src/upserting.ts b/src/upserting.ts
@@ -144,7 +144,19 @@ export const upsert_prereserved_doi = (upsert_location: string, prereserved_doi:
 
 
 const write_cff_file = (cff: CffObject): void => {
-    const cffstr = yaml.dump(cff, { sortKeys: false })
+    let cffstr = yaml.dump(cff, { sortKeys: false })
+    // replace full precision dates with just YYYY-MM-DD before writing to file
+    const regexes = [
+        new RegExp('(?<k>date-accessed): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-downloaded): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-published): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-released): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-end): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g'),
+        new RegExp('(?<k>date-start): (?<v>[0-9]{4}-[0-9]{2}-[0-9]{2})T00:00:00.000Z', 'g')
+    ]
+    for (const regex of regexes) {
+        cffstr = cffstr.replace(regex, '$<k>: $<v>')
+    }
     fs.writeFileSync('CITATION.cff', cffstr, 'utf8')
     return
 }
diff --git a/tests/upserting/1.0.3/doi/append/upserting.test.js b/tests/upserting/1.0.3/doi/append/upserting.test.js
diff --git a/tests/upserting/1.0.3/doi/overwrite/upserting.test.js b/tests/upserting/1.0.3/doi/overwrite/upserting.test.js
diff --git a/tests/upserting/1.0.3/errors/upserting.test.js b/tests/upserting/1.0.3/errors/upserting.test.js
diff --git a/tests/upserting/1.1.0/dates/CITATION.cff b/tests/upserting/1.1.0/dates/CITATION.cff
@@ -0,0 +1,21 @@
+authors:
+  - name: anonymous
+cff-version: 1.1.0
+date-released: 2020-12-31
+doi: 10.0000/FIXME
+message: testing dates
+references:
+  - authors:
+      - name: anonymous
+    date-accessed: 2020-11-30
+    date-downloaded: 2020-10-30
+    date-published: 2020-09-30
+    date-released: 2020-08-30
+    type: conference
+    title: reference title
+    conference:
+      name: some conference
+      date-end: 2020-02-02
+      date-start: 2020-01-30
+title: testing dates
+version: 0.0.0