initial commit
--- /dev/null
+++ b/.idea/other.xml
@@ -1,1 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PyDocumentationSettings">
+ <option name="myDocStringFormat" value="Plain" />
+ </component>
+</project>
+
--- /dev/null
+++ b/.idea/testrunner.xml
@@ -1,1 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="TestRunnerService">
+ <option name="projectConfiguration" value="Unittests" />
+ <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+ </component>
+</project>
+
--- a/README.rst
+++ b/README.rst
@@ -1,66 +1,21 @@
-This CKAN Extension demonstrates some common patterns for customising a CKAN instance.
+This CKAN Extension customises a CKAN instance for the hosting of data.gov.au.
It comprises:
-* A CKAN Extension "plugin" at ``ckanext/example/plugin.py`` which, when
+* A CKAN Extension "plugin" at ``ckanext/datagovau/plugin.py`` which, when
loaded, overrides various settings in the core ``ini``-file to provide:
-
- * A path to local customisations of the core templates and stylesheets
- * 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 custom Pylons controller for overriding some core CKAN behaviour
-
-* A custom Package edit form
-
-* A custom Group 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
-
-* Some simple template customisations
+ * A path to local customisations of the core templates and available licenses database
+ * A custom Package edit form
+ * A custom n3/rdf output format
Installation
============
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-datagovau#egg=ckanext-datagovau
-Then activate it by setting ``ckan.plugins = example`` in your main ``ini``-file.
+Then activate it by setting ``ckan.plugins = datagovau`` in your main ``ini``-file.
-Orientation
-===========
-* Examine the source code, starting with ``ckanext/example/plugin.py``
-
-* To understand the nuts and bolts of this file, which is a CKAN
- *Extension*, read in conjunction with the "Extension
- documentation": http://docs.ckan.org/en/latest/plugins.html
-
-* One thing the extension does is set the values of
- ``extra_public_paths`` and ``extra_template_paths`` in the CKAN
- config, which are "documented
- here": http://docs.ckan.org/en/latest/configuration.html#extra-template-paths
-
-* These are set to point at directories within
- ``ckanext/example/theme/`` (in this package). Here we:
- * 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
- * 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.
- It uses the _layout template_ pattern "described in the Genshi
- documentation":http://genshi.edgewall.org/wiki/GenshiTutorial#AddingaLayoutTemplate.
- This allows you to use Xpath selectors to override snippets of HTML
- globally.
-
-* 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
- updating. In the meantime, follow the instructions at:
- http://readthedocs.org/docs/ckan/en/latest/forms.html
-
-
--- /dev/null
+++ b/ckanext-datagovau.iml
@@ -1,1 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
--- /dev/null
+++ b/ckanext/datagovau/templates/package/read_base.html
@@ -1,1 +1,15 @@
+{% ckan_extends %}
+{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
+
+{% block links -%}
+{{ super() }}
+<link rel="lol" type="test"/>
+{% endblock -%}
+
+{% block head_extras -%}
+{{ super() }}
+<meta property="og:gon" content="lol">
+{% endblock -%}
+
+
--- a/ckanext/example/__init__.py
+++ /dev/null
@@ -1,2 +1,1 @@
-# package
--- a/ckanext/example/controller.py
+++ /dev/null
@@ -1,53 +1,1 @@
-import sys
-from ckan.lib.base import request
-from ckan.lib.base import c, g, h
-from ckan.lib.base import model
-from ckan.lib.base import render
-from ckan.lib.base import _
-from ckan.lib.navl.validators import not_empty
-
-from ckan.controllers.user import UserController
-
-
-class CustomUserController(UserController):
- """This controller is an example to show how you might extend or
- override core CKAN behaviour from an extension package.
-
- It overrides 2 method hooks which the base class uses to create the
- validation schema for the creation and editing of a user; to require
- that a fullname is given.
- """
-
- new_user_form = 'user/register.html'
-
- def _add_requires_full_name_to_schema(self, schema):
- """
- Helper function that modifies the fullname validation on an existing schema
- """
- schema['fullname'] = [not_empty, unicode]
-
- def _new_form_to_db_schema(self):
- """
- Defines a custom schema that requires a full name to be supplied
-
- This method is a hook that the base class calls for the validation
- schema to use when creating a new user.
- """
- schema = super(CustomUserController, self)._new_form_to_db_schema()
- self._add_requires_full_name_to_schema(schema)
- return schema
-
- def _edit_form_to_db_schema(self):
- """
- Defines a custom schema that requires a full name cannot be removed
- when editing the user.
-
- This method is a hook that the base class calls for the validation
- schema to use when editing an exiting user.
- """
- schema = super(CustomUserController, self)._edit_form_to_db_schema()
- self._add_requires_full_name_to_schema(schema)
- return schema
-
-
--- a/ckanext/example/forms.py
+++ /dev/null
@@ -1,232 +1,1 @@
-import os, logging
-from ckan.authz import Authorizer
-from ckan.logic.converters import convert_to_extras,\
- convert_from_extras, convert_to_tags, convert_from_tags, free_tags_only
-from ckan.logic import get_action
-from ckan.logic.schema import package_form_schema, group_form_schema
-from ckan.lib.base import c, model
-from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer, IConfigurable
-from ckan.plugins import implements, SingletonPlugin
-from ckan.lib.navl.validators import ignore_missing, not_empty, keep_extras
-log = logging.getLogger(__name__)
-
-class ExampleGroupForm(SingletonPlugin):
- """This plugin demonstrates how a class packaged as a CKAN
- extension might extend CKAN behaviour by providing custom forms
- based on the type of a Group.
-
- In this case, we implement two extension interfaces to provide custom
- forms for specific types of group.
-
- - ``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.
-
- - ``IGroupForm`` allows us to provide a custom form for a dataset
- based on the 'type' that may be set for a group. Where the
- 'type' matches one of the values in group_types then this
- class will be used.
- """
- implements(IGroupForm, 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 group_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 group_form(self):
- """
- Returns a string representing the location of the template to be
- rendered. e.g. "forms/group_form.html".
- """
- return 'forms/group_form.html'
-
- def group_types(self):
- """
- Returns an iterable of group type strings.
-
- If a request involving a group of one of those types is made, then
- this plugin instance will be delegated to.
-
- There must only be one plugin registered to each group type. Any
- attempts to register more than one plugin instance to a given group
- type will raise an exception at startup.
- """
- return ["testgroup"]
-
- def is_fallback(self):
- """
- Returns true iff this provides the fallback behaviour, when no other
- plugin instance matches a group's type.
-
- As this is not the fallback controller we should return False. If
- we were wanting to act as the fallback, we'd return True
- """
- return False
-
- def form_to_db_schema(self):
- """
- Returns the schema for mapping group data from a form to a format
- suitable for the database.
- """
- return group_form_schema()
-
- def db_to_form_schema(self):
- """
- Returns the schema for mapping group data from the database into a
- format suitable for the form (optional)
- """
- return {}
-
- def check_data_dict(self, data_dict):
- """
- Check if the return data is correct.
-
- raise a DataError if not.
- """
-
- def setup_template_variables(self, context, data_dict):
- """
- Add variables to c just prior to the template being rendered.
- """
-
-
-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(IConfigurer, inherit=True)
- implements(IConfigurable)
-
- 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 configure(self, config):
- """
- Adds our new vocabulary to the database if it doesn't
- already exist.
- """
- self.vocab_name = u'example_vocab'
- v = model.Vocabulary.get(self.vocab_name)
- if not v:
- log.info("Adding vocab %s" % self.vocab_name)
- vocab = model.Vocabulary(self.vocab_name)
- model.Session.add(vocab)
- model.Session.commit()
- log.info("Adding example tags to vocab %s" % self.vocab_name)
- vocab_tag_1 = model.Tag('vocab-tag-example-1', vocab.id)
- vocab_tag_2 = model.Tag('vocab-tag-example-2', vocab.id)
- model.Session.add(vocab_tag_1)
- model.Session.add(vocab_tag_2)
- model.Session.commit()
-
- def package_form(self):
- """
- Returns a string representing the location of the template to be
- rendered. e.g. "package/new_package_form.html".
- """
- return 'forms/dataset_form.html'
-
- def is_fallback(self):
- """
- Returns true iff this provides the fallback behaviour, when no other
- plugin instance matches a package's type.
-
- As this is not the fallback controller we should return False. If
- we were wanting to act as the fallback, we'd return True
- """
- return True
-
- def package_types(self):
- """
- Returns an iterable of package type strings.
-
- If a request involving a package of one of those types is made, then
- this plugin instance will be delegated to.
-
- There must only be one plugin registered to each package type. Any
- attempts to register more than one plugin instance to a given package
- type will raise an exception at startup.
- """
- return ["example_dataset_form"]
-
- def setup_template_variables(self, context, data_dict=None):
- """
- 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.publishers = [('Example publisher', 'Example publisher 2')]
- c.is_sysadmin = Authorizer().is_sysadmin(c.user)
- c.resource_columns = model.Resource.get_columns()
- c.vocab_tags = get_action('tag_list')(context, {'vocabulary_name': self.vocab_name})
-
- ## This is messy as auths take domain object not data_dict
- pkg = context.get('package') or c.pkg
- if pkg:
- c.auth_for_change_state = Authorizer().am_authorized(
- c, model.Action.CHANGE_STATE, pkg)
-
- def form_to_db_schema(self):
- """
- Returns the schema for mapping package data from a form to a format
- suitable for the database.
- """
- schema = package_form_schema()
- schema.update({
- 'published_by': [not_empty, unicode, convert_to_extras],
- 'vocab_tag_string': [ignore_missing, convert_to_tags(self.vocab_name)],
- })
- return schema
-
- def db_to_form_schema(self):
- """
- Returns the schema for mapping package data from the database into a
- format suitable for the form (optional)
- """
- schema = package_form_schema()
- schema.update({
- 'tags': {
- '__extras': [keep_extras, free_tags_only]
- },
- 'vocab_tag_string': [convert_from_tags(self.vocab_name), ignore_missing],
- 'published_by': [convert_from_extras, ignore_missing],
- })
- return schema
-
- def check_data_dict(self, data_dict):
- """
- Check if the return data is correct and raises a DataError if not.
- """
- return
-
-
--- a/ckanext/example/package_form.py
+++ /dev/null
@@ -1,40 +1,1 @@
-from sqlalchemy.util import OrderedDict
-from pylons.i18n import _
-from ckan.forms import common
-from ckan.forms import package
-
-
-# Setup the fieldset
-def build_example_form(is_admin=False,
- user_editable_groups=None,
- **kwargs):
- """Customise the core CKAN dataset editing form by adding a new
- field "temporal coverage", and changing the layout of the core
- fields.
- """
- # Restrict fields
- builder = package.build_package_form(
- user_editable_groups=user_editable_groups)
-
- # Extra fields
- builder.add_field(common.DateRangeExtraField('temporal_coverage'))
-
- # Layout
- field_groups = OrderedDict([
- (_('Customised Basic information'), ['title', 'name', 'url',
- 'notes', 'tags']),
- (_('Details'), ['author', 'author_email', 'groups',
- 'maintainer', 'maintainer_email',
- 'license_id', 'temporal_coverage' ]),
- (_('Resources'), ['resources']),
- ])
- builder.set_displayed_fields(field_groups)
- return builder
-
-
-def get_example_fieldset(is_admin=False, user_editable_groups=None, **kwargs):
- return build_example_form(is_admin=is_admin,
- user_editable_groups=user_editable_groups,
- **kwargs).get_fieldset()
-
--- a/ckanext/example/plugin.py
+++ /dev/null
@@ -1,102 +1,1 @@
-import os
-from logging import getLogger
-from genshi.filters.transform import Transformer
-
-from ckan.plugins import implements, SingletonPlugin
-from ckan.plugins import IConfigurer
-from ckan.plugins import IGenshiStreamFilter
-from ckan.plugins import IRoutes
-
-log = getLogger(__name__)
-
-
-class ExamplePlugin(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 the site
- title, and to tell CKAN to look in this package for templates
- and resources that customise the core look and feel.
-
- - ``IGenshiStreamFilter`` allows us to filter and transform the
- HTML stream just before it is rendered. In this case we use
- it to rename "frob" to "foobar"
-
- - ``IRoutes`` allows us to add new URLs, or override existing
- URLs. In this example we use it to override the default
- ``/register`` behaviour with a custom controller
- """
- implements(IConfigurer, inherit=True)
- implements(IGenshiStreamFilter, inherit=True)
- implements(IRoutes, inherit=True)
-
- def update_config(self, config):
- """This IConfigurer implementation causes CKAN to look in the
- ```public``` and ```templates``` directories present in this
- package for any customisations.
-
- It also shows how to set the site title here (rather than in
- the main site .ini file), and causes CKAN to use the
- customised package form defined in ``package_form.py`` in this
- directory.
- """
- here = os.path.dirname(__file__)
- rootdir = os.path.dirname(os.path.dirname(here))
- our_public_dir = os.path.join(rootdir, 'ckanext',
- 'example', 'theme', 'public')
- template_dir = os.path.join(rootdir, 'ckanext',
- 'example', 'theme',
- 'templates')
- # set our local template and resource overrides
- config['extra_public_paths'] = ','.join([our_public_dir,
- config.get('extra_public_paths', '')])
- config['extra_template_paths'] = ','.join([template_dir,
- config.get('extra_template_paths', '')])
- # add in the extra.css
- config['ckan.template_head_end'] = config.get('ckan.template_head_end', '') +\
- '<link rel="stylesheet" href="/css/extra.css" type="text/css"> '
- # set the title
- config['ckan.site_title'] = "Example CKAN theme"
- # set the customised package form (see ``setup.py`` for entry point)
- config['package_form'] = "example_form"
-
- def filter(self, stream):
- """Conform to IGenshiStreamFilter interface.
-
- This example filter renames 'frob' to 'foobar' (this string is
- found in the custom ``home/index.html`` template provided as
- part of the package).
- """
- stream = stream | Transformer('//p[@id="examplething"]/text()')\
- .substitute(r'frob', r'foobar')
- return stream
-
- def before_map(self, map):
- """This IRoutes implementation overrides the standard
- ``/user/register`` behaviour with a custom controller. You
- might instead use it to provide a completely new page, for
- example.
-
- Note that we have also provided a custom register form
- template at ``theme/templates/user/register.html``.
- """
- # Hook in our custom user controller at the points of creation
- # and edition.
- map.connect('/user/register',
- controller='ckanext.example.controller:CustomUserController',
- action='register')
- map.connect('/user/edit',
- controller='ckanext.example.controller:CustomUserController',
- action='edit')
- map.connect('/user/edit/{id:.*}',
- controller='ckanext.example.controller:CustomUserController',
- action='edit')
-
- map.connect('/package/new', controller='package_formalchemy', action='new')
- map.connect('/package/edit/{id}', controller='package_formalchemy', action='edit')
- return map
-
--- a/ckanext/example/theme/public/css/extra.css
+++ /dev/null
@@ -1,5 +1,1 @@
-body {
- background-color: pink;
-}
-
--- a/ckanext/example/theme/templates/forms/dataset_form.html
+++ /dev/null
@@ -1,251 +1,1 @@
-<form id="dataset-edit" method="post"
- py:attrs="{'class':'has-errors'} if errors else {}"
- xmlns:i18n="http://genshi.edgewall.org/i18n"
- xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<div class="error-explanation" py:if="error_summary">
-<h2>Errors in form</h2>
-<p>The form contains invalid entries:</p>
-<ul>
- <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}
- <py:if test="key=='Resources'">
- <ul>
- <py:for each="idx, errordict in enumerate(errors.get('resources', []))">
- <li py:if="errordict">
- Resource ${idx}:
- <ul>
- <li py:for="thiskey, thiserror in errordict.items()">${thiskey}: <py:for each="errorinfo in thiserror">${errorinfo}; </py:for></li>
- </ul>
- </li>
- </py:for>
- </ul>
- </py:if>
- </li>
-</ul>
-</div>
-
-<fieldset id="basic-information">
- <dl>
- <dt class="title-label"><label class="field_opt" for="title">Title</label></dt>
- <dd class="title-field">
- <input id="title"
- class="js-title"
- name="title" type="text"
- value="${data.get('title', '')}"
- placeholder="${_('A short descriptive title for the dataset')}"
- />
- </dd>
- <dd class="title-instructions field_error" py:if="errors.get('title', '')">${errors.get('title', '')}</dd>
-
- <dt class="name-label"><label class="field_req" for="name">Url</label></dt>
- <dd class="name-field">
- <span class="js-url-text url-text">${url(controller='package', action='index')+'/'}<span class="js-url-viewmode js-url-suffix"> </span><a href="#" style="display: none;" class="url-edit js-url-editlink js-url-viewmode">(edit)</a></span>
- <input style="display: none;" id="name" maxlength="100" name="name" type="text" class="url-input js-url-editmode js-url-input" value="${data.get('name', '')}" />
- <p class="js-url-is-valid"> </p>
- </dd>
- <dd style="display: none;" class="js-url-editmode name-instructions basic">2+ characters, lowercase, using only 'a-z0-9' and '-_'</dd>
- <dd class="js-url-editmode name-instructions field_error" py:if="errors.get('name', '')">${errors.get('name', '')}</dd>
-
- <dt class="homepage-label"><label class="field_opt" for="url">Home Page</label></dt>
- <dd class="homepage-field"><input id="url" name="url" type="text" value="${data.get('url', '')}"/></dd>
- <dd class="homepage-instructions instructions basic">The URL for the web page describing the data (not the data itself).</dd>
- <dd class="homepage-instructions hints">e.g. http://www.example.com/growth-figures.html</dd>
- <dd class="homepage-instructions field_error" py:if="errors.get('url', '')">${errors.get('url', '')}</dd>
-
- <dt class="license-label"><label class="field_opt" for="license_id">License</label></dt>
- <dd class="license-field">
- <select id="license_id" name="license_id">
- <py:for each="licence_desc, licence_id in c.licences">
- <option value="${licence_id}" py:attrs="{'selected': 'selected' if data.get('license_id', '') == licence_id else None}" >${licence_desc}</option>
- </py:for>
- </select>
- </dd>
- <dd class="license-instructions instructions basic">The licence under which the dataset is released.</dd>
-
- <dt class="description-label"><label class="field_opt" for="notes">Description</label></dt>
- <dd class="description-field"><div class="markdown-editor">
- <ul class="button-row">
- <li><button class="pretty-button js-markdown-edit depressed">Edit</button></li>
- <li><button class="pretty-button js-markdown-preview">Preview</button></li>
- </ul>
- <textarea class="markdown-input" name="notes" id="notes" placeholder="${_('Start with a summary sentence ...')}">${data.get('notes','')}</textarea>
- <div class="markdown-preview" style="display: none;"></div>
- <span class="hints">You can use <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown formatting</a> here.</span>
- <!--
- <dd class="instructions basic">The main description of the dataset</dd>
- <dd class="instructions further">It is often displayed with the dataset title. In particular, it should start with a short sentence that describes the dataset succinctly, because the first few words alone may be used in some views of the datasets.</dd>
- -->
- </div></dd>
- </dl>
-</fieldset>
-
-<fieldset id="resources">
- <div class="instructions basic"><h3>Resources: the files and APIs associated with this dataset</h3></div>
- <table class="resource-table-edit">
- <thead>
- <tr>
- <th class="field_req resource-url">Resource</th>
- <th class="resource-delete-link"></th>
- </tr>
- </thead>
- <tbody class="js-resource-editor">
- </tbody>
- </table>
-
-
- <div class="resource-add">
- <ul class="button-row">
- <li><h4>Add a resource:</h4></li>
- <li><button class="pretty-button js-link-file">Link to a file</button></li>
- <li><button class="pretty-button js-link-api">Link to an API</button></li>
- <li class="js-upload-file ckan-logged-in" style="display: none;"><button class="pretty-button js-upload-file">Upload a file</button></li>
- </ul>
- </div>
-</fieldset>
-
-<fieldset id="groups">
- <h3>Groups</h3>
- <dl>
- <py:for each="num, group in enumerate(data.get('groups', []))">
- <?python
- authorized_group = [group_authz for group_authz in c.groups_authz if group_authz['id'] == group['id']]
- authorized_group = authorized_group[0] if authorized_group el