Merge branch 'master' into pagination

Conflicts:
	server/vendor/monarch/client/lib/monarch/model/relations/ordering.js
	server/vendor/monarch/client/lib/monarch/model/relations/relation.js

lib/monarch.js

@@ -16,6 +16,7 @@
 //= require "monarch/subscription_bundle"
 //= require "monarch/future"
 //= require "monarch/queue"
+//= require "monarch/skip_list"
 //= require "monarch/inflection"
 //= require "monarch/view"
 //= require "monarch/http"

lib/monarch/http.js

@@ -8,6 +8,5 @@
 //= require "http/update_command"
 //= require "http/destroy_command"
 //= require "http/comet_client"
-//= require "http/command_batch"
 
 })(Monarch);

lib/monarch/http/command.js

@@ -1,6 +1,30 @@
 (function(Monarch) {
 
 _.constructor("Monarch.Http.Command", {
+  initialize: function(record, server) {
+    this.record = record;
+    this.server = server;
+    this.future = new Monarch.Http.AjaxFuture();
+  },
+
+  perform: function() {
+    this.server.post(Repository.originUrl + "/mutate", { operations: [this.wireRepresentation()] })
+      .onSuccess(this.hitch('handleSuccessfulResponse'))
+      .onFailure(this.hitch('handleUnsuccessfulResponse'))
+    return this.future;
+  },
+
+  handleSuccessfulResponse: function(data) {
+    this.future.updateRepositoryAndTriggerCallbacks(this.record, this.bind(function() {
+      this.complete(data.primary[0]);
+      Repository.mutate(data.secondary);
+    }));
+  },
+
+  handleUnsuccessfulResponse: function(data) {
+    this.handleFailure(data.errors);
+    this.future.triggerFailure(this.record);
+  }
 });
 
 })(Monarch);

lib/monarch/http/command_batch.js

@@ -1,56 +0,0 @@
-(function(Monarch) {
-
-_.constructor("Monarch.Http.CommandBatch", {
-  initialize: function(server, commands) {
-    this.server = server;
-    this.commands = commands;
-  },
-
-  perform: function() {
-    this.future = new Monarch.Http.AjaxFuture();
-
-    if (this.commands.length > 0) {
-      this.server.post(Repository.originUrl + "/mutate", { operations: this.wireRepresentation() })
-        .onSuccess(function(responseData) {
-          this.handleSuccessfulResponse(responseData);
-        }, this)
-        .onFailure(function(responseData) {
-          this.handleUnsuccessfulResponse(responseData);
-        }, this);
-    } else {
-      this.future.updateRepositoryAndTriggerCallbacks(null, _.identity);
-    }
-
-    return this.future;
-  },
-
-  // private
-
-  wireRepresentation: function() {
-    return _.map(this.commands, function(command) {
-      return command.wireRepresentation();
-    });
-  },
-
-  handleSuccessfulResponse: function(responseData) {
-    this.future.updateRepositoryAndTriggerCallbacks(this.commands[0].record, _.bind(function() {
-      _.each(this.commands, function(command, index) {
-        command.complete(responseData.primary[index]);
-      });
-      Repository.mutate(responseData.secondary);
-    }, this));
-  },
-
-  handleUnsuccessfulResponse: function(responseData) {
-    _.each(this.commands, function(command, index) {
-      if (index == responseData.index) {
-        command.handleFailure(responseData.errors);
-        this.future.triggerFailure(command.record);
-      } else {
-        command.handleFailure(null);
-      }
-    }, this);
-  }
-});
-
-})(Monarch);

lib/monarch/http/create_command.js

