Decode body from response-specified charset to UTF8

index.js

@@ -1,6 +1,7 @@
 var request    = require('request')
   , sax        = require('sax')
-  , _          = require('underscore');
+  , _          = require('underscore')
+  , iconv      = require('iconv-lite');
 
 
 // Public: Fetch the articles from the RSS or ATOM feed.
@@ -51,16 +52,26 @@ FeedRead.identify = function(xml) {
   }
 }
 
-
+// Internal: Identify response charset.
+// 
+// response - Response object (returned by request lib).
+// 
+// Returns charset specified via Content-Type header or "utf-8" if nothing is specified.
+FeedRead.identifyCharset = function(response) {
+  var contentType = response && response.headers && response.headers["content-type"];
+  var match = contentType && contentType.match(/charset=(\S+)/);
+  return match && match[1] || "utf-8";
+}
 
 // Internal: Get a single feed.
 // 
 // feed_url - String url.
 // callback - Receives `(err, articles)`.
 // 
 FeedRead.get = function(feed_url, callback) {
-  request(feed_url, {timeout: 5000}, function(err, res, body) {
+  request(feed_url, {encoding: null, timeout: 5000}, function(err, res, body) {
     if (err) return callback(err);
+    body = iconv.decode(body, FeedRead.identifyCharset(res));
     var type = FeedRead.identify(body);
     if (type == "atom") {
       FeedRead.atom(body, feed_url, callback);

package.json

@@ -1,38 +1,41 @@
-{ "name":        "feed-read"
-, "version":     "0.0.1"
-, "description": "a ATOM and RSS feed parser"
-, "keywords":    ["atom", "rss", "feed", "parser"]
-, "homepage":    "https://github.com/sentientwaffle/feed-read"
-, "bugs":
-  { "url":  "https://github.com/sentientwaffle/feed-read/issues"
+{
+  "name": "feed-read",
+  "version": "0.0.2",
+  "description": "a ATOM and RSS feed parser",
+  "keywords": [
+    "atom",
+    "rss",
+    "feed",
+    "parser"
+  ],
+  "homepage": "https://github.com/sentientwaffle/feed-read",
+  "bugs": {
+    "url": "https://github.com/sentientwaffle/feed-read/issues"
+  },
+  "author": {
+    "name": "sentientwaffle",
+    "url": "http://sentientwaffle.github.com/"
+  },
+  "main": "./index",
+  "scripts": {
+    "test": "mocha"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sentientwaffle/feed-read.git"
+  },
+  "dependencies": {
+    "iconv-lite": "^0.4.8",
+    "request": "2.x.x",
+    "sax": "0.3.x",
+    "underscore": "1.x.x"
+  },
+  "devDependencies": {
+    "should": "0.x.x",
+    "mocha": "0.x.x",
+    "connect": "1.x.x"
+  },
+  "engines": {
+    "node": ">=0.4.1"
   }
-, "author":
-  { "name": "sentientwaffle"
-  , "url":  "http://sentientwaffle.github.com/"
-  }
-
-, "main": "./index"
-, "scripts":
-  { "test": "mocha"
-  }
-
-
-, "repository":
-  { "type": "git"
-  , "url":  "https://github.com/sentientwaffle/feed-read.git"
-  }
-
-, "dependencies":
-  { "request":    "2.x.x"
-  , "sax":        "0.3.x"
-  , "underscore": "1.x.x"
-  }
-
-, "devDependencies":
-  { "should":  "0.x.x"
-  , "mocha":   "0.x.x"
-  , "connect": "1.x.x"
-  }
-
-, "engines": { "node": ">=0.4.1" }
 }