Merge branch 'master-2' into localRel

# Conflicts:
#	supermodel.js
#	supermodel.min.js
#	test/has.js

Author: nachocodoner

supermodel.js

@@ -165,7 +165,12 @@
 
     replace: function(model, other) {
       var other = this.alter(model, other)
-      if( other ) this.associate(other, model)
+      if( other ) {
+        this.associate(other, model);
+
+        // Triggers the association replace.
+        model.trigger("replace:"+this.name, model, other);
+      }
     },
 
     // Replace the current association with `other`, taking care to remove the
@@ -198,6 +203,7 @@
       // Tear down the current association.
       if (!other) model.unset(this.id);
       if (current) {
+        current.off('all', null, this);
         delete model[this.store];
         this.dissociate(current, model);
       }
@@ -206,6 +212,29 @@
           // Set up the new association.
           model.set(this.id, other.id);
           model[this.store] = other;
+
+        // Listening association events.
+        other
+          .on('all', function(eventName, object) {
+            var splittedEvent = eventName.split(":");
+
+            // Avoids a loop generated by two-way associations.
+            var reservedNamespace = splittedEvent[1];
+            if(this.inverse == reservedNamespace)
+              return;
+
+            var headEvent = splittedEvent[0];
+            var tailEvents = _.rest(splittedEvent).join(":");
+
+            // Building the new event to trigger (namespace, association name).
+            var newEvent = headEvent+":"+this.name;
+            if(tailEvents) newEvent += ":"+tailEvents;
+
+            // Trigger new event from the concrete object.
+            arguments[0] = newEvent;
+            model.trigger.apply(model, arguments);
+          }, this);
+
           return other;
       }
     }
@@ -247,6 +276,28 @@
       // handle events that it triggers.
       collection.owner = model;
 
+      // Listening association events.
+      collection
+        .on('all', function(eventName, object) {
+          var splittedEvents = eventName.split(":");
+
+          // Avoids a loop generated by two-way associations
+          var reservedNamespace = splittedEvents[1];
+          if(this.inverse == reservedNamespace) 
+            return;
+          
+          var headEvent = splittedEvents[0];
+          var tailEvents = _.rest(splittedEvents).join(":");
+
+          // Building the new event to trigger (namespace, association name).
+          var newEvent = headEvent+":"+this.name;
+          if(tailEvents) newEvent += ":"+tailEvents;
+
+          // Trigger new event from the concrete object
+          arguments[0] = newEvent;
+          model.trigger.apply(model, arguments);
+        }, this);
+
       return collection;
     },
 
@@ -378,6 +429,35 @@
         .on('associate:' + this.source, this._associate)
         .on('dissociate:' + this.source, this._dissociate));
 
+      // Listening association events.
+      collection
+        .on('all', function(eventName) {
+          var splittedEvents = eventName.split(":");
+
+          // Avoids a loop generated by two-way associations
+          var reservedNamespace = [splittedEvents[1], splittedEvents[2]];
+          if(this.through === reservedNamespace[0] ||
+            _.indexOf(reservedNamespace, this.name) > -1) 
+            return;
+
+          var headEvent = splittedEvents[0];
+          var tailEvents = _.rest(splittedEvents).join(":");
+
+          // Building a new event to trigger (namespace, association name).
+          var newEventName = headEvent+":"+this.name;
+          if(tailEvents) newEventName += ":"+tailEvents;
+
+          arguments[0] = newEventName;
+          model.trigger.apply(model, arguments);
+
+          // Building a new event to trigger (namespace, association through).
+          var newEventThrough = headEvent+":"+this.through;
+          if(tailEvents) newEventThrough += ":"+tailEvents;
+
+          arguments[0] = newEventThrough;
+          model.trigger.apply(model, arguments);
+        }, this);
+
       return collection;
     },
 
@@ -539,6 +619,33 @@
     getId: function() {
       if(this.id) return this.id;
       else return this.cid;
+    },
+
+    // Alters clone method to prepare a model copy ready to work as a Supermodel
+    // but without associations
+    clone: function() {
+      var attrsCopy = this.cloneAttributes();
+      return new this.constructor(attrsCopy);
+    },
+
+    // Returns attributes to be cloned
+    cloneAttributes: function() {      
+      // Attributes to copy
+      var attrsCopy = _.extend({}, this.attributes);
+
+      var ctor = this.constructor;
+
+      // Remove id attributes
+      delete attrsCopy[ctor.prototype.cidAttribute];
+      delete attrsCopy[ctor.prototype.idAttribute];
+
+      // Remove associations
+      var allAssociations = ctor.allAssociations();
+      for(var assoc in allAssociations) {
+        delete attrsCopy[allAssociations[assoc].id];
+      }
+
+      return attrsCopy;
     }
 
   }, {
@@ -617,6 +724,18 @@
       return this._associations || (this._associations = {});
     },
 
+    // Return a hash of all associations for each constructor in its prototype chain.
+    allAssociations: function() {
+      var allAssociations = {};
+
+      var ctor = this;
+      do { 
+        _.extend(allAssociations, ctor._associations); 
+      } while (ctor = ctor.parent);
+
+      return allAssociations;
+    },
+
     // Models and associations are tracked via `all` and `associations`,
     // respectively.  `reset` removes all model references to allow garbage
     // collection.