Merge branch 'master' into dev

Conflicts:
	isso/views/comments.py

CHANGES.rst

@@ -7,12 +7,35 @@ Changelog for Isso
 - Nothing changed yet.
 
 
-0.9.5 (unreleased)
+0.9.6 (unreleased)
 ------------------
 
 - Nothing changed yet.
 
 
+0.9.5 (2014-08-10)
+------------------
+
+- prevent no-break space ( ) insertion to enable manual line breaks using
+  two trailing spaces (as per Markdown convention), #112
+
+- limit request size to 256 kb, #107
+
+  Previously unlimited or limited by proxy server). 256 kb is a rough
+  approximation of the next database schema with comments limited to 65535
+  characters and additional fields.
+
+- add support for logging to file, #103
+
+    [general]
+    log-file =
+
+- show timestamp when hovering <time>, #104
+
+- fix a regression when editing comments with multiple paragraphs introduced
+  in 0.9.3 which would HTML escape manually inserted linebreaks.
+
+
 0.9.4 (2014-07-09)
 ------------------
 

docs/docs/configuration/client.rst

@@ -14,8 +14,8 @@ preferably in the script tag which embeds the JS:
             data-isso-max-comments-nested="5"
             data-isso-reveal-on-click="5"
             data-isso-avatar="true"
-            data-avatar-bg="#f0f0f0"
+            data-isso-avatar-bg="#f0f0f0"
-            data-avatar-fg="#9abf88 #5698c4 #e279a3 #9163b6 ..."
+            data-isso-avatar-fg="#9abf88 #5698c4 #e279a3 #9163b6 ..."
             src="/prefix/js/embed.js"></script>
 
 Furthermore you can override the automatic title detection inside

docs/docs/configuration/server.rst

@@ -44,6 +44,7 @@ session key and hostname. Here are the default values for this section:
     host =
     max-age = 15m
     notify = stdout
+    log-file =
 
 dbpath
     file location to the SQLite3 database, highly recommended to change this
@@ -86,6 +87,9 @@ notify
         Send notifications via SMTP on new comments with activation (if
         moderated) and deletion links.
 
+log-file
+    Log console messages to file instead of standard out.
+
 
 .. _CORS: https://developer.mozilla.org/en/docs/HTTP/Access_control_CORS
 

docs/docs/install.rst

@@ -139,6 +139,8 @@ Prebuilt Packages
 * Arch Linux: https://aur.archlinux.org/packages/isso/
   – install with `yaourt isso`.
 
+* Docker Image: https://registry.hub.docker.com/u/bl4n/isso/
+
 Install from Source
 -------------------
 

isso/__init__.py

@@ -78,7 +78,7 @@ from isso.utils import http, JSONRequest, html, hash
 
 from isso.ext.notifications import Stdout, SMTP
 
-logging.getLogger('werkzeug').setLevel(logging.ERROR)
+logging.getLogger('werkzeug').setLevel(logging.WARN)
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s %(levelname)s: %(message)s")
@@ -270,6 +270,15 @@ def main():
         migrate.dispatch(tc, cc, args.type, args.dump)
         sys.exit(0)
 
+    if conf.get("general", "log-file"):
+        handler = logging.FileHandler(conf.get("general", "log-file"))
+
+        logger.addHandler(handler)
+        logging.getLogger("werkzeug").addHandler(handler)
+
+        logger.propagate = False
+        logging.getLogger("werkzeug").propagate = False
+
     if not any(conf.getiter("general", "host")):
         logger.error("No website(s) configured, Isso won't work.")
         sys.exit(1)

isso/js/app/i18n/fr.js

