resourceful - npm Package Compare versions

Comparing version 0.3.2 to 0.3.3

lib/resourceful/engines/couchdb/view.js

@@ -64,12 +64,14 @@ var events = require('events'),
   //
-  R[name] = function (/* [param], callback */) {
-    var that     = this,
-        promise  = new events.EventEmitter(),
-        args     = Array.prototype.slice.call(arguments),
-        callback = args.pop(),
-        param    = args.pop() || {},
-        path     = [this.resource, name].join('/');
+  R[name] = function (param, callback) {
+    var that = this,
+        path = [this.resource, name].join('/'),
+        params;
 
-    var params = (typeof(param) === 'object' && !Array.isArray(param)) ? param : { key: param };
+    if (typeof param === 'function') {
+      callback = param;
+      param = {};
+    }
 
+    params = (typeof(param) === 'object' && !Array.isArray(param)) ? param : { key: param };
+
     if (options) {
@@ -76,0 +78,0 @@ Object.keys(options).forEach(function (key) {

lib/resourceful/resource.js

@@ -232,4 +232,6 @@ var util = require('util'),
 Resource.create = function (attrs, callback) {
-  if (this._timestamps) {
-    attrs.ctime = attrs.mtime = Date.now();
+  if (this._ctime || this._mtime) {
+    var now = Date.now();
+    if(this._ctime) attrs.ctime = now;
+    if(this._mtime) attrs.mtime = now;
   }
@@ -282,11 +284,14 @@
   if (!validate.valid) {
-    var e = { validate: validate, value: instance, schema: that.schema };
+    var e = { validate: validate, value: obj, schema: this.schema };
     return callback && callback(e);
   }
 
-  if (this._timestamps) {
-    obj.mtime = Date.now();
-    if (obj.isNewRecord) {
-      obj.ctime = obj.mtime;
+  if (this._ctime || this._mtime) {
+    var now = Date.now();
+    if (this._mtime) {
+      obj.mtime = now;
     }
+    if (this._ctime && obj.isNewRecord) {
+      obj.ctime = now;
+    }
   }
@@ -335,3 +340,3 @@
 
-  if (this._timestamps) {
+  if (this._mtime) {
     obj.mtime = Date.now();
@@ -545,2 +550,25 @@ }
     //
+    // Parent.getChild(parent, child_id, callback)
+    //
+    factory['get' + rstringc] = function (parent, child_id, callback) {
+      var id  = parent.key || parent,
+          cid = child_id;
+      
+      id_path = factory.lowerResource + '/' + id + '/' + cid
+      
+      rfactory.get(id_path, function(err, child){
+        if(err) {
+          if(callback) return callback(err);
+        }
+        return callback(null, child);
+      });
+    }
+    //
+    // parent.getChild(child_id, callback)
+    //
+    factory.prototype['get' + rstringc] = function (child_id, callback) {
+      return this.constructor['get' + rstringc](this.key, child_id, callback);
+    };
+
+    //
     // Parent.createChild(id, child, callback)
@@ -833,4 +861,6 @@ //
 
-Resource.timestamps = function () {
-  this._timestamps = true;
+Resource.timestamps = function (options) {
+  this._ctime = !options || !('ctime' in options) || options.ctime;
+  this._mtime = !options || !('mtime' in options) || options.mtime;
+  this._atime = !!options && !!options.atime;
   //
@@ -843,11 +873,18 @@ // Remark: All timestamps should be considered Unix time format,
   //
-  this.property('ctime', 'number', { format: "unix-time", private: true });
+  if (this._ctime) {
+    this.property('ctime', 'number', { format: "unix-time", private: true });
+  }
   //
   // The last time the resource was modified
   //
-  this.property('mtime', 'number', { format: "unix-time", private: true });
+  if (this._mtime) {
+    this.property('mtime', 'number', { format: "unix-time", private: true });
+  }
   //
   // The last time the resource was accessed
   //
-  // TODO: this.property('atime', 'number', { format: "unix-time", private: true });
+  if (this._atime) {
+    this.property('atime', 'number', { format: "unix-time", private: true });
+    //TODO actually update atime
+  }
 };
@@ -854,0 +891,0 @@

package.json

 {
   "name": "resourceful",
   "description": "an isomorphic Resource engine for JavaScript",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "url": "http://github.com/flatiron/resourceful",
@@ -28,3 +28,3 @@ "keywords": [
     "node-uuid": "1.3.x",
-    "utile": "*"
+    "utile": "0.1.x"
   },
@@ -42,2 +42,2 @@ "devDependencies": {
   }
-}
+}

test/couchdb-filter-test.js

@@ -97,2 +97,17 @@ var assert = require('assert'),
           }
+        },
+        "<by> ['yoda', 'fitzgerald']": {
+          topic: function (Article) {
+            Article.by({
+              keys: ['yoda', 'fitzgerald']
+            }, this.callback);
+          },
+          "should return an array of Article records by 'yoda' or 'fitzgerald'": function (e, res) {
+            assert.isArray(res);
+            assert.equal(res.length, 2);
+            assert(
+              (res[0].author === 'yoda' && res[1].author === 'fitzgerald') ||
+              (res[0].author === 'fitzgerald' && res[1].author === 'yoda')
+            );
+          }
         }
@@ -99,0 +114,0 @@ }

test/relationship-test.js

@@ -97,2 +97,50 @@ var vows = require('vows'),
               }
+            },
+            "and when 'Parent.getChild()' is used": {
+              topic: function (obj) {
+                resources[e].User.getRepository('pavan', 'bullet', this.callback);
+              },
+              "should return one repository": function (err, obj) {
+                assert.isNull(err);
+                assert.isObject(obj);
+                assert.equal(obj.id, 'user/pavan/bullet');
+                assert.equal(obj.name, 'bullet');
+              },
+              "should be of proper resource type": function (err, obj) {
+                assert.isNull(err);
+                assert.equal(obj.resource, 'Repository');
+              },
+              "should have the user_id set correctly": function (err, obj) {
+                assert.isNull(err);
+                assert.equal(obj.user_id, 'pavan');
+              }
+            },
+            "and when 'Parent.prototype.getChild()' is used": {
+              topic: function (obj) {
+                obj.getRepository('bullet', this.callback);
+              },
+              "should return one repository": function (err, obj) {
+                assert.isNull(err);
+                assert.isObject(obj);
+                assert.equal(obj.id, 'user/pavan/bullet');
+                assert.equal(obj.name, 'bullet');
+              },
+              "should be of proper resource type": function (err, obj) {
+                assert.isNull(err);
+                assert.equal(obj.resource, 'Repository');
+              },
+              "should have the user_id set correctly": function (err, obj) {
+                assert.isNull(err);
+                assert.equal(obj.user_id, 'pavan');
+              }
+            },
+            "and when 'Parent.getChild()' is used with an invalid child id": {
+              topic: function (obj) {
+                resources[e].User.getRepository('pavan', 'pants', this.callback);
+              },
+              "should return 404": function (err, obj) {
+                assert.isObject(err);
+                assert.isUndefined(obj);
+                assert.equal(err.status, 404)
+              },
             }
@@ -99,0 +147,0 @@ }

test/resourceful-test.js

@@ -167,3 +167,3 @@ var assert = require('assert'),
       "and be found by non-sanitized_id": function (r) {
-        assert.equal(r.toString(), '{"id":"abc","resource":"Resource6"}');
+        assert.equal(r.id, 'abc');
       }
@@ -170,0 +170,0 @@ }

Fixed alerts

Non-existent author

Supply chain risk

The package was published by an npm account that no longer exists.

Found 1 instance in 1 package

Floating dependency

Quality

Package has a dependency with a floating version range. This can cause issues if the dependency publishes a new major version.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

204602

increased by1.18%

Lines of code

5503

increased by0.94%

Number of medium quality alerts

1

decreased by-50%

Number of high supply chain risk alerts

0

decreased by-100%

Dependency changes

• + Addedarray-buffer-byte-length@1.0.1(transitive)

• + Addedavailable-typed-arrays@1.0.7(transitive)

• + Addedcall-bind@1.0.7(transitive)

• + Addeddeep-equal@2.2.3(transitive)

• + Addeddefine-data-property@1.1.4(transitive)

• + Addeddefine-properties@1.2.1(transitive)

• + Addedes-define-property@1.0.0(transitive)

• + Addedes-errors@1.3.0(transitive)

• + Addedes-get-iterator@1.1.3(transitive)

• + Addedfor-each@0.3.3(transitive)

• + Addedfunction-bind@1.1.2(transitive)

• + Addedfunctions-have-names@1.2.3(transitive)

• + Addedget-intrinsic@1.2.4(transitive)

• + Addedgopd@1.0.1(transitive)

• + Addedhas-bigints@1.0.2(transitive)

• + Addedhas-property-descriptors@1.0.2(transitive)

• + Addedhas-proto@1.0.3(transitive)

• + Addedhas-symbols@1.0.3(transitive)

• + Addedhas-tostringtag@1.0.2(transitive)

• + Addedhasown@2.0.2(transitive)

• + Addedinternal-slot@1.0.7(transitive)

• + Addedis-arguments@1.1.1(transitive)

• + Addedis-array-buffer@3.0.4(transitive)

• + Addedis-bigint@1.0.4(transitive)

• + Addedis-boolean-object@1.1.2(transitive)

• + Addedis-callable@1.2.7(transitive)

• + Addedis-date-object@1.0.5(transitive)

• + Addedis-map@2.0.3(transitive)

• + Addedis-number-object@1.0.7(transitive)

• + Addedis-regex@1.1.4(transitive)

• + Addedis-set@2.0.3(transitive)

• + Addedis-shared-array-buffer@1.0.3(transitive)

• + Addedis-string@1.0.7(transitive)

• + Addedis-symbol@1.0.4(transitive)

• + Addedis-weakmap@2.0.2(transitive)

• + Addedis-weakset@2.0.3(transitive)

• + Addedisarray@2.0.5(transitive)

• + Addedncp@0.2.7(transitive)

• + Addedobject-inspect@1.13.1(transitive)

• + Addedobject-is@1.1.6(transitive)

• + Addedobject-keys@1.1.1(transitive)

• + Addedobject.assign@4.1.5(transitive)

• + Addedpossible-typed-array-names@1.0.0(transitive)

• + Addedregexp.prototype.flags@1.5.2(transitive)

• + Addedrimraf@1.0.9(transitive)

• + Addedset-function-length@1.2.2(transitive)

• + Addedset-function-name@2.0.2(transitive)

• + Addedside-channel@1.0.6(transitive)

• + Addedstop-iteration-iterator@1.0.0(transitive)

• + Addedutile@0.1.7(transitive)

• + Addedwhich-boxed-primitive@1.0.2(transitive)

• + Addedwhich-collection@1.0.2(transitive)

• + Addedwhich-typed-array@1.1.15(transitive)

• - Removedasync@0.9.2(transitive)

• - Removedbalanced-match@1.0.2(transitive)

• - Removedbrace-expansion@1.1.11(transitive)

• - Removedconcat-map@0.0.1(transitive)

• - Removeddeep-equal@0.2.2(transitive)

• - Removedfs.realpath@1.0.0(transitive)

• - Removedglob@7.2.3(transitive)

• - Removedinflight@1.0.6(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedminimatch@3.1.2(transitive)

• - Removedncp@1.0.1(transitive)

• - Removedonce@1.4.0(transitive)

• - Removedpath-is-absolute@1.0.1(transitive)

• - Removedrimraf@2.7.1(transitive)

• - Removedutile@0.3.0(transitive)

• - Removedwrappy@1.0.2(transitive)

• Updatedutile@0.1.x