ende 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52237c1735e1a7a869f529311883f4b26d16dba6
-  data.tar.gz: 6b80f204da396bc04481a1c2dafb2211a4d467f5
+  metadata.gz: 62968c729a073ebbf59f3784cab367762e84d539
+  data.tar.gz: 4cf11ac267c9c8bbc05dccf562f44c0ac0cad292
 SHA512:
-  metadata.gz: 0f4d01fb4e90db307400b08c1ad512dff0cf8bf24dfa957caf1b21a056d03b24cfbcdf4571110e82c301b72d802387ffc7f2ff5f3fe8c86b21d4a81193d20c3f
-  data.tar.gz: 69d53d478d64d4b3f0cb7780c97efbab1a2c3332e1358b72b368ebed6a10e9ed54c20d52c9b9c46266f17e56341d6882632c7b1ad15f3ecbd37889fb944048ff
+  metadata.gz: b42de80aa1a414be0df5218d99f657827457c17548f52eddadb82d7295e19730e5c1fea9ef5728c99880450fd745e86eef85537bc4f5443436de98c022d81806
+  data.tar.gz: 9647f2ea5a1ed71670ebc9206575b150511157584c774f91a7db46e2fbdaeb4fe7676b1a21bf98f9939514812a1e207533578a10fd56f1469f1a28b44b48d608

data/component.json

@@ -2,7 +2,7 @@
   "name": "ende",
   "repo": "indefinido/ende",
   "description": "Core web application functionacility",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "keywords": [],
   "dependencies": {
     "mikeric/rivets": "v0.5.12",
@@ -16,7 +16,7 @@
     "components/modernizr": "*",
     "indefinido/advisable": "*",
     "indefinido/observable": "es6-modules",
-    "indefinido/indemma": "*",
+    "indefinido/indemma": "master",
     "component/dialog": "*"
   },
   "scripts": [

data/components/indefinido/indemma/master/component.json

@@ -1,45 +1,55 @@
 {
   "name": "indemma",
   "description": "Indemma (mind picture = memory), client side ES5 observable REST model",
-  "version": "0.1.9",
+  "version": "0.1.13",
   "keywords": [],
   "dependencies": {
     "pluma/assimilate": "0.3.0",
     "component/type": "*",
     "component/bind": "*",
     "component/jquery": "*",
-    "indefinido/observable": "*",
     "indefinido/advisable": "*",
-    "chaijs/chai": "*"
+    "indefinido/observable": "es6-modules"
+  },
+  "development": {
+    "dependencies": {
+      "chaijs/chai": "*"
+    },
+    "scripts": [
+      "vendor/spec/sinon.js",
+      "vendor/spec/sinon/**/*.js"
+    ]
   },
-  "development": {},
   "license": "WTFPL",
+  "paths": [
+    "vendor/components"
+  ],
   "scripts": [
     "index.js",
-    "vendor/stampit.js",
-    "vendor/sinon.js",
-    "vendor/owl/pluralize.js",
+    "lib/extensions/rivets.js",
     "lib/record.js",
     "lib/record/associable.js",
+    "lib/record/dirtyable.js",
+    "lib/record/errors.js",
+    "lib/record/maid.js",
     "lib/record/persistable.js",
-    "lib/record/storable.js",
     "lib/record/queryable.js",
     "lib/record/resource.js",
     "lib/record/rest.js",
     "lib/record/restfulable.js",
     "lib/record/scopable.js",
-    "lib/record/maid.js",
+    "lib/record/storable.js",
     "lib/record/translationable.js",
-    "lib/record/validations/validatorable.js",
-    "lib/record/validations/confirmation.js",
+    "lib/record/validatable.js",
     "lib/record/validations/associated.js",
+    "lib/record/validations/confirmation.js",
+    "lib/record/validations/cpf.js",
     "lib/record/validations/presence.js",
     "lib/record/validations/remote.js",
     "lib/record/validations/type.js",
-    "lib/record/validations/cpf.js",
-    "lib/record/validatable.js",
-    "lib/extensions/rivets.js"
+    "lib/record/validations/validatorable.js",
+    "vendor/stampit.js",
+    "vendor/owl/pluralize.js"
   ],
-  "repository": "indefinido/indemma",
-  "repo": "indefinido/indemma"
-}
+  "repository": "indefinido/indemma"
+}

data/components/indefinido/indemma/master/lib/record/associable.js

@@ -1,4 +1,4 @@
-var $, associable, callbacks, extend, model, modifiers, plural, root, singular, subscribers,
+var $, associable, callbacks, descriptors, extend, model, plural, root, singular,
   __slice = [].slice;
 
 root = window;
