Add in findById and deleteById

sillydeveloper · sillydeveloper · commit eb1d910fa4ac · 2015-02-17T10:38:04.000-08:00
diff --git a/README.md b/README.md
@@ -8,6 +8,21 @@ This was built primarily to see how far I could get in an afternoon / evening in
 npm install pg-orm --save
 ```
 
+Note that this will automatically use your database.json file to build the pg link, a la:
+
+```
+{
+  "dev": {
+    "driver": "pg",
+    "user": "skoobi",
+    "password": "something",
+    "host": "localhost",
+    "database": "myDB",
+    "schema": "myDBSchema"
+  }
+}
+```
+
 ### Creating your models
 
 The ORM essentially acts like a factory that pops out objects based on a simple DSL. Here's an example definition:
diff --git a/libs/base.js b/libs/base.js
@@ -33,6 +33,7 @@ function dbCall(stmnt, values) {
 
 // ---------------------------------------
 
+// This should probably be in another file...
 var Base = function() {
   this.tableName = null;
   this.tableProperties = null;
@@ -46,6 +47,7 @@ Base.prototype.create = function(data) {
     _propertyValues = [], 
     _cnt = 1;
 
+  // check the incoming data to ensure that it's legit mapped to the db:
   for (var i in data) {
     if (this.tableProperties.hasOwnProperty(i)) {
       _propertyNames.push(i);
@@ -97,10 +99,46 @@ Base.prototype.update = function() {
   dbCall(stmnt, _propertyValues).then(function(data) {
     defer.resolve(data);
   });
-  
+
   return defer.promise;
 }; // end update
 
+Base.prototype.findById = function(id) {
+  var _this = this;
+  var stmnt = 'SELECT * FROM ' + _this.tableName + ' WHERE id = $1';
+
+  var defer = Q.defer();
+  dbCall(stmnt, [ id ]).then(function(data) {
+    if (data.rows.length < 1) {
+      defer.resolve(data);
+    }
+
+    // build a new object from the result:
+    var newObject = new Base();
+    newObject.tableProperties = _this.tableProperties;
+    newObject.tableName = _this.tableName;
+
+    for(var j in newObject.tableProperties) {
+      newObject[j] = data.rows[0][j];
+    }
+    defer.resolve(newObject);
+  });
+
+  return defer.promise;
+}; // end findById
+
+Base.prototype.deleteById = function(id) {
+  var _this = this;
+  var stmnt = 'DELETE FROM ' + _this.tableName + ' WHERE id=$1';
+
+  var defer = Q.defer();
+  dbCall(stmnt, [ id ]).then(function(data) {
+    defer.resolve(data);
+  });
+
+  return defer.promise;
+}; // end deleteById
+
 // ---------------------------------------
 
 module.exports.build = function(obj) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-orm",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "A simple node ORM for postgres",
   "homepage": "http://skoobistudios.com",
   "author": {
diff --git a/test/base.js b/test/base.js
@@ -17,28 +17,45 @@ var testBase = base.build({
   }
 });
 
-describe('base node module', function () {
+describe('crud operators', function () {
   it('should should build an object', function () {
     assert(testBase.tableName == 'test', 'named object should be named');
   });
 
-  it('should be able to create a new object', function(done) {
-    testBase.create({ 'name': 'Ronald' }).then(function(testObject) {
-      assert(testObject.name == 'Ronald', 'Name should be ronald');
+  it('should be able to create an object', function(done) {
+    testBase.create({ 'name': 'Create' }).then(function(testObject) {
+      assert(testObject.name == 'Create', 'Name should be Create');
       assert(typeof testObject.id != 'undefined', 'ID should not be undefined after insert');
       assert(testObject.prototype == testBase.prototype, 'Protos don\'t match');
       done();
     });
   });
 
   it('should be able to update an existing object', function(done) {
-    this.timeout(5000);
-    testBase.create({ 'name': 'Ronald' }).then(function(testObject) {
+    testBase.create({ 'name': 'Update' }).then(function(testObject) {
       testObject.name = 'Mike';
       testObject.update().then(function() {
-        assert(testObject.name == 'Mike', 'Should update to new name');
+        assert(testObject.name == 'Mike', 'Should update to new name of Mike');
         done();
       });
     });
   });
+
+  it('should be able to find an existing object', function(done) {
+    testBase.create({ 'name': 'Find' }).then(function(testObject) {
+      testBase.findById(testObject.id).then(function(newTestObject) {
+        assert(testObject.name == 'Find', 'Name should be Find after find');
+        done();
+      });
+    });
+  });
+
+  it('should be able to delete an existing object', function(done) {
+    testBase.create({ 'name': 'Delete' }).then(function(testObject) {
+      var _id = testObject.id;
+      testObject.deleteById(_id).then(function(data) {
+        done();
+      })
+    });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pg-orm",`
`3`		`- "version": "0.0.1",`
	`3`	`+ "version": "0.0.2",`
`4`	`4`	`"description": "A simple node ORM for postgres",`
`5`	`5`	`"homepage": "http://skoobistudios.com",`
`6`	`6`	`"author": {`