gjhiggins / Shabti / changeset / 57af73d603e9

Up to file-list docs/shabti_templates/shabti_formalchemy.rst:

 .. _shabti-formalchemy:
-**shabti_formalchemy** -- HTML forms generation
+**shabti_formalchemy** -- "Pylons Admin" Web UI
 ===============================================
 .. note:: This Shabti template was kindly contributed by Gaël Pasgrimaud of the Formalchemy development team.
@@ -230,7 +230,7 @@ Creating a new user entity
 .. seealso:: Form structure, content and appearance can all be customized. For details on how to customize the forms and the fields, see the docs for the `Formalchemy Pylons extension <http://docs.formalchemy.org/current/ext/pylons.html#customization>`_
 TODO
 ====
 ----
 . Adjust the generation of the form so that password fields are presented unpopulated.

Up to file-list setup.py:

@@ -24,7 +24,7 @@ Current Status
 Shabti %s described on this page is stable.
 There is also an unstable `development version
-<http://www.bitbucket.org/gjhiggins/shabti/overview/>`_ of Shabti.
+<http://www.bitbucket.org/gjhiggins/shabti/get/tip.tar.gz#egg=Shabti-dev>`_ of Shabti.
 Download and Installation
 -------------------------

Up to file-list shabti/templates/auth/+package+/lib/auth/__init__.py_tmpl:

 from pylons import request, session
 from pylons.controllers.util import redirect_to
 from pylons import request, session, url
 from pylons.controllers.util import redirect
 from {{package}} import model as model
 _login_url = '/login'
@@ -26,7 +26,7 @@ def logout():
     session.delete()
 def redirect_to_login():
-    redirect_to(controller=_login_url)
+    redirect(url(controller=_login_url))

Up to file-list shabti/templates/auth/+package+/lib/decorators.py_tmpl:

@@ -18,3 +18,66 @@ def authorize(permission):
         redirect_to_login()
     return decorator(wrapper)
 # Alternatively, use the decorators listed below, taken from
 # Ben Bangert's pastie:
 # http://pylonshq.com/pasties/ad4b1f541220b4099c97d573a6673e41
 # N.B. Assumed to be implemented:
 # User.in_group(self, group): returns True or False
 # User.computed_permissions(self): returns list_of_computed_permissions
+#
 from {{package}}.model import meta
 from pylons.controllers.util import abort
 def in_group(group):
     """Requires a user to be logged in, and the group specified"""
     def wrapper(func, *args, **kwargs):
         user = pylons.tmpl_context.user
         if not user:
             log.debug("No user logged in for permission restricted function")
             abort(401, "Not Authorized")
         if user.in_group(group):
             log.debug("User %s verified in group %s", user, group)
             return func(*args, **kwargs)
         else:
             log.debug("User %s not in group %s", user, group)
             abort(401, "Not Authorized")
     return decorator(wrapper)
 def not_in_group(group):
     """Requires a user to be logged in, and NOT in the group specified"""
     def wrapper(func, *args, **kwargs):
         user = pylons.tmpl_context.user
         if not user:
             log.debug("No user logged in for permission restricted function")
             abort(401, "Not Authorized")
         if not user.in_group(group):
             log.debug("User %s verified in group %s", user, group)
             return func(*args, **kwargs)
         else:
             log.debug("User %s not in group %s", user, group)
             abort(401, "Not Authorized")
     return decorator(wrapper)
 def has_permission(permission):
     """Requires a user to be logged in, and have the permission"""
     def wrapper(func, *args, **kwargs):
         user = pylons.tmpl_context.user
         if not user:
             log.debug("No user logged in for permission restricted function")
             abort(401, "Not Authorized")
         if permission in user.computed_permissions():
             log.debug("User %s verified in group %s", user, permission)
             return func(*args, **kwargs)
         else:
             log.debug("User %s does not have permission %s", user, permission)
             abort(401, "Not Authorized")
     return decorator(wrapper)
 @decorator
 def logged_in(func, *args, **kwargs):
     user = pylons.tmpl_context.user
     if not user:
         log.debug("No user logged in for permission restricted function")
         abort(401, "Not Authorized")
     return func(*args, **kwargs)

Up to file-list shabti/templates/auth_couchdb/+package+/lib/auth/__init__.py_tmpl:

 from pylons import request, session
 from pylons.controllers.util import redirect_to
 from pylons import request, session, url
 from pylons.controllers.util import redirect
 from {{package}}.model import *
 _login_url = '/login'
@@ -25,5 +25,5 @@ def logout():
     session.delete()
 def redirect_to_login():
-    redirect_to(controller=_login_url)
+    redirect(url(controller=_login_url))

