ende 0.4.18 → 0.4.19

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.9",
+  "version": "0.1.10",
   "keywords": [],
   "dependencies": {
     "pluma/assimilate": "0.3.0",

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

@@ -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 = {

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

@@ -141,7 +141,7 @@ 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, _base, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4, _results;
 
       _ref = model[this.resource.toString()].has_many;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -185,6 +185,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 = typeof (_base = attributes[association_name]).json === "function" ? _base.json() : 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];

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

@@ -243,11 +243,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++) {
@@ -259,7 +261,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/vendor/components/indefinido-indemma/spec/record/associable_spec.js

@@ -124,11 +124,12 @@ describe('model', function() {
           return association = person().friends;
         });
         it('should have query methods', function() {
-          association.should.have.property('all');
+          association.should.have.property('has_many');
+          association.should.have.property('find');
           association.should.have.property('each');
           return association.should.have.property('reload');
         });
-        return describe('#all', function() {
+        return describe('#every', function() {
           return it('should auto observe nested associations attributes');
         });
       });

data/vendor/components/indefinido-indemma/spec/record/scopable_spec.js

@@ -20,11 +20,8 @@ describe('scopable', function() {
   });
   return describe('model', function() {
     return describe('#(options)', function() {
-      var person;
-
-      person = null;
       beforeEach(function() {
-        return person = model.call({
+        return this.person = model.call({
           $hetero: true,
           $by_type: [],
           $by_name: String,
@@ -32,14 +29,14 @@ describe('scopable', function() {
         });
       });
       it('should add scope methods to model', function() {
-        return person.none.should.be["function"];
+        return this.person.none.should.be["function"];
       });
       it('should generate scope methods based on model definition', function() {
-        return person.hetero.should.be["function"];
+        return this.person.hetero.should.be["function"];
       });
       describe('#none', function() {
         return it('should return empty response on fetch calls', function(done) {
-          return person.none().fetch(null, function(people) {
+          return this.person.none().fetch(null, function(people) {
             people.length.should.be.empty;
             return done();
           });
@@ -48,28 +45,22 @@ describe('scopable', function() {
       describe('scope', function() {
         return describe('#(name, type)', function() {
           return it('should add scope methods to model', function() {
-            person.scope('bissexual', Boolean);
-            return person.bissexual.should.be["function"];
+            this.person.scope('bissexual', Boolean);
+            return this.person.bissexual.should.be["function"];
           });
         });
       });
       return describe('#{generated_scope}', function() {
-        var deferred;
-
-        deferred = null;
         beforeEach(function() {
-          deferred = jQuery.Deferred();
-          sinon.stub(jQuery, "ajax").returns(deferred);
-          return person.scope.clear();
+          this.request = jQuery.Deferred();
+          sinon.stub(jQuery, "ajax").returns(this.request);
+          return this.person.scope.clear();
         });
         afterEach(function() {
           return jQuery.ajax.restore();
         });
-        describe('#all', function() {
-          var promises;
-
-          deferred = promises = person = null;
-          return it('should return models when promise is resolved', function(done) {
+        describe('#every', function() {
+          return it('should fetch models from the server', function(done) {
             var fetched;
 
             fetched = function(people) {
@@ -77,8 +68,8 @@ describe('scopable', function() {
               people[0].name.should.be.string;
               return done();
             };
-            person.every(fetched);
-            deferred.resolveWith(person, [
+            this.person.every(fetched);
+            this.request.resolveWith(this.person, [
               [
                 {
                   name: 'Arthur'
@@ -92,22 +83,22 @@ describe('scopable', function() {
         });
         describe('when string', function() {
           it('should acumulate data in scope object', function() {
-            person.by_name();
-            return person.scope.data.by_name.should.be.a('string');
+            this.person.by_name();
+            return this.person.scope.data.by_name.should.be.a('string');
           });
           return it('should override data throught parameters', function() {
-            person.by_name('Ford');
-            return person.scope.data.by_name.should.be.eq('Ford');
+            this.person.by_name('Ford');
+            return this.person.scope.data.by_name.should.be.eq('Ford');
           });
         });
         describe('when array', function() {
           it('should acumulate data in scope object', function() {
-            person.by_type();
-            return person.scope.data.by_type.should.be.a('array');
+            this.person.by_type();
+            return this.person.scope.data.by_type.should.be.a('array');
           });
           it('should override data throught parameters', function() {
-            person.by_type(1, 2, 3);
-            return person.scope.data.by_type.should.contain(1, 2, 3);
+            this.person.by_type(1, 2, 3);
+            return this.person.scope.data.by_type.should.contain(1, 2, 3);
           });
           it('should use default value');
           it('should allow scope chaining');
@@ -115,45 +106,42 @@ describe('scopable', function() {
             it('should build correct url', function() {
               var settings;
 
-              person.by_type(1, 3, 4).fetch();
+              this.person.by_type(1, 3, 4).fetch();
               settings = jQuery.ajax.firstCall.args[0];
               settings.should.have.property('data');
               settings.data.should.have.property('by_type');
               return settings.data.by_type.should.include(1, 3, 4);
             });
             return it('should make call', function() {
-              person.by_type(1, 3, 4).fetch();
+              this.person.by_type(1, 3, 4).fetch();
               return jQuery.ajax.callCount.should.be.eq(1);
             });
           });
         });
         describe('when boolean', function() {
           it('should acumulate data in scope object', function() {
-            person.hetero();
-            return person.scope.data.hetero.should.be.eq(true);
+            this.person.hetero();
+            return this.person.scope.data.hetero.should.be.eq(true);
           });
           it('should override data throught parameters', function() {
-            person.hetero(false);
-            return person.scope.data.hetero.should.be.eq(false);
+            this.person.hetero(false);
+            return this.person.scope.data.hetero.should.be.eq(false);
           });
           it('should allow scope chaining');
           return it('should make ajax call', function() {
-            person.hetero().fetch();
+            this.person.hetero().fetch();
             return jQuery.ajax.callCount.should.be.eq(1);
           });
         });
         return describe('#{generated_association}', function() {
           describe('of type belongs_to', function() {
-            var towel;
-
-            towel = null;
             beforeEach(function() {
-              person = model.call({
+              this.person = model.call({
                 $hetero: true,
                 $by_type: [],
                 resource: 'person'
               });
-              return towel = model.call({
+              return this.towel = model.call({
                 resource: 'towel',
                 material: 'cotton',
                 belongs_to: 'person'
@@ -163,7 +151,7 @@ describe('scopable', function() {
               return it('can be called on association', function() {
                 var soft_towel;
 
-                soft_towel = towel({
+                soft_towel = this.towel({
                   material: 'silicon microfiber'
                 });
                 soft_towel.build_person();
@@ -172,37 +160,79 @@ describe('scopable', function() {
             });
           });
           return describe('of type has_many', function() {
-            var arthur, towel;
-
-            arthur = towel = null;
             beforeEach(function() {
-              person = model.call({
+              this.person = model.call({
                 $hetero: true,
                 $by_type: [],
                 resource: 'person',
                 has_many: 'towels'
               });
-              towel = model.call({
+              this.towel = model.call({
                 $by_material: [],
                 resource: 'towel',
                 material: 'cotton',
                 belongs_to: 'person'
               });
-              return arthur = person({
+              this.arthur = this.person({
                 name: 'Arthur'
               });
+              return this.person.scope.clear();
             });
             return describe('#{generated_scope}', function() {
               it('can be called on association', function() {
-                return expect(arthur.towels).to.respondTo('by_material');
+                return expect(this.arthur.towels).to.respondTo('by_material');
               });
-              return it('should be serializable into paramenters', function() {
+              it('should be serializable into paramenters', function() {
                 var query_string;
 
-                arthur.towels.by_material('cotton', 'microfiber');
-                query_string = decodeURIComponent(jQuery.param(arthur.towels.scope.data));
+                this.arthur.towels.by_material('cotton', 'microfiber');
+                query_string = decodeURIComponent(jQuery.param(this.arthur.towels.scope.data));
                 return query_string.should.be.eq('by_material[]=cotton&by_material[]=microfiber');
               });
+              return describe('#every', function() {
+                it('should empty association when no models are returned', function(done) {
+                  var fetched,
+                    _this = this;
+
+                  fetched = function(towels) {
+                    towels.should.be.array;
+                    towels.should.be.empty;
+                    _this.arthur.towels.should.have.length(0);
+                     this.should.have.length(0) ;
+                    return done();
+                  };
+                  this.arthur.towels.every(fetched);
+                  this.request.resolveWith(this.arthur.towels, [[]]);
+                  return jQuery.ajax.callCount.should.be.eq(1);
+                });
+                return it('should update resources when already exists in association', function(done) {
+                  var aditions, fetched,
+                    _this = this;
+
+                  aditions = this.arthur.towels.add({
+                    _id: 1,
+                    material: 'colan'
+                  });
+                  fetched = function(towels) {
+                    towels.should.be.array;
+                    towels.should.have.length(1);
+                    towels[0].material.should.be.eq('cotton');
+                    aditions[0].material.should.be.eq('cotton');
+                    _this.arthur.towels[0].material.should.be.eq('cotton');
+                    return done();
+                  };
+                  this.arthur.towels.every(fetched);
+                  this.request.resolveWith(this.arthur.towels, [
+                    [
+                      {
+                        _id: 1,
+                        material: 'cotton'
+                      }
+                    ]
+                  ]);
+                  return jQuery.ajax.callCount.should.be.eq(1);
+                });
+              });
             });
           });
         });

data/vendor/components/indefinido-indemma/spec/record/validations/cpf_spec.js

@@ -6,26 +6,25 @@ require('indemma/lib/record/validatable');
 
 describe('model #() validates_cpf_format', function() {
   return describe('basic usage', function() {
-    var model, person;
+    var model;
 
     model = root.model;
-    person = null;
     beforeEach(function() {
-      return person = model.call({
+      return this.person = model.call({
         resource: 'person',
         cpf: String,
         validates_cpf_format: 'cpf'
       });
     });
     afterEach(function() {
-      return person != null ? person.validators.length = 0 : void 0;
+      return this.person.validators.length = 0;
     });
     return describe('#validate', function() {
       return it('should add error to record when fields is in invalid format', function() {
         var arthur;
 
-        arthur = person({
-          cpf: '871.943.417-00'
+        arthur = this.person({
+          cpf: '871.95FRANGO-00'
         });
         arthur.valid;
         return arthur.errors.messages.should.have.deep.property('cpf', "O campo cpf não está válido.");

data/vendor/components/indefinido-indemma/src/lib/record/associable.coffee

@@ -32,10 +32,16 @@ plural = # has_many ## TODO embeds_many
   push    : ->
     console.warn "#{@resource}.push is deprecated and will be removed, please use add instead"
     Array.prototype.push.apply @, arguments
+    arguments[0]
 
   length : 0
   json   : (methods, omissions) -> record.json(methods, omissions) for record in @
 
+  find   : (id) -> return resource for resource in @ when resource._id is id
+
+  # TODO better support searching
+  filter   :  Array.prototype.filter || _?.filter
+
 
 singular = # belongs_to, has_one ## TODO embeds_one, embedded_in
   # @ = record

data/vendor/components/indefinido-indemma/src/lib/record/queryable.coffee

@@ -9,8 +9,7 @@ queryable =
   find: (key) ->
     throw new TypeError "InvalidFind: resource.find was called with a falsey value" unless key
     @storage.store key
-  every: ->
-    @storage.values()
+  every: -> @storage.values()
   where: ->
     throw new Error 'queryable.where: Not implemented yet'
 

data/vendor/components/indefinido-indemma/src/lib/record/restfulable.coffee

@@ -178,6 +178,19 @@ restful =
         @[association_name] = @["build_#{association_name}"] association_attributes if association_attributes
 
 
+      # Nested attributes
+      # TODO implement setter on belongs_to association and move this
+      # code there
+      for association_name in model[@resource.toString()].belongs_to
+        association_attributes = attributes[association_name].json?() ? attributes[association_name]
+
+        # TODO copy attributes object and don't change it inside the
+        # assignment method
+        delete attributes[association_name]
+        delete attributes[association_name + "_attributes"]
+        @[association_name] = @["build_#{association_name}"] association_attributes if association_attributes
+
+
       # Assign remaining attributes
       # TODO see if it is a best practice not overriding unchanged attributes
       # TODO rename attributes for properties
@@ -423,7 +436,7 @@ restful =
       json
 
 
-# TODO put deprecation warning on json method
+# TODO pt udeprecation warning on json method
 # TODO rename json method to toJSON
 restful.toJSON = restful.json
 

data/vendor/components/indefinido-indemma/src/lib/record/scopable.coffee

@@ -244,12 +244,14 @@ if model.associable
       # TODO implement setter on this association and let user to set
       reload.done (records, status) ->
 
-        # Clear current stored cache on this association
-        # it to an empty array
-        Array.prototype.splice.call @, 0
+        # if no records were found by the server on this association
+        unless records.length
+          # Clear current stored cache on this association
+          # it to an empty array
+          Array.prototype.splice.call @, 0 if @length
+
+          return true
 
-        # return if no records were found by the server
-        return unless records.length
 
         singular_resource = model.singularize @resource
 
@@ -263,8 +265,17 @@ if model.associable
             record["#{association_name}_attributes"] = record[association_name]
             delete record[association_name]
 
+        # Update found records
+        # TODO create update method
+        create = []
+        for record, index in records
+          if target = @find record._id
+            target.assign_attributes record
+          else
+            create.push record
+
         # Load new records on this association
-        @add.apply @, records
+        @add.apply @, create
 
         # Override the response records object with added to association records
         records.splice 0
@@ -281,5 +292,4 @@ if model.associable
 
       # TODO cache models
       @get().done (records) =>
-        for record in @
-          callback record
+        callback record for record in @

data/vendor/components/indefinido-indemma/src/spec/record/associable_spec.coffee

@@ -121,10 +121,11 @@ describe 'model',  ->
         beforeEach -> association = person().friends
 
         it 'should have query methods', ->
-          association.should.have.property 'all'
+          association.should.have.property 'has_many'
+          association.should.have.property 'find'
           association.should.have.property 'each'
           association.should.have.property 'reload'
 
-        describe '#all', ->
+        describe '#every', ->
 
           it 'should auto observe nested associations attributes'