@@ -1,8 +1,8 @@
 (function(Monarch) {
 
 _.constructor("Monarch.Http.CreateCommand", Monarch.Http.Command, {
-  initialize: function(record) {
-    this.record = record;
+  initialize: function($super, record, server) {
+    $super(record, server);
     this.table = this.record.table;
     this.tableName = this.table.globalName;
     this.fieldValues = record.dirtyWireRepresentation();

lib/monarch/http/destroy_command.js

@@ -1,8 +1,8 @@
 (function(Monarch) {
 
 _.constructor("Monarch.Http.DestroyCommand", Monarch.Http.Command, {
-  initialize: function(record) {
-    this.record = record;
+  initialize: function($super, record, server) {
+    $super(record, server);
     this.tableName = record.table.globalName;
     this.id = record.id();
   },

lib/monarch/http/server.js

@@ -26,7 +26,6 @@ _.constructor("Monarch.Http.Server", {
   fetch: function(relations) {
     return this.get(Repository.originUrl + "/fetch", {
       relations: _.map(relations, function(relation) {
-        if (!relation.wireRepresentation) debugger;
         return relation.wireRepresentation();
       })
     });
@@ -62,26 +61,16 @@ _.constructor("Monarch.Http.Server", {
     });
   },
 
-  save: function() {
-    var commands = _.map(this.extractDirtyRecords(arguments), function(dirtyRecord) {
-      return this.buildAppropriateCommand(dirtyRecord);
-    }, this);
-
+  create: function(record) {
+    return this.performCommand(new Monarch.Http.CreateCommand(record, this));
+  },
 
-    if (_.isEmpty(commands)) {
-      var saveFuture = new Monarch.Http.AjaxFuture();
-      saveFuture.updateRepositoryAndTriggerCallbacks(this.firstRecord(arguments), _.identity);
-      return saveFuture;
-    } else {
-      var batch = new Monarch.Http.CommandBatch(this, commands);
-      Repository.pauseMutations();
-      var saveFuture = batch.perform();
-      saveFuture.onComplete(function() {
-        Repository.resumeMutations();
-      });
+  update: function(record) {
+    return this.performCommand(new Monarch.Http.UpdateCommand(record, this));
+  },
 
-      return saveFuture;
-    }
+  destroy: function(record) {
+    return this.performCommand(new Monarch.Http.DestroyCommand(record, this));
   },
 
   post: function(url, data) {
@@ -102,39 +91,14 @@ _.constructor("Monarch.Http.Server", {
   },
 
   // private
-  newRealTimeClient: function() {
-    return new Monarch.Http.CometClient(this.realTimeClientId());
+  performCommand: function(command) {
+    Repository.pauseMutations();
+    return command.perform().onComplete(Repository.hitch('resumeMutations'));
   },
 
-  extractDirtyRecords: function(recordsOrRelations) {
-    var dirtyRecords = []
-    _.each(recordsOrRelations, function(arg) {
-      if (arg._relation_) {
-        dirtyRecords.push.apply(dirtyRecords, arg.dirtyTuples());
-      } else {
-        if (arg.dirty()) dirtyRecords.push(arg);
-      }
-    });
-    return dirtyRecords;
-  },
-
-  firstRecord: function(recordsOrRelations) {
-    var first = recordsOrRelations[0];
-    if (first._relation_) {
-      return first.first();
-    } else {
-      return first;
-    }
-  },
 
-  buildAppropriateCommand: function(record) {
-    if (record.locallyDestroyed) {
-      return new Monarch.Http.DestroyCommand(record);
-    } else if (!record.isRemotelyCreated) {
-      return new Monarch.Http.CreateCommand(record);
-    } else {
-      return new Monarch.Http.UpdateCommand(record);
-    }
+  newRealTimeClient: function() {
+    return new Monarch.Http.CometClient(this.realTimeClientId());
   },
 
   request: function(type, url, data) {

lib/monarch/http/update_command.js

@@ -1,8 +1,8 @@
 (function(Monarch) {
 
 _.constructor("Monarch.Http.UpdateCommand", Monarch.Http.Command, {
-  initialize: function(record) {
-    this.record = record;
+  initialize: function($super, record, server) {
+    $super(record, server);
     this.version = this.record.nextPendingVersion();
     this.tableName = this.record.table.globalName;
     this.id = this.record.id();

lib/monarch/model/column.js

@@ -4,6 +4,8 @@ _.constructor("Monarch.Model.Column", {
   initialize: function(table, name, type) {
     this.table = table;
     this.name = name;
+    this.globalName = _.underscore(name);
+    this.qualifiedName = table.globalName + "." + this.globalName;
     this.type = type;
   },
 
@@ -43,7 +45,7 @@ _.constructor("Monarch.Model.Column", {
     return {
       type: "column",
       table: this.table.globalName,
-      name: _.underscore(this.name)
+      name: this.globalName
     };
   },
 

lib/monarch/model/composite_tuple.js

@@ -22,9 +22,13 @@ _.constructor("Monarch.Model.CompositeTuple", {
     return this.leftTuple.record(table) || this.rightTuple.record(table);
   },
 
-  equals: function(other) {
+  isEqual: function(other) {
     if (!other.constructor === this.constructor) return false;
-    return this.leftTuple.equals(other.leftTuple) && this.rightTuple.equals(other.rightTuple);
+    return this.leftTuple.isEqual(other.leftTuple) && this.rightTuple.isEqual(other.rightTuple);
+  },
+
+  wireRepresentation: function() {
+    return [this.leftTuple.wireRepresentation(), this.rightTuple.wireRepresentation()]
   }
 });