Merging changes

src/mesh/model/Entity.as

@@ -14,7 +14,6 @@ package mesh.model
 	import mesh.model.associations.HasOneDefinition;
 	import mesh.model.validators.Errors;
 	import mesh.model.validators.Validator;
-	import mesh.operations.Operation;
 	import mesh.services.DestroyRequest;
 	import mesh.services.Request;
 
@@ -133,13 +132,20 @@ package mesh.model
 		}
 
 		/**
-		 * Reloads the attributes of this entity from the backend.
+		 * Returns a request that will reload the attributes of this entity when executed.
 		 * 
-		 * @return An executing operation.
+		 * @return An unexecuted request.
 		 */
-		public function reload():Operation
+		public function reload():Request
 		{
-			return null;
+			var request:Request = Mesh.service(reflect.clazz).find(id);
+			request.addHandler({
+				success:function():void
+				{
+					translateFrom(request.translateTo());
+				}
+			});
+			return request;
 		}
 
 		/**

src/mesh/model/associations/Association.as

@@ -158,6 +158,23 @@ package mesh.model.associations
 			entity.markForRemoval();
 		}
 
+		/**
+		 * Clears the association of its loaded data.
+		 */
+		public function reset():void
+		{
+			if (isLoading) {
+				_loadRequest.cancel();
+				_isLoading = false;
+				dispatchEvent( PropertyChangeEvent.createUpdateEvent(this, "isLoading", true, false) );
+			}
+
+			if (isLoaded) {
+				_isLoaded = false;
+				dispatchEvent( PropertyChangeEvent.createUpdateEvent(this, "isLoaded", true, false) );
+			}
+		}
+
 		/**
 		 * Changes the state of the object for this association back to what it was at the last save.
 		 */

src/mesh/model/associations/AssociationCollection.as

@@ -33,7 +33,6 @@ package mesh.model.associations
 
 			afterLoad(loaded);
 			afterAdd(populateInverseAssociation);
-
 			afterAdd(registerObserversOnEntity);
 		}
 
@@ -84,6 +83,7 @@ package mesh.model.associations
 			for each (var property:Object in properties) {
 				var entity:Entity = new definition.target();
 				copy(property, entity);
+				populateInverseAssociation(entity);
 				result.push(entity);
 			}
 			return result.length == 1 ? result.pop() : result;
@@ -281,6 +281,22 @@ package mesh.model.associations
 			return object.removeItemAt(index);
 		}
 
+		/**
+		 * @inheritDoc
+		 */
+		override public function reset():void
+		{
+			for each (var entity:Entity in toArray().concat(_removedEntities.toArray())) {
+				unregisterObserversOnEntity(entity);
+			}
+			object.removeEventListener(CollectionEvent.COLLECTION_CHANGE, handleEntitiesCollectionChange);
+
+			object = undefined;
+			_removedEntities.clear();
+
+			super.reset();
+		}
+
 		/**
 		 * @inheritDoc
 		 */
