ende 0.3.13 → 0.4.0

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

@@ -1,4 +1,4 @@
-var $, builders, defaults, extend, merge, model, record, rest, scopable, stampit,
+var $, builders, defaults, extend, merge, model, observable, record, rest, scopable, stampit, util,
   __slice = [].slice;
 
 require('./restfulable');
@@ -9,12 +9,29 @@ stampit = require('../../vendor/stampit');
 
 extend = require('assimilate');
 
+observable = require('observable').mixin;
+
 merge = extend.withStrategy('deep');
 
 $ = require('jquery');
 
 rest = require('./rest');
 
+util = {
+  model: {
+    map: function(records) {
+      var index, record, _i, _len, _results;
+
+      _results = [];
+      for (index = _i = 0, _len = records.length; _i < _len; index = ++_i) {
+        record = records[index];
+        _results.push((this.build || this).call(this, record));
+      }
+      return _results;
+    }
+  }
+};
+
 scopable = {
   builder: stampit().enclose(function() {
     return stampit.mixIn(function(name, type) {
@@ -45,14 +62,19 @@ scopable = {
       fetch: function(data, done, fail) {
         var deferred, scope;
 
+        if (typeof data === 'function') {
+          done = data;
+          data = {};
+        }
         scope = extend({}, this.scope.data);
+        observable.unobserve(scope);
         if (scope.noned != null) {
           deferred = $.Deferred();
           deferred.resolveWith(this, [[]]);
         } else {
           deferred = rest.get.call(this, extend(scope, data));
         }
-        deferred.done(this.scope.then.concat(done)).fail([this.scope.fail, fail]);
+        deferred.then(util.model.map).done(this.scope.then.concat([done])).fail(this.scope.fail.concat([fail]));
         this.scope.clear();
         return deferred;
       },
@@ -95,6 +117,10 @@ scopable = {
       return this;
     },
     fetch: function(data, done, fail) {
+      if (typeof data === 'function') {
+        done = data;
+        data = null;
+      }
       return this.scope.fetch.call(this, data, done, fail);
     },
     forward_scopes_to_associations: function() {

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

@@ -23,7 +23,7 @@ storable = stampit({
       return collection[key];
     } else {
       this.writes++;
-      value.sustained = true;
+      value.sustained || (value.sustained = true);
       return collection[key] = value;
     }
   },

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

@@ -1,8 +1,8 @@
-var errorsable, extensions, initializers, manager, messages, observable, root, stampit, type, validatable;
+var errorsable, extensions, initializers, manager, messages, observable, root, stampit, type;
 
 require('./translationable');
 
-root = typeof exports !== "undefined" && exports !== null ? exports : window;
+root = typeof exports !== "undefined" && exports !== null ? exports : this;
 
 stampit = require('../../vendor/stampit');
 
@@ -93,7 +93,7 @@ initializers = {
     });
     this.validated = false;
     this.subscribe('dirty', function(value) {
-      return this.validated = false;
+      return value && (this.validated = false);
     });
     return Object.defineProperty(this, 'valid', {
       get: function() {
@@ -187,7 +187,12 @@ extensions = {
       this.validation.done(doned);
       this.validation.fail(failed);
       this.validation.then(function(record) {
-        return record.validated = true;
+        var old_dirty;
+
+        old_dirty = record.dirty;
+        record.dirty = null;
+        record.validated || (record.validated = true);
+        return record.dirty = old_dirty;
       });
       return this.validation;
     }
@@ -198,15 +203,6 @@ manager = {
   validators: {}
 };
 
-validatable = stampit({
-  validate: function() {
-    throw new Error('Composed factory must override the validate method');
-  },
-  validate_each: function() {
-    throw new Error('Composed factory must override the validate each method');
-  }
-});
-
 model.mix(function(modelable) {
   jQuery.extend(modelable, extensions.model);
   jQuery.extend(modelable.record, extensions.record);
@@ -215,18 +211,14 @@ model.mix(function(modelable) {
   return model.validators = manager.validators;
 });
 
-root.validatable = validatable;
-
-root.manager = manager;
-
-require('./validations/confirmation');
+manager.validators.confirmation = require('./validations/confirmation');
 
-require('./validations/associated');
+manager.validators.associated = require('./validations/associated');
 
-require('./validations/presence');
+manager.validators.presence = require('./validations/presence');
 
-require('./validations/remote');
+manager.validators.remote = require('./validations/remote');
 
-require('./validations/type');
+manager.validators.type = require('./validations/type');
 
-require('./validations/cpf');
+manager.validators.cpf = require('./validations/cpf');

data/vendor/components/indefinido-indemma/lib/record/validations/associated.js

@@ -1,6 +1,4 @@
-var associationable, composed, stampit, validations;
-
-validations = require('../validatable');
+var associationable, composed, stampit;
 
 stampit = require('../../../vendor/stampit');
 
@@ -23,8 +21,8 @@ associationable = stampit({
   }
 });
 
-composed = stampit.compose(validations.validatable, associationable);
+composed = stampit.compose(require('./validatorable'), associationable);
 
 composed.definition_key = 'validates_associated';
 
-validations.manager.validators.association = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/confirmation.js

@@ -1,6 +1,4 @@
-var composed, confirmationable, stampit, validations;
-
-validations = require('../validatable');
+var composed, confirmationable, stampit;
 
 stampit = require('../../../vendor/stampit');
 
@@ -12,8 +10,8 @@ confirmationable = stampit({
   }
 });
 
-composed = stampit.compose(validations.validatable, confirmationable);
+composed = stampit.compose(require('./validatorable'), confirmationable);
 
 composed.definition_key = 'validates_confirmation_of';
 
-validations.manager.validators.confirmation = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/cpf.js

@@ -1,6 +1,4 @@
-var composed, cpfable, stampit, validations;
-
-validations = require('../validatable');
+var composed, cpfable, stampit;
 
 stampit = require('../../../vendor/stampit');
 
@@ -20,7 +18,7 @@ cpfable = stampit({
     d1 = 0;
     v = false;
     i = 0;
-    for (i = _i = 1; _i <= 9; i = ++_i) {
+    for (i = _i = 0; _i <= 9; i = ++_i) {
       d1 += c.charAt(i) * (10 - i);
     }
     if (d1 === 0) {
@@ -34,7 +32,7 @@ cpfable = stampit({
       return false;
     }
     d1 *= 2;
-    for (i = _j = 1; _j <= 9; i = ++_j) {
+    for (i = _j = 0; _j <= 9; i = ++_j) {
       d1 += c.charAt(i) * (11 - i);
     }
     d1 = 11 - (d1 % 11);
@@ -53,8 +51,8 @@ cpfable = stampit({
   }
 });
 
-composed = stampit.compose(validations.validatable, cpfable);
+composed = stampit.compose(require('./validatorable'), cpfable);
 
 composed.definition_key = 'validates_cpf_format';
 
-validations.manager.validators.cpf = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/presence.js

@@ -1,6 +1,4 @@
-var composed, presenceable, stampit, validations;
-
-validations = require('../validatable');
+var composed, presenceable, stampit;
 
 stampit = require('../../../vendor/stampit');
 
@@ -12,8 +10,8 @@ presenceable = stampit({
   }
 });
 
-composed = stampit.compose(validations.validatable, presenceable);
+composed = stampit.compose(require('./validatorable'), presenceable);
 
 composed.definition_key = 'validates_presence_of';
 
-validations.manager.validators.presence = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/remote.js

@@ -1,8 +1,4 @@
-var composed, remoteable, rest, root, stampit, validations;
-
-root = typeof exports !== "undefined" && exports !== null ? exports : window;
-
-validations = require('../validatable');
+var composed, remoteable, rest, stampit;
 
 rest = require('../rest');
 
@@ -65,8 +61,8 @@ remoteable = stampit({
   return this;
 });
 
-composed = stampit.compose(validations.validatable, remoteable);
+composed = stampit.compose(require('./validatorable'), remoteable);
 
 composed.definition_key = 'validates_remotely';
 
-validations.manager.validators.remote = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/type.js

@@ -22,8 +22,8 @@ typeable = stampit({
   }
 });
 
-composed = stampit.compose(validations.validatable, typeable);
+composed = stampit.compose(require('./validatorable'), typeable);
 
 composed.definition_key = 'validates_type_of';
 
-validations.manager.validators.type = composed;
+module.exports = composed;

data/vendor/components/indefinido-indemma/lib/record/validations/validatorable.js

@@ -0,0 +1,12 @@
+var stampit;
+
+stampit = require('../../../vendor/stampit');
+
+module.exports = stampit({
+  validate: function() {
+    throw new Error('Composed factory must override the validate method');
+  },
+  validate_each: function() {
+    throw new Error('Composed factory must override the validate each method');
+  }
+});

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

@@ -0,0 +1,9 @@
+{
+  "name": "indemma",
+  "version": "0.1.7",
+  "devDependencies": {
+    "mocha": "*",
+    "karma": "~0.10",
+    "karma-mocha": "~0.1"
+  }
+}

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

@@ -121,6 +121,18 @@ describe('restfulable', function() {
             belongs_to: 'person'
           });
         });
+        it('should not assign attribute with the same value twice', function() {
+          var arthur, object;
+
+          object = {};
+          arthur = person({
+            name: object
+          });
+          arthur.assign_attributes({
+            name: {}
+          });
+          return arthur.name.should.not.be.eq(object);
+        });
         return it('assigns associations properly', function() {
           var arthur, attributes, ford, marvin, search_record;
 

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

@@ -18,9 +18,9 @@ describe('model', function() {
     person.should.have.property('validators');
     return person.validators.should.be.an('array');
   });
-  return describe('#()', function() {
+  return describe('(validates_... : ...)', function() {
     describe('validators instatiation', function() {
-      it('should instantiate validators with prefix validates_', function() {
+      it('should have validators', function() {
         var validator;
 
         person = model.call({
@@ -32,9 +32,9 @@ describe('model', function() {
         validator = person.validators[0];
         return validator.should.have.property('attribute_name', 'name');
       });
-      return it('should instantiate validators with in the key validates');
+      return it('should have validators with in the key validates');
     });
-    describe('#validate_attribute', function() {
+    describe('.validate_attribute()', function() {
       beforeEach(function() {
         person.validators.length = 0;
         return person = model.call({

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

@@ -4,7 +4,7 @@ root = typeof exports !== "undefined" && exports !== null ? exports : window;
 
 require('indemma/lib/record/validatable');
 
-describe('model #() validates_associated', function() {
+describe('model ( validates_associated: ... )', function() {
   return describe('basic usage', function() {
     var address, model, person;
 
@@ -26,7 +26,7 @@ describe('model #() validates_associated', function() {
       person.validators.length = 0;
       return address.validators.length = 0;
     });
-    return describe('#validate', function() {
+    return describe('.validate()', function() {
       return it('should add error to record when fields does not match', function() {
         var arthur;
 

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

@@ -20,7 +20,6 @@ plural = # has_many ## TODO embeds_many
   build: (data = {}) ->
     data.parent_resource = @parent_resource
 
-
     # TODO Setup a before save callback to generate route when there is no id
     data.route ||= "#{@parent.route}/#{@parent._id}/#{model.pluralize @resource.toString()}" if @parent?
     throw "associable.has_many: cannot redefine route of association #{@parent_resource}.#{@resource} from #{@route} to #{data.route}" if @route isnt data.route and @route
@@ -54,15 +53,15 @@ subscribers =
       association_name = @resource.toString()
 
       # TODO faster nullifing association check
-      # TODO only allow nullifying with null
-      if resource_id == null or resource_id == undefined
+      # TODO check if its usefull to only allow disassociating with null
+      unless resource_id
         @dirty = true
         @owner[association_name] = resource_id
         return resource_id
 
       # TODO Discover and update inverse side of association
       # associated[@owner.resource.toString()] = @owner
-      current_resource_id = @owner[association_name]?._id
+      current_resource_id = @owner.observed[association_name]?._id
       if resource_id != current_resource_id
         # Update association with blank resource that will update
         resource = model[association_name]
@@ -71,10 +70,13 @@ subscribers =
           return resource_id
 
         # TODO remote find or local find automatically, and implement find_or_initialize_by
-        associated   = resource.find resource_id
-        associated ||= resource _id: resource_id
+        # this code is not needed, since the association loader already loads the associated record when trying to get it
+        # associated   = resource.find resource_id
+        # associated ||= resource _id: resource_id
 
-        @owner.observed[association_name] = associated
+        # Nullify associated object, so next time user accesses it,
+        # association loader loads the new object
+        @owner.observed[association_name] = null
 
       resource_id
 
@@ -83,7 +85,7 @@ subscribers =
       @owner.observed["#{@resource.toString()}_id"] = if associated then associated._id else null
 
 modifiers =
-  # Called before record initialization to create the a lazy loader
+# Called before record initialization to create the a lazy loader
   # for other records
   belongs_to:
     associated_loader: ->
@@ -102,7 +104,7 @@ modifiers =
           # resource and on retrievability of the resource
           return associated unless associated?._id? or associated_id
 
-          # Retunrs imediatelly for resources on storage
+          # Returns imediatelly for resources on storage
           # TODO make this extenxible
           return associated if associated?.sustained
 
@@ -111,12 +113,17 @@ modifiers =
             console.warn "subscribers.belongs_to.foreign_key: associated factory not found for model: #{association_name}"
             return associated
 
+          # Search through stored resources to see if it is stored
           associated   = resource.find associated_id || associated._id
-          associated ||= resource _id: associated_id
 
-          resource.storage.store associated._id, associated
-          associated.reload()
+          # Found associated in storage, update this model and return associated
+          return @owner.observed[association_name] = associated if associated
+
+          # Not found associated in storage
+          associated ||= resource _id: associated_id  # initialize and store a new record
+          associated.reload()                         # fetch resource
 
+          # Store temporary unloaded resource in this model
           @owner.observed[association_name] = associated
 
         configurable: true
@@ -133,9 +140,14 @@ callbacks =
       association_names = model[@resource].has_many
       if association_names
         for association_name in association_names
+
+          # Instantiate new records for the association attributes
+          # TODO DO not support '_attributes' property on instantiating!
+          # TODO define setter for attributes
           associations_attributes = @["#{association_name}_attributes"]
+          association = @[model.pluralize association_name]
+
           if associations_attributes and associations_attributes.length
-            association = @[model.pluralize association_name]
 
             unless association
               message  = "has_many.nest_attributes: Association not found for #{association_name}. \n"
@@ -232,9 +244,19 @@ associable =
           # @resource = model[resource].resource
 
           # TODO Remember to clear association proxy when object is destroyed
-          association_proxy   = resource: resource, parent_resource: @resource, parent: @
-          association_name    = model.pluralize resource
-          @[association_name] = $.extend association_proxy, plural
+          association_proxy      = resource: resource, parent_resource: @resource, parent: @
+          association_name       = model.pluralize resource
+
+          # When deserializing has many associated resources from
+          # server, it is common to send as the association without
+          # suffix
+          association_attributes = @[association_name] ||  []
+          @["#{association_name}_attributes"]          ||= []
+          @["#{association_name}_attributes"]            = @["#{association_name}_attributes"].concat association_attributes if association_attributes.length
+
+          # Create or Override sent attributes by the association proxy
+          @[association_name]    = $.extend association_proxy, plural
+
 
         # Update association attribute
         @after 'saved', callbacks.has_many.update_association
@@ -273,7 +295,7 @@ associable =
           # TODO see why this code is here, since we have the owner key
           association_proxy[@resource.toString()] = @
 
-          @["build_#{resource}" ] = $.proxy singular.build , association_proxy
+          @["build_#{resource}"]  = $.proxy singular.build , association_proxy
           @["create_#{resource}"] = $.proxy singular.create, association_proxy
 
           # TODO copy from active record and better modularization of
@@ -281,19 +303,21 @@ associable =
           # To prevent association loading request we must nullify the
           # association when subscribing
           old_resource_id     = @["#{resource}_id"]
+          old_dirty           = @dirty
           @["#{resource}_id"] = null
 
           @subscribe "#{resource}_id"   , $.proxy subscribers.belongs_to.foreign_key, association_proxy
           @subscribe resource.toString(), $.proxy subscribers.belongs_to.associated_changed, association_proxy
 
           # Restore id after loader prevention has passed
-          @resource_id = old_resource_id
+          @["#{resource}_id"] = old_resource_id
+          @dirty = old_dirty
 
           # Execute relation attributes binding
           # TODO validate bindings! When @resource._id != @["#{resource}_id"]
           # TODO write test for this case
-          if @["#{resource}_id"] and not @[resource]
-            @publish "#{resource}_id", @["#{resource}_id"]
+          # if @["#{resource}_id"] and not @[resource]
+          #   @publish "#{resource}_id", @["#{resource}_id"]
 
     # TODO better organization of this code, probably transforming the
     # association into a composable object inside this function: @ =

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

@@ -13,8 +13,13 @@ handlers =
 persistable =
   record:
     after_initialize: ->
-      # TODO check persistable configuration before attaching handlers
-      @after 'saved', handlers.store_after_saved
+      if @_id
+        # TODO remove global model usage
+        {storage} = model[@resource.toString()]
+        storage.store @_id, @
+      else
+        # TODO check persistable configuration before attaching handlers
+        @after 'saved', handlers.store_after_saved
 
 # Extend indemma
 # TODO use stampit to extend record and model

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

@@ -7,6 +7,7 @@ queryable =
   # FIXME don't let everyone use the same storage instance! or let it?
   storage: storable()
   find: (key) ->
+    throw new TypeError "InvalidFind: resource.find was called with a falsey value" unless key
     @storage.store key
   all: ->
     @storage.values()

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

@@ -24,6 +24,32 @@ resource = stampit
 
     @
 
+# TODO Think of a better name, and move to a composable stampit item
+descriptors =
+  route:
+    get: ->
+       # TODO use resource object on associations!
+      @resource = name: @resource if typeof @resource == 'string'
+
+      route  = '/'
+      route += "#{@parent.route}/#{@parent._id}/" if @parent?
+      route += @resource.scope + '/' if @resource.scope?
+
+      route += if @resource.singular then @resource.name else model.pluralize @resource.name
+
+      @route = route
+
+    configurable: true
+#    set: (value) -> @initial_route = value
+
+  # TODO Deprecated! Remove on 15/02/2014
+  # parent_id:
+  #   get: -> @[@parent_resource]._id if @[@parent_resource]
+  #   set: -> console.error 'Warning changing associations throught parent_id not allowed for security and style guide purposes' # TODO
+  #   configurable: true
+  #   enumerable: true
+
+# TODO Think of a better name, and move to a composable stampit item
 resourceable =
   pluralize: (word, count, plural) ->
     throw new TypeError "Invalid string passed to pluralize '#{word}'" unless word and word.length
@@ -41,36 +67,13 @@ resourceable =
     else
       word
 
-  # TODO move to resourceable method
-  route:
-    get: ->
-      return @initial_route if @initial_route?
-
-      # TODO use resource object on associations!
-      @resource = name: @resource if typeof @resource == 'string'
-
-      route  = '/'
-      route += "#{@parent.route}/#{@parent._id}/" if @parent?
-      route += @resource.scope + '/' if @resource.scope?
-
-      route += if @resource.singular then @resource.name else model.pluralize @resource.name
-      @initial_route = route
-
-      route
-
-    set: (value) -> @initial_route = value
-
-  parent_id:
-    get: -> @[@parent_resource]._id if @[@parent_resource]
-    set: -> console.error 'Warning changing associations throught parent_id not allowed for security and style guide purposes' # TODO
-
   initialize: ->
+
+    # Deprecated! Remove on 15/02/2014
     # Set parent attribute and default nested route
-    if @parent_resource
-      Object.defineProperty @, "#{@parent_resource}_id",
-        value: resourceable.parent_id
-        configurable: true
-        enumerable: true
+    # If you're using the associable plugin, this getter and setter will be overwritten!
+    # if @parent_resource
+    #   Object.defineProperty @, "#{@parent_resource}_id", descriptors.parent_id
 
     # Setup resource
     resource_definition = {}
@@ -86,13 +89,10 @@ resourceable =
     # TODO remove mentions of @parent_resource and use only resource: {parent: ...}
     resource_definition.parent = @parent_resource
 
-
-
-
     @resource = resource resource_definition
 
     # TODO Support route parsing, and change route to /parents/:id/childrens
-    @route ? Object.defineProperty @, 'route', resourceable.route
+    @route ? Object.defineProperty @, 'route', descriptors.route
 
 
 # Extend indemma