From 866346e1ada583daeb649c253516c8f8a879c387 Mon Sep 17 00:00:00 2001 From: git5 Date: Thu, 1 Jan 1970 00:00:01 +0000 Subject: git5: git5track synced with perforce at 0 --- .gitignore | 24 ++++++++++++++++++++++++ READONLY | 1 + 2 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 120000 READONLY diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2b10d121 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +.git4_perforce_config +blaze-eclipse +google3/blaze-* +google3/Makefile* +google3/buildconf +google3/bin +google3/.forge +google3/genfiles +.p4config +/review +google3/linux-* +*.pyc +*~ +.nfs* +.*.swp +*.pyc-2.4 +.dotest +google3/.forge +google3/.grunt +google3/.gwt-tmp +google3/alloc +google3tomcat +google3/mbin +google3/mgenfiles \ No newline at end of file diff --git a/READONLY b/READONLY new file mode 120000 index 00000000..fda55c75 --- /dev/null +++ b/READONLY @@ -0,0 +1 @@ +/google/src/files/0/depot \ No newline at end of file -- cgit v1.2.3 From 8f9bf37bcf38165e89f37c147f9315cb8e72fc1f Mon Sep 17 00:00:00 2001 From: Rob Spies Date: Tue, 22 Jun 2010 17:11:57 -0700 Subject: asdsad --- test/ResourceSpec.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/ResourceSpec.js b/test/ResourceSpec.js index d11c3e08..4ab3537c 100644 --- a/test/ResourceSpec.js +++ b/test/ResourceSpec.js @@ -35,11 +35,6 @@ describe("resource", function() { var item = LineItem.get({id:456}); xhr.flush(); nakedExpect(item).toEqual({id:'abc'}); - - item = LineItem.get({id:456}); - xhr.flush(); - nakedExpect(item).toEqual({id:'abc'}); - }); it("should create resource", function(){ -- cgit v1.2.3 From 4034a2d1e2efb6c76020273c96c3da5ae146f5ca Mon Sep 17 00:00:00 2001 From: Rob Spies Date: Tue, 13 Jul 2010 14:09:53 -0700 Subject: better naming for our verify cache scheme, and tests. --- src/Resource.js | 9 +++++---- src/services.js | 4 ++-- test/ResourceSpec.js | 20 ++++++++++++++++++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/Resource.js b/src/Resource.js index ba460c30..1279dc54 100644 --- a/src/Resource.js +++ b/src/Resource.js @@ -1,3 +1,5 @@ + + function Route(template, defaults) { this.template = template = template + '#'; this.defaults = defaults || {}; @@ -86,7 +88,7 @@ ResourceFactory.prototype = { throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments."; } - var value = action.isArray ? [] : new Resource(data;) + var value = action.isArray ? [] : new Resource(data) self.xhr( action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), @@ -94,8 +96,7 @@ ResourceFactory.prototype = { function(status, response, clear) { if (status == 200) { if (action.isArray) { - if (action.cacheThenRetrieve) - value = []; + value.length = 0; foreach(response, function(item){ value.push(new Resource(item)); }); @@ -107,7 +108,7 @@ ResourceFactory.prototype = { throw {status: status, response:response, message: status + ": " + response}; } }, - action.cacheThenRetrieve + action.verifyCache ); return value; }; diff --git a/src/services.js b/src/services.js index 64f2ea4f..ed6f73ad 100644 --- a/src/services.js +++ b/src/services.js @@ -313,7 +313,7 @@ angularService('$xhr.bulk', function($xhr, $error, $log){ angularService('$xhr.cache', function($xhr){ var inflight = {}, self = this;; - function cache(method, url, post, callback, cacheThenRetrieve){ + function cache(method, url, post, callback, verifyCache){ if (isFunction(post)) { callback = post; post = null; @@ -322,7 +322,7 @@ angularService('$xhr.cache', function($xhr){ var data; if (data = cache.data[url]) { callback(200, copy(data.value)); - if (!cacheThenRetrieve) + if (!verifyCache) return; } diff --git a/test/ResourceSpec.js b/test/ResourceSpec.js index 4ab3537c..18b3979b 100644 --- a/test/ResourceSpec.js +++ b/test/ResourceSpec.js @@ -30,8 +30,7 @@ describe("resource", function() { it("should build resource with default param", function(){ xhr.expectGET('/Order/123/Line/456.visa?minimum=0.05').respond({id:'abc'}); - xhr.expectGET('/Order/123/Line/456.visa?minimum=0.05').respond({id:'ddd'}); - var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05}); + var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05}, {verifyCache: 'blah'}); var item = LineItem.get({id:456}); xhr.flush(); nakedExpect(item).toEqual({id:'abc'}); @@ -136,6 +135,23 @@ describe("resource", function() { expect(person.name).toEqual('misko'); }); + it('should return the same object when verifying the cache', function(){ + var scope = angular.compile('
'); + var Person = scope.$resource('/Person/:id', null, {query: {method:'GET', isArray: true, verifyCache: true}}); + scope.$browser.xhr.expectGET('/Person/123').respond('[\n{\nname:\n"misko"\n}\n]'); + var person = Person.query({id:123}); + scope.$browser.xhr.flush(); + expect(person[0].name).toEqual('misko'); + + scope.$browser.xhr.expectGET('/Person/123').respond('[\n{\nname:\n"rob"\n}\n]'); + var person2 = Person.query({id:123}); + expect(person2[0].name).toEqual('misko'); + var person2Cache = person2; + scope.$browser.xhr.flush(); + expect(person2Cache).toEqual(person2); + expect(person2[0].name).toEqual('rob'); + }); + describe('failure mode', function(){ it('should report error when non 200', function(){ xhr.expectGET('/CreditCard/123').respond(500, "Server Error"); -- cgit v1.2.3 From ac3c2736c786abe996acc3d01d857dd5f0b3328a Mon Sep 17 00:00:00 2001 From: Rob Spies Date: Tue, 13 Jul 2010 14:15:01 -0700 Subject: Removes silly test addition. --- test/ResourceSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ResourceSpec.js b/test/ResourceSpec.js index 18b3979b..4882e70e 100644 --- a/test/ResourceSpec.js +++ b/test/ResourceSpec.js @@ -30,7 +30,7 @@ describe("resource", function() { it("should build resource with default param", function(){ xhr.expectGET('/Order/123/Line/456.visa?minimum=0.05').respond({id:'abc'}); - var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05}, {verifyCache: 'blah'}); + var LineItem = resource.route('/Order/:orderId/Line/:id:verb', {orderId: '123', id: '@id.key', verb:'.visa', minimum:0.05}); var item = LineItem.get({id:456}); xhr.flush(); nakedExpect(item).toEqual({id:'abc'}); -- cgit v1.2.3