Merge branch 'master' into merge-python3-port

Has some issues, will iteratively fix!

Conflicts:
	mediagoblin/gmg_commands/__init__.py
	mediagoblin/gmg_commands/deletemedia.py
	mediagoblin/gmg_commands/users.py
	mediagoblin/oauth/views.py
	mediagoblin/plugins/api/views.py
	mediagoblin/tests/test_api.py
	mediagoblin/tests/test_edit.py
	mediagoblin/tests/test_oauth1.py
	mediagoblin/tests/test_util.py
	mediagoblin/tools/mail.py
	mediagoblin/webfinger/views.py
	setup.py

2 files changed, 77 insertions, 8 deletions

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 2c9b5e99..c0bece8b 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -15,10 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import wtforms
+from jsonschema import Draft4Validator
 
 from mediagoblin.tools.text import tag_length_validator
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
+from mediagoblin.tools.metadata import DEFAULT_SCHEMA, DEFAULT_CHECKER
 from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
@@ -38,7 +40,7 @@ class EditForm(wtforms.Form):
             "Separate tags by commas."))
     slug = wtforms.TextField(
         _('Slug'),
-        [wtforms.validators.Required(message=_("The slug can't be empty"))],
+        [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
         description=_(
             "The title part of this media's address. "
             "You usually don't need to change this."))
@@ -85,7 +87,7 @@ class EditAttachmentsForm(wtforms.Form):
 class EditCollectionForm(wtforms.Form):
     title = wtforms.TextField(
         _('Title'),
-        [wtforms.validators.Length(min=0, max=500), wtforms.validators.Required(message=_("The title can't be empty"))])
+        [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired(message=_("The title can't be empty"))])
     description = wtforms.TextAreaField(
         _('Description of this collection'),
         description=_("""You can use
@@ -93,7 +95,7 @@ class EditCollectionForm(wtforms.Form):
                       Markdown</a> for formatting."""))
     slug = wtforms.TextField(
         _('Slug'),
-        [wtforms.validators.Required(message=_("The slug can't be empty"))],
+        [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
         description=_(
             "The title part of this collection's address. "
             "You usually don't need to change this."))
@@ -102,12 +104,12 @@ class EditCollectionForm(wtforms.Form):
 class ChangePassForm(wtforms.Form):
     old_password = wtforms.PasswordField(
         _('Old password'),
-        [wtforms.validators.Required()],
+        [wtforms.validators.InputRequired()],
         description=_(
             "Enter your old password to prove you own this account."))
     new_password = wtforms.PasswordField(
         _('New password'),
-        [wtforms.validators.Required(),
+        [wtforms.validators.InputRequired(),
          wtforms.validators.Length(min=6, max=30)],
         id="password")
 
@@ -115,10 +117,45 @@ class ChangePassForm(wtforms.Form):
 class ChangeEmailForm(wtforms.Form):
     new_email = wtforms.TextField(
         _('New email address'),
-        [wtforms.validators.Required(),
+        [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
     password = wtforms.PasswordField(
         _('Password'),
-        [wtforms.validators.Required()],
+        [wtforms.validators.InputRequired()],
         description=_(
             "Enter your password to prove you own this account."))
+
+class MetaDataValidator(object):
+    """
+    Custom validator which runs form data in a MetaDataForm through a jsonschema
+    validator and passes errors recieved in jsonschema to wtforms.
+
+    :param  schema              The json schema to validate the data against. By
+                                default this uses the DEFAULT_SCHEMA from
+                                mediagoblin.tools.metadata.
+    :param  format_checker      The FormatChecker object that limits which types
+                                jsonschema can recognize. By default this uses
+                                DEFAULT_CHECKER from mediagoblin.tools.metadata.
+    """
+    def __init__(self, schema=DEFAULT_SCHEMA, format_checker=DEFAULT_CHECKER):
+        self.schema = schema
+        self.format_checker = format_checker
+
+    def __call__(self, form, field):
+        metadata_dict = {field.data:form.value.data}
+        validator = Draft4Validator(self.schema,
+                        format_checker=self.format_checker)
+        errors = [e.message
+            for e in validator.iter_errors(metadata_dict)]
+        if len(errors) >= 1:
+            raise wtforms.validators.ValidationError(
+                errors.pop())
+
+class MetaDataForm(wtforms.Form):
+    identifier = wtforms.TextField(_(u'Identifier'),[MetaDataValidator()])
+    value = wtforms.TextField(_(u'Value'))
+
+class EditMetaDataForm(wtforms.Form):
+    media_metadata = wtforms.FieldList(
+        wtforms.FormField(MetaDataForm, ""),
+    )
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 52f808b6..59d851f6 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -19,8 +19,10 @@ import six
 from datetime import datetime
 
 from itsdangerous import BadSignature
+from pyld import jsonld
 from werkzeug.exceptions import Forbidden
 from werkzeug.utils import secure_filename
+from jsonschema import ValidationError, Draft4Validator
 
 from mediagoblin import messages
 from mediagoblin import mg_globals
@@ -31,8 +33,11 @@ from mediagoblin.edit import forms
 from mediagoblin.edit.lib import may_edit_media
 from mediagoblin.decorators import (require_active_login, active_user_from_url,
                             get_media_entry_by_id, user_may_alter_collection,
-                            get_user_collection)
+                            get_user_collection, user_has_privilege,
+                            user_not_banned)
 from mediagoblin.tools.crypto import get_timed_signer_url
+from mediagoblin.tools.metadata import (compact_and_validate, DEFAULT_CHECKER,
+                                        DEFAULT_SCHEMA)
 from mediagoblin.tools.mail import email_debug_message
 from mediagoblin.tools.response import (render_to_response,
                                         redirect, redirect_obj, render_404)
@@ -434,3 +439,30 @@ def change_email(request):
         'mediagoblin/edit/change_email.html',
         {'form': form,
          'user': user})
+
+@user_has_privilege(u'admin')
+@require_active_login
+@get_media_entry_by_id
+def edit_metadata(request, media):
+    form = forms.EditMetaDataForm(request.form)
+    if request.method == "POST" and form.validate():
+        metadata_dict = dict([(row['identifier'],row['value'])
+                            for row in form.media_metadata.data])
+        json_ld_metadata = None
+        json_ld_metadata = compact_and_validate(metadata_dict)
+        media.media_metadata = json_ld_metadata
+        media.save()
+        return redirect_obj(request, media)      
+
+    if len(form.media_metadata) == 0:
+        for identifier, value in media.media_metadata.iteritems():
+            if identifier == "@context": continue
+            form.media_metadata.append_entry({
+                'identifier':identifier,
+                'value':value})
+
+    return render_to_response(
+        request,
+        'mediagoblin/edit/metadata.html',
+        {'form':form,
+         'media':media})