ende 0.3.13 → 0.4.0

data/vendor/components/indefinido-indemma/component.json

@@ -2,7 +2,7 @@
   "name": "indemma",
   "repo": "indefinido/indemma",
   "description": "Indemma (mind picture = memory), client side ES5 observable REST model",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "keywords": [],
   "dependencies": {
     "pluma/assimilate": "0.3.0",
@@ -19,6 +19,7 @@
     "vendor/stampit.js",
     "vendor/sinon.js",
     "vendor/owl/pluralize.js",
+
     "lib/record.js",
     "lib/record/associable.js",
     "lib/record/persistable.js",
@@ -30,6 +31,7 @@
     "lib/record/scopable.js",
     "lib/record/maid.js",
     "lib/record/translationable.js",
+    "lib/record/validations/validatorable.js",
     "lib/record/validations/confirmation.js",
     "lib/record/validations/associated.js",
     "lib/record/validations/presence.js",

data/vendor/components/indefinido-indemma/karma.conf.js

@@ -1,86 +1,76 @@
 // Karma configuration
-// Generated on Mon May 27 2013 16:00:28 GMT-0300 (BRT)
 
+module.exports = function(config) {
+  config.set({
 
-// base path, that will be used to resolve files and exclude
-basePath = '';
+    // base path, that will be used to resolve files and exclude
+    basePath: '',
 
-// list of files / patterns to load in the browser
-files = [
 
-  // Test environment
-  MOCHA,
-  MOCHA_ADAPTER,
-  'vendor/sinon.js',
+    // frameworks to use
+    frameworks: ['mocha'],
 
-  // Test dependencies
-  'build/test.js',
-  'spec/support/**/*.js',
 
-  // Test Source files
-  'spec/spec_helper.js',
-  'spec/**/*.js'
-];
+    // list of files / patterns to load in the browser
+    files: [
+        'vendor/sinon.js',
+        'build/test.js',
+        'spec/support/**/*.js',
+        'spec/spec_helper.js',
+        'spec/**/*.js'
+    ],
 
+    // list of files to excudle
+    exclude: [
+      'spec/coverage/**/*.js'
+    ],
 
-// list of files to exclude
-exclude = [
-  'spec/coverage'
-];
+    client: {
+        mocha: {
+            ui: 'bdd'
+        }
+    },
 
 
-// test results reporter to use
-// possible values: 'dots', 'progress', 'junit'
-reporters = ['progress', 'coverage'];
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
+    reporters: ['progress'],
 
 
-// web server port
-port = 9876;
+    // web server port
+    port: 9876,
 
 
-// cli runner port
-runnerPort = 9100;
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
 
 
-// enable / disable colors in the output (reporters and logs)
-colors = true;
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
 
 
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_INFO;
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
 
 
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = true;
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera (has to be installed with `npm install karma-opera-launcher`)
+    // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
+    // - PhantomJS
+    // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
+    browsers: ['Chrome'],
 
 
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-browsers = ['Chrome'];
+    // If browser does not capture in given timeout [ms], kill it
+    captureTimeout: 60000,
 
 
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 600000;
-
-
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = false;
-
-// Coverage preprocessors
-preprocessors = {
-  '**/lib/*.js': 'coverage'
+    // Continuous Integration mode
+    // if true, it capture browsers, run tests and exit
+    singleRun: false
+  });
 };
-
-// Converage configuration
-coverageReporter = {
-  type : 'html',
-  dir  : 'spec/coverage'
-}

data/vendor/components/indefinido-indemma/lib/record/associable.js

@@ -79,26 +79,22 @@ singular = {
 subscribers = {
   belongs_to: {
     foreign_key: function(resource_id) {
-      var associated, association_name, current_resource_id, resource, _ref;
+      var association_name, current_resource_id, resource, _ref;
 
       association_name = this.resource.toString();
-      if (resource_id === null || resource_id === void 0) {
+      if (!resource_id) {
         this.dirty = true;
         this.owner[association_name] = resource_id;
         return resource_id;
       }
-      current_resource_id = (_ref = this.owner[association_name]) != null ? _ref._id : void 0;
+      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);
           return resource_id;
         }
-        associated = resource.find(resource_id);
-        associated || (associated = resource({
-          _id: resource_id
-        }));
-        this.owner.observed[association_name] = associated;
+        this.owner.observed[association_name] = null;
       }
       return resource_id;
     },
@@ -136,10 +132,12 @@ modifiers = {
             return associated;
           }
           associated = resource.find(associated_id || associated._id);
+          if (associated) {
+            return _this.owner.observed[association_name] = associated;
+          }
           associated || (associated = resource({
             _id: associated_id
           }));
-          resource.storage.store(associated._id, associated);
           associated.reload();
           return _this.owner.observed[association_name] = associated;
         },
@@ -161,8 +159,8 @@ callbacks = {
         for (_i = 0, _len = association_names.length; _i < _len; _i++) {
           association_name = association_names[_i];
           associations_attributes = this["" + association_name + "_attributes"];
+          association = this[model.pluralize(association_name)];
           if (associations_attributes && associations_attributes.length) {
-            association = this[model.pluralize(association_name)];
             if (!association) {
               message = "has_many.nest_attributes: Association not found for " + association_name + ". \n";
               message += "did you set it on model declaration? \n  has_many: " + association_name + " ";
@@ -252,7 +250,7 @@ associable = {
       return true;
     },
     create_after_hooks: function(definition) {
-      var association_name, association_proxy, old_resource_id, options, resource, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _results;
+      var association_attributes, association_name, association_proxy, old_dirty, old_resource_id, options, resource, _i, _j, _k, _len, _len1, _len2, _name, _ref, _ref1, _ref2, _results;
 
       options = model[this.resource.name || this.resource.toString()];
       if (options.has_many) {
@@ -265,6 +263,11 @@ associable = {
             parent: this
           };
           association_name = model.pluralize(resource);
+          association_attributes = this[association_name] || [];
+          this[_name = "" + association_name + "_attributes"] || (this[_name] = []);
+          if (association_attributes.length) {
+            this["" + association_name + "_attributes"] = this["" + association_name + "_attributes"].concat(association_attributes);
+          }
           this[association_name] = $.extend(association_proxy, plural);
         }
         this.after('saved', callbacks.has_many.update_association);
@@ -300,15 +303,12 @@ associable = {
           this["build_" + resource] = $.proxy(singular.build, association_proxy);
           this["create_" + resource] = $.proxy(singular.create, association_proxy);
           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));
-          this.resource_id = old_resource_id;
-          if (this["" + resource + "_id"] && !this[resource]) {
-            _results.push(this.publish("" + resource + "_id", this["" + resource + "_id"]));
-          } else {
-            _results.push(void 0);
-          }
+          this["" + resource + "_id"] = old_resource_id;
+          _results.push(this.dirty = old_dirty);
         }
         return _results;
       }

data/vendor/components/indefinido-indemma/lib/record/persistable.js

@@ -16,7 +16,14 @@ handlers = {
 persistable = {
   record: {
     after_initialize: function() {
-      return this.after('saved', handlers.store_after_saved);
+      var storage;
+
+      if (this._id) {
+        storage = model[this.resource.toString()].storage;
+        return storage.store(this._id, this);
+      } else {
+        return this.after('saved', handlers.store_after_saved);
+      }
     }
   }
 };

data/vendor/components/indefinido-indemma/lib/record/queryable.js

@@ -9,6 +9,9 @@ stampit = require('../../vendor/stampit');
 queryable = {
   storage: storable(),
   find: function(key) {
+    if (!key) {
+      throw new TypeError("InvalidFind: resource.find was called with a falsey value");
+    }
     return this.storage.store(key);
   },
   all: function() {

data/vendor/components/indefinido-indemma/lib/record/resource.js

@@ -1,4 +1,4 @@
-var model, resource, resourceable, stampit;
+var descriptors, model, resource, resourceable, stampit;
 
 stampit = require('../../vendor/stampit');
 
@@ -25,34 +25,11 @@ resource = stampit({
   return this;
 });
 
-resourceable = {
-  pluralize: function(word, count, plural) {
-    if (!(word && word.length)) {
-      throw new TypeError("Invalid string passed to pluralize '" + word + "'");
-    }
-    if (word.indexOf('s') !== word.length - 1) {
-      return owl.pluralize(word, count, plural);
-    } else {
-      return word;
-    }
-  },
-  singularize: function(word) {
-    if (!(word && word.length)) {
-      throw new TypeError("Invalid string passed to singularize '" + word + "'");
-    }
-    if (word.lastIndexOf('s') === word.length - 1) {
-      return word.substring(0, word.length - 1);
-    } else {
-      return word;
-    }
-  },
+descriptors = {
   route: {
     get: function() {
       var route;
 
-      if (this.initial_route != null) {
-        return this.initial_route;
-      }
       if (typeof this.resource === 'string') {
         this.resource = {
           name: this.resource
@@ -66,33 +43,36 @@ resourceable = {
         route += this.resource.scope + '/';
       }
       route += this.resource.singular ? this.resource.name : model.pluralize(this.resource.name);
-      this.initial_route = route;
-      return route;
+      return this.route = route;
     },
-    set: function(value) {
-      return this.initial_route = value;
+    configurable: true
+  }
+};
+
+resourceable = {
+  pluralize: function(word, count, plural) {
+    if (!(word && word.length)) {
+      throw new TypeError("Invalid string passed to pluralize '" + word + "'");
+    }
+    if (word.indexOf('s') !== word.length - 1) {
+      return owl.pluralize(word, count, plural);
+    } else {
+      return word;
     }
   },
-  parent_id: {
-    get: function() {
-      if (this[this.parent_resource]) {
-        return this[this.parent_resource]._id;
-      }
-    },
-    set: function() {
-      return console.error('Warning changing associations throught parent_id not allowed for security and style guide purposes');
+  singularize: function(word) {
+    if (!(word && word.length)) {
+      throw new TypeError("Invalid string passed to singularize '" + word + "'");
+    }
+    if (word.lastIndexOf('s') === word.length - 1) {
+      return word.substring(0, word.length - 1);
+    } else {
+      return word;
     }
   },
   initialize: function() {
     var resource_definition, _ref;
 
-    if (this.parent_resource) {
-      Object.defineProperty(this, "" + this.parent_resource + "_id", {
-        value: resourceable.parent_id,
-        configurable: true,
-        enumerable: true
-      });
-    }
     resource_definition = {};
     if (typeof this.resource === 'string') {
       resource_definition = {
@@ -105,7 +85,7 @@ resourceable = {
     }
     resource_definition.parent = this.parent_resource;
     this.resource = resource(resource_definition);
-    return (_ref = this.route) != null ? _ref : Object.defineProperty(this, 'route', resourceable.route);
+    return (_ref = this.route) != null ? _ref : Object.defineProperty(this, 'route', descriptors.route);
   }
 };
 

data/vendor/components/indefinido-indemma/lib/record/restfulable.js

@@ -1,4 +1,4 @@
-var $, merge, model, observable, record, rest, restful, type, util,
+var $, merge, model, observable, record, rest, restful, root, type, util,
   __slice = [].slice;
 
 merge = require('assimilate').withStrategy('deep');
@@ -11,15 +11,17 @@ $ = require('jquery');
 
 rest = require('./rest.js');
 
+root = typeof exports !== "undefined" && exports !== null ? exports : this;
+
 util = {
   model: {
-    map: function(models) {
-      var model, _i, _len, _results;
+    map: function(records) {
+      var record, _i, _len, _results;
 
       _results = [];
-      for (_i = 0, _len = models.length; _i < _len; _i++) {
-        model = models[_i];
-        _results.push(this(model));
+      for (_i = 0, _len = records.length; _i < _len; _i++) {
+        record = records[_i];
+        _results.push(this(record));
       }
       return _results;
     }
@@ -51,15 +53,15 @@ restful = {
       }
       return $.when.apply($, savings);
     },
-    all: function(conditions, callback) {
+    all: function(conditions, doned, failed) {
       if (conditions == null) {
         conditions = {};
       }
       if (typeof conditions === 'function') {
-        callback = conditions;
+        doned = conditions;
         conditions = {};
       }
-      return $.when(rest.get.call(this, conditions)).then(util.model.map).done(callback);
+      return $.when(rest.get.call(this, conditions)).then(util.model.map).done(doned).fail(failed);
     },
     first: function(conditions, callback) {
       var namespaced;
@@ -77,15 +79,21 @@ restful = {
       return this.all(conditions, callback);
     },
     get: function(action, data) {
-      var old_route, payload, promise, resource, route;
+      var default_route, old_route, payload, promise, resource;
 
       if (data == null) {
         data = {};
       }
       old_route = this.route;
-      this.route = "/" + (model.pluralize(this.resource.name));
+      default_route = "/" + (model.pluralize(this.resource.name));
+      if (default_route !== this.route) {
+        this.route = default_route;
+      }
       if (action) {
-        this.route += "/" + action;
+        Object.defineProperty(this, 'route', {
+          value: "" + default_route + "/" + action,
+          configurable: true
+        });
       }
       resource = data.resource;
       if (data && data.json) {
@@ -97,13 +105,19 @@ restful = {
         data[resource] = payload;
       }
       promise = rest.get.call(this, data);
-      route = old_route;
+      Object.defineProperty(this, 'route', {
+        value: old_route,
+        configurable: true
+      });
       return promise;
     },
     put: rest.put,
     "delete": rest["delete"]
   },
   record: {
+    ready: function(callback) {
+      return callback.call(this);
+    },
     reload: function() {
       var data, param, params, promise, _i, _len;
 
@@ -115,6 +129,11 @@ restful = {
       promise = rest.get.call(this, data || {});
       promise.done(this.assign_attributes);
       promise.fail(this.failed);
+      this.reloading = promise;
+      this.ready = function() {
+        console.warn("resource.ready was deprecated, please use resource.reloading.done");
+        return promise.done.apply(promise, arguments);
+      };
       for (_i = 0, _len = params.length; _i < _len; _i++) {
         param = params[_i];
         promise.done(param);
@@ -122,7 +141,7 @@ restful = {
       return promise;
     },
     assign_attributes: function(attributes) {
-      var association, association_attributes, association_name, associations_attributes, attribute, message, 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, _ref, _ref1, _ref2, _results;
 
       _ref = model[this.resource.toString()].has_many;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -167,9 +186,18 @@ restful = {
         }
       }
       _results = [];
-      for (attribute in attributes) {
-        if (attribute !== this[attribute]) {
-          _results.push(this[attribute] = attributes[attribute]);
+      for (name in attributes) {
+        attribute = attributes[name];
+        if (attribute !== this[name]) {
+          if (type(attribute) === 'object') {
+            if (JSON.stringify(attribute) !== JSON.stringify(this[name])) {
+              _results.push(this[name] = attributes[name]);
+            } else {
+              _results.push(void 0);
+            }
+          } else {
+            _results.push(this[name] = attributes[name]);
+          }
         }
       }
       return _results;
@@ -190,18 +218,23 @@ restful = {
     saving: false,
     salvation: null,
     save: function(doned, failed, data) {
-      var salvation;
+      var lock, salvation;
 
+      lock = JSON.stringify(this.json());
       if (this.saving) {
-        return this.salvation;
+        if (this.lock === lock) {
+          return this.salvation;
+        } else {
+          this.salvation.abort();
+        }
       }
-      this.lock = JSON.stringify(this.json());
+      this.lock = lock;
       if (!this.dirty) {
         salvation = $.Deferred().resolveWith(this, null);
       }
+      this.saving = true;
       salvation || (salvation = rest[this._id ? 'put' : 'post'].call(this, data));
       this.salvation = salvation;
-      this.saving = true;
       salvation.done(this.saved);
       salvation.fail(this.failed);
       salvation.always(function() {
@@ -217,8 +250,6 @@ restful = {
       if (this.lock === JSON.stringify(this.json())) {
         this.dirty = false;
         delete this.lock;
-      } else {
-        return this.save();
       }
       if (data != null) {
         this.assign_attributes(data);
@@ -244,8 +275,21 @@ restful = {
       }
       payload || (payload = xhr.responseText);
       switch (xhr.status) {
+        case 0:
+          message = status || xhr.statusText;
+          switch (message) {
+            case 'abort':
+              console.info("salvation probably aborted");
+              break;
+            case 'error':
+              console.info("server probably unreachable");
+              break;
+            default:
+              throw new Error('Unhandled status code for xhr');
+          }
+          break;
         case 422:
-          definition = model[this.resource];
+          definition = model[this.resource.toString()];
           _ref = payload.errors;
           for (attribute_name in _ref) {
             messages = _ref[attribute_name];
@@ -270,8 +314,9 @@ restful = {
         default:
           message = "Fail in " + this.resource + ".save:\n";
           message += "Record: " + this + "\n";
-          message += "Status: " + status + " (" + (payload.status || xhr.status) + ")\n";
+          message += "Status: " + status + " (" + (payload || xhr).status + ")\n";
           message += "Error : " + (payload.error || payload.message || payload);
+          console.log(message);
       }
       return this.saving = false;
     },
@@ -283,20 +328,27 @@ restful = {
       return JSON.stringify(serialized);
     },
     json: function(methods) {
-      var attribute, json, name, value, _i, _len, _ref;
+      var attribute, definition, json, name, value, _i, _len, _ref;
 
       if (methods == null) {
         methods = {};
       }
       json = {};
+      definition = model[this.resource.toString()];
       for (name in this) {
-        value = this[name];
-        if (!(type(value) !== 'function')) {
+        if (!(type(value))) {
           continue;
         }
+        if (definition.belongs_to.indexOf(name) !== -1 && this.nested_attributes.indexOf(name) === -1) {
+          continue;
+        }
+        value = this[name];
         if (value == null) {
           continue;
         }
+        if (type(value) === 'function') {
+          continue;
+        }
         if (type(value) === 'object') {
           if (value.toJSON != null) {
             json[name] = value.toJSON(methods[name]);
@@ -322,6 +374,8 @@ restful = {
       delete json.before_initialize;
       delete json.parent_resource;
       delete json.nested_attributes;
+      delete json.reloading;
+      delete json.ready;
       delete json.saving;
       delete json.salvation;
       delete json.sustained;