monastery 1.28.3 → 1.28.4

package/docs/Gemfile

@@ -1,20 +1,10 @@
-# Gemfile is only used in development
+# Old
+# source 'https://rubygems.org'
+# gem 'github-pages', group: :jekyll_plugins
 
-# Old, doesn't pull the latest version
+# Below pulls the latest remote_theme in development
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
-
-# # Below pulls the latest remote_theme in development
-# source "https://rubygems.org"
-
-# # Same as github-docs
-# gem "bundler"
-# gem "jekyll", "~> 3.9.0"
-# gem "jekyll-github-metadata", "~> 2.13.0"
-# gem "jekyll-seo-tag", "~> 2.7.1"
-# gem "kramdown-parser-gfm", "~> 1.1.0"
-# gem "github-docs", git: "https://github.com/boycce/github-docs"
-
-# group :jekyll_plugins do
-#   gem "jekyll-remote-theme", "~> 0.4.2"
-# end
+gem "github-docs", git: "https://github.com/boycce/github-docs"
+group :jekyll_plugins do
+  gem "jekyll-remote-theme", "~> 0.4.2"
+end

package/docs/_config.yml

@@ -2,16 +2,13 @@ remote_theme: boycce/github-docs
 title: Monastery
 description: A straight forward MongoDB ODM built upon MonkJS
 github_url: "https://github.com/boycce/monastery"
-basedir: ""
+basedir: "docs"
 
 # Aux links for the naviation.
 aux_links:
   "Monastery on GitHub":
     - "//github.com/boycce/monastery"
 
-plugins:
-  - jekyll-remote-theme
-
 defaults:
   -
     scope:

package/lib/model-validate.js

@@ -259,10 +259,9 @@ module.exports = {
     let ruleMessage = ruleMessageKey && this.messages[ruleMessageKey][ruleName]
     if (!ruleMessage) ruleMessage = rule.message
 
-
     if (ruleName !== 'required') {
       // Ignore undefined when not testing 'required'
-      if (typeof value === 'undefined') return ////////////////////////////////////////
+      if (typeof value === 'undefined') return
 
       // Ignore null if not testing required
       if (value === null && !field.isObject && !field.isArray) return

package/lib/rules.js

@@ -5,7 +5,6 @@ let validator = require('validator')
 module.exports = {
 
   required: {
-    runOnUndefined: true, // integrate
     message: 'This field is required.',
     fn: function(x) {
       if (util.isArray(x) && !x.length) return false
@@ -13,7 +12,7 @@ module.exports = {
     }
   },
 
-  // Type rules below ignore undefined
+  // Rules below ignore null
 
   'isBoolean': {
     message: 'Value was not a boolean.',
@@ -26,6 +25,12 @@ module.exports = {
       return typeof x === 'boolean'
     }
   },
+  'isNotEmptyString': {
+    message: 'Value was an empty string.',
+    fn: function(x) {
+      return x !== ''
+    }
+  },
   'isArray': {
     message: 'Value was not an array.',
     tryParse: function(x) {
@@ -127,8 +132,6 @@ module.exports = {
       return util.isObject(x) && ObjectId.isValid(x)/*x.get_inc*/? true : false
     }
   },
-
-
   'max': {
     message: (x, arg) => 'Value was greater than the configured maximum (' + arg + ')',
     fn: function(x, arg) {
@@ -143,16 +146,8 @@ module.exports = {
       return x >= arg
     }
   },
-  'isNotEmptyString': {
-    message: 'Value was an empty string.',
-    fn: function(x) {
-      return x !== ''
-    }
-  },
-
-  // Rules below ignore undefined & empty strings
-  // (e.g. an empty email field can be saved that isn't required)
 
+  // Rules below ignore null & empty strings
   'enum': {
     ignoreEmptyString: true,
     message: (x, arg) => 'Invalid enum value',
@@ -162,10 +157,10 @@ module.exports = {
       }
     }
   },
-  // 'hasAgreed': {
-  //   message: (x, arg) => 'Please agree to the terms and conditions.',
-  //   fn: function(x, arg) { return !x }
-  // },
+  'hasAgreed': {
+    message: (x, arg) => 'Please agree to the terms and conditions.',
+    fn: function(x, arg) { return !x }
+  },
   'isAfter': {
     ignoreEmptyString: true,
     message: (x, arg) => 'Value was before the configured time (' + arg + ')',

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "1.28.3",
+  "version": "1.28.4",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.742.0",
-    "debug": "^4.1.1",
+    "debug": "4.1.1",
     "file-type": "^15.0.0",
     "monk": "^7.3.0",
     "nanoid": "^3.1.12",