images/favicon.ico textile.py @@ -1,5 +1,5 @@ application: onelinr -version: 1 +version: 2 runtime: python api_version: 1 app.yaml @@ -1,6 +1,7 @@ +{% load markup %} {% include "header.html" %} <div id="header"> - <a id="text-logo" href="/">Onelinr</a> | You are viewing the {{channel.name}} oneliner channel.<!--<a href="http://whytheluckystiff.net/ruby/redcloth/">Textile</a> is enabled.--> + <a id="text-logo" href="/">Onelinr</a> | You are viewing the {{channel.name}} oneliner channel. <a href="http://hobix.com/textile/">Textile</a> is enabled. <!-- <span id="customizr"> <span id="text-color"> <form> @@ -31,7 +32,8 @@ This is a test oneliner. <ul id="oneliners"> {% for p in posts %} <li id="oneliner-{{p.post_id}}"> - {{p.text}} + + {{p.text|textile}} <a href="http://onelinr.com/{{channel.name}}#oneliner-{{p.post_id}}" title="Permalink for this oneliner" class="permalink">#</a> </li> {% endfor %} channel.html @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<rss version="2.0"> +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/"> + {% load markup %} <channel> <title>onelinr: {{ channel.name }}</title> <link>http://onelinr.com/</link> <description>A onelinr feed of channel {{ channel.name }}</description> -<pubDate>{{channel.date_created}}</pubDate> -<lastBuildDate>{{channel.date_created}}</lastBuildDate> +<pubDate>{{channel.date_created|date:"r"}}</pubDate> +<lastBuildDate>{{channel.date_created|date:"r"}}</lastBuildDate> <generator>http://onelinr.com/</generator> {% for post in posts %} <item> -<title>{{ post.text }}</title> +<title>{{ post.text}}</title> <link>http://onelinr.com/{{channel.name}}#oneliner_{{ post.post_id }}</link> - <description> - {{post.text }} -</description> -<pubDate>{{post.date_posted}}</pubDate> + <description><![CDATA[{{post.text|textile }}]]></description> + <content:encoded><![CDATA[{{post.text|textile }}]]></content:encoded> + +<pubDate>{{post.date_posted|date:"r"}}</pubDate> <author>nobody@onelinr.com (nobody)</author> <guid isPermaLink="false">tag:onelinr.com,2007:/onelinr/{{post.post_id}}</guid> </item> channel_feed.html @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<rss version="2.0"> +<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/"> <channel> +{% load markup %} + <title>onelinr</title> <link>http://onelinr.com/</link> <description>A feed of all recent onelinrs</description> @@ -9,10 +11,11 @@ {% for post in posts %} <item> <title>{{ post.text }}</title> - <description> - {{post.text }} -</description> -<pubDate>{{post.date_posted}}</pubDate> + +<description><![CDATA[{{post.text|textile }}]]></description> +<content:encoded><![CDATA[{{post.text|textile }}]]></content:encoded> + +<pubDate>{{ post.date_posted|date:"r" }}</pubDate> <author>nobody@onelinr.com (nobody)</author> </item> {% endfor %} feed.html @@ -40,7 +40,7 @@ indexes: - name: belongs_to - name: post_id -# Used 59 times in query history. +# Used 61 times in query history. - kind: Post properties: - name: date_posted index.yaml @@ -8,7 +8,12 @@ from google.appengine.ext import webapp from google.appengine.ext.webapp \ import template +import re from google.appengine.ext.webapp.util import run_wsgi_app +from django.conf import settings +import textile + +settings.INSTALLED_APPS = ('django.contrib.markup', 'onelinr') SKIP_LIST = ["favicon.ico","robots.txt"] @@ -67,7 +72,7 @@ class ChannelPage(webapp.RequestHandler): # force_unicode function from django used here post = Post(text=force_unicode(self.request.get('value')), belongs_to=channel, post_id=next_id) post = db.get(post.put()) - self.response.out.write("{'post_id':"+str(post.post_id)+",'text':'"+post.text+"'}") + self.response.out.write("{'post_id':"+str(post.post_id)+",'text':'"+re.escape(textile.textile(post.text))+"'}") class ChannelFeed(webapp.RequestHandler): def get(self): @@ -108,7 +113,7 @@ class LatestPosts(webapp.RequestHandler): posts_json = "[" idx = 1 for post in posts: - posts_json += "{'post_id':"+str(post.post_id)+",'text':'"+post.text+"'}" + posts_json += "{'post_id':"+str(post.post_id)+",'text':'"+re.escape(textile.textile(post.text))+"'}" if idx != len(posts): posts_json += "," idx += 1 onelinr.py favicon.ico cad1f03a68501c64939564d51a8bb50592c9eb92 Henrik Berggren hinke@hinkeb.com http://github.com/ericw/onelinr/commit/de0ba9fc105d8708d9725aa75cc10afeea5363eb de0ba9fc105d8708d9725aa75cc10afeea5363eb 2008-08-11T16:18:25-07:00 2008-08-11T16:18:25-07:00 Added textile support, date formatting, skiplist and escaped dangerous chars 9de8ddc4a320ef48efea7ff4b69b1e36c2aa80bb Henrik Berggren hinke@hinkeb.com