# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1288797530 25200
# Node ID ac693b8df32c231ab6b6d0380d7bed5b356f7b00
# Parent  af73a3fda72397a7f852256667a604c07e70329d
add idea of formats and json format

diff -r af73a3fda723 -r ac693b8df32c decoupage/formats.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/decoupage/formats.py	Wed Nov 03 08:18:50 2010 -0700
@@ -0,0 +1,13 @@
+try:
+  import json as json
+except ImportError:
+  import simplejson as json
+
+def format_json(data):
+
+  # fix datetime
+  for f in data['files']:
+    f['modified'] = f['modified'].ctime()
+
+  return 'application/json', json.dumps(data['files'])
+  
diff -r af73a3fda723 -r ac693b8df32c decoupage/web.py
--- a/decoupage/web.py	Wed Nov 03 07:22:39 2010 -0700
+++ b/decoupage/web.py	Wed Nov 03 08:18:50 2010 -0700
@@ -15,8 +15,9 @@
 from genshi.template.base import TemplateSyntaxError
 from martini.config import ConfigMunger
 from paste.fileapp import FileApp
+from pkg_resources import iter_entry_points
+from pkg_resources import load_entry_point
 from pkg_resources import resource_filename
-from pkg_resources import iter_entry_points
 from webob import Request, Response, exc
 
 transformers = [i.lower() for i in transformers()]
@@ -51,6 +52,18 @@
 
         # static file server
         self.fileserver = FileApp # XXX still used?!?
+
+        # pluggable formats
+        self.formats = {}
+        for _format in iter_entry_points('decoupage.formats'):
+            try:
+                function = _format.load()
+            except Exception, e:
+                # record the error, but persist
+                print >> sys.stderr, "Couldn't load format: %s" % _format
+                print >> sys.stderr, e
+                continue
+            self.formats[_format.name] = function
         
         # pluggable index data formatters
         self.formatters = {}
@@ -60,8 +73,10 @@
                 template_dir = resource_filename(formatter.module_name, 'templates')
                 if template_dir not in self.template_directories and os.path.isdir(template_dir):
                     self.template_directories.append(template_dir)
-            except:
-                print "Couldn't load formatter: %s" % formatter
+            except Exception, e:
+                # record the error, but persist
+                print >> sys.stderr, "Couldn't load formatter: %s" % formatter
+                print >> sts.stderr, e
                 continue 
             self.formatters[formatter.name] = _formatter
         
@@ -148,6 +163,16 @@
             formatter = self.formatters[name](conf.get('/%s' % name, ''))
             formatter(request, data)
 
+        # return an alternate format if specified
+        # decoupage.formats should return a 2-tuple:
+        # (content_type, body)
+        if 'format' in request.GET:
+            format_name = request.GET['format']
+            if format_name in self.formats:
+                function = self.formats[format_name]
+                content_type, body = function(data)
+                return Response(content_type=content_type, body=body)
+
         # render the template
         template = conf.get('/template')
         local_index = False 
diff -r af73a3fda723 -r ac693b8df32c setup.py
--- a/setup.py	Wed Nov 03 07:22:39 2010 -0700
+++ b/setup.py	Wed Nov 03 08:18:50 2010 -0700
@@ -1,12 +1,12 @@
 from setuptools import setup, find_packages
-import sys, os
 
+# use README as long_description
 try:
     description = file("README.txt").read()
 except IOError:
     description = ''
 
-version = '0.8'
+version = '0.9'
 
 setup(name='decoupage',
       version=version,
@@ -38,6 +38,9 @@
       [paste.app_factory]
       main = decoupage.factory:factory
 
+      [decoupage.formats]
+      json = decoupage.formats:format_json
+
       [decoupage.formatters]
       all = decoupage.formatters:All
       css = decoupage.formatters:CSS