test/IdentityMapTestFetchAndUpdateCollection.as @@ -11,10 +11,14 @@ package flails { this.modelClass = modelClass; } - public function fetchAndUpdateArray(idProperty:String, data:Array):Array { - return data.map(function(item:*, ... rest):Object { - return fetchAndUpdate(item[idProperty], item); - }); + public function fetchAndUpdateCollection(idProperty:String, data:Array):ArrayCollection { + var coll:ArrayCollection = new ArrayCollection(); + + for each (var o:Object in data) { + coll.addItem(fetchAndUpdate(o[idProperty], o)); + } + + return coll; } public function fetchAndUpdate(id:Object, attributes:Object):* { src/flails/IdentityMap.as @@ -75,7 +75,7 @@ package flails.resource { var result:* = filter.load(data); if (result is Array) { - return identityMap.fetchAndUpdateArray("id", result as Array); + return identityMap.fetchAndUpdateCollection("id", result as Array); } return identityMap.fetchAndUpdate(result.id, result); src/flails/resource/RailsResource.as @@ -8,7 +8,7 @@ package test { public class FrameworkSuite extends TestSuite { public function FrameworkSuite() { addTestCase(new IdentityMapTestFetchAndUpdate()); - addTestCase(new IdentityMapTestFetchAndUpdateArray()); + addTestCase(new IdentityMapTestFetchAndUpdateCollection()); addTestCase(new ResourceTest()); addTestCase(new ResultTest()); addTestCase(new RailsResourceTest()); test/FrameworkSuite.as @@ -21,12 +21,12 @@ package test.resource { } public function testIndex():void { - doTest(resource.index(), function (a:Array):void { + doTest(resource.index(), function (a:ArrayCollection):void { assertEquals(2, a.length); - assertEquals('testFindAll #1', a[0].subject); - assertEquals('testFindAll #1 body', a[0].body); - assertEquals('testFindAll #2', a[1].subject); - assertEquals('testFindAll #2 body', a[1].body); + assertEquals('testFindAll #1', a.getItemAt(0).subject); + assertEquals('testFindAll #1 body', a.getItemAt(0).body); + assertEquals('testFindAll #2', a.getItemAt(1).subject); + assertEquals('testFindAll #2 body', a.getItemAt(1).body); }, 1000); } test/resource/RailsResourceTest.as test/IdentityMapTestFetchAndUpdateArray.as 5fff4070d48c142a7e08e7a3ae56cfc2010fedee David Leal dgleal@gmail.com http://github.com/lancecarlson/flails/commit/a6a18bb477e64b470aafc28a17dbad8fa2dfb453 a6a18bb477e64b470aafc28a17dbad8fa2dfb453 2009-11-05T11:13:08-08:00 2009-11-05T11:13:08-08:00 Revert "Identity map returns arrays instead of array collections." This reverts commit 1da6319cde9e52bef0c5f22efe0fc1827ae53cd7. Signed-off-by: David Leal <dgleal@gmail.com> 7e4f246834478b10a5deec666924dee790501075 David Leal dgleal@gmail.com