backbone-orm - npm Package Compare versions

Comparing version 0.5.4 to 0.5.5

bower.json

 {
   "name": "backbone-orm",
   "main": "backbone-orm.js",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "homepage": "http://vidigami.github.io/backbone-orm/",
@@ -6,0 +6,0 @@ "authors": [

lib/cache/cursor.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cache/memory_store.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cache/model_cache.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cache/query_cache.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cache/singletons.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cache/sync.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/connection_pool.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/cursor.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/database_url.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/extensions/collection.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/extensions/model.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -11,3 +11,3 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)
 (function() {
-  var Backbone, ModelStream, Queue, Utils, modelEach, modelInterval, moment, _;
+  var Backbone, DatabaseURL, ModelStream, Queue, Utils, modelEach, modelInterval, moment, _;
 
@@ -30,2 +30,4 @@ _ = require('underscore');
 
+  DatabaseURL = require('../database_url');
+
   require('./collection');
@@ -32,0 +34,0 @@

lib/index.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/json_utils.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/memory/cursor.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -98,4 +98,4 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)
         queue.defer(function(callback) {
-          var find_queue, id, ins, ins_size, key, model_json, value, _fn, _ref1, _ref2, _ref3;
-          ins = {};
+          var find_queue, id, ins, ins_size, key, model_json, nins, nins_size, value, _fn, _ref1, _ref2, _ref3, _ref4, _ref5;
+          _ref1 = [{}, {}], ins = _ref1[0], nins = _ref1[1];
           for (key in find_query) {
@@ -107,9 +107,13 @@ value = find_query[key];
             }
+            if (value != null ? value.$nin : void 0) {
+              delete find_query[key];
+              nins[key] = value.$nin;
+            }
           }
-          ins_size = _.size(ins);
-          if (keys.length || ins_size) {
+          _ref2 = [_.size(ins), _.size(nins)], ins_size = _ref2[0], nins_size = _ref2[1];
+          if (keys.length || ins_size || nins_size) {
             if (_this._cursor.$ids) {
-              _ref1 = _this.store;
-              for (id in _ref1) {
-                model_json = _ref1[id];
+              _ref3 = _this.store;
+              for (id in _ref3) {
+                model_json = _ref3[id];
                 if (_.contains(_this._cursor.$ids, id) && _.isEqual(_.pick(model_json, keys), find_query)) {
@@ -122,3 +126,3 @@ json.push(JSONUtils.deepClone(model_json));
               find_queue = new Queue();
-              _ref2 = _this.store;
+              _ref4 = _this.store;
               _fn = function(model_json) {
@@ -144,4 +148,4 @@ return find_queue.defer(function(callback) {
               };
-              for (id in _ref2) {
-                model_json = _ref2[id];
+              for (id in _ref4) {
+                model_json = _ref4[id];
                 _fn(model_json);
@@ -155,6 +159,6 @@ }
                   json = _.filter(json, function(model_json) {
-                    var values, _ref3;
+                    var values, _ref5;
                     for (key in ins) {
                       values = ins[key];
-                      if (_ref3 = model_json[key], __indexOf.call(values, _ref3) >= 0) {
+                      if (_ref5 = model_json[key], __indexOf.call(values, _ref5) >= 0) {
                         return true;
@@ -165,2 +169,13 @@ }
                 }
+                if (nins_size) {
+                  json = _.filter(json, function(model_json) {
+                    var values, _ref5;
+                    for (key in nins) {
+                      values = nins[key];
+                      if (_ref5 = model_json[key], __indexOf.call(values, _ref5) < 0) {
+                        return true;
+                      }
+                    }
+                  });
+                }
                 return callback();
@@ -171,5 +186,5 @@ });
             if (_this._cursor.$ids) {
-              _ref3 = _this.store;
-              for (id in _ref3) {
-                model_json = _ref3[id];
+              _ref5 = _this.store;
+              for (id in _ref5) {
+                model_json = _ref5[id];
                 if (_.contains(_this._cursor.$ids, id)) {
@@ -181,7 +196,7 @@ json.push(JSONUtils.deepClone(model_json));
               json = (function() {
-                var _ref4, _results;
-                _ref4 = this.store;
+                var _ref6, _results;
+                _ref6 = this.store;
                 _results = [];
-                for (id in _ref4) {
-                  model_json = _ref4[id];
+                for (id in _ref6) {
+                  model_json = _ref6[id];
                   _results.push(JSONUtils.deepClone(model_json));
@@ -188,0 +203,0 @@ }

lib/memory/sync.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/node/model_type_id.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -54,5 +54,7 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)
       var id;
-      id = this.modelID(model_type);
-      if (this.strict && this.ids[id] && this.ids[id] !== model_type) {
-        throw new Error("Duplicate model name / url combination: " + model_type.model_name + ", " + (_.result(model_type.prototype, 'url')) + ". Set a unique model_name property on one of the conflicting models.");
+      if (!(id = model_type.model_type_id)) {
+        id = this.modelID(model_type);
+        if (this.strict && this.ids[id] && this.ids[id] !== model_type) {
+          throw new Error("Duplicate model name / url combination: " + model_type.model_name + ", " + (_.result(model_type.prototype, 'url')) + ". Set a unique model_name property on one of the conflicting models.");
+        }
       }
@@ -59,0 +61,0 @@ this.ids[id] = model_type;

lib/node/utils.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/queue.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/relations/many.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/relations/one.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/relations/relation.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/schema.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

lib/utils.js

 // Generated by CoffeeScript 1.6.3
 /*
-  backbone-orm.js 0.5.4
+  backbone-orm.js 0.5.5
   Copyright (c) 2013 Vidigami - https://github.com/vidigami/backbone-orm
@@ -5,0 +5,0 @@ License: MIT (http://www.opensource.org/licenses/mit-license.php)

package.json

 {
   "name": "backbone-orm",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "A polystore ORM for Node.js and the browser",
@@ -9,3 +9,3 @@ "main": "./lib/index.js",
   "contributors": ["Gwilym Humphreys (https://github.com/gwilymhumphreys)"],
-  "repository": {"type": "git", "url": "https://bitbucket.org/vidigami/backbone-orm.git"},
+  "repository": {"type": "git", "url": "https://github.com/vidigami/backbone-orm.git"},
   "keywords": ["backbone", "orm", "backbone-orm"],
@@ -12,0 +12,0 @@ "engines": {"node": "*"},

RELEASE_NOTES.md

 Please refer to the following release notes when upgrading your version of BackboneORM.
 
+### 0.5.5
+* Added $nin support
+* Allow for manual model_type_id
+
 ### 0.5.4
@@ -4,0 +8,0 @@ * Bug fix: references to util Node.js module

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2426809

increased by0.22%

Lines of code

34586

increased by0.1%

No dependency changes