Merge branch 'matteocrippa.it'

Author: Arachnid

config.py

@@ -34,6 +34,12 @@
     # If another string is used besides 'default', calls to static files and
     #  use of template files in /views will go to directory by that name.
     "theme": "default",
+    
+    # Display gravatars alongside user comments?
+    "use_gravatars": True,
+    
+    # Do you want to be emailed when new comments are posted?
+    "send_comment_notification": True,
 
     # If you want to use legacy ID mapping for your former blog platform,
     # define it here and insert the necessary mapping code in the

handlers/bloog/blog.py

@@ -50,6 +50,8 @@
 from google.appengine.api import users
 from google.appengine.ext import db
 from google.appengine.ext.webapp import template
+from google.appengine.api import mail
+from google.appengine.api import urlfetch
 
 from handlers import restful
 from utils import authorized
@@ -143,7 +145,13 @@ def get_sanitizer_func(handler, **kwargs):
     logging.debug("Content-type: %s", handler.request.headers['CONTENT_TYPE'])
     logging.debug("In sanitizer: %s", kwlist)
     return lambda html : sanitizer.sanitize_html(html, **kwlist)
-        
+
+def do_sitemap_ping():
+    form_fields = { "sitemap": "%s/sitemap.xml" % (config.BLOG['root_url'],) }
+    urlfetch.fetch(url="http://www.google.com/webmasters/tools/ping",
+                   payload=urllib.urlencode(form_fields),
+                   method=urlfetch.GET)
+
 def process_embedded_code(article):
     # TODO -- Check for embedded code, escape opening triangular brackets
     # within code, and set article embedded_code strings so we can
@@ -212,6 +220,7 @@ def process_article_submission(handler, article_type):
         article.put()
         for key in article.tag_keys:
             db.get(key).counter.increment()
+        do_sitemap_ping()
         restful.send_successful_response(handler, '/' + article.permalink)
         view.invalidate_cache()
     else:
@@ -280,6 +289,16 @@ def process_comment_submission(handler, article):
         logging.debug("Bad comment: %s", property_hash)
         handler.error(400)
         return
+        
+    # Notify the author of a new comment (from matteocrippa.it)
+    if config.BLOG['send_comment_notification']:
+        recipient = "%s <%s>" % (config.BLOG['author'], config.BLOG['email'],)
+        body = ("A new comment has just been posted on %s/%s by %s."
+                % (config.BLOG['root_url'], article.permalink, comment.name))
+        mail.send_mail(sender=config.BLOG['email'],
+                       to=recipient,
+                       subject="New comment by %s" % (comment.name,),
+                       body=body)
 
     # Render just this comment and send it to client
     response = template.render(
@@ -318,7 +337,9 @@ def render_article(handler, article):
                                    "allow_comments": allow_comments,
                                    "article": article,
                                    "captcha1": captcha[:3],
-                                   "captcha2": captcha[3:6] })
+                                   "captcha2": captcha[3:6],
+                                   "use_gravatars": config.BLOG['use_gravatars']
+            })
     else:
         # This didn't fall into any of our pages or aliases.
         # Page not found.
@@ -565,3 +586,16 @@ def get(self):
         page = view.ViewPage()
         page.render(self, {"blog_updated_timestamp": updated, 
                            "articles": articles, "ext": "xml"})
+
+class SitemapHandler(webapp.RequestHandler):
+	def get(self):
+		logging.debug("Sending Sitemap")
+		articles = db.Query(models.blog.Article).order('-published').fetch(1000)
+		if articles:
+			self.response.headers['Content-Type'] = 'text/xml'
+			page = view.ViewPage()
+			page.render(self, {
+          "articles": articles,
+          "ext": "xml",
+          "root_url": config.BLOG['root_url']
+      })

main.py

@@ -36,6 +36,10 @@
 # Force sys.path to have our own directory first, so we can import from it.
 sys.path.insert(0, config.APP_ROOT_DIR)
 
+# Import custom django libraries
+webapp.template.register_template_library('utils.django_libs.gravatar')
+webapp.template.register_template_library('utils.django_libs.description')
+
 # Log a message each time this module get loaded.
 logging.info('Loading %s, app version = %s',
              __name__, os.getenv('CURRENT_VERSION_ID'))
@@ -54,6 +58,7 @@
     ('/tag/(.*)', blog.TagHandler),
     (config.BLOG['master_atom_url'] + '/*$', blog.AtomHandler),
     ('/articles', blog.ArticlesHandler),
+    ('/sitemap.xml', blog.SitemapHandler),
     ('/(.*)', blog.ArticleHandler)]
 
 def main():

static/default/style.css

@@ -147,6 +147,7 @@ h3#respond{color:#555;margin-bottom:7px;}
 .comment_text ul,
 .comment_text ol,
 .comment_text blockquote{margin:0 1em;}
+p.comment_meta .gravatar{vertical-align:top;margin-left:7px;}
 p.comment_meta span.subject{font-weight:bold;text-transform:uppercase;margin:0 0 0 7px;}
 p.comment_meta span.user{font-weight:bold;}
 p.comment_meta span.date{font-weight:normal;text-align:right;}

static/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Disallow: /tag/*

utils/django_libs/__init__.py

@@ -0,0 +1,37 @@
+# The MIT License
+# 
+# Copyright (c) 2008 Matteo Crippa
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to 
+# deal in the Software without restriction, including without limitation 
+# the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+# and/or sell copies of the Software, and to permit persons to whom the 
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# DEALINGS IN THE SOFTWARE.
+
+"""
+Description Support for Bloog
+"""
+__author__ = 'Matteo Crippa'
+
+import re
+
+from google.appengine.ext import webapp
+
+register = webapp.template.create_template_register()
+
+def description(value):
+	return re.sub(r'<[^>]*?>', '', value).replace("\n","")[0:150]	
+	
+register.filter(description)

utils/django_libs/description.py

@@ -0,0 +1,37 @@
+# The MIT License
+# 
+# Copyright (c) 2008 Matteo Crippa
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to 
+# deal in the Software without restriction, including without limitation 
+# the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+# and/or sell copies of the Software, and to permit persons to whom the 
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# DEALINGS IN THE SOFTWARE.
+
+"""
+Gravatar Support for Bloog
+"""
+__author__ = 'Matteo Crippa'
+
+import md5
+
+from google.appengine.ext import webapp
+
+register = webapp.template.create_template_register()
+
+def gravatar(email):
+	return md5.new(email).hexdigest()	
+	
+register.filter(gravatar)

utils/django_libs/gravatar.py

@@ -100,8 +100,10 @@ <h3>Categories</h3>
                         <p class="tags">
                         {% if blog_tags %}
                             {% for tag in blog_tags %}
-                            <a href="/tag/{{ tag.name|urlencode }}">{{ tag.name }}</a>
-                            ({{ tag.count }})<br />
+                                {% ifnotequal tag.count 0 %}
+                                <a href="/tag/{{ tag.name|urlencode }}">{{ tag.name }}</a>
+                                ({{ tag.count }})<br />
+                                {% endifnotequal %}
                             {% endfor %}
                         {% else %}
                             No posts have been tagged yet.

views/default/bloog/base.html

@@ -3,6 +3,7 @@
 {% if article.embedded_code %}
 {% block head %}
 <link type="text/css" rel="stylesheet" href="/static/syntaxhighlighter/SyntaxHighlighter.css"></link>
+<meta name="description" content="{{article.html|description}}" />
 {% endblock %}
 {% endif %}