@@ -337,8 +353,8 @@ package mesh.model.associations
 		 */
 		override flash_proxy function get dirtyEntities():Array
 		{
-			var result:Array = _removedEntities.toArray();
-			for each (var entity:Entity in this) {
+			var result:Array = [];
+			for each (var entity:Entity in toArray().concat(_removedEntities.toArray())) {
 				if (entity.isDirty) {
 					result.push(entity);
 				}
@@ -374,7 +390,7 @@ package mesh.model.associations
 			}
 
 			if (value != null && (!(value is Array) && !value.hasOwnProperty("toArray"))) {
-				throw new ArgumentError("AssociationCollection.object must be an Array, have a toArray method, or be null.");
+				throw new ArgumentError("AssociationCollection.object must be an Array, have a 'toArray' method, or be null.");
 			}
 
 			if (value != object) {

src/mesh/model/associations/HasOneAssociation.as

@@ -33,6 +33,15 @@ package mesh.model.associations
 			throw new IllegalOperationError("Cannot load " + this + " with undefined service undefined for " + definition);
 		}
 
+		/**
+		 * @inheritDoc
+		 */
+		override public function reset():void
+		{
+			super.object = undefined;
+			super.reset();
+		}
+
 		/**
 		 * @inheritDoc
 		 */

src/mesh/services/Request.as

@@ -4,6 +4,8 @@ package mesh.services
 
 	import mesh.core.proxy.DataProxy;
 
+	import mx.managers.CursorManager;
+
 	public dynamic class Request extends DataProxy
 	{
 		private var _block:Function;
@@ -33,23 +35,40 @@ package mesh.services
 			return this;
 		}
 
+		public function cancel():void
+		{
+
+		}
+
 		public function execute(handler:Object = null):Request
 		{
 			if (!_isExecuting) {
 				_isExecuting = true;
+
+				showBusyCursor();
 				if (handler != null) {
 					addHandler(handler);
 				}
+
 				executeBlock(_block);
 			}
 			return this;
 		}
 
+		private var _useBusyCursor:Boolean;
+		public function useBusyCursor():Request
+		{
+			_useBusyCursor = true;
+			return this;
+		}
+
 		protected function fault(fault:Object):void
 		{
+			hideBusyCursor();
 			for each (var handler:Object in _handlers) {
 				handler.fault(fault);
 			}
+			_isExecuting = false;
 		}
 
 		protected function result(data:Object):void
@@ -59,6 +78,7 @@ package mesh.services
 
 		protected function success():void
 		{
+			hideBusyCursor();
 			for each (var handler:Object in _handlers) {
 				handler.success();
 			}
@@ -84,6 +104,20 @@ package mesh.services
 		{
 			block.apply(null, blockArgs());
 		}
+
+		private function showBusyCursor():void
+		{
+			if (_useBusyCursor) {
+				CursorManager.setBusyCursor();
+			}
+		}
+
+		private function hideBusyCursor():void
+		{
+			if (_useBusyCursor) {
+				CursorManager.removeBusyCursor();
+			}
+		}
 	}
 }
 

src/mesh/services/SynchronousRequest.as

@@ -0,0 +1,26 @@
+package mesh.services
+{
+	import mesh.operations.MethodOperation;
+	import mesh.operations.Operation;
+
+	/**
+	 * A request the executes a block function. The request's result will be the data
+	 * that the block returns. If the block throws an error, the request will fault with
+	 * that error.
+	 * 
+	 * @author Dan Schultz
+	 */
+	public class SynchronousRequest extends OperationRequest
+	{
+		/**
+		 * @copy Request#Request()
+		 */
+		public function SynchronousRequest(block:Function = null)
+		{
+			super(function():Operation
+			{
+				return new MethodOperation(block);
+			});
+		}
+	}
+}

tests/mesh/model/AssociationCollectionTests.as

@@ -9,8 +9,12 @@ package mesh.model
 
 	import org.flexunit.assertThat;
 	import org.hamcrest.collection.array;
+	import org.hamcrest.collection.emptyArray;
+	import org.hamcrest.core.isA;
 	import org.hamcrest.object.equalTo;
 
+	use namespace flash_proxy;
+
 	public class AssociationCollectionTests
 	{
 		private var _collection:AssociationCollection;
@@ -41,6 +45,14 @@ package mesh.model
 			_collection.callback("afterLoad");
 		}
 
+		[Test]
+		public function testBuild():void
+		{
+			var order:Order = _collection.build({total:15});
+			assertThat(order.customer.flash_proxy::object, isA(Customer));
+			assertThat(order.total, equalTo(15));
+		}
+
 		[Test]
 		public function testRevertRestoresToOriginalEntities():void
 		{
@@ -100,5 +112,18 @@ package mesh.model
 			assertThat(order.isNew, equalTo(true));
 			assertThat(order.isDirty, equalTo(true));
 		}
+
+		[Test]
+		public function testReset():void
+		{
+			var order:Order = _collection.getItemAt(0) as Order;
+
+			_collection.reset();
+
+			assertThat(order.isMarkedForRemoval, equalTo(false));
+			assertThat(_collection.dirtyEntities, emptyArray());
+			assertThat(_collection.length, equalTo(0));
+			assertThat(_collection.isLoaded, equalTo(false));
+		}
 	}
 }

tests/mesh/model/EntityTests.as

@@ -0,0 +1,35 @@
+package mesh.model
+{
+	import mesh.Customer;
+	import mesh.Mesh;
+	import mesh.Name;
+	import mesh.services.Request;
+
+	import org.flexunit.assertThat;
+	import org.hamcrest.object.equalTo;
+
+	public class EntityTests
+	{
+		private var _customer:Customer;
+
+		[Before]
+		public function setup():void
+		{
+			_customer = new Customer();
+			_customer.name = new Name("Jimmy", "Page");
+			_customer.age = 67;
+			_customer.save().execute();
+		}
+
+		[Test]
+		public function testReload():void
+		{
+			var customer:Request = Mesh.service(Customer).find(_customer.id).execute();
+			customer.age = 68;
+			customer.reload().execute();
+
+			assertThat(customer.age, equalTo(_customer.age));
+			assertThat(customer.isDirty, equalTo(false));
+		}
+	}
+}

tests/mesh/model/HasOneAssociationTests.as

@@ -9,6 +9,7 @@ package mesh.model
 
 	import org.flexunit.assertThat;
 	import org.hamcrest.object.equalTo;
+	import org.hamcrest.object.nullValue;
 
 	use namespace flash_proxy;
 
@@ -109,5 +110,23 @@ package mesh.model
 			customer.account.load().execute();
 			assertThat(customer.account.id, equalTo(account.id));
 		}
+
+		[Test]
+		public function testReset():void
+		{
+			var account:Account = new Account();
+			account.number = "000-001";
+
+			_customer.account.object = account;
+			_customer.account.save().execute();
+			_customer.save().execute();
+
+			var customer:Request = Mesh.service(Customer).find(_customer.id).execute();
+			customer.account.load().execute();
+
+			customer.account.reset();
+			assertThat(customer.account.object, nullValue());
+			assertThat(customer.account.isLoaded, equalTo(false));
+		}
 	}
 }