From 9c800c0ed82a4ce559e870430afa05c482c50e4c Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 20 Jan 2009 22:39:05 +0100 Subject: [PATCH 1/6] setup Pylons infrastructure paster create -t pylons ... paster controller ddportfolio add support for sphinx --- MANIFEST.in | 2 + README.txt | 19 ++ ddportfolioservice/__init__.py | 1 - ddportfolioservice/config/__init__.py | 0 ddportfolioservice/config/environment.py | 33 +++ ddportfolioservice/config/middleware.py | 57 ++++++ ddportfolioservice/config/routing.py | 24 +++ ddportfolioservice/controllers/__init__.py | 0 ddportfolioservice/controllers/ddportfolio.py | 13 ++ ddportfolioservice/controllers/error.py | 41 ++++ ddportfolioservice/controllers/template.py | 27 +++ ddportfolioservice/lib/__init__.py | 0 ddportfolioservice/lib/app_globals.py | 14 ++ ddportfolioservice/lib/base.py | 27 +++ ddportfolioservice/lib/helpers.py | 6 + ddportfolioservice/model/__init__.py | 0 ddportfolioservice/tests/__init__.py | 40 ++++ .../tests/functional/__init__.py | 0 .../tests/functional/test_ddportfolio.py | 7 + ddportfolioservice/tests/test_models.py | 0 ddportfolioservice/websetup.py | 14 ++ development.ini | 64 ++++++ docs/conf.py | 190 ++++++++++++++++++ docs/index.rst | 18 ++ setup.cfg | 32 +++ setup.py | 74 +++---- test.ini | 21 ++ 27 files changed, 689 insertions(+), 35 deletions(-) create mode 100644 MANIFEST.in create mode 100644 README.txt create mode 100644 ddportfolioservice/config/__init__.py create mode 100644 ddportfolioservice/config/environment.py create mode 100644 ddportfolioservice/config/middleware.py create mode 100644 ddportfolioservice/config/routing.py create mode 100644 ddportfolioservice/controllers/__init__.py create mode 100644 ddportfolioservice/controllers/ddportfolio.py create mode 100644 ddportfolioservice/controllers/error.py create mode 100644 ddportfolioservice/controllers/template.py create mode 100644 ddportfolioservice/lib/__init__.py create mode 100644 ddportfolioservice/lib/app_globals.py create mode 100644 ddportfolioservice/lib/base.py create mode 100644 ddportfolioservice/lib/helpers.py create mode 100644 ddportfolioservice/model/__init__.py create mode 100644 ddportfolioservice/tests/__init__.py create mode 100644 ddportfolioservice/tests/functional/__init__.py create mode 100644 ddportfolioservice/tests/functional/test_ddportfolio.py create mode 100644 ddportfolioservice/tests/test_models.py create mode 100644 ddportfolioservice/websetup.py create mode 100644 development.ini create mode 100644 docs/conf.py create mode 100644 docs/index.rst create mode 100644 test.ini diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..a0348e0 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include ddportfolioservice/public * +recursive-include ddportfolioservice/templates * diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..578eba3 --- /dev/null +++ b/README.txt @@ -0,0 +1,19 @@ +This file is for you to describe the ddportfolioservice application. Typically +you would include information such as the information below: + +Installation and Setup +====================== + +Install ``ddportfolioservice`` using easy_install:: + + easy_install ddportfolioservice + +Make a config file as follows:: + + paster make-config ddportfolioservice config.ini + +Tweak the config file as appropriate and then setup the application:: + + paster setup-app config.ini + +Then you are ready to go. diff --git a/ddportfolioservice/__init__.py b/ddportfolioservice/__init__.py index 792d600..e69de29 100644 --- a/ddportfolioservice/__init__.py +++ b/ddportfolioservice/__init__.py @@ -1 +0,0 @@ -# diff --git a/ddportfolioservice/config/__init__.py b/ddportfolioservice/config/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/config/environment.py b/ddportfolioservice/config/environment.py new file mode 100644 index 0000000..2056bc7 --- /dev/null +++ b/ddportfolioservice/config/environment.py @@ -0,0 +1,33 @@ +"""Pylons environment configuration""" +import os + +from pylons import config + +import ddportfolioservice.lib.app_globals as app_globals +import ddportfolioservice.lib.helpers +from ddportfolioservice.config.routing import make_map + +def load_environment(global_conf, app_conf): + """Configure the Pylons environment via the ``pylons.config`` + object + """ + # Pylons paths + root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + paths = dict(root=root, + controllers=os.path.join(root, 'controllers'), + static_files=os.path.join(root, 'public'), + templates=[os.path.join(root, 'templates')]) + + # Initialize config with the basic options + config.init_app(global_conf, app_conf, package='ddportfolioservice', + template_engine='mako', paths=paths) + + config['routes.map'] = make_map() + config['pylons.g'] = app_globals.Globals() + config['pylons.h'] = ddportfolioservice.lib.helpers + + # Customize templating options via this variable + tmpl_options = config['buffet.template_options'] + + # CONFIGURATION OPTIONS HERE (note: all config options will override + # any Pylons config options) diff --git a/ddportfolioservice/config/middleware.py b/ddportfolioservice/config/middleware.py new file mode 100644 index 0000000..1033181 --- /dev/null +++ b/ddportfolioservice/config/middleware.py @@ -0,0 +1,57 @@ +"""Pylons middleware initialization""" +from paste.cascade import Cascade +from paste.registry import RegistryManager +from paste.urlparser import StaticURLParser +from paste.deploy.converters import asbool + +from pylons import config +from pylons.error import error_template +from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler, \ + StaticJavascripts +from pylons.wsgiapp import PylonsApp + +from ddportfolioservice.config.environment import load_environment + +def make_app(global_conf, full_stack=True, **app_conf): + """Create a Pylons WSGI application and return it + + ``global_conf`` + The inherited configuration for this application. Normally from + the [DEFAULT] section of the Paste ini file. + + ``full_stack`` + Whether or not this application provides a full WSGI stack (by + default, meaning it handles its own exceptions and errors). + Disable full_stack when this application is "managed" by + another WSGI middleware. + + ``app_conf`` + The application's local configuration. Normally specified in the + [app:] section of the Paste ini file (where + defaults to main). + """ + # Configure the Pylons environment + load_environment(global_conf, app_conf) + + # The Pylons WSGI app + app = PylonsApp() + + # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares) + + if asbool(full_stack): + # Handle Python exceptions + app = ErrorHandler(app, global_conf, error_template=error_template, + **config['pylons.errorware']) + + # Display error documents for 401, 403, 404 status codes (and + # 500 when debug is disabled) + app = ErrorDocuments(app, global_conf, mapper=error_mapper, **app_conf) + + # Establish the Registry for this application + app = RegistryManager(app) + + # Static files + javascripts_app = StaticJavascripts() + static_app = StaticURLParser(config['pylons.paths']['static_files']) + app = Cascade([static_app, javascripts_app, app]) + return app diff --git a/ddportfolioservice/config/routing.py b/ddportfolioservice/config/routing.py new file mode 100644 index 0000000..edfa2e8 --- /dev/null +++ b/ddportfolioservice/config/routing.py @@ -0,0 +1,24 @@ +"""Routes configuration + +The more specific and detailed routes should be defined first so they +may take precedent over the more generic routes. For more information +refer to the routes manual at http://routes.groovie.org/docs/ +""" +from pylons import config +from routes import Mapper + +def make_map(): + """Create, configure and return the routes Mapper""" + map = Mapper(directory=config['pylons.paths']['controllers'], + always_scan=config['debug']) + + # The ErrorController route (handles 404/500 error pages); it should + # likely stay at the top, ensuring it can always be resolved + map.connect('error/:action/:id', controller='error') + + # CUSTOM ROUTES HERE + map.connect('', controller='ddportfolio', action='index') + map.connect(':controller/:action/:id') + map.connect('*url', controller='template', action='view') + + return map diff --git a/ddportfolioservice/controllers/__init__.py b/ddportfolioservice/controllers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py new file mode 100644 index 0000000..6e0987b --- /dev/null +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -0,0 +1,13 @@ +import logging + +from ddportfolioservice.lib.base import * + +log = logging.getLogger(__name__) + +class DdportfolioController(BaseController): + + def index(self): + # Return a rendered template + # return render('/some/template.mako') + # or, Return a response + return 'Hello World' diff --git a/ddportfolioservice/controllers/error.py b/ddportfolioservice/controllers/error.py new file mode 100644 index 0000000..b09e4ec --- /dev/null +++ b/ddportfolioservice/controllers/error.py @@ -0,0 +1,41 @@ +import cgi +import os.path + +from paste.urlparser import StaticURLParser +from pylons.middleware import error_document_template, media_path + +from ddportfolioservice.lib.base import * + +class ErrorController(BaseController): + """Generates error documents as and when they are required. + + The ErrorDocuments middleware forwards to ErrorController when error + related status codes are returned from the application. + + This behaviour can be altered by changing the parameters to the + ErrorDocuments middleware in your config/middleware.py file. + + """ + def document(self): + """Render the error document""" + page = error_document_template % \ + dict(prefix=request.environ.get('SCRIPT_NAME', ''), + code=cgi.escape(request.params.get('code', '')), + message=cgi.escape(request.params.get('message', ''))) + return page + + def img(self, id): + """Serve Pylons' stock images""" + return self._serve_file(os.path.join(media_path, 'img'), id) + + def style(self, id): + """Serve Pylons' stock stylesheets""" + return self._serve_file(os.path.join(media_path, 'style'), id) + + def _serve_file(self, root, path): + """Call Paste's FileApp (a WSGI application) to serve the file + at the specified path + """ + static = StaticURLParser(root) + request.environ['PATH_INFO'] = '/%s' % path + return static(request.environ, self.start_response) diff --git a/ddportfolioservice/controllers/template.py b/ddportfolioservice/controllers/template.py new file mode 100644 index 0000000..0192e98 --- /dev/null +++ b/ddportfolioservice/controllers/template.py @@ -0,0 +1,27 @@ +from ddportfolioservice.lib.base import * + +class TemplateController(BaseController): + + def view(self, url): + """By default, the final controller tried to fulfill the request + when no other routes match. It may be used to display a template + when all else fails, e.g.:: + + def view(self, url): + return render('/%s' % url) + + Or if you're using Mako and want to explicitly send a 404 (Not + Found) response code when the requested template doesn't exist:: + + import mako.exceptions + + def view(self, url): + try: + return render('/%s' % url) + except mako.exceptions.TopLevelLookupException: + abort(404) + + By default this controller aborts the request with a 404 (Not + Found) + """ + abort(404) diff --git a/ddportfolioservice/lib/__init__.py b/ddportfolioservice/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/lib/app_globals.py b/ddportfolioservice/lib/app_globals.py new file mode 100644 index 0000000..7f7585f --- /dev/null +++ b/ddportfolioservice/lib/app_globals.py @@ -0,0 +1,14 @@ +"""The application's Globals object""" +from pylons import config + +class Globals(object): + """Globals acts as a container for objects available throughout the + life of the application + """ + + def __init__(self): + """One instance of Globals is created during application + initialization and is available during requests via the 'g' + variable + """ + pass diff --git a/ddportfolioservice/lib/base.py b/ddportfolioservice/lib/base.py new file mode 100644 index 0000000..ce88636 --- /dev/null +++ b/ddportfolioservice/lib/base.py @@ -0,0 +1,27 @@ +"""The base Controller API + +Provides the BaseController class for subclassing, and other objects +utilized by Controllers. +""" +from pylons import c, cache, config, g, request, response, session +from pylons.controllers import WSGIController +from pylons.controllers.util import abort, etag_cache, redirect_to +from pylons.decorators import jsonify, validate +from pylons.i18n import _, ungettext, N_ +from pylons.templating import render + +import ddportfolioservice.lib.helpers as h +import ddportfolioservice.model as model + +class BaseController(WSGIController): + + def __call__(self, environ, start_response): + """Invoke the Controller""" + # WSGIController.__call__ dispatches to the Controller method + # the request is routed to. This routing information is + # available in environ['pylons.routes_dict'] + return WSGIController.__call__(self, environ, start_response) + +# Include the '_' function in the public names +__all__ = [__name for __name in locals().keys() if not __name.startswith('_') \ + or __name == '_'] diff --git a/ddportfolioservice/lib/helpers.py b/ddportfolioservice/lib/helpers.py new file mode 100644 index 0000000..0eb7c8f --- /dev/null +++ b/ddportfolioservice/lib/helpers.py @@ -0,0 +1,6 @@ +"""Helper functions + +Consists of functions to typically be used within templates, but also +available to Controllers. This module is available to both as 'h'. +""" +from webhelpers import * diff --git a/ddportfolioservice/model/__init__.py b/ddportfolioservice/model/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/tests/__init__.py b/ddportfolioservice/tests/__init__.py new file mode 100644 index 0000000..91ff2e7 --- /dev/null +++ b/ddportfolioservice/tests/__init__.py @@ -0,0 +1,40 @@ +"""Pylons application test package + +When the test runner finds and executes tests within this directory, +this file will be loaded to setup the test environment. + +It registers the root directory of the project in sys.path and +pkg_resources, in case the project hasn't been installed with +setuptools. It also initializes the application via websetup (paster +setup-app) with the project's test.ini configuration file. +""" +import os +import sys +from unittest import TestCase + +import pkg_resources +import paste.fixture +import paste.script.appinstall +from paste.deploy import loadapp +from routes import url_for + +__all__ = ['url_for', 'TestController'] + +here_dir = os.path.dirname(os.path.abspath(__file__)) +conf_dir = os.path.dirname(os.path.dirname(here_dir)) + +sys.path.insert(0, conf_dir) +pkg_resources.working_set.add_entry(conf_dir) +pkg_resources.require('Paste') +pkg_resources.require('PasteScript') + +test_file = os.path.join(conf_dir, 'test.ini') +cmd = paste.script.appinstall.SetupCommand('setup-app') +cmd.run([test_file]) + +class TestController(TestCase): + + def __init__(self, *args, **kwargs): + wsgiapp = loadapp('config:test.ini', relative_to=conf_dir) + self.app = paste.fixture.TestApp(wsgiapp) + TestCase.__init__(self, *args, **kwargs) diff --git a/ddportfolioservice/tests/functional/__init__.py b/ddportfolioservice/tests/functional/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/tests/functional/test_ddportfolio.py b/ddportfolioservice/tests/functional/test_ddportfolio.py new file mode 100644 index 0000000..c67c4ed --- /dev/null +++ b/ddportfolioservice/tests/functional/test_ddportfolio.py @@ -0,0 +1,7 @@ +from ddportfolioservice.tests import * + +class TestDdportfolioController(TestController): + + def test_index(self): + response = self.app.get(url_for(controller='ddportfolio')) + # Test response... diff --git a/ddportfolioservice/tests/test_models.py b/ddportfolioservice/tests/test_models.py new file mode 100644 index 0000000..e69de29 diff --git a/ddportfolioservice/websetup.py b/ddportfolioservice/websetup.py new file mode 100644 index 0000000..763622c --- /dev/null +++ b/ddportfolioservice/websetup.py @@ -0,0 +1,14 @@ +"""Setup the ddportfolioservice application""" +import logging + +from paste.deploy import appconfig +from pylons import config + +from ddportfolioservice.config.environment import load_environment + +log = logging.getLogger(__name__) + +def setup_config(command, filename, section, vars): + """Place any commands to setup ddportfolioservice here""" + conf = appconfig('config:' + filename) + load_environment(conf.global_conf, conf.local_conf) diff --git a/development.ini b/development.ini new file mode 100644 index 0000000..0a2cd4e --- /dev/null +++ b/development.ini @@ -0,0 +1,64 @@ +# +# ddportfolioservice - Pylons development environment configuration +# +# The %(here)s variable will be replaced with the parent directory of this file +# +[DEFAULT] +debug = true +# Uncomment and replace with the address which should receive any error reports +#email_to = you@yourdomain.com +smtp_server = localhost +error_email_from = paste@localhost + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 5000 + +[app:main] +use = egg:ddportfolioservice +full_stack = true +cache_dir = %(here)s/data +beaker.session.key = ddportfolioservice +beaker.session.secret = somesecret + +# If you'd like to fine-tune the individual locations of the cache data dirs +# for the Cache data, or the Session saves, un-comment the desired settings +# here: +#beaker.cache.data_dir = %(here)s/data/cache +#beaker.session.data_dir = %(here)s/data/sessions + +# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* +# Debug mode will enable the interactive debugging tool, allowing ANYONE to +# execute malicious code after an exception is raised. +#set debug = false + + +# Logging configuration +[loggers] +keys = root, ddportfolioservice + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = INFO +handlers = console + +[logger_ddportfolioservice] +level = DEBUG +handlers = +qualname = ddportfolioservice + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..ce686a8 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,190 @@ +# -*- coding: utf-8 -*- +# +# Debian Developer Portfolio Service documentation build configuration file, created by +# sphinx-quickstart on Tue Jan 20 22:27:21 2009. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# The contents of this file are pickled, so don't put values in the namespace +# that aren't pickleable (module imports are okay, they're removed automatically). +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If your extensions are in another directory, add it here. If the directory +# is relative to the documentation root, use os.path.abspath to make it +# absolute, like shown here. +#sys.path.append(os.path.abspath('.')) + +# General configuration +# --------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.autodoc'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['.templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'Debian Developer Portfolio Service' +copyright = u'2009, Jan Dittberner' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.1' +# The full version, including alpha/beta/rc tags. +release = '0.1dev' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = [] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + + +# Options for HTML output +# ----------------------- + +# The style sheet to use for HTML and HTML Help pages. A file of that name +# must exist either in Sphinx' static/ path, or in one of the custom paths +# given in html_static_path. +html_style = 'default.css' + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['.static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +html_use_modindex = False + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, the reST sources are included in the HTML build as _sources/. +#html_copy_source = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'DebianDeveloperPortfolioServicedoc' + + +# Options for LaTeX output +# ------------------------ + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, document class [howto/manual]). +latex_documents = [ + ('index', 'DebianDeveloperPortfolioService.tex', ur'Debian Developer Portfolio Service Documentation', + ur'Jan Dittberner', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..39a38d5 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,18 @@ +.. Debian Developer Portfolio Service documentation master file, created by sphinx-quickstart on Tue Jan 20 22:27:21 2009. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to Debian Developer Portfolio Service's documentation! +============================================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`search` + diff --git a/setup.cfg b/setup.cfg index 01bb954..5c5ebdd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,35 @@ [egg_info] tag_build = dev tag_svn_revision = true + +[easy_install] +find_links = http://www.pylonshq.com/download/ + +[build_sphinx] +source-dir = docs + +[publish] +doc-dir=docs/html +make-dirs=1 + +# Babel configuration +[compile_catalog] +domain = ddportfolioservice +directory = ddportfolioservice/i18n +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = ddportfolioservice/i18n/ddportfolioservice.pot +width = 80 + +[init_catalog] +domain = ddportfolioservice +input_file = ddportfolioservice/i18n/ddportfolioservice.pot +output_dir = ddportfolioservice/i18n + +[update_catalog] +domain = ddportfolioservice +input_file = ddportfolioservice/i18n/ddportfolioservice.pot +output_dir = ddportfolioservice/i18n +previous = true diff --git a/setup.py b/setup.py index d52526d..4dfafb4 100644 --- a/setup.py +++ b/setup.py @@ -1,39 +1,45 @@ -from setuptools import setup, find_packages -import sys, os +try: + from setuptools import setup, find_packages +except ImportError: + from ez_setup import use_setuptools + use_setuptools() + from setuptools import setup, find_packages -version = '0.1' - -setup(name='ddportfolioservice', - version=version, - description="service to create DDPortfolio URLs", - long_description="""This is a service implementation that +setup( + name='ddportfolioservice', + version='0.1', + description='service to create DDPortfolio URLs', + long_description="""This is a service implementation that returns a set of personalized URLs as outlined in http://wiki.debian.org/DDPortfolio. It takes the Debian developers full name and email address as input and returns a JSON formatted array of URLs.""", - # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=['Development Status :: 3 - Alpha', - 'Environment :: Web Environment', - 'License :: DFSG approved', - 'License :: OSI approved :: ' + - 'GNU Affero General Public License v3', - 'Programming Language :: Python'], - keywords='Debian service JSON', - author='Jan Dittberner', - author_email='jan@dittberner.info', - url='http://debian-stuff.dittberner.info/ddportfolioservice/', - license='AGPLv3', - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), - include_package_data=True, - zip_safe=False, - package_data= { - 'ddportfolioservice' : ['*.ini'], - }, - install_requires=[ - # -*- Extra requirements: -*- - 'Paste', - 'PasteDeploy', - 'simplejson', - 'formencode' - ], - ) + # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=['Development Status :: 3 - Alpha', + 'Environment :: Web Environment', + 'License :: DFSG approved', + 'License :: OSI approved :: ' + + 'GNU Affero General Public License v3', + 'Programming Language :: Python'], + keywords='Debian service JSON', + author='Jan Dittberner', + author_email='jan@dittberner.info', + url='http://debian-stuff.dittberner.info/ddportfolioservice', + license='AGPL-3.0+', + install_requires=["Pylons>=0.9.6.2"], + packages=find_packages(exclude=['ez_setup']), + include_package_data=True, + test_suite='nose.collector', + package_data={'ddportfolioservice': ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']}, + message_extractors = {'ddportfolioservice': [ + ('**.py', 'python', None), + ('templates/**.mako', 'mako', None), + ('public/**', 'ignore', None)]}, + entry_points=""" + [paste.app_factory] + main = ddportfolioservice.config.middleware:make_app + + [paste.app_install] + main = pylons.util:PylonsInstaller + """, +) diff --git a/test.ini b/test.ini new file mode 100644 index 0000000..6f3a54e --- /dev/null +++ b/test.ini @@ -0,0 +1,21 @@ +# +# ddportfolioservice - Pylons testing environment configuration +# +# The %(here)s variable will be replaced with the parent directory of this file +# +[DEFAULT] +debug = true +# Uncomment and replace with the address which should receive any error reports +#email_to = you@yourdomain.com +smtp_server = localhost +error_email_from = paste@localhost + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 5000 + +[app:main] +use = config:development.ini + +# Add additional test specific configuration options as necessary. From 7d1c54fe70b0bba806f13dc13c89dc6607502340 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 20 Jan 2009 22:43:26 +0100 Subject: [PATCH 2/6] add AGPL 3.0 license text --- agpl-3.0.txt | 661 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 agpl-3.0.txt diff --git a/agpl-3.0.txt b/agpl-3.0.txt new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/agpl-3.0.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 12dc602c0b1ea5ca0e235d2b8e5465a84195983e Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 20 Jan 2009 23:15:11 +0100 Subject: [PATCH 3/6] add form template use render in ddportfolio controller add webhelpers.rails to helpers.py create showform.mako resembling the output of the old ddportfolio.py --- ddportfolioservice/controllers/ddportfolio.py | 2 +- ddportfolioservice/lib/helpers.py | 1 + ddportfolioservice/templates/showform.mako | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 ddportfolioservice/templates/showform.mako diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 6e0987b..10dc215 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -10,4 +10,4 @@ class DdportfolioController(BaseController): # Return a rendered template # return render('/some/template.mako') # or, Return a response - return 'Hello World' + return render('/showform.mako') diff --git a/ddportfolioservice/lib/helpers.py b/ddportfolioservice/lib/helpers.py index 0eb7c8f..bfa5567 100644 --- a/ddportfolioservice/lib/helpers.py +++ b/ddportfolioservice/lib/helpers.py @@ -4,3 +4,4 @@ Consists of functions to typically be used within templates, but also available to Controllers. This module is available to both as 'h'. """ from webhelpers import * +from webhelpers.rails import * diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako new file mode 100644 index 0000000..e2fbc99 --- /dev/null +++ b/ddportfolioservice/templates/showform.mako @@ -0,0 +1,21 @@ + + + + ${_('Debian Developer Portfolio')} + + + ${h.start_form(h.url_for(action='handle_post'), method='post')} +
+ ${_('Debian Developer Portfolio')} +
+ ${h.text_field('name', value=request.params.get('name', None))}
+
+ ${h.text_field('email', value=request.params.get('email', None))}
+
+ ${h.text_field('username', value=request.params.get('username', None))}
+ ${h.submit(value=_('Build DD Portfolio URLs'))} +
+ ${h.end_form()} + + From a6d4a99050c532011c5a317fef56b12deead9e32 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 20 Jan 2009 23:25:49 +0100 Subject: [PATCH 4/6] initial Pylons i18n include language detection support in BaseController add initial german translation --- .../i18n/ddportfolioservice.pot | 55 ++++++++++++++++++ .../i18n/de/LC_MESSAGES/ddportfolioservice.mo | Bin 0 -> 768 bytes .../i18n/de/LC_MESSAGES/ddportfolioservice.po | 55 ++++++++++++++++++ ddportfolioservice/lib/base.py | 8 ++- 4 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 ddportfolioservice/i18n/ddportfolioservice.pot create mode 100644 ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo create mode 100644 ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot new file mode 100644 index 0000000..1535eeb --- /dev/null +++ b/ddportfolioservice/i18n/ddportfolioservice.pot @@ -0,0 +1,55 @@ +# Translations template for ddportfolioservice. +# Copyright (C) 2009 ORGANIZATION +# This file is distributed under the same license as the ddportfolioservice +# project. +# FIRST AUTHOR , 2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ddportfolioservice 0.1\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2009-01-20 23:13+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.1\n" + +#: ddportfolioservice/ddportfolio.py:35 +#, python-format +msgid "unable to parse %s: %s" +msgstr "" + +#: ddportfolioservice/ddportfolio.py:69 ddportfolioservice/ddportfolio.py:81 +#: ddportfolioservice/ddportfolio.py:86 +#: ddportfolioservice/templates/showform.mako:5 +#: ddportfolioservice/templates/showform.mako:10 +msgid "Debian Developer Portfolio" +msgstr "" + +#: ddportfolioservice/ddportfolio.py:87 +#: ddportfolioservice/templates/showform.mako:11 +msgid "Name:" +msgstr "" + +#: ddportfolioservice/ddportfolio.py:89 +msgid "E-Mail:" +msgstr "" + +#: ddportfolioservice/ddportfolio.py:91 +#: ddportfolioservice/templates/showform.mako:15 +msgid "User name:" +msgstr "" + +#: ddportfolioservice/ddportfolio.py:93 +#: ddportfolioservice/templates/showform.mako:17 +msgid "Build DD Portfolio URLs" +msgstr "" + +#: ddportfolioservice/templates/showform.mako:13 +msgid "E-Mail address:" +msgstr "" + diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo new file mode 100644 index 0000000000000000000000000000000000000000..e99efc11ef2cf5db578a3477ce89c03ae8a28043 GIT binary patch literal 768 zcmaKpKX21O7{(3apDgi53?LzfTRK%2oOEfgP{pZDh_I6=O^`q=m-tP3#l4Hp=Ro^C z*g)b-F!2qTU}8foNKEW(JWc{-!qQLAo&CIi@80L@%?qzRJXgS7@Vwgm^Sr_OHh2r} zfcM}!_yjJ4Z{Q;M0etWi+ycLVI_G&ezy{W*=U4Ubpx3bf0KEkL2(9WrL$5-=K&w9A zpKJ~lkq2H3uUxmSvLREAN310Ar{o?{(!32JS}D_ z?F-F ziU#q)!5*x7R>~RiA<1LGlCawzg>Cqfq?xOlv9mot?WFP9b?ddj-#6NkMvs#@4(sTZ zyEo6J(z|SOSdGg)DBYBApZTh@Ov&%N%}vob+mFBG_qYKzYe-Zx^$e!` H7J2^$phnnB literal 0 HcmV?d00001 diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po new file mode 100644 index 0000000..05c5688 --- /dev/null +++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po @@ -0,0 +1,55 @@ +# German translations for ddportfolioservice. +# Copyright (C) 2009 Jan Dittberner +# This file is distributed under the same license as the ddportfolioservice +# project. +# Jan Dittberner , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ddportfolioservice 0.1\n" +"Report-Msgid-Bugs-To: jan@dittberner.info\n" +"POT-Creation-Date: 2009-01-20 23:13+0100\n" +"PO-Revision-Date: 2009-01-20 23:24+0100\n" +"Last-Translator: Jan Dittberner \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.1\n" + +#: ddportfolioservice/ddportfolio.py:35 +#, python-format +msgid "unable to parse %s: %s" +msgstr "Konnte %s nicht parsen: %s" + +#: ddportfolioservice/ddportfolio.py:69 ddportfolioservice/ddportfolio.py:81 +#: ddportfolioservice/ddportfolio.py:86 +#: ddportfolioservice/templates/showform.mako:5 +#: ddportfolioservice/templates/showform.mako:10 +msgid "Debian Developer Portfolio" +msgstr "Debian-Entwicklerportfolio" + +#: ddportfolioservice/ddportfolio.py:87 +#: ddportfolioservice/templates/showform.mako:11 +msgid "Name:" +msgstr "Name:" + +#: ddportfolioservice/ddportfolio.py:89 +msgid "E-Mail:" +msgstr "E-Mail" + +#: ddportfolioservice/ddportfolio.py:91 +#: ddportfolioservice/templates/showform.mako:15 +msgid "User name:" +msgstr "Benutzername:" + +#: ddportfolioservice/ddportfolio.py:93 +#: ddportfolioservice/templates/showform.mako:17 +msgid "Build DD Portfolio URLs" +msgstr "Debian-Entwicklerportfolio-URLs bauen" + +#: ddportfolioservice/templates/showform.mako:13 +msgid "E-Mail address:" +msgstr "E-Mailadresse:" + diff --git a/ddportfolioservice/lib/base.py b/ddportfolioservice/lib/base.py index ce88636..0bad547 100644 --- a/ddportfolioservice/lib/base.py +++ b/ddportfolioservice/lib/base.py @@ -7,7 +7,7 @@ from pylons import c, cache, config, g, request, response, session from pylons.controllers import WSGIController from pylons.controllers.util import abort, etag_cache, redirect_to from pylons.decorators import jsonify, validate -from pylons.i18n import _, ungettext, N_ +from pylons.i18n import _, ungettext, N_, add_fallback from pylons.templating import render import ddportfolioservice.lib.helpers as h @@ -20,6 +20,12 @@ class BaseController(WSGIController): # WSGIController.__call__ dispatches to the Controller method # the request is routed to. This routing information is # available in environ['pylons.routes_dict'] + # set language environment + for lang in request.languages: + try: + add_fallback(lang) + except: + pass return WSGIController.__call__(self, environ, start_response) # Include the '_' function in the public names From d86965304fec4672498306c9c788f3d966db6aec Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 21 Jan 2009 00:11:19 +0100 Subject: [PATCH 5/6] add form validation validate input in ddportfolio controller input validation schema in model/form.py error message display and style added --- ddportfolioservice/controllers/ddportfolio.py | 10 ++++++++++ ddportfolioservice/model/form.py | 8 ++++++++ .../public/stylesheets/style.css | 4 ++++ ddportfolioservice/templates/showform.mako | 19 ++++++++++++++++--- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 ddportfolioservice/model/form.py create mode 100644 ddportfolioservice/public/stylesheets/style.css diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 10dc215..8434b5f 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -1,6 +1,7 @@ import logging from ddportfolioservice.lib.base import * +from ddportfolioservice.model.form import * log = logging.getLogger(__name__) @@ -11,3 +12,12 @@ class DdportfolioController(BaseController): # return render('/some/template.mako') # or, Return a response return render('/showform.mako') + + def handle_post(self): + schema = DeveloperData() + try: + form_result = schema.to_python(request.params) + except formencode.validators.Invalid, error: + c.messages = { 'errors' : error.unpack_errors() } + return render('/showform.mako') + return ["done"] diff --git a/ddportfolioservice/model/form.py b/ddportfolioservice/model/form.py new file mode 100644 index 0000000..a4cba23 --- /dev/null +++ b/ddportfolioservice/model/form.py @@ -0,0 +1,8 @@ +import formencode + +class DeveloperData(formencode.Schema): + allow_extra_fields = True + filter_extra_fields = True + name = formencode.validators.String(not_empty=True) + email = formencode.validators.Email(not_empty=True) + username = formencode.validators.PlainText(not_empty=True) diff --git a/ddportfolioservice/public/stylesheets/style.css b/ddportfolioservice/public/stylesheets/style.css new file mode 100644 index 0000000..db49c40 --- /dev/null +++ b/ddportfolioservice/public/stylesheets/style.css @@ -0,0 +1,4 @@ +.errormsg { + font-size: 80%; + color: red; +} \ No newline at end of file diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index e2fbc99..55c83a4 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -3,16 +3,29 @@ ${_('Debian Developer Portfolio')} + ${h.stylesheet_link_tag('style')} ${h.start_form(h.url_for(action='handle_post'), method='post')}
${_('Debian Developer Portfolio')} -
+
${h.text_field('name', value=request.params.get('name', None))}
-
+
${h.text_field('email', value=request.params.get('email', None))}
-
+
${h.text_field('username', value=request.params.get('username', None))}
${h.submit(value=_('Build DD Portfolio URLs'))}
From f33f6c7751547fc14645a5b11e33b3348b2ef453 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 21 Jan 2009 01:11:01 +0100 Subject: [PATCH 6/6] implement URL generation move code for URL generation to model/urlbuilder.py add format selection to input form create output template --- ddportfolioservice/controllers/ddportfolio.py | 9 +- ddportfolioservice/ddportfolio.py | 101 ------------------ ddportfolioservice/lib/base.py | 1 + .../{ => model}/ddportfolio.ini | 12 +-- ddportfolioservice/model/urlbuilder.py | 30 ++++++ ddportfolioservice/templates/showform.mako | 2 + ddportfolioservice/templates/showurls.mako | 34 ++++++ 7 files changed, 81 insertions(+), 108 deletions(-) delete mode 100644 ddportfolioservice/ddportfolio.py rename ddportfolioservice/{ => model}/ddportfolio.ini (70%) create mode 100644 ddportfolioservice/model/urlbuilder.py create mode 100644 ddportfolioservice/templates/showurls.mako diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 8434b5f..7c7702d 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -1,7 +1,9 @@ import logging +import simplejson from ddportfolioservice.lib.base import * from ddportfolioservice.model.form import * +from ddportfolioservice.model.urlbuilder import * log = logging.getLogger(__name__) @@ -20,4 +22,9 @@ class DdportfolioController(BaseController): except formencode.validators.Invalid, error: c.messages = { 'errors' : error.unpack_errors() } return render('/showform.mako') - return ["done"] + data = build_urls(form_result) + if 'mode' in request.params and request.params['mode'] == 'json': + response.headers['Content-Type'] = 'text/json' + return simplejson.dumps(data['data']) + c.urldata = data + return render('/showurls.mako') diff --git a/ddportfolioservice/ddportfolio.py b/ddportfolioservice/ddportfolio.py deleted file mode 100644 index 361cdc0..0000000 --- a/ddportfolioservice/ddportfolio.py +++ /dev/null @@ -1,101 +0,0 @@ -# -*- python -*- -# -*- coding: utf8 -*- - -from paste.request import parse_formvars -import pkg_resources -import simplejson -from ConfigParser import ConfigParser -from urllib import quote_plus -import logging -import sys -import formencode -from gettext import gettext as _ -from formencode import validators - -logging.basicConfig(level=logging.DEBUG, stream=sys.stderr) - -my_config = ConfigParser() -my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini')) - - -def build_urls(fields): - """Build personalized URLs using the developer information in - fields.""" - result = {} - qfields = dict([(key, quote_plus(fields[key])) for key in fields]) - for section in my_config.sections(): - if my_config.has_option(section, 'urls'): - for url in my_config.get(section, 'urls').split(','): - if my_config.has_option(section, url + '.pattern'): - try: - result[section + '.' + url] = \ - my_config.get(section, url + '.pattern', - False, qfields) - except Exception, e: - logging.error(_("unable to parse %s: %s") % - (my_config.get(section, url + - '.pattern', True), e)) - return result - -class DeveloperData(formencode.Schema): - name = validators.String(not_empty=True) - email = validators.Email(not_empty=True) - username = validators.PlainText(not_empty=True) - -def validate_input(fields): - logging.debug(fields) - return DeveloperData().to_python(fields) - -def gather_additional_info(fields): - logging.debug(fields) - return fields - -def application(environ, start_response): - """WSGI application entry point.""" - if environ['REQUEST_METHOD'] == 'POST': - try: - fields = gather_additional_info( - validate_input(parse_formvars(environ))) - except formencode.Invalid, e: - start_response('400 Bad Request', [('content-type', 'text/plain')]) - return ["input validation failed\n", e.unpack_errors()] - data = build_urls(fields) - if ('mode' in fields and fields['mode'] == 'json'): - start_response('200 OK', [('content-type', 'text/json')]) - return [simplejson.dumps(data)] - else: - start_response('200 OK', [('content-type', 'text/html')]) - return [''' -''', _("Debian Developer Portfolio"),''' - -
    -
  • ''', - '
  • '.join([ - '%(key)s: %(url)s' % - {'key': key, 'url': data[key]} for key in data]), - '
'] - else: - start_response('200 OK', [('content-type', 'text/html')]) - return [''' - - ''', _('Debian Developer Portfolio'), ''' - - -
-
- ''', _('Debian Developer Portfolio'), ''' -
-
-
-
-
-
- -
-
- -'''] - -if __name__ == '__main__': - from paste import httpserver - httpserver.serve(application, host='127.0.0.1', port='8080') diff --git a/ddportfolioservice/lib/base.py b/ddportfolioservice/lib/base.py index 0bad547..be55c0a 100644 --- a/ddportfolioservice/lib/base.py +++ b/ddportfolioservice/lib/base.py @@ -26,6 +26,7 @@ class BaseController(WSGIController): add_fallback(lang) except: pass + c.messages = { 'errors': [], 'messages': [] } return WSGIController.__call__(self, environ, start_response) # Include the '_' function in the public names diff --git a/ddportfolioservice/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini similarity index 70% rename from ddportfolioservice/ddportfolio.ini rename to ddportfolioservice/model/ddportfolio.ini index 888340a..37c6d89 100644 --- a/ddportfolioservice/ddportfolio.ini +++ b/ddportfolioservice/model/ddportfolio.ini @@ -9,13 +9,13 @@ received.pattern=http://bugs.debian.org/%(email)s reported.pattern=http://bugs.debian.org/from:%(email)s bugstats.pattern=http://asdfasdf.debian.net/~tar/bugstats/?%(email)s usertags.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(email)s -searchall.pattern=http://merkel.debian.org/~don/cgi/search.cgi?phrase=%(name)s&search=search +searchall.pattern=http://merkel.debian.org/~don/cgi/search.cgi?phrase=%(name)s&search=search wnpp.pattern=http://qa.debian.org/developer.php?wnpp=%(email)s [build] urls=buildd,igloo,svnbuildstat buildd.pattern=http://buildd.debian.org/pkg.cgi?maint=%(email)s -igloo.pattern=http://oldpeople.debian.org/~igloo/status.php?email=%(email)s&thin=on +igloo.pattern=http://oldpeople.debian.org/~igloo/status.php?email=%(email)s&thin=on svnbuildstat.pattern=http://svnbuildstat.debian.net/packages/list/%(email)s [qa] @@ -30,9 +30,9 @@ keylog.pattern=http://merkel.debian.org/~enrico/keylog/%(gpgfp)s.html [lists] urls=dolists,adolists,gmane -dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date +dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date adolists.pattern=http://www.google.com/search?q=site%%3Alists.alioth.debian.org+%%22%(name)s%%22 -gmane.pattern=http://search.gmane.org/?email=%(name)s&group=gmane.linux.debian.* +gmane.pattern=http://search.gmane.org/?email=%(name)s&group=gmane.linux.debian.* [files] urls=people,alioth @@ -42,10 +42,10 @@ alioth.pattern=http://alioth.debian.org/~%(username)s/ [membership] urls=nm,db,alioth nm.pattern=https://nm.debian.org/nmstatus.php?email=%(email)s -db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search +db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search alioth.pattern=http://alioth.debian.org/users/%(username)s/ [miscellaneous] urls=debtags,links debtags.pattern=http://debtags.alioth.debian.org/todo.html?maint=%(email)s -links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search +links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search diff --git a/ddportfolioservice/model/urlbuilder.py b/ddportfolioservice/model/urlbuilder.py new file mode 100644 index 0000000..11cad6e --- /dev/null +++ b/ddportfolioservice/model/urlbuilder.py @@ -0,0 +1,30 @@ +# -*- python -*- +# -*- coding: utf8 -*- + +import ConfigParser +import pkg_resources +from urllib import quote_plus + +my_config = ConfigParser.ConfigParser() +my_config.readfp(pkg_resources.resource_stream(__name__, 'ddportfolio.ini')) + + +def build_urls(fields): + """Build personalized URLs using the developer information in + fields.""" + data = {} + errors = {} + qfields = dict([(key, quote_plus(fields[key])) for key in fields]) + for section in my_config.sections(): + if my_config.has_option(section, 'urls'): + for url in my_config.get(section, 'urls').split(','): + if my_config.has_option(section, url + '.pattern'): + try: + data[section + '.' + url] = \ + my_config.get(section, url + '.pattern', + False, qfields) + except Exception, e: + errors['%s.%s.pattern' % (section, url)] = \ + [my_config.get(section, '%s.pattern' % url, + True), str(e)] + return {'data' : data, 'errors' : errors} diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index 55c83a4..9d46f08 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -27,6 +27,8 @@ % endif
${h.text_field('username', value=request.params.get('username', None))}
+
+ ${_('HTML')} ${h.radio_button('mode', 'html', checked=(request.params.get('mode', 'html') == 'html'))} ${_('JSON')} ${h.radio_button('mode', 'json', checked=(request.params.get('mode', 'html') == 'json'))}
${h.submit(value=_('Build DD Portfolio URLs'))} ${h.end_form()} diff --git a/ddportfolioservice/templates/showurls.mako b/ddportfolioservice/templates/showurls.mako new file mode 100644 index 0000000..2df852c --- /dev/null +++ b/ddportfolioservice/templates/showurls.mako @@ -0,0 +1,34 @@ + + + + ${_('Debian Developer Portfolio')} + ${h.stylesheet_link_tag('style')} + + + % if c.urldata['data']: +
+ ${_('Debian Developer Portfolio')} +
    + % for key in c.urldata['data']: +
  • ${key}
    ${h.link_to(h.truncate( + c.urldata['data'][key], length=120), c.urldata['data'][key])}
    • + % endfor +
+
+ % endif + % if c.urldata['errors']: +
+ ${_('Errors during URL creation')} +
    + % for key in c.urldata['errors']: +
  • ${key}
    + ${c.urldata['errors'][key][0]}
    + ${c.urldata['errors'][key][1]}
    • + % endfor +
+
+ % endif +

${h.link_to(_('Restart'), h.url_for(action='index'))}

+ +