Removes iconv and closes #93

Author: claudioc

ChangeLog.md

@@ -1,3 +1,11 @@
+Version 1.4.0, October 11th, 2015
+=================================
+
+- Fixes a bug on header rendering (closes #93)
+- Removes iconv and uses the transliteration module (finally!)
+
+The version is coded 1.4.0 because removing iconv may create some regression of old installations.
+
 Version 1.3.1, October 4th, 2015
 =================================
 

README.md

@@ -2,8 +2,6 @@
 
 [ ![Codeship Status for claudioc/jingo](https://www.codeship.io/projects/4c413870-353e-0132-115c-220292a78f73/status)](https://www.codeship.io/projects/40997)
 
-**Warning: the current version of Jingo (1.x.x) is relatively new and it has gone through some major rewrites. If you find yourself having problems with this version, you can still use the previous stable [version 0.6.1](https://github.com/claudioc/jingo/releases/tag/v0.6.1). If this is the case, please take a minute and fill out one [issue](https://github.com/claudioc/jingo/issues). And don't forget to take a look at the [list of changes](https://github.com/claudioc/jingo/blob/master/ChangeLog.md)!**
-
 JINGO
 =====
 
@@ -140,11 +138,6 @@ If anonRead is false you need to authenticate also for reading and then the emai
 
 The authentication is mandatory to edit pages from the web interface, but jingo works on a git repository; that means that you could skip the authentication altogether and edit pages with your editor and push to the remote that jingo is serving.
 
-Common problems
----------------
-
-Sometimes upgrading your version of node.js could break the `iconv` module. Try updating it with `npm install iconv`.
-
 Known limitations
 -----------------
 
@@ -356,7 +349,7 @@ Configuration options reference
 
 #### pages.title.asciiOnly
 
-  If this is set to true, Jingo will convert any non-Ascii character present in the title of the document to an ASCII equivalent (using iconv), when creating the filename of the document. Default was true for Jingo < 1.0 while for Jingo >= 1.0 the default is false
+  If this is set to true, Jingo will convert any non-Ascii character present in the title of the document to an ASCII equivalent (using transliteration), when creating the filename of the document. Default was true for Jingo < 1.0 while for Jingo >= 1.0 the default is false
 
 #### pages.title.lowercase
 

jingo

@@ -17,7 +17,7 @@ var program = require('commander'),
 
 global.Git = require('./lib/gitmech');
 
-program.version('1.3.1')
+program.version('1.4.0')
        .option('-c, --config <path>', 'Specify the config file')
        .option('-#, --hash-string <string>', 'Create an hash for a string')
        .option('-l, --local', 'Listen on localhost only')

lib/namer.js

@@ -1,8 +1,7 @@
-var Iconv = require("iconv").Iconv,
+var tr = require("transliteration"),
     app = require("./app"),
     Configurable = require("./configurable");
 
-var iconv = new Iconv("UTF-8", "ASCII//TRANSLIT//IGNORE");
 var wsReplacement = "-";
 var overrides = {};
 
@@ -35,9 +34,7 @@ Namer.prototype.wikify = function (str) {
   ret = ret.replace(/\//g, '+');
 
   if (pc.title.asciiOnly) {
-    ret = iconv.convert(ret)
-               .toString()
-               .replace(/[^a-zA-Z0-9\- _]/g, "");
+    ret = tr(ret).replace(/[^a-zA-Z0-9\- _]/g, "");
   }
 
   ret = ret.trim();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <claudio.cicali@gmail.com>",
   "keywords": [
@@ -32,7 +32,6 @@
     "express-session": "^1.9.3",
     "express-validator": "^2.7.0",
     "gravatar": "^1.1.0",
-    "iconv": "*",
     "jade": "*",
     "js-yaml": "^3.1.0",
     "lodash": "^2.4.1",
@@ -45,7 +44,8 @@
     "passport-google-oauth": "^0.1.5",
     "passport-local": "^1.0.0",
     "semver": "^2.3.2",
-    "serve-favicon": "^2.1.7"
+    "serve-favicon": "^2.1.7",
+    "transliteration": "^0.1.1"
   },
   "devDependencies": {
     "chai": "*",

routes/wiki.js

@@ -89,7 +89,7 @@ function _getWikiPage(req, res) {
       res.render("show", {
         page: page,
         title: app.locals.config.get("application").title + " – " + page.title,
-        content: renderer.render("#" + page.title + "\n" + page.content)
+        content: renderer.render("# " + page.title + "\n" + page.content)
       });
     }
     else {

test/mocha.opts

@@ -1,4 +1,5 @@
 --reporter spec
 --require test/support/setup
 --check-leaks
---recursive
+--recursive
+--globals strNew

test/spec/namerSpec.js

@@ -55,6 +55,7 @@ describe("namer", function() {
       expect(namer.wikify("_Sidebar")).to.equal("_Sidebar");
       expect(namer.wikify("nell'aria")).to.equal("nellaria");
       expect(namer.wikify("Caffé")).to.equal("Caffe");
+      expect(namer.wikify("àéîöū")).to.equal("aeiou");
       expect(namer.wikify("Caffé corretto!")).to.equal("Caffe-corretto");
       expect(namer.wikify("Per favore: nessun, dico; E un punto...")).to.equal("Per-favore-nessun-dico-E-un-punto");
       expect(namer.wikify("prova.md")).to.equal("provamd");