@@ -17,7 +17,7 @@ define({
     "comment-queued": "Commentaire en attente de modération.",
     "comment-anonymous": "Anonyme",
     "comment-hidden": "1 caché\n{{ n }} cachés",
-    "date-now": "À l'instant'",
+    "date-now": "À l'instant",
     "date-minute": "Il y a une minute\nIl y a {{ n }} minutes",
     "date-hour": "Il y a une heure\nIl y a {{ n }} heures ",
     "date-day": "Hier\nIl y a {{ n }} jours",

isso/js/app/isso.js

@@ -101,7 +101,7 @@ define(["app/dom", "app/utils", "app/config", "app/api", "app/jade", "app/i18n",
 
         // update datetime every 60 seconds
         var refresh = function() {
-            $(".permalink > date", el).textContent = utils.ago(
+            $(".permalink > time", el).textContent = utils.ago(
                 globals.offset.localTime(), new Date(parseInt(comment.created, 10) * 1000));
             setTimeout(refresh, 60*1000);
         };

isso/js/app/jade.js

@@ -21,6 +21,13 @@ define(["libjs-jade-runtime", "app/utils", "jade!app/text/postbox", "jade!app/te
     load("comment-loader", tt_comment_loader);
 
     set("bool", function(arg) { return arg ? true : false; });
+    set("humanize", function(date) {
+        if (typeof date !== "object") {
+            date = new Date(parseInt(date, 10) * 1000);
+        }
+
+        return date.toString();
+    });
     set("datetime", function(date) {
         if (typeof date !== "object") {
             date = new Date(parseInt(date, 10) * 1000);
@@ -30,7 +37,11 @@ define(["libjs-jade-runtime", "app/utils", "jade!app/text/postbox", "jade!app/te
             date.getUTCFullYear(),
             utils.pad(date.getUTCMonth(), 2),
             utils.pad(date.getUTCDay(), 2)
-        ].join("-");
+        ].join("-") + "T" + [
+            utils.pad(date.getUTCHours(), 2),
+            utils.pad(date.getUTCMinutes(), 2),
+            utils.pad(date.getUTCSeconds(), 2)
+        ].join(":") + "Z";
     });
 
     return {

isso/js/app/markup.js

@@ -1,50 +0,0 @@
-define(["vendor/markup", "app/config", "app/i18n", "app/text/svg"], function(Mark, config, i18n, svg) {
-
-    "use strict";
-
-
-    // circumvent https://github.com/adammark/Markup.js/issues/22
-    function merge(obj) {
-        var result = {};
-        for (var prefix in obj) {
-            for (var attrname in obj[prefix]) {
-                result[prefix + "-" + attrname] = obj[prefix][attrname];
-            }
-        }
-        return result;
-    }
-
-    Mark.delimiter = ":";
-    Mark.includes = merge({
-        conf: config,
-        i18n: i18n[i18n.lang],
-        svg: svg
-    });
-
-    Mark.pipes.datetime = function(date) {
-        if (typeof date !== "object") {
-            date = new Date(parseInt(date, 10) * 1000);
-        }
-
-        return [date.getUTCFullYear(), pad(date.getUTCMonth(), 2), pad(date.getUTCDay(), 2)].join("-");
-    };
-
-    Mark.pipes.substract = function(a, b) {
-        return parseInt(a, 10) - parseInt(b, 10);
-    };
-
-    var strip = function(string) {
-        // allow whitespace between Markup.js delimiters such as
-        // {{ var | pipe : arg }} instead of {{var|pipe:arg}}
-        return string.replace(/\{\{\s*(.+?)\s*\}\}/g, function(match, val) {
-            return ("{{" + val + "}}").replace(/\s*\|\s*/g, "|")
-                                      .replace(/\s*\:\s*/g, ":");
-        });
-    };
-
-    return {
-        up: function(template, context) {
-            return Mark.up(strip(template), context);
-        }
-    };
-});

isso/js/app/text/comment.jade

@@ -12,7 +12,7 @@ div(class='isso-comment' id='isso-#{comment.id}')
                     = bool(comment.author) ? comment.author : i18n('comment-anonymous')
             span(class="spacer") •
             a(class='permalink' href='#isso-#{comment.id}')
-                date(datetime='#{datetime(comment.created)}')
+                time(title='#{humanize(comment.created)}' datetime='#{datetime(comment.created)}')
             span(class='note')
                 = comment.mode == 2 ? i18n('comment-queued') : comment.mode == 4 ? i18n('comment-deleted') : ''
 

isso/js/app/utils.js

@@ -57,13 +57,15 @@ define(["app/i18n"], function(i18n) {
         var _ = document.createElement("div");
         _.innerHTML = html.replace(/<div><br><\/div>/gi, '<br>')
                           .replace(/<div>/gi,'<br>')
-                          .replace(/<br>/gi, '\n');
+                          .replace(/<br>/gi, '\n')
+                          .replace(/&nbsp;/gi, ' ');
         return _.textContent.trim();
     };
 
     var detext = function(text) {
-        return escape(text.replace(/\n\n/gi, '<br><div><br></div>')
+        text = escape(text);
-                          .replace(/\n/gi, '<br>'));
+        return text.replace(/\n\n/gi, '<br><div><br></div>')
+                   .replace(/\n/gi, '<br>');
     };
 
     return {

isso/utils/__init__.py

@@ -8,9 +8,11 @@ werkzeug = pkg_resources.get_distribution("werkzeug")
 import json
 import hashlib
 
-from werkzeug.wrappers import Request, Response
+from werkzeug.wrappers import Response
 from werkzeug.exceptions import BadRequest
 
+from isso.wsgi import Request
+
 try:
     import ipaddress
 except ImportError:

isso/wsgi.py

@@ -17,6 +17,7 @@ except ImportError:
     from BaseHTTPServer import HTTPServer
 
 from werkzeug.serving import WSGIRequestHandler
+from werkzeug.wrappers import Request as _Request
 from werkzeug.datastructures import Headers
 
 from isso.compat import string_types
@@ -148,6 +149,14 @@ class CORSMiddleware(object):
         return self.app(environ, add_cors_headers)
 
 
+class Request(_Request):
+
+    # Assuming UTF-8, comments with 65536 characters would consume
+    # 128 kb memory. The remaining 128 kb cover additional parameters
+    # and WSGI headers.
+    max_content_length = 256 * 1024
+
+
 class SocketWSGIRequestHandler(WSGIRequestHandler):
 
     def run_wsgi(self):

share/isso.conf

@@ -43,6 +43,9 @@ max-age = 15m
 #     moderated) and deletion links.
 notify = stdout
 
+# Log console messages to file instead of standard out.
+log-file =
+
 
 [moderation]
 # enable comment moderation queue. This option only affects new comments.