@@ -52,7 +52,8 @@ plural = {
   },
   push: function() {
     console.warn("" + this.resource + ".push is deprecated and will be removed, please use add instead");
-    return Array.prototype.push.apply(this, arguments);
+    Array.prototype.push.apply(this, arguments);
+    return arguments[0];
   },
   length: 0,
   json: function(methods, omissions) {
@@ -64,7 +65,18 @@ plural = {
       _results.push(record.json(methods, omissions));
     }
     return _results;
-  }
+  },
+  find: function(id) {
+    var resource, _i, _len;
+
+    for (_i = 0, _len = this.length; _i < _len; _i++) {
+      resource = this[_i];
+      if (resource._id === id) {
+        return resource;
+      }
+    }
+  },
+  filter: Array.prototype.filter || (typeof _ !== "undefined" && _ !== null ? _.filter : void 0)
 };
 
 singular = {
@@ -76,82 +88,61 @@ singular = {
   }
 };
 
-subscribers = {
+descriptors = {
   belongs_to: {
-    foreign_key: function(resource_id) {
-      var association_name, current_resource_id, resource, _ref;
+    resource_id: {
+      getter: function() {
+        return this.owner.observed[this.resource + '_id'];
+      },
+      setter: function(resource_id) {
+        var association_name, current_resource_id, _ref;
 
-      association_name = this.resource.toString();
-      if (!resource_id) {
-        this.dirty = true;
-        this.owner[association_name] = resource_id;
-        return resource_id;
-      }
-      current_resource_id = (_ref = this.owner.observed[association_name]) != null ? _ref._id : void 0;
-      if (resource_id !== current_resource_id) {
-        resource = model[association_name];
-        if (!resource) {
-          console.warn("subscribers.belongs_to.foreign_key: associated factory not found for model: " + association_name);
+        association_name = this.resource.toString();
+        if (!resource_id) {
+          this.dirty = true;
+          this.owner[association_name] = resource_id;
           return resource_id;
         }
-        this.owner.observed[association_name] = null;
+        current_resource_id = (_ref = this.owner.observed[association_name]) != null ? _ref._id : void 0;
+        if (resource_id !== current_resource_id) {
+          this.owner.observed[association_name + '_id'] = resource_id;
+          this.owner.observed[association_name] = null;
+        }
+        return resource_id;
       }
-      return resource_id;
     },
-    associated_changed: function(associated) {
-      return this.owner.observed["" + (this.resource.toString()) + "_id"] = associated ? associated._id : null;
-    }
-  }
-};
-
-modifiers = {
-  belongs_to: {
-    associated_loader: function() {
-      var association_name, definition, temporary_observed,
-        _this = this;
-
-      association_name = this.resource.toString();
-      if (this.owner.observed == null) {
-        this.owner.observed = {};
-        temporary_observed = true;
-      }
-      definition = Object.defineProperty(this.owner, association_name, {
-        set: function(associated) {
-          return this.observed[association_name] = associated;
-        },
-        get: function() {
-          var associated, associated_id, resource;
+    resource: {
+      getter: function() {
+        var associated, associated_id, association_name, resource;
 
-          associated = _this.owner.observed[association_name];
-          associated_id = _this.owner.observed[association_name + '_id'];
-          if (!(((associated != null ? associated._id : void 0) != null) || associated_id)) {
-            return associated;
-          }
-          if (associated != null ? associated.sustained : void 0) {
-            return associated;
-          }
-          resource = model[association_name];
-          if (!resource) {
-            console.warn("subscribers.belongs_to.foreign_key: associated factory not found for model: " + association_name);
-            return associated;
-          }
-          associated = resource.find(associated_id || associated._id);
-          if (associated) {
-            return _this.owner.observed[association_name] = associated;
-          }
-          associated || (associated = resource({
-            _id: associated_id
-          }));
-          associated.reload();
-          return _this.owner.observed[association_name] = associated;
-        },
-        configurable: true,
-        enumerable: true
-      });
-      if (temporary_observed) {
-        delete this.owner.observed;
+        association_name = this.resource.toString();
+        associated = this.owner.observed[association_name];
+        associated_id = this.owner.observed[association_name + '_id'];
+        if (!(((associated != null ? associated._id : void 0) != null) || associated_id)) {
+          return associated;
+        }
+        if (associated != null ? associated.sustained : void 0) {
+          return associated;
+        }
+        resource = model[association_name];
+        if (!resource) {
+          console.warn("descriptors.belongs_to.resource.getter: associated factory not found for model '" + association_name + "' belonging to '" + this.owner.resource + "'");
+          return associated;
+        }
+        associated = resource.find(associated_id || associated._id);
+        if (associated) {
+          return this.owner.observed[association_name] = associated;
+        }
+        associated || (associated = resource({
+          _id: associated_id
+        }));
+        associated.reload();
+        return this.owner.observed[association_name] = associated;
+      },
+      setter: function(associated) {
+        this.owner.observed[this.resource.toString()] = associated;
+        return this.owner.observed[this.resource.toString() + '_id'] = associated ? associated._id : null;
       }
-      return definition;
     }
   }
 };
@@ -313,8 +304,11 @@ associable = {
           old_resource_id = this["" + resource + "_id"];
           old_dirty = this.dirty;
           this["" + resource + "_id"] = null;
-          this.subscribe("" + resource + "_id", $.proxy(subscribers.belongs_to.foreign_key, association_proxy));
-          this.subscribe(resource.toString(), $.proxy(subscribers.belongs_to.associated_changed, association_proxy));
+          Object.defineProperty(this, "" + resource + "_id", {
+            get: $.proxy(descriptors.belongs_to.resource_id.getter, association_proxy),
+            set: $.proxy(descriptors.belongs_to.resource_id.setter, association_proxy),
+            configurable: true
+          });
           this["" + resource + "_id"] = old_resource_id;
           _results.push(this.dirty = old_dirty);
         }
@@ -322,7 +316,7 @@ associable = {
       }
     },
     create_before_hooks: function(record) {
-      var association_proxy, definition, resource, _i, _len, _ref, _results;
+      var association_proxy, definition, old_resource, resource, _i, _len, _ref, _results;
 
       definition = this;
       if (definition.belongs_to) {
@@ -335,7 +329,12 @@ associable = {
             parent_resource: this.resource,
             owner: record
           };
-          _results.push(modifiers.belongs_to.associated_loader.call(association_proxy));
+          old_resource = this[resource];
+          Object.defineProperty(record, resource.toString(), {
+            get: $.proxy(descriptors.belongs_to.resource.getter, association_proxy),
+            set: $.proxy(descriptors.belongs_to.resource.setter, association_proxy)
+          });
+          _results.push(this[resource] = old_resource);
         }
         return _results;
       }

data/components/indefinido/indemma/master/lib/record/dirtyable.js

@@ -0,0 +1,40 @@
+'use strict';
+var dirtyable, model, record;
+
+dirtyable = {
+  ignores: ['dirty', 'resource', 'route', 'initial_route', 'after_initialize', 'before_initialize', 'parent_resource', 'nested_attributes', 'reloading', 'ready', 'saving', 'salvation', 'sustained', 'element', 'default', 'lock', 'validated', 'validation', 'errors', 'dirty'],
+  change: function(name) {
+    return dirtyable.ignores.indexOf(name) === -1;
+  },
+  descriptor: {
+    get: function() {
+      return this.observed.dirty;
+    },
+    set: function(value) {
+      return this.observed.dirty = value;
+    }
+  },
+  record: {
+    after_initialize: function() {
+      Object.defineProperty(this, 'dirty', dirtyable.descriptor);
+      this.observed.dirty = !!this._id;
+      return this.subscribe(function(added, removed, changed, past) {
+        return this.dirty || (this.dirty = !!Object.keys(changed).filter(dirtyable.change).length);
+      });
+    }
+  }
+};
+
+model = window.model;
+
+record = window.record;
+
+model.dirtyable = true;
+
+record.mix(function(recordable) {
+  return recordable.after_initialize.push(dirtyable.record.after_initialize);
+});
+
+model.mix(function(modelable) {});
+
+export default dirtyable;

data/components/indefinido/indemma/master/lib/record/queryable.js

@@ -14,8 +14,8 @@ queryable = {
     }
     return this.storage.store(key);
   },
-  every: function() {
-    return this.storage.values();
+  every: function(callback) {
+    return callback(this.storage.values());
   },
   where: function() {
     throw new Error('queryable.where: Not implemented yet');

data/components/indefinido/indemma/master/lib/record/resource.js

@@ -37,7 +37,7 @@ descriptors = {
       }
       route = '/';
       if (this.parent != null) {
-        route += "" + this.parent.route + "/" + this.parent._id + "/";
+        route += ("" + this.parent.route + "/" + this.parent._id) + "/";
       }
       if (this.resource.scope != null) {
         route += this.resource.scope + '/';

data/components/indefinido/indemma/master/lib/record/rest.js

@@ -1,4 +1,4 @@
-var $, request;
+var $, data_for, request;
 
 $ = require('jquery');
 
@@ -17,7 +17,7 @@ module.exports = {
   }
 };
 
-request = function(method, url, data) {
+data_for = function(data) {
   var param_name;
 
   param_name = this.resource.param_name || this.resource.toString();
@@ -29,6 +29,11 @@ request = function(method, url, data) {
     delete data[param_name]['id'];
     delete data[param_name]['_id'];
   }
+  return data;
+};
+
+request = function(method, url, data) {
+  data = data_for.call(this, data);
   return $.ajax({
     url: url,
     data: data,

data/components/indefinido/indemma/master/lib/record/restfulable.js

@@ -13,6 +13,8 @@ rest = require('./rest.js');
 
 root = typeof exports !== "undefined" && exports !== null ? exports : this;
 
+import './dirtyable.js';
+
 util = {
   model: {
     map: function(records) {
@@ -85,7 +87,11 @@ restful = {
         data = {};
       }
       old_route = this.route;
-      default_route = "/" + (model.pluralize(this.resource.name));
+      default_route = '/';
+      if (this.resource.scope != null) {
+        default_route += this.resource.scope + '/';
+      }
+      default_route += this.resource.singular ? this.resource.name : model.pluralize(this.resource.name);
       if (default_route !== this.route) {
         this.route = default_route;
       }
@@ -141,13 +147,14 @@ restful = {
       return promise;
     },
     assign_attributes: function(attributes) {
-      var association, association_attributes, association_name, associations_attributes, attribute, message, name, singular_resource, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _results;
+      var association, association_attributes, association_name, associations_attributes, attribute, message, name, singular_resource, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _results;
 
       _ref = model[this.resource.toString()].has_many;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         association_name = _ref[_i];
-        associations_attributes = attributes[association_name];
+        associations_attributes = attributes[association_name + "_attributes"] || attributes[association_name];
         delete attributes[association_name];
+        delete attributes[association_name + '_attributes'];
         association = this[association_name];
         if (association == null) {
           message = "Association '" + association_name + "' not found. \n";
@@ -185,6 +192,16 @@ restful = {
           this[association_name] = this["build_" + association_name](association_attributes);
         }
       }
+      _ref3 = model[this.resource.toString()].belongs_to;
+      for (_m = 0, _len4 = _ref3.length; _m < _len4; _m++) {
+        association_name = _ref3[_m];
+        association_attributes = (_ref4 = (_ref5 = attributes[association_name]) != null ? typeof _ref5.json === "function" ? _ref5.json() : void 0 : void 0) != null ? _ref4 : attributes[association_name];
+        delete attributes[association_name];
+        delete attributes[association_name + "_attributes"];
+        if (association_attributes) {
+          this[association_name] = this["build_" + association_name](association_attributes);
+        }
+      }
       _results = [];
       for (name in attributes) {
         attribute = attributes[name];
@@ -339,11 +356,11 @@ restful = {
         return JSON.stringify(serialized);
       }
     },
-    json: function(methods) {
-      var definition, json, name, nature, nested, value;
+    json: function(options) {
+      var definition, json, method, name, nature, nested, value, _ref, _ref1;
 
-      if (methods == null) {
-        methods = {};
+      if (options == null) {
+        options = {};
       }
       json = {};
       definition = model[this.resource.toString()];
@@ -369,15 +386,15 @@ restful = {
               console.warn("json: Tryied to serialize nested attribute '" + name + "' without serialization method!");
               continue;
             }
-            json["" + name + "_attributes"] = value.json(methods[name]);
+            json["" + name + "_attributes"] = value.json(options[name]);
           } else if ((value.toJSON != null) || (value.json != null)) {
             if (value.resource) {
               continue;
             }
             if (value.json != null) {
-              json[name] = value.json(methods[name]);
+              json[name] = value.json(options[name]);
             } else {
-              json[name] = value.toJSON(methods[name]);
+              json[name] = value.toJSON(options[name]);
             }
           } else {
             continue;
@@ -387,6 +404,16 @@ restful = {
         }
       }
       json = observable.unobserve(json);
+      _ref1 = (_ref = options.methods) != null ? _ref : {};
+      for (name in _ref1) {
+        value = _ref1[name];
+        method = this[name];
+        if (typeof method === 'function') {
+          json[name] = method();
+        } else {
+          json[name] = method;
+        }
+      }
       delete json.dirty;
       delete json.resource;
       delete json.route;

data/components/indefinido/indemma/master/lib/record/scopable.js

@@ -60,14 +60,16 @@ scopable = {
       fail: [],
       declared: [],
       fetch: function(data, done, fail) {
-        var deferred, scope;
+        var deferred, method, scope;
 
         if (typeof data === 'function') {
           done = data;
           data = {};
         }
         scope = extend({}, this.scope.data);
-        observable.unobserve(scope);
+        for (method in observable.methods) {
+          delete scope[method];
+        }
         if (scope.noned != null) {
           deferred = $.Deferred();
           deferred.resolveWith(this, [[]]);
@@ -124,7 +126,7 @@ scopable = {
       return this.scope.fetch.call(this, data, done, fail);
     },
     forward_scopes_to_associations: function() {
-      var associated_factory, associated_resource, association, association_name, factory, forwarder, generate_forwarder, scope, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4;
+      var associated_factory, associated_resource, association, association_name, factory, scope, _i, _j, _len, _len1, _ref, _ref1;
 
       factory = model[this.resource.name];
       _ref = factory.has_many;
@@ -144,46 +146,6 @@ scopable = {
           association.scope(scope, associated_factory["$" + scope]);
         }
       }
-      _ref2 = factory.has_one;
-      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
-        associated_resource = _ref2[_k];
-        if (!model[associated_resource]) {
-          console.warn("Associated factory not found for associated resource: " + associated_resource);
-          continue;
-        }
-        _ref3 = model[associated_resource].scope.declared;
-        for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
-          scope = _ref3[_l];
-          this[associated_resource][scope] = factory[scope];
-        }
-      }
-      if (factory.belongs_to.length) {
-        generate_forwarder = function(associated_resource) {
-          var declared_scopes;
-
-          associated_factory = model[associated_resource];
-          if (!associated_factory) {
-            return console.warn("Associated factory not found for associated resource: " + associated_resource);
-          }
-          declared_scopes = associated_factory.scope.declared;
-          return function() {
-            var _len4, _m, _results;
-
-            _results = [];
-            for (_m = 0, _len4 = declared_scopes.length; _m < _len4; _m++) {
-              scope = declared_scopes[_m];
-              _results.push(this[associated_resource][scope] = associated_factory[scope]);
-            }
-            return _results;
-          };
-        };
-        _ref4 = factory.belongs_to;
-        for (_m = 0, _len4 = _ref4.length; _m < _len4; _m++) {
-          associated_resource = _ref4[_m];
-          forwarder = generate_forwarder(associated_resource);
-          this.after("build_" + associated_resource, forwarder);
-        }
-      }
       return true;
     }
   },
@@ -283,11 +245,13 @@ if (model.associable) {
       promises.push(this.scope.fetch.call(this, data, null, scopable.record.failed));
       reload = $.when.apply(jQuery, promises);
       reload.done(function(records, status) {
-        var association_name, singular_resource, _i, _j, _len, _len1, _ref;
+        var association_name, create, index, singular_resource, target, _i, _j, _k, _len, _len1, _len2, _ref;
 
-        Array.prototype.splice.call(this, 0);
         if (!records.length) {
-          return;
+          if (this.length) {
+            Array.prototype.splice.call(this, 0);
+          }
+          return true;
         }
         singular_resource = model.singularize(this.resource);
         for (_i = 0, _len = records.length; _i < _len; _i++) {
@@ -299,7 +263,16 @@ if (model.associable) {
             delete record[association_name];
           }
         }
-        this.add.apply(this, records);
+        create = [];
+        for (index = _k = 0, _len2 = records.length; _k < _len2; index = ++_k) {
+          record = records[index];
+          if (target = this.find(record._id)) {
+            target.assign_attributes(record);
+          } else {
+            create.push(record);
+          }
+        }
+        this.add.apply(this, create);
         records.splice(0);
         return records.push.apply(records, this);
       });

data/components/indefinido/indemma/master/lib/record/storable.js

@@ -6,6 +6,17 @@ merge = extend.withStrategy('deep');
 
 stampit = require('../../vendor/stampit');
 
+Object.values || (Object.values = (typeof _ !== "undefined" && _ !== null ? _.values : void 0) || function(object) {
+  var key, value, _results;
+
+  _results = [];
+  for (key in object) {
+    value = object[key];
+    _results.push(value);
+  }
+  return _results;
+});
+
 storable = stampit({
   store: function(keypath, value, options) {
     var collection, entry, key, _i, _len;