Merge remote-tracking branch 'gitorious/master'

This commit is contained in:
Jef van Schendel 2011-06-22 15:32:06 +02:00
commit 69a303a84c
12 changed files with 161 additions and 31 deletions

View File

@ -50,5 +50,20 @@ class MediaEntryMigration(DocumentMigration):
'description_html': cleaned_markdown_conversion( 'description_html': cleaned_markdown_conversion(
doc['description'])}} doc['description'])}}
class UserMigration(DocumentMigration):
MIGRATE_CLASSES = ['MediaEntry'] def allmigration01_add_bio_and_url_profile(self):
"""
User can elaborate profile with home page and biography
"""
self.target = {'url': {'$exists': False},
'bio': {'$exists': False}}
if not self.status:
for doc in self.collection.find(self.target):
self.update = {
'$set': {'url': '',
'bio': ''}}
self.collection.update(
self.target, self.update, multi=True, safe=True)
MIGRATE_CLASSES = ['MediaEntry', 'User']

View File

@ -46,6 +46,8 @@ class User(Document):
'status': unicode, 'status': unicode,
'verification_key': unicode, 'verification_key': unicode,
'is_admin': bool, 'is_admin': bool,
'url' : unicode,
'bio' : unicode
} }
required_fields = ['username', 'created', 'pw_hash', 'email'] required_fields = ['username', 'created', 'pw_hash', 'email']
@ -56,6 +58,8 @@ class User(Document):
'status': u'needs_email_verification', 'status': u'needs_email_verification',
'verification_key': lambda: unicode(uuid.uuid4()), 'verification_key': lambda: unicode(uuid.uuid4()),
'is_admin': False} 'is_admin': False}
migration_handler = migrations.UserMigration
def check_login(self, password): def check_login(self, password):
""" """

View File

@ -25,3 +25,10 @@ class EditForm(wtforms.Form):
slug = wtforms.TextField( slug = wtforms.TextField(
'Slug') 'Slug')
description = wtforms.TextAreaField('Description of this work') description = wtforms.TextAreaField('Description of this work')
class EditProfileForm(wtforms.Form):
url = wtforms.TextField(
'website URL',
[wtforms.validators.URL(message='Improperly formed URL')])
bio = wtforms.TextAreaField('bio',
[wtforms.validators.Length(min=0, max=500)])

View File

@ -19,4 +19,5 @@ from routes.route import Route
edit_routes = [ edit_routes = [
# Media editing view handled in user_pages/routing.py # Media editing view handled in user_pages/routing.py
] Route('mediagoblin.edit.profile', '/profile/',
controller="mediagoblin.edit.views:edit_profile")]

View File

@ -68,3 +68,25 @@ def edit_media(request, media):
'mediagoblin/edit/edit.html', 'mediagoblin/edit/edit.html',
{'media': media, {'media': media,
'form': form}) 'form': form})
@require_active_login
def edit_profile(request):
user = request.user
form = forms.EditProfileForm(request.POST,
url = user.get('url'),
bio = user.get('bio'))
if request.method == 'POST' and form.validate():
user['url'] = request.POST['url']
user['bio'] = request.POST['bio']
user.save()
return redirect(request, "index", user=user['username'])
return render_to_response(
request,
'mediagoblin/edit/edit_profile.html',
{'user': user,
'form': form})

View File

@ -35,6 +35,8 @@
<div class="mediagoblin_header_right"> <div class="mediagoblin_header_right">
{% if request.user %} {% if request.user %}
{{ request.user['username'] }}'s account {{ request.user['username'] }}'s account
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user= request.user['username']) }}">home</a>
<a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery', <a href="{{ request.urlgen('mediagoblin.user_pages.user_gallery',
user= request.user['username']) }}">gallery</a> user= request.user['username']) }}">gallery</a>
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)

View File