Up to file-list shabti/templates/auth_rdfalchemy/+package+/lib/auth/__init__.py_tmpl:

 from pylons import request, session
 from pylons.controllers.util import redirect_to
 from pylons import request, session, url
 from pylons.controllers.util import redirect
 from {{package}}.model.rdfmodel import *
 _login_url = '/login'
@@ -25,5 +25,5 @@ def logout():
     session.delete()
 def redirect_to_login():
-    redirect_to(controller=_login_url)
+    redirect(url(controller=_login_url))

Up to file-list shabti/templates/default/+package+/lib/fixtures.py_tmpl:

@@ -120,7 +120,7 @@ def _dump_data_to_file(model, filename,
 def _load_instance_from_dict(model, dict):
     if not dict: return
     instance = model()
-    fields = model._descriptor.fields.keys()
+    fields = model._descriptor.columns.keys()
     for k, v in dict.iteritems():
         if k in fields:
             setattr(instance, k, v)
@@ -131,7 +131,7 @@ def _dump_instance_to_dict(instance):
     if hasattr(instance, 'to_json'):
         return instance.to_json()
     d = {}
-    fields = instance._descriptor.fields.keys()
+    fields = instance._descriptor.columns.keys()
     for field in fields:
         d[field] = getattr(instance, field)
     return d

Up to file-list shabti/templates/microsite/+package+/config/routing.py_tmpl:

@@ -6,6 +6,52 @@ refer to the routes manual at http://rou
 """
 from routes import Mapper
 import routes.mapper
 class Mapper(routes.Mapper):
+    #
     # Pretty string representation - returns a string formatted like this:
+    #
     #    Route name   Methods Path
     #                         /error/{action}
     #                         /error/{action}/{id}
     #    home         GET     /
     #    things       GET     /things
     #    create_thing POST    /things
     #    new_thing    GET     /things/new
     #    thing                  GET     /thing/{id}
+    #
     #    etc
+    #
     # Enter 'print mapper' in the paster shell to use it, or (TBD) run it via a
     # configured paster command.
+    #
     def __str__(self):
         def format_methods(r):
             if r.conditions:
                 method = r.conditions.get('method', '')
                 return method if type(method) is str else ', '.join(method)
             else:
                 return ''
         table = [('Route name', 'Methods', 'Path')] + [
+            (
                 r.name or '',
                 format_methods(r),
                 r.routepath or''
+            )
             for r in self.matchlist]
         widths = [
             max(len(row[col]) for row in table)
             for col in range(len(table[0]))]
         return '\n'.join(
             ' '.join(
                     row[col].ljust(widths[col])
                     for col in range(len(widths))
                 ).rstrip()
             for row in table)
 # from formalchemy.ext.pylons import maps
 # from coastal.controllers.admin import AdminController

Up to file-list shabti/templates/microsite/+package+/lib/fixtures.py_tmpl:

@@ -120,7 +120,7 @@ def _dump_data_to_file(model, filename,
 def _load_instance_from_dict(model, dict):
     if not dict: return
     instance = model()
-    fields = model._descriptor.fields.keys()
+    fields = model._descriptor.columns.keys()
     for k, v in dict.iteritems():
         if k in fields:
             setattr(instance, k, v)
@@ -131,7 +131,7 @@ def _dump_instance_to_dict(instance):
     if hasattr(instance, 'to_json'):
         return instance.to_json()
     d = {}
-    fields = instance._descriptor.fields.keys()
+    fields = instance._descriptor.columns.keys()
     for field in fields:
         d[field] = getattr(instance, field)
     return d

Up to file-list tests/test_make_project.py:

@@ -60,7 +60,6 @@ def paster_create(project_name, template
     projenv.environ['PYTHONPATH'] = (
         projenv.environ.get('PYTHONPATH', '') + ':'
         + projenv.base_path)
     return projenv
@@ -92,7 +91,6 @@ def setup_model():
                    os.path.join(projenv_files, 'news.json_tmpl') : os.path.join('projectname', 'tests', 'fixtures', 'news', 'newsitems.json' ),
                    os.path.join(projenv_files, 'test_news.py_tmpl') : os.path.join('projectname', 'tests', 'unit', 'test_news.py'),
                    os.path.join(projenv_files, 'news.py_tmpl') : os.path.join('projectname', 'model', 'news.py' )})
     res = projenv.run(_get_script_name('paster')+' setup-app development.ini', expect_stderr='expect_error')
@@ -202,3 +200,4 @@ def test_project():
         yield (migrate_commit, )
         yield (migrate_upgrade, )
         yield (migrate_downgrade, )

commit 268:	57af73d603e9
parent 267:	6a689e9a2741
branch:	default

gjhiggins / Shabti (http://bel-epa.com/shabtidocs/)