grand-central-records - npm Package Compare versions

Comparing version 0.1.3 to 0.1.4

index.js

@@ -139,2 +139,4 @@ // Custom ORM that connects with MySQL, Postgres, SQLite3
 fn.toString = function() {
+    if (!this.q) return '';
+
     var other = " " +
@@ -141,0 +143,0 @@ this.q.others.orderBy + " " +

lib/chain.js

@@ -31,3 +31,3 @@ var _    = require('lodash'),
 
-        Object.keys(options).forEach(function(key) {
+        if (this.q) Object.keys(options).forEach(function(key) {
             if (_.contains(['action', 'from', 'where', 'table'], key)) {
@@ -34,0 +34,0 @@ this.q[key] = (options[key] + ' ' + (value || '')).trim();

lib/model.js

 var _ = require('lodash');
-var Q = require('q');
 
@@ -236,15 +235,21 @@ var Model = exports.Model = function(data, options, db) {
         if (callback) callback(err);
-        else {
-            var d = Q.defer();
-            d.reject(err);
-            return d.promise;
-        }
+        else return this._db.reject(err);
     }
 
     var isNew = (this[this._options._idField] == -1);
-    var method = isNew ? 'insert' : 'update';
     var data = isNew ? this.toJSON() : this.changed();
 
-    if (callback) this._db[method](data, callback);
-    else return this._db[method](data);
+    // If model hasn't changed, don't update
+    if (!isNew && _.isEmpty(data)) {
+        if (callback) return callback(null, []);
+        this._db.q = null;
+        return this._db;
+    // Otherwise run callback or return promise
+    } else if (isNew) {
+        if (callback) this._db.insert(data, callback);
+        else return this._db.insert(data);
+    } else {
+        if (callback) this._db.update(this.id, data, callback);
+        else return this._db.update(this.id, data);
+    }
 };
@@ -251,0 +256,0 @@

lib/promise.js

@@ -6,2 +6,3 @@ var _ = require('lodash');
 
+
 // Starts a promise chain
@@ -31,2 +32,12 @@ fn.then = function(callback) {
 
+fn._err = null;
+
+// Call this elsewhere to reject promise chain
+fn.reject = function(err) {
+    this._err = err;
+    this.q = null;
+
+    return this;
+};
+
 // Runs callback or returns a promise
@@ -33,0 +44,0 @@ fn.run = function(cb) {

lib/query.js

@@ -30,2 +30,6 @@ var _ = require('lodash');
         newCallback(null, query);
+    } else if (query === '') {
+        callback(this._err, []);
+        this._err = null;
+        this._rebuild();
     } else {
@@ -32,0 +36,0 @@ this.query(query, values, newCallback);

package.json

 {
     "name": "grand-central-records",
     "description": "An activerecord-inspired ORM for Node.js",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "keywords": ["grand central", "rails", "orm", "activerecord"],
@@ -6,0 +6,0 @@ "author": {

Readme.md

@@ -50,2 +50,4 @@ # Grand Central Records
 * [Models](#models)
+* [Validations](#validations)
+* [Creating & Updating Models](#newmodels)
 * [Expansion of models](#expansion)
@@ -286,2 +288,29 @@ * [reload()](#reload)
 
+<a name="newmodels" />
+### Creating & updating models
+
+Creating a new model:
+```js
+var tiger = Animal.new({ name: 'Tiger' });
+
+// Run validations and insert into DB:
+tiger.save(function(err) { ... });
+// PROMISES //
+tiger.save().then(function(err) { ... });
+```
+
+Updating a model:
+```js
+Animal.where({ name: 'Tiger' }, function(err, animals) {
+    animals[0].name = 'Siberian Tiger';
+    // Run validations and update in DB:
+    animals[0].save(function(err) { ... });
+});
+// PROMISES //
+Animal.where({ name: 'Tiger' }).then(function(animals) {
+    animals[0].name = 'Siberian Tiger';
+    return animals[0].save().run();
+}).fail(function(err) { ... });
+```
+
 <a name="expansion" />
@@ -288,0 +317,0 @@ ### Expansion of models

No alert changes

Improved metrics

Total package byte prevSize

102878

increased by1.28%

Lines of code

2487

increased by0.69%

Number of lines in readme file

544

increased by5.63%

No dependency changes