@ -0,0 +1,35 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# 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 <http://www.gnu.org/licenses/>.
#}
{% extends "mediagoblin/base.html" %}
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
{% block mediagoblin_content %}
<h1>Edit details for {{ user['username'] }}</h1>
<form action="{{ request.urlgen('mediagoblin.edit.profile',
user=user.username) }}"
method="POST" enctype="multipart/form-data">
<div class="submit_box form_box">
{{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons">
<input type="submit" value="submit" class="button" />
</div>
</div>
</form>
{% endblock %}

View File

@ -22,20 +22,19 @@
<h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1> <h1>{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}</h1>
{% if request.user %} {% if request.user %}
<p> <p>
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>. <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>
</p> <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
</p>
{% else %} {% else %}
<p> <p>
If you have an account, you can If you have an account, you can
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>. <a href="{{ request.urlgen('mediagoblin.auth.login') }}">Login</a>.
</p> </p>
<p> <p>
If you don't have an account, please If you don't have an account, please
<a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>. <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Register</a>.
</p> </p>
{% endif %} {% endif %}
{# temporarily, an "image gallery" that isn't one really ;) #} {# temporarily, an "image gallery" that isn't one really ;) #}

View File

@ -27,6 +27,8 @@
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{% if user %} {% if user %}
<h1>User page for '{{ user.username }}'</h1> <h1>User page for '{{ user.username }}'</h1>
{% include "mediagoblin/utils/profile.html" %}
{% include "mediagoblin/utils/object_gallery.html" %} {% include "mediagoblin/utils/object_gallery.html" %}

View File

@ -0,0 +1,35 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011 Free Software Foundation, Inc
#
# 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 <http://www.gnu.org/licenses/>.
#}
{% block profile_content -%}
<div>
<ul>
{% if user.url %}
<li>
<a href="{{ user.url }}">homepage</a>
</li>
{% endif %}
{% if user.bio %}
<li>
{{ user.bio }}
</li>
{% endif %}
</ul>
</div>
{% endblock %}

View File

@ -16,12 +16,17 @@
from mediagoblin import mg_globals from mediagoblin import mg_globals
from mediagoblin.tests.tools import (
MEDIAGOBLIN_TEST_DB_NAME, suicide_if_bad_celery_environ)
def setup_package(): def setup_package():
pass suicide_if_bad_celery_environ()
def teardown_package(): def teardown_package():
if mg_globals.db_connection: if ((mg_globals.db_connection
print "Killing db ..." and mg_globals.database.name == MEDIAGOBLIN_TEST_DB_NAME)):
mg_globals.db_connection.drop_database(mg_globals.database.name) print "Killing db ..."
print "... done" mg_globals.db_connection.drop_database(MEDIAGOBLIN_TEST_DB_NAME)
print "... done"

View File

@ -28,7 +28,7 @@ from mediagoblin.decorators import _make_safe
from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.db.open import setup_connection_and_db_from_config
MEDIAGOBLIN_TEST_DB_NAME = '__mediagoblinunittests__' MEDIAGOBLIN_TEST_DB_NAME = u'__mediagoblin_tests__'
TEST_SERVER_CONFIG = pkg_resources.resource_filename( TEST_SERVER_CONFIG = pkg_resources.resource_filename(
'mediagoblin.tests', 'test_paste.ini') 'mediagoblin.tests', 'test_paste.ini')
TEST_APP_CONFIG = pkg_resources.resource_filename( TEST_APP_CONFIG = pkg_resources.resource_filename(
@ -42,17 +42,23 @@ USER_DEV_DIRECTORIES_TO_SETUP = [
'media/public', 'media/queue', 'media/public', 'media/queue',
'beaker/sessions/data', 'beaker/sessions/lock'] 'beaker/sessions/data', 'beaker/sessions/lock']
BAD_CELERY_MESSAGE = """\
Sorry, you *absolutely* must run nosetests with the
mediagoblin.celery_setup.from_tests module. Like so:
$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests"""
class BadCeleryEnviron(Exception): pass class BadCeleryEnviron(Exception): pass
def get_test_app(dump_old_app=True): def suicide_if_bad_celery_environ():
if not os.environ.get('CELERY_CONFIG_MODULE') == \ if not os.environ.get('CELERY_CONFIG_MODULE') == \
'mediagoblin.celery_setup.from_tests': 'mediagoblin.celery_setup.from_tests':
raise BadCeleryEnviron( raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
u"Sorry, you *absolutely* must run nosetests with the\n"
u"mediagoblin.celery_setup.from_tests module. Like so:\n"
u"$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests") def get_test_app(dump_old_app=True):
suicide_if_bad_celery_environ()
global MGOBLIN_APP global MGOBLIN_APP
global CELERY_SETUP global CELERY_SETUP
@ -78,6 +84,7 @@ def get_test_app(dump_old_app=True):
# @@: For now we're dropping collections, but we could also just # @@: For now we're dropping collections, but we could also just
# collection.remove() ? # collection.remove() ?
connection, db = setup_connection_and_db_from_config(app_config) connection, db = setup_connection_and_db_from_config(app_config)
assert db.name == MEDIAGOBLIN_TEST_DB_NAME
collections_to_wipe = [ collections_to_wipe = [
collection collection
@ -87,10 +94,6 @@ def get_test_app(dump_old_app=True):
for collection in collections_to_wipe: for collection in collections_to_wipe:
db.drop_collection(collection) db.drop_collection(collection)
# Don't need these anymore...
del(connection)
del(db)
# TODO: Drop and recreate indexes # TODO: Drop and recreate indexes
# setup app and return # setup app and return