Issue #23 - non-latin characters

- Allow setting rssEncoding in options array, defaults to UTF-8
- Move from iconv-lite to iconv, more reliable

.travis.yml

@@ -3,4 +3,3 @@ node_js:
 - 0.11
 - 0.10
 - 0.8
-

lib/feed.js

@@ -3,7 +3,7 @@ var xml2js = require('xml2js'),
     _ = require('underscore'),
     request = require('request'),
     URL = require('url'),
-    iconv = require('iconv-lite');
+    Iconv = require('iconv').Iconv;
 /**
  All you need to do is send a feed URL that can be opened via fs
  Options are optional, see xml2js for extensive list
@@ -21,7 +21,9 @@ function parseURL(feedURL, options, callback) {
         jar: false,
         proxy: false,
         followRedirect: true,
-        timeout: 1000 * 30
+        timeout: 1000 * 30,
+        encoding: null,
+        rssEncoding: 'UTF-8'
     };
     options = _.extend(defaults, options);
     //check that the protocal is either http or https
@@ -40,9 +42,9 @@ function parseURL(feedURL, options, callback) {
                     if (response.statusCode >= 400) {
                         callback("Failed to retrieve source! Invalid response code (" + response.statusCode + ")!", null);
                     } else {
-                        var encodedXml = iconv.decode(new Buffer(xml), 'ISO-8859-1');
-                        parseString(encodedXml, options, callback);
-                        //issues22
+                        var iconv = new Iconv(options.rssEncoding, 'UTF-8');
+                        xml = iconv.convert(new Buffer(xml)).toString();
+                        parseString(xml, options, callback);
                     }
                 } else {
                     callback("Failed to retrieve source! No response code!!", null);
@@ -341,4 +343,4 @@ var DateHelper = {
         }
         return 'over ' + Math.floor(distance_in_minutes / 525960) + ' years';
     }
-};
+};

package.json

@@ -1,7 +1,11 @@
 {
     "name": "rssparser",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "author": "Arjunkumar Krishnamoorthy",
+    "contributors": [
+        "Javier Scappini",
+        "Andrija Vucinic"
+    ],
     "description": "rssparser is an all purpose RSS/ATOM feed parser that parses feeds into a JSON format.",
     "keywords": [
         "rss",
@@ -20,7 +24,7 @@
         "xml2js": ">=0.2.0",
         "request": ">=2.9.3",
         "underscore": ">=1.3.3",
-        "iconv-lite": ">=0.4.4"
+        "iconv": ">=2.1.4"
     },
     "devDependencies": {
         "vows": "*"
@@ -31,6 +35,6 @@
     "main": "./lib/feed.js",
     "readme": "node-rssparser",
     "readmeFilename": "README.md",
-    "_id": "rssparser@0.0.9",
+    "_id": "rssparser@0.0.10",
     "_from": "rssparser"
 }