only multipart tests to fix now

MaherSaif · Feb 2, 2011 · 5199d86 · 5199d86
1 parent 5b0b672
commit 5199d86
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/lib/restler.js b/lib/restler.js
@@ -42,9 +42,10 @@ function Request(uri, options) {
     this.options.data = qs.stringify(this.options.data);
     this.headers['Content-Type'] = 'application/x-www-form-urlencoded';
     this.headers['Content-Length'] = this.options.data.length;
-  } else if (this.options.multipart) {
+  }
+
+  if (this.options.multipart) {
     this.headers['Content-Type'] = 'multipart/form-data; boundary=' + multipart.defaultBoundary;
-    this.headers['Transfer-Encoding'] = 'chunked';
   }
 
   var proto = (this.url.protocol == 'https:') ? https : http;
@@ -110,6 +111,7 @@ mixin(Request.prototype, {
       response.addListener('end', function() {
          if (self.options.parser) {
            self.options.parser.call(response, body, function(parsedData) {
+
              self._fireEvents(parsedData, response);
            });
          } else {
@@ -192,8 +194,9 @@ var parsers = {
 
     if (contentType) {
       for (var matcher in parsers.auto.matchers) {
+
         if (contentType == matcher) {
-          parsers.auto.matchers[matcher].call(this, data, callback);
+          return parsers.auto.matchers[matcher].call(this, data, callback);
         }
       }
     }
@@ -216,7 +219,7 @@ try {
     return callback(data && yaml.eval(data));
   };
 
-  parsers.auto.parsers['application/yaml'] = parsers.yaml;
+  parsers.auto.matchers['application/yaml'] = parsers.yaml;
 } catch(e) {}
 
 try {
@@ -236,7 +239,7 @@ try {
     }
   };
 
-  parsers.auto.parsers['application/xml'] = parsers.yaml;
+  parsers.auto.matchers['application/xml'] = parsers.xml;
 } catch(e) {}
 
 

diff --git a/test/restler.js b/test/restler.js
@@ -123,20 +123,20 @@ helper.testCase("Deserialization Tests", helper.dataServer, {
       test.equal(true, data.ok, "returned " + sys.inspect(data));
     });
   },
-  // testAutoSerializerShouldParseXML: function(host, test) {
-  //   rest.get(host, {
-  //     headers: { 'Accepts': 'application/xml' }
-  //   }).on('complete', function(data) {
-  //     test.equal("true", data.document.ok, "returned " + sys.inspect(data));
-  //   });
-  // },
-  // testAutoSerializerShouldParseYAML: function(host, test) {
-  //   rest.get(host, {
-  //     headers: { 'Accepts': 'application/yaml' }
-  //   }).on('complete', function(data) {
-  //     test.equal(true, data.ok, "returned " + sys.inspect(data));
-  //   });
-  // }
+  testAutoSerializerShouldParseXML: function(host, test) {
+    rest.get(host, {
+      headers: { 'Accepts': 'application/xml' }
+    }).on('complete', function(data) {
+      test.equal("true", data.ok, "returned " + sys.inspect(data));
+    });
+  },
+  testAutoSerializerShouldParseYAML: function(host, test) {
+    rest.get(host, {
+      headers: { 'Accepts': 'application/yaml' }
+    }).on('complete', function(data) {
+      test.equal(true, data.ok, "returned " + sys.inspect(data));
+    });
+  }
 });
 
 helper.testCase('Redirect Tests', helper.redirectServer, {

diff --git a/test/test_helper.js b/test/test_helper.js
@@ -39,7 +39,7 @@ exports.dataServer = function() {
   var yaml = "ok: true";
 
   var server = http.createServer(function(request, response) {
-    response.writeHead(200, { 'Content-Type': request.headers['accepts'] });
+    response.writeHead(200, { 'Content-Type': request.headers['accepts'], 'test': 'thing' });
 
     if (request.headers['accepts'] == 'application/json') {
       response.write(json);