monastery 1.37.0 → 1.37.3

package/changelog.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.37.3](https://github.com/boycce/monastery/compare/1.37.2...1.37.3) (2022-06-17)
+
+
+### Bug Fixes
+
+* test ([dad21ad](https://github.com/boycce/monastery/commit/dad21ad9c014a45ccc50a4755daa12941d6b7465))
+
+### [1.37.2](https://github.com/boycce/monastery/compare/1.37.1...1.37.2) (2022-06-13)
+
+
+### Bug Fixes
+
+* changed the default awsAcl from public-read to private ([ba383b5](https://github.com/boycce/monastery/commit/ba383b5f363dafe3b893e08de1a124b7ce96df44))
+
+### [1.37.1](https://github.com/boycce/monastery/compare/1.37.0...1.37.1) (2022-06-13)
+
+
+### Bug Fixes
+
+* add _id to upserted document ([a78512f](https://github.com/boycce/monastery/commit/a78512f16b39422160756fe91ef4d4a3239f5890))
+
 ## [1.37.0](https://github.com/boycce/monastery/compare/1.36.3...1.37.0) (2022-06-12)
 
 

package/docs/readme.md

@@ -93,7 +93,7 @@ Coming soon...
 - ~~Whitelisting a parent will remove any previously blacklisted children~~
 - ~~Blacklist/project works the same across find/insert/update/validate~~
 - Automatic embedded document ids/createdAt/updatedAt fields
-- Remove ACL default 'public read'
+- ~~Change ACL default 'public read' to 'private'~~
 - ~~Public db.arrayWithSchema method~~
 - Global after/before hooks
 - docs: Make the implicit ID query conversion more apparent

package/lib/model-crud.js

@@ -255,7 +255,11 @@ module.exports = {
       // Update
       let update = await this['_' + type](opts.query, operators, util.omit(opts, this._queryOptions))
       if (type == 'findOneAndUpdate') response = update
-      else if (update.n) response = Object.assign(Object.create({ _output: update }), operators['$set']||{})
+      else if (update.n) response = Object.assign(
+        Object.create({ _output: update }),
+        operators['$set'] || {},
+        (update.upserted||[])[0] ? { _id: update.upserted[0]._id } : {},
+      )
 
       // Hook: afterUpdate (doesn't have access to validated data)
       if (response) await util.runSeries(this.afterUpdate.map(f => f.bind(opts, response)))

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "1.37.0",
+  "version": "1.37.3",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/plugins/images/index.js

@@ -25,7 +25,7 @@ let plugin = module.exports = {
     }
 
     // Settings
-    this.awsAcl = options.awsAcl || 'public-read'
+    this.awsAcl = options.awsAcl || 'private' // default
     this.awsBucket = options.awsBucket
     this.awsAccessKeyId = options.awsAccessKeyId
     this.awsSecretAccessKey = options.awsSecretAccessKey

package/test/crud.js

@@ -201,6 +201,15 @@ module.exports = function(monastery, opendb) {
         name: 'Martin Luther3'
       }
     ])
+
+    // Upsert
+    let newId = db.id()
+    await expect(user.update({ query: newId, data: { name: 'Martin Luther3' }, upsert: true }))
+      .resolves.toEqual({ _id: newId, name: 'Martin Luther3' }) // inserted
+
+    await expect(user.update({ query: inserted._id, data: { name: 'Martin Luther4' }, upsert: true }))
+      .resolves.toEqual({ name: 'Martin Luther4' }) // updated
+
     db.close()
   })
 

package/test/plugin-images.js

@@ -641,7 +641,7 @@ module.exports = function(monastery, opendb) {
     app.use(upload({ limits: { fileSize: 1000 * 480, files: 10 }}))
 
     // Basic tests
-    expect(plugin.awsAcl).toEqual('public-read')
+    expect(plugin.awsAcl).toEqual('private')
     expect(plugin.filesize).toEqual(undefined)
     expect(plugin.formats).toEqual(['bmp', 'gif', 'jpg', 'jpeg', 'png', 'tiff'])
     expect(plugin.getSignedUrl).toEqual(undefined)
@@ -688,7 +688,7 @@ module.exports = function(monastery, opendb) {
         // S3 options
         expect(response[1]).toEqual([
           [{
-            ACL: 'public-read',
+            ACL: 'private',
             Body: expect.any(Object),
             Bucket: 'fake',
             Key: expect.stringMatching(/^full\/.*png$/),