Changeset 25 for bitstructures

Timestamp:

12/09/07 15:54:23 (13 months ago)

Author:

simon

Message:

Added code to extract code blocks from Markdown text.
Changed drafts to be publicly viewable.
Added a colophon section to the base.html template that links to the svn repository.

Location:

bitstructures/trunk

Files:

• README (modified) (1 diff)
• images/LICENSE (added)
• substructure/codeblocks.py (added)
• substructure/tests.py (added)
• substructure/urls.py (modified) (1 diff)
• substructure/views.py (modified) (3 diffs)
• templates/substructure/base.html (modified) (1 diff)

bitstructures/trunk/README

@@ +1 @@
+Bitstructures.com
+
+This is the code running bitstructures.com. It's not really set up (yet)
+for easy deployment in other situations but please feel free to reuse
+parts if useful.
+
+Unless explicitly stated, the source code is licensed under the MIT license.
+Please see the LICENSE file.
+
 Dependencies
 

bitstructures/trunk/substructure/urls.py

@@ -5 +5 @@
     (r'^$', 'blog'),
     (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[a-z0-9-]+)$', 'entry_page'),
+    (r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<slug>[a-z0-9-]+)/(?P<num>\d+)/(?P<filename>[a-zA-Z0-9-_\.]+)$', 'entry_codeblock'),
     (r'^drafts/(?P<slug>[a-z0-9-]+)$', 'draft_page'),
+    (r'^drafts/(?P<slug>[a-z0-9-]+)/(?P<num>\d+)/(?P<filename>[a-zA-Z0-9-_\.]+)$', 'draft_codeblock'),
     (r'^fb-atom.xml$', 'atom_feed')
 )

bitstructures/trunk/substructure/views.py

@@ -5 +5 @@
 from django.conf import settings
 from bitstructures.substructure.models import Entry
+from bitstructures.substructure.codeblocks import MarkdownCodeblocksParser
 
 def blog(request):
@@ -13 +14 @@
 def entry_page(request, year, month, slug):
     entry = get_object_or_404(Entry, slug=slug)
+    check_view_entry(entry, year, month)
+    data = get_context_data(request)
+    data['entry'] = entry
+    return render_to_response('substructure/entry_page.html', data)
+
+def entry_codeblock(request, year, month, slug, num, filename):
+    entry = get_object_or_404(Entry, slug=slug)
+    check_view_entry(entry, year, month)
+    return get_codeblock_response(entry, num, filename)
+
+def check_view_entry(entry, year, month):
     if not entry.is_published():
         raise Http404
@@ -19 +31 @@
     if int(month) != entry.date_published.month:
         raise Http404
+
+def draft_page(request, slug):
+    entry = get_object_or_404(Entry, slug=slug)
+    check_view_draft(request, entry)
     data = get_context_data(request)
     data['entry'] = entry
     return render_to_response('substructure/entry_page.html', data)
 
-def draft_page(request, slug):
-    if not user_can_change_entry(request):
-        raise Http404
+def draft_codeblock(request, slug, num, filename):
     entry = get_object_or_404(Entry, slug=slug)
+    check_view_draft(request, entry)
+    return get_codeblock_response(entry, num, filename)
+
+def check_view_draft(request, entry):
     if not entry.is_draft():
         raise Http404
-    data = get_context_data(request)
-    data['entry'] = entry
-    return render_to_response('substructure/entry_page.html', data)
+
+def get_codeblock_response(entry, num, filename):
+    parser = MarkdownCodeblocksParser()
+    codeblock = parser.get_codeblock(entry.text, int(num))
+    if codeblock:
+        if filename.lower().endswith('html'):
+            return HttpResponse(codeblock, mimetype='text/html')
+        else:
+            return HttpResponse(codeblock, mimetype='text/plain')
+    else:
+        raise Http404
 
 def atom_feed(request):

bitstructures/trunk/templates/substructure/base.html

@@ -35 +35 @@
 the <a href="http://dojotoolkit.org/">Dojo</a> JavaScript toolkit.</p>
 <p><a href="http://del.icio.us/simonbates">del.icio.us/simonbates</a></p>
+</div>
+
+<div class="info-entry">
+<h2>Colophon</h2>
+<p>This site is running a
+<a href="http://trac.bitstructures.com/browser/bitstructures/trunk">custom
+Python application</a> (MIT license) built with
+<a href="http://www.djangoproject.com/">Django</a>.</p>
 <p><a href="/atom.xml"><img src="{{ MEDIA_URL }}images/feed-icon-14x14.png" alt="Site feed"> Site feed</a></p>
 </div>