apps/media/scripts/gadget_handler.js apps/media/tests/gadget_handler.xml @@ -1,5 +1,5 @@ application: jquery-douban -version: 0-1-20090228 +version: 2 runtime: python api_version: 1 apps/app.yaml @@ -1 +1 @@ -../../../src/gm_handler.js \ No newline at end of file +../../../src/greasemonkey_handler.js \ No newline at end of file apps/media/scripts/gm_handler.js @@ -1,4 +1,4 @@ -var url = 'http://localhost:8080/test/handler/'; +var url = 'http://jquery-douban.appspot.com/test/handler/'; var params = { 'p1': 'parameter_one', 'p2': 'parameter_two' }; var headers = { 'h1': 'header_one', 'h2': 'header_two' }; var data = '<?xml version="1.0" encoding="UTF-8"?><entry></entry>'; @@ -20,5 +20,5 @@ function testJson(json) { function testText(text) { console.debug(text); - fireunit.compare('{"url": "http:\\/\\/localhost:8080\\/test\\/handler\\/?p1=parameter_one&p2=parameter_two", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {"p2": "parameter_two", "p1": "parameter_one"}, "data": ""}', text, "Text"); + fireunit.compare('{"url": "http:\\/\\/jquery-douban.appspot.com\\/test\\/handler\\/?p1=parameter_one&p2=parameter_two", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {"p2": "parameter_two", "p1": "parameter_one"}, "data": ""}', text, "Text"); } apps/media/tests/gears.js @@ -16,7 +16,7 @@ window.fireunit = { } }; -var url = 'http://localhost:8080/test/handler/'; +var url = 'http://jquery-douban.appspot.com/test/handler/'; var params = { 'p1': 'parameter_one', 'p2': 'parameter_two' }; var headers = { 'h1': 'header_one', 'h2': 'header_two' }; var data = '<?xml version="1.0" encoding="UTF-8"?><entry></entry>'; @@ -38,5 +38,5 @@ function testJson(json) { function testText(text) { console.debug(text); - fireunit.compare('{"url": "http:\\/\\/localhost:8080\\/test\\/handler\\/?p1=parameter_one&p2=parameter_two", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {"p2": "parameter_two", "p1": "parameter_one"}, "data": ""}', text, "Text"); + fireunit.compare('{"url": "http:\\/\\/jquery-douban.appspot.com\\/test\\/handler\\/?p1=parameter_one&p2=parameter_two", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {"p2": "parameter_two", "p1": "parameter_one"}, "data": ""}', text, "Text"); } apps/media/tests/gm_handler.user.js @@ -1,6 +1,6 @@ netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead"); -var url = 'http://localhost:8080/test/handler/'; +var url = 'http://jquery-douban.appspot.com/test/handler/'; var params = { 'p1': 'parameter_one', 'p2': 'parameter_two' }; var headers = { 'h1': 'header_one', 'h2': 'header_two' }; var data = '<?xml version="1.0" encoding="UTF-8"?><entry></entry>'; @@ -22,5 +22,5 @@ function testJson(json) { function testText(text) { console.debug(text); - fireunit.compare('{"url": "http:\\/\\/localhost:8080\\/test\\/handler\\/", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {}, "data": "p1=parameter_one&p2=parameter_two"}', text, "Text"); + fireunit.compare('{"url": "http:\\/\\/jquery-douban.appspot.com\\/test\\/handler\\/", "headers": {"h2": "header_two", "h1": "header_one"}, "params": {}, "data": "p1=parameter_one&p2=parameter_two"}', text, "Text"); } apps/media/tests/jquery.js @@ -9,7 +9,6 @@ from google.appengine.ext.webapp import template from google.appengine.ext.webapp.util import run_wsgi_app testcases = ( - 'basic', 'collection', 'event', 'miniblog', @@ -52,8 +51,7 @@ class TestHandler(webapp.RequestHandler): class TestcasePage(webapp.RequestHandler): def get(self, testcase_name): if testcase_name not in testcases: - # return self.error(404) - return self.response.out.write(testcase_name) + return self.error(404) template_path = 'templates/tests/%s.html' % testcase_name template_values = { apps/test.py @@ -4,7 +4,7 @@ import os from optparse import OptionParser -""" python build.py [-acemnrRstu] [-AgGMj] [-h|--help] """ +""" Usage: python build.py [-acemnrRstu] [-AgGMj] [-h|--help] """ src_dir = 'src' build_dir = 'build' @@ -21,7 +21,6 @@ services = ['collection', 'event', 'miniblog', 'note', 'recommendation', \ handlers = ['jquery', 'gears', 'gadget', 'greasemonkey'] - options = ( ('-a', '--all', 'include all services'), ('-c', '--collection', 'include collection service'), build.py @@ -1,39 +1,46 @@ -if (window.gadgets) { +if (gadgets) { var GadgetHandler = Douban.handler.gadget = { name: 'gadget', - GET: function(url, params, headers, success) { + GET: function(url, params, headers, success, type) { url = Douban.util.buildUri(url, params); - var parameters = GadgetHandler.setParams('GET', 'JSON', headers); - return gadgets.io.makeRequest(url, success, parameters ); + var parameters = GadgetHandler.setParams('GET', type || 'JSON', headers); + return gadgets.io.makeRequest(url, this.response(type, success), parameters ); }, - POST: function(url, params, data, headers, success) { + POST: function(url, params, data, headers, success, type) { url = Douban.util.buildUri(url, params); - var parameters = GadgetHandler.setParams('POST', 'JSON', headers, data); - return gadgets.io.makeRequest(url, success, parameters ); + var parameters = GadgetHandler.setParams('POST', type || 'JSON', headers, data); + return gadgets.io.makeRequest(url, this.response(type, success), parameters ); }, - PUT: function(url, params, data, headers, success) { + PUT: function(url, params, data, headers, success, type) { url = Douban.util.buildUri(url, params); - var parameters = GadgetHandler.setParams('PUT', 'JSON', headers, data); - return gadgets.io.makeRequest(url, success, parameters); + var parameters = GadgetHandler.setParams('PUT', type || 'JSON', headers, data); + return gadgets.io.makeRequest(url, this.response(type, success), parameters); }, - DELETE: function(url, params, headers, success) { + DELETE: function(url, params, headers, success, type) { url = Douban.util.buildUri(url, params); - var parameters = GadgetHandler.setParams('DELETL', 'TEXT', headers); - return gadgets.io.makeRequest(url, success, parameters); + var parameters = GadgetHandler.setParams('DELETE', type || 'TEXT', headers); + return gadgets.io.makeRequest(url, this.response(type, success), parameters); }, setParams: function(type, contentType, headers, data) { var params = {}; params[gadgets.io.RequestParameters.METHOD] = gadgets.io.MethodType[type]; - params[gadgets.io.RequestParameters.CONTENT_TYPE] = gadgets.io.ContentType[contentType]; + params[gadgets.io.RequestParameters.CONTENT_TYPE] = gadgets.io.ContentType[contentType.toUpperCase()]; params[gadgets.io.RequestParameters.HEADERS] = headers; if (data) params[gadgets.io.RequestParameters.POST_DATA] = data; return params; + }, + + response: function(type, success) { + return function(response) { + var data = type == 'text' ? response.text : response.data; + success && success(data); + } } }; src/gadget_handler.js @@ -4,9 +4,8 @@ var jQueryHandler = Douban.handler.jquery = { name: 'jquery', GET: function(url, params, headers, success, type) { - return jQuery.ajax({ url: url, + return jQuery.ajax({ url: Douban.util.buildUri(url, params), type: 'GET', - data: params, dataType: type || 'json', success: success, beforeSend: jQueryHandler.beforeSend(headers) }); @@ -35,9 +34,8 @@ var jQueryHandler = Douban.handler.jquery = { }, DELETE: function(url, params, headers, success, type) { - return jQuery.ajax({ url: url, + return jQuery.ajax({ url: Douban.util.buildUri(url, params), type: 'DELETE', - data: params, dataType: type || 'text', success: success, beforeSend: jQueryHandler.beforeSend(headers) }); src/jquery_handler.js apps/media/tests/basic.js apps/templates/tests/basic.html 33b8a19ee3e0a399b2c965e61622805be63da6da wu yuntao wyt.py@thonic.org http://github.com/wuyuntao/jquery-douban/commit/0c111b08776ad1cd3d9d4af6006dc79183118945 0c111b08776ad1cd3d9d4af6006dc79183118945 2009-03-19T21:20:49-07:00 2009-03-19T21:20:49-07:00 Gadget handler testcases. Fix bugs 071b659682a32234b322b21909bd8183162e26b2 wu yuntao wyt.py@thonic.org