ende 0.5.0 → 0.5.1

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/spec/record/associable_spec.js

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

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/spec/record/scopable_spec.js

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

@@ -6,25 +6,26 @@ require('indemma/lib/record/validatable');
 
 describe('model #() validates_cpf_format', function() {
   return describe('basic usage', function() {
-    var model;
+    var model, person;
 
     model = root.model;
+    person = null;
     beforeEach(function() {
-      return this.person = model.call({
+      return person = model.call({
         resource: 'person',
         cpf: String,
         validates_cpf_format: 'cpf'
       });
     });
     afterEach(function() {
-      return this.person.validators.length = 0;
+      return person != null ? person.validators.length = 0 : void 0;
     });
     return describe('#validate', function() {
       return it('should add error to record when fields is in invalid format', function() {
         var arthur;
 
-        arthur = this.person({
-          cpf: '871.95FRANGO-00'
+        arthur = person({
+          cpf: '871.943.417-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 → components/indefinido/indemma/master}/src/lib/record/associable.coffee

@@ -32,16 +32,10 @@ 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 → components/indefinido/indemma/master}/src/lib/record/persistable.coffee

@@ -12,8 +12,6 @@ handlers =
 
 persistable =
   record:
-    # TODO better caching check after resource initialization
-    # TODO think how to retrieve already stored resources
     after_initialize: ->
       if @_id
         # TODO remove global model usage

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/lib/record/queryable.coffee

@@ -9,7 +9,8 @@ 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 → components/indefinido/indemma/master}/src/lib/record/resource.coffee

@@ -25,7 +25,6 @@ resource = stampit
     @
 
 # TODO Think of a better name, and move to a composable stampit item
-# TODO Externalize route generatio so we can reuse in other files
 descriptors =
   route:
     get: ->
@@ -34,9 +33,9 @@ descriptors =
 
       route  = '/'
       route += "#{@parent.route}/#{@parent._id}/" if @parent?
-        route += @resource.scope + '/' if @resource.scope?
+      route += @resource.scope + '/' if @resource.scope?
 
-        route += if @resource.singular then @resource.name else model.pluralize @resource.name
+      route += if @resource.singular then @resource.name else model.pluralize @resource.name
 
       @route = route
 

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/lib/record/rest.coffee

@@ -7,9 +7,7 @@ module.exports =
   post  : (data) -> request.call @, 'post'  , @route, data
   delete: (data) -> request.call @, 'delete', (if @_id then  "#{@route}/#{@_id}" else @route), data
 
-
-# TODO move to serialization module
-data_for = (data) ->
+request = (method, url, data) ->
   param_name = @resource.param_name || @resource.toString()
 
   # TODO optmize this serialization lookup
@@ -21,10 +19,6 @@ data_for = (data) ->
     delete data[param_name]['id']
     delete data[param_name]['_id']
 
-  data
-
-request  = (method, url, data) ->
-  data = data_for.call @, data
 
   $.ajax
     url     : url

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/lib/record/restfulable.coffee

@@ -63,13 +63,7 @@ restful =
     get: (action, data = {}) ->
       # TODO better way to override route
       old_route     = @route
-
-      # TODO extract route generation concern
-      default_route = ''
-      default_route += @resource.scope + '/' if @resource.scope?
-      default_route += if @resource.singular then @resource.name else model.pluralize @resource.name
-
-      # TODO think why this code is here
+      default_route = "/#{model.pluralize @resource.name}"
       @route        = default_route unless default_route == @route
 
       if action
@@ -184,19 +178,6 @@ 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
@@ -342,7 +323,7 @@ restful =
     # TODO move this to serializable module
     # TODO figure out why sometimes is rendering a circular referenced json
     # TODO rename to toJSON
-    json: (options = {}) ->
+    json: (methods = {}) ->
       json = {}
 
       definition = model[@resource.toString()]
@@ -375,7 +356,7 @@ restful =
 
             # TODO move nested attributes to model definition and
             # implement toJSON there
-            json["#{name}_attributes"] = value.json options[name]
+            json["#{name}_attributes"] = value.json methods[name]
 
           # Serialize complex type values
           else if value.toJSON? || value.json?
@@ -385,9 +366,9 @@ restful =
 
             # TODO rename json to toJSON
             if value.json?
-              json[name] = value.json options[name]
+              json[name] = value.json methods[name]
             else
-              json[name] = value.toJSON options[name]
+              json[name] = value.toJSON methods[name]
 
           # It is a complex type value without serializtion support so
           # we just ignore it
@@ -400,16 +381,9 @@ restful =
           # Serialize primitive type values
           json[name] = value
 
-      # Remove observable options and dom node properties
+      # Remove observable methods and dom node properties
       json = observable.unobserve json
 
-      for name, value of options.methods ? {}
-        method = @[name]
-        if typeof method  == 'function'
-          json[name] = method()
-        else
-          json[name] = method
-
       # TODO Store reserved words in a array
       # TODO Use _.omit function
       # TODO Use object.defineProperty to not need to delete this properties
@@ -442,7 +416,7 @@ restful =
       json
 
 
-# TODO pt udeprecation warning on json method
+# TODO put deprecation warning on json method
 # TODO rename json method to toJSON
 restful.toJSON = restful.json
 
@@ -470,4 +444,4 @@ model.associable && model.associable.mix (singular_association,  plural_associat
 
   plural_association.post = ->
     @route ||= "#{@parent.route}/#{@parent._id}/#{model.pluralize @resource.name}" if @parent?
-    rest.post.apply @, arguments
+    rest.post.apply @, arguments

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/lib/record/scopable.coffee

@@ -108,7 +108,6 @@ scopable =
       @scope.fetch.call @, data, done, fail
 
     # TODO optmize this iterations or add support for stampit on associable and merge factories
-    # TODO rename this method to forward extensions to association, and store extensions on has_many definitions
     # @ = record instance
     forward_scopes_to_associations: ->
       factory = model[@resource.name]
@@ -130,24 +129,34 @@ scopable =
         for scope in associated_factory.scope.declared
           association.scope scope, associated_factory["$#{scope}"]
 
+      for associated_resource in factory.has_one
+        # TODO change this warn message into a exception when
+        # associations are renamable
+        unless model[associated_resource]
+          console.warn("Associated factory not found for associated resource: #{associated_resource}")
+          continue
+
+        for scope in model[associated_resource].scope.declared
+          @[associated_resource][scope] = factory[scope]
+
         # TODO improve associable inner workings to stampit objects
-      # if factory.belongs_to.length
-      #   generate_forwarder = (associated_resource) ->
-      #     associated_factory = model[associated_resource]
+      if factory.belongs_to.length
+        generate_forwarder = (associated_resource) ->
+          associated_factory = model[associated_resource]
 
-      #     # TODO change this warn message into a exception when
-      #     # associations are renamable
-      #     return console.warn("Associated factory not found for associated resource: #{associated_resource}") unless associated_factory
+          # TODO change this warn message into a exception when
+          # associations are renamable
+          return console.warn("Associated factory not found for associated resource: #{associated_resource}") unless associated_factory
 
-      #     declared_scopes    = associated_factory.scope.declared
+          declared_scopes    = associated_factory.scope.declared
 
-      #     ->
-      #       for scope in declared_scopes
-      #         @[associated_resource][scope] = associated_factory[scope]
+          ->
+            for scope in declared_scopes
+              @[associated_resource][scope] = associated_factory[scope]
 
-      #   for associated_resource in factory.belongs_to
-      #     forwarder = generate_forwarder associated_resource
-      #     @after "build_#{associated_resource}", forwarder
+        for associated_resource in factory.belongs_to
+          forwarder = generate_forwarder associated_resource
+          @after "build_#{associated_resource}", forwarder
 
       true
   # @ = model instance
@@ -244,14 +253,12 @@ if model.associable
       # TODO implement setter on this association and let user to set
       reload.done (records, status) ->
 
-        # 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
+        # Clear current stored cache on this association
+        # it to an empty array
+        Array.prototype.splice.call @, 0
 
+        # return if no records were found by the server
+        return unless records.length
 
         singular_resource = model.singularize @resource
 
@@ -265,17 +272,8 @@ 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 @, create
+        @add.apply @, records
 
         # Override the response records object with added to association records
         records.splice 0
@@ -292,4 +290,5 @@ if model.associable
 
       # TODO cache models
       @get().done (records) =>
-        callback record for record in @
+        for record in @
+          callback record

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/lib/record/validatable.coffee

@@ -173,18 +173,7 @@ extensions =
       @validation.fail failed
 
       # TODO store this callback
-      @validation.done (record) ->
-        # Disable dirty checking to prevent validation believe that
-        # the model values has changed
-        old_dirty        = record.dirty
-        record.dirty     = null
-
-        record.validated ||= true
-
-        # Restore dirty state
-        record.dirty     = old_dirty
-
-        record
+      @validation.done (record) -> record.validated ||= true
 
 
 # Validators management

data/{vendor/components/indefinido-indemma → components/indefinido/indemma/master}/src/spec/record/associable_spec.coffee

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