Cleaned up the controller plugin and started removing some cruft.
Cleaned up the controller plugin and started removing some cruft.

Make sure the new plugin implemented IConfigurable in case it was used in
isolation (we need to make sure the template folder was in config)

file:a/README.rst -> file:b/README.rst
This CKAN Extension demonstrates some common patterns for customising a CKAN instance. This CKAN Extension demonstrates some common patterns for customising a CKAN instance.
   
It comprises: It comprises:
   
* A CKAN Extension "plugin" at ``ckanext/example/plugin.py`` which, when * A CKAN Extension "plugin" at ``ckanext/example/plugin.py`` which, when
loaded, overrides various settings in the core ``ini``-file to provide: loaded, overrides various settings in the core ``ini``-file to provide:
   
* A path to local customisations of the core templates and stylesheets * A path to local customisations of the core templates and stylesheets
* A "stream filter" that replaces arbitrary strings in rendered templates * A "stream filter" that replaces arbitrary strings in rendered templates
* A "route" to override and extend the default behaviour of a core CKAN page * A "route" to override and extend the default behaviour of a core CKAN page
   
* A custom Pylons controller for overriding some core CKAN behaviour * A custom Pylons controller for overriding some core CKAN behaviour
   
* A custom Package edit form * A custom Package edit form
   
  * A plugin that allows for custom forms to be used for datasets based on
  their "type".
   
* A custom User registration and edition form * A custom User registration and edition form
   
* Some simple template customisations * Some simple template customisations
   
Installation Installation
============ ============
   
To install this package, from your CKAN virtualenv, run the following from your CKAN base folder (e.g. ``pyenv/``):: To install this package, from your CKAN virtualenv, run the following from your CKAN base folder (e.g. ``pyenv/``)::
   
pip install -e git+https://github.com/okfn/ckanext-example#egg=ckanext-example pip install -e git+https://github.com/okfn/ckanext-example#egg=ckanext-example
   
Then activate it by setting ``ckan.plugins = example`` in your main ``ini``-file. Then activate it by setting ``ckan.plugins = example`` in your main ``ini``-file.
   
   
Orientation Orientation
=========== ===========
   
* Examine the source code, starting with ``ckanext/example/plugin.py`` * Examine the source code, starting with ``ckanext/example/plugin.py``
   
* To understand the nuts and bolts of this file, which is a CKAN * To understand the nuts and bolts of this file, which is a CKAN
*Extension*, read in conjunction with the "Extension *Extension*, read in conjunction with the "Extension
documentation": http://docs.ckan.org/en/latest/plugins.html documentation": http://docs.ckan.org/en/latest/plugins.html
   
* One thing the extension does is set the values of * One thing the extension does is set the values of
``extra_public_paths`` and ``extra_template_paths`` in the CKAN ``extra_public_paths`` and ``extra_template_paths`` in the CKAN
config, which are "documented config, which are "documented
here": http://docs.ckan.org/en/latest/configuration.html#extra-template-paths here": http://docs.ckan.org/en/latest/configuration.html#extra-template-paths
   
* These are set to point at directories within * These are set to point at directories within
``ckanext/example/theme/`` (in this package). Here we: ``ckanext/example/theme/`` (in this package). Here we:
* override the home page HTML ``ckanext/example/theme/templates/home/index.html`` * override the home page HTML ``ckanext/example/theme/templates/home/index.html``
* provide some extra style by serving ``extra.css`` (which is loaded using the ``ckan.template_head_end`` option * provide some extra style by serving ``extra.css`` (which is loaded using the ``ckan.template_head_end`` option
* customise the navigation and header of the main template in the file ``layout.html``. * customise the navigation and header of the main template in the file ``layout.html``.
   
The latter file is a great place to make global theme alterations. The latter file is a great place to make global theme alterations.
It uses the _layout template_ pattern "described in the Genshi It uses the _layout template_ pattern "described in the Genshi
documentation":http://genshi.edgewall.org/wiki/GenshiTutorial#AddingaLayoutTemplate. documentation":http://genshi.edgewall.org/wiki/GenshiTutorial#AddingaLayoutTemplate.
This allows you to use Xpath selectors to override snippets of HTML This allows you to use Xpath selectors to override snippets of HTML
globally. globally.
   
* The custom package edit form at ``package_form.py`` follows a deprecated * The custom package edit form at ``package_form.py`` follows a deprecated
way to make a form (using FormAlchemy). This part of the Example Theme needs way to make a form (using FormAlchemy). This part of the Example Theme needs
updating. In the meantime, follow the instructions at: updating. In the meantime, follow the instructions at:
http://readthedocs.org/docs/ckan/en/latest/forms.html http://readthedocs.org/docs/ckan/en/latest/forms.html
   
   
import logging import os, logging
from ckan.lib.base import BaseController, render, c, model, abort, request from ckan.authz import Authorizer
from ckan.lib.base import redirect, _, config, h  
import ckan.logic.action.create as create import ckan.logic.action.create as create
import ckan.logic.action.update as update import ckan.logic.action.update as update
import ckan.logic.action.get as get import ckan.logic.action.get as get
from ckan.logic.converters import date_to_db, date_to_form, convert_to_extras, convert_from_extras from ckan.logic.converters import date_to_db, date_to_form, convert_to_extras, convert_from_extras
from ckan.lib.navl.dictization_functions import DataError, flatten_dict, unflatten  
from ckan.logic import NotFound, NotAuthorized, ValidationError from ckan.logic import NotFound, NotAuthorized, ValidationError
from ckan.logic import tuplize_dict, clean_dict, parse_params from ckan.logic import tuplize_dict, clean_dict, parse_params
  import ckan.logic.schema as default_schema
from ckan.logic.schema import package_form_schema from ckan.logic.schema import package_form_schema
from ckan.plugins import IDatasetForm import ckan.logic.validators as val
from ckan.plugins import implements, SingletonPlugin from ckan.lib.base import BaseController, render, c, model, abort, request
  from ckan.lib.base import redirect, _, config, h
from ckan.lib.package_saver import PackageSaver from ckan.lib.package_saver import PackageSaver
from ckan.lib.field_types import DateType, DateConvertError from ckan.lib.field_types import DateType, DateConvertError
from ckan.authz import Authorizer  
from ckan.lib.navl.dictization_functions import Invalid from ckan.lib.navl.dictization_functions import Invalid
from ckan.lib.navl.dictization_functions import validate, missing from ckan.lib.navl.dictization_functions import validate, missing
import ckan.logic.validators as val from ckan.lib.navl.dictization_functions import DataError, flatten_dict, unflatten
import ckan.logic.schema as default_schema from ckan.plugins import IDatasetForm, IConfigurer
  from ckan.plugins import implements, SingletonPlugin
   
from ckan.lib.navl.validators import (ignore_missing, from ckan.lib.navl.validators import (ignore_missing,
not_empty, not_empty,
empty, empty,
ignore, ignore,
keep_extras, keep_extras,
) )
   
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
   
   
   
class ExampleDatasetForm(SingletonPlugin): class ExampleDatasetForm(SingletonPlugin):
  """This plugin demonstrates how a theme packaged as a CKAN
  extension might extend CKAN behaviour.
   
  In this case, we implement three extension interfaces:
   
  - ``IConfigurer`` allows us to override configuration normally
  found in the ``ini``-file. Here we use it to specify where the
  form templates can be found.
  - ``IDatasetForm`` allows us to provide a custom form for a dataset
  based on the type_name that may be set for a package. Where the
  type_name matches one of the values in package_types then this
  class will be used.
""" """
   
"""  
   
implements(IDatasetForm, inherit=True) implements(IDatasetForm, inherit=True)
  implements(IConfigurer, inherit=True)
   
  def update_config(self, config):
  """
  This IConfigurer implementation causes CKAN to look in the
  ```templates``` directory when looking for the package_form()
  """
  here = os.path.dirname(__file__)
  rootdir = os.path.dirname(os.path.dirname(here))
  template_dir = os.path.join(rootdir, 'ckanext',
  'example', 'theme', 'templates')
  config['extra_template_paths'] = ','.join([template_dir,
  config.get('extra_template_paths', '')])
   
def package_form(self): def package_form(self):
""" """
Returns a string representing the location of the template to be Returns a string representing the location of the template to be
rendered. e.g. "package/new_package_form.html". rendered. e.g. "package/new_package_form.html".
""" """
return 'controller/package_plugin.html' return 'controller/package_plugin.html'
   
def is_fallback(self): def is_fallback(self):
""" """
Returns true iff this provides the fallback behaviour, when no other Returns true iff this provides the fallback behaviour, when no other
plugin instance matches a package's type. plugin instance matches a package's type.
   
As this is not the fallback controller we should return False. If As this is not the fallback controller we should return False. If
we were wanting to act as the fallback, we'd return True we were wanting to act as the fallback, we'd return True
""" """
return False return False
   
def package_types(self): def package_types(self):
""" """
Returns an iterable of package type strings. Returns an iterable of package type strings.
   
If a request involving a package of one of those types is made, then If a request involving a package of one of those types is made, then
this plugin instance will be delegated to. this plugin instance will be delegated to.
   
There must only be one plugin registered to each package type. Any There must only be one plugin registered to each package type. Any
attempts to register more than one plugin instance to a given package attempts to register more than one plugin instance to a given package
type will raise an exception at startup. type will raise an exception at startup.
""" """
return ["example"] return ["example"]
   
def setup_template_variables(self, context, data_dict=None): def setup_template_variables(self, context, data_dict=None):
""" """
Add variables to c just prior to the template being rendered. Adds variables to c just prior to the template being rendered that can
  then be used within the form
""" """
c.licences = [('', '')] + model.Package.get_license_options() c.licences = [('', '')] + model.Package.get_license_options()
c.publishers = self.get_publishers() c.publishers = [('Example publisher', 'Example publisher 2')]
c.is_sysadmin = Authorizer().is_sysadmin(c.user) c.is_sysadmin = Authorizer().is_sysadmin(c.user)
c.resource_columns = model.Resource.get_columns() c.resource_columns = model.Resource.get_columns()
   
## This is messy as auths take domain object not data_dict ## This is messy as auths take domain object not data_dict
pkg = context.get('package') or c.pkg pkg = context.get('package') or c.pkg
if pkg: if pkg:
c.auth_for_change_state = Authorizer().am_authorized( c.auth_for_change_state = Authorizer().am_authorized(
c, model.Action.CHANGE_STATE, pkg) c, model.Action.CHANGE_STATE, pkg)
   
def form_to_db_schema(self): def form_to_db_schema(self):
""" """
Returns the schema for mapping package data from a form to a format Returns the schema for mapping package data from a form to a format
suitable for the database. suitable for the database.
""" """
schema = { schema = {
'title': [not_empty, unicode], 'title': [not_empty, unicode],
'name': [not_empty, unicode, val.name_validator, val.package_name_validator], 'name': [not_empty, unicode, val.name_validator, val.package_name_validator],
'notes': [not_empty, unicode], 'notes': [not_empty, unicode],
   
'date_released': [date_to_db, convert_to_extras], 'date_released': [date_to_db, convert_to_extras],
'date_updated': [date_to_db, convert_to_extras], 'date_updated': [date_to_db, convert_to_extras],
'date_update_future': [date_to_db, convert_to_extras], 'date_update_future': [date_to_db, convert_to_extras],
'url': [unicode], 'url': [unicode],
'taxonomy_url': [unicode, convert_to_extras], 'taxonomy_url': [unicode, convert_to_extras],
   
'resources': default_schema.default_resource_schema(), 'resources': default_schema.default_resource_schema(),
'published_by': [not_empty, unicode, convert_to_extras], 'published_by': [not_empty, unicode, convert_to_extras],
'published_via': [ignore_missing, unicode, convert_to_extras], 'published_via': [ignore_missing, unicode, convert_to_extras],
'author': [ignore_missing, unicode], 'author': [ignore_missing, unicode],
'author_email': [ignore_missing, unicode], 'author_email': [ignore_missing, unicode],
'mandate': [ignore_missing, unicode, convert_to_extras], 'mandate': [ignore_missing, unicode, convert_to_extras],
'license_id': [ignore_missing, unicode], 'license_id': [ignore_missing, unicode],
'tag_string': [ignore_missing, val.tag_string_convert], 'tag_string': [ignore_missing, val.tag_string_convert],
'national_statistic': [ignore_missing, convert_to_extras], 'national_statistic': [ignore_missing, convert_to_extras],
'state': [val.ignore_not_admin, ignore_missing], 'state': [val.ignore_not_admin, ignore_missing],
   
'log_message': [unicode, val.no_http], 'log_message': [unicode, val.no_http],
   
'__extras': [ignore], '__extras': [ignore],
'__junk': [empty], '__junk': [empty],
} }
return schema return schema
def db_to_form_schema(data): def db_to_form_schema(data):
""" """
Returns the schema for mapping package data from the database into a Returns the schema for mapping package data from the database into a
format suitable for the form (optional) format suitable for the form (optional)
""" """
schema = { schema = {
'date_released': [convert_from_extras, ignore_missing, date_to_form], 'date_released': [convert_from_extras, ignore_missing, date_to_form],
'date_updated': [convert_from_extras, ignore_missing, date_to_form], 'date_updated': [convert_from_extras, ignore_missing, date_to_form],
'date_update_future': [convert_from_extras, ignore_missing, date_to_form], 'date_update_future': [convert_from_extras, ignore_missing, date_to_form],
'precision': [convert_from_extras, ignore_missing], 'precision': [convert_from_extras, ignore_missing],
'taxonomy_url': [convert_from_extras, ignore_missing], 'taxonomy_url': [convert_from_extras, ignore_missing],
   
'resources': default_schema.default_resource_schema(), 'resources': default_schema.default_resource_schema(),
'extras': { 'extras': {
'key': [], 'key': [],
'value': [], 'value': [],
'__extras': [keep_extras] '__extras': [keep_extras]
}, },
'tags': { 'tags': {
'__extras': [keep_extras] '__extras': [keep_extras]
}, },
'published_by': [convert_from_extras, ignore_missing], 'published_by': [convert_from_extras, ignore_missing],
'published_via': [convert_from_extras, ignore_missing], 'published_via': [convert_from_extras, ignore_missing],
'mandate': [convert_from_extras, ignore_missing], 'mandate': [convert_from_extras, ignore_missing],
'national_statistic': [convert_from_extras, ignore_missing], 'national_statistic': [convert_from_extras, ignore_missing],
'__extras': [keep_extras], '__extras': [keep_extras],
'__junk': [ignore], '__junk': [ignore],
} }
return schema return schema
   
def check_data_dict(self, data_dict): def check_data_dict(self, data_dict):
""" """
Check if the return data is correct. Check if the return data is correct and raises a DataError if not.
   
raise a DataError if not.  
""" """
return return
   
def get_publishers(self):  
"""  
"""  
return [('pub1', 'pub2')]