mediagoblin.git
13 years agoadds routing.py and view.py changes
cfdv [Tue, 7 Jun 2011 05:25:08 +0000 (00:25 -0500)]
adds routing.py and view.py changes

13 years agoissue #330 - creates a user gallery template
Caleb Forbes Davis V [Sat, 4 Jun 2011 01:36:51 +0000 (20:36 -0500)]
issue #330 - creates a user gallery template

13 years agoMerge remote branch 'remotes/elrond/dev/workbench_class'
Christopher Allan Webber [Tue, 14 Jun 2011 22:17:03 +0000 (17:17 -0500)]
Merge remote branch 'remotes/elrond/dev/workbench_class'

13 years agoMove destroy_workbench to Workbench class
Elrond [Tue, 14 Jun 2011 18:39:14 +0000 (20:39 +0200)]
Move destroy_workbench to Workbench class

And add a lot of warnings, as the checks for "being part of
the main Manager" are all gone.

13 years agoDrop WorkbenchManager.localized_file()
Elrond [Tue, 14 Jun 2011 18:01:39 +0000 (20:01 +0200)]
Drop WorkbenchManager.localized_file()

As Workbench has the localized_file() method, use this
everywhere and drop the wrapper method from
WorkbenchManager.

The processing code already did that.

13 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

13 years agoA super strict HTML cleaner method with mediocre tests.
Christopher Allan Webber [Tue, 14 Jun 2011 02:01:19 +0000 (21:01 -0500)]
A super strict HTML cleaner method with mediocre tests.

13 years agoAdds local toc sections
Will Kahn-Greene [Mon, 13 Jun 2011 16:31:23 +0000 (12:31 -0400)]
Adds local toc sections

* Some of our chapters are pretty long and this should make it much
  easier for a user to find what they're looking for and jumping
  to it.  It's easier to read the section toc at the top of the
  chapter, than it is to read it in the sidebar.

13 years agoUpdates version in docs
Will Kahn-Greene [Mon, 13 Jun 2011 16:24:52 +0000 (12:24 -0400)]
Updates version in docs

13 years agoAlready mentioned, but clarifying that branches should be localized to
Christopher Allan Webber [Mon, 13 Jun 2011 14:08:18 +0000 (09:08 -0500)]
Already mentioned, but clarifying that branches should be localized to
a feature/bugfix/issue.

13 years agoTweaks git workflow structure
Will Kahn-Greene [Mon, 13 Jun 2011 02:46:25 +0000 (22:46 -0400)]
Tweaks git workflow structure

* minor tweaking of the headers of the git workflow to break
  things up and organize them a bit better

13 years agoFixes git workflow
Will Kahn-Greene [Mon, 13 Jun 2011 02:42:10 +0000 (22:42 -0400)]
Fixes git workflow

* overhauls the docs so they're (hopefully) clearer on the git
  workflow
* adds text about putting things in bugfix branches, documenting
  your work, and using the issue tracker
* adds a contrived example that uses aliens

13 years agoMerge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
Christopher Allan Webber [Sun, 12 Jun 2011 22:42:26 +0000 (17:42 -0500)]
Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'

Conflicts:
mediagoblin/process_media/__init__.py

13 years agoCreate a Workbench class and use it everywhere.
Elrond [Sun, 12 Jun 2011 22:36:56 +0000 (00:36 +0200)]
Create a Workbench class and use it everywhere.

Some references to Workbench.dir look ugly, I'm happy to
hear suggestions there.

13 years agoensure color mode compatibility when making image thumbnails
cfdv [Sun, 12 Jun 2011 22:35:07 +0000 (17:35 -0500)]
ensure color mode compatibility when making image thumbnails

13 years agoFirst import of mg_globals as mgg, partly because I just wanted it to
Christopher Allan Webber [Sun, 12 Jun 2011 22:28:54 +0000 (17:28 -0500)]
First import of mg_globals as mgg, partly because I just wanted it to
be clear that it's okay to do by doing it *somewhere* :)

13 years agomediagoblin.globals->mediagoblin.mg_globals
Christopher Allan Webber [Sun, 12 Jun 2011 22:27:37 +0000 (17:27 -0500)]
mediagoblin.globals->mediagoblin.mg_globals

13 years agoMerge remote branch 'remotes/elrond/idea/clean_celery_setup'
Christopher Allan Webber [Sun, 12 Jun 2011 14:16:12 +0000 (09:16 -0500)]
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'

Conflicts:
mediagoblin/celery_setup/from_celery.py

13 years agoMerge remote branch 'remotes/elrond/idea/tests_kill_db'
Christopher Allan Webber [Sun, 12 Jun 2011 14:11:39 +0000 (09:11 -0500)]
Merge remote branch 'remotes/elrond/idea/tests_kill_db'

13 years agopossibly_localize_file->localized_file... a bit less terribly long.
Christopher Allan Webber [Sun, 12 Jun 2011 02:23:32 +0000 (21:23 -0500)]
possibly_localize_file->localized_file... a bit less terribly long.

13 years agoSwitch process_media over to using the workbench.
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:39 +0000 (21:20 -0500)]
Switch process_media over to using the workbench.

13 years agoDon't bother returning whether or not we copied it or not, we can
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:26 +0000 (21:20 -0500)]
Don't bother returning whether or not we copied it or not, we can
figure that out by looking to see whether our storage is local or not.

13 years agoMoving workbench out of process_media
Christopher Allan Webber [Sun, 12 Jun 2011 01:33:41 +0000 (20:33 -0500)]
Moving workbench out of process_media

13 years agoMerge branch 'master' into workbench
Christopher Allan Webber [Sun, 12 Jun 2011 00:49:44 +0000 (19:49 -0500)]
Merge branch 'master' into workbench

13 years agoImport mediagoblin.globals as mg_globals so we can be sure things are
Christopher Allan Webber [Sun, 12 Jun 2011 00:48:49 +0000 (19:48 -0500)]
Import mediagoblin.globals as mg_globals so we can be sure things are
set up in the right order.

13 years agoHave the application set up instances of the WorkbenchManager.
Christopher Allan Webber [Sun, 12 Jun 2011 00:47:02 +0000 (19:47 -0500)]
Have the application set up instances of the WorkbenchManager.

13 years agotest WorkbenchManager.possibly_localize_file()
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:51 +0000 (19:18 -0500)]
test WorkbenchManager.possibly_localize_file()

13 years agoWe don't need this extra '.' in making the filename
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:27 +0000 (19:18 -0500)]
We don't need this extra '.' in making the filename

13 years agoAdded a FakeRemoteStorage, for testing purposes
Christopher Allan Webber [Sun, 12 Jun 2011 00:17:44 +0000 (19:17 -0500)]
Added a FakeRemoteStorage, for testing purposes

13 years agoMake sure workbench won't kill directories out of scope.
Christopher Allan Webber [Sat, 11 Jun 2011 23:52:48 +0000 (18:52 -0500)]
Make sure workbench won't kill directories out of scope.

13 years agoTests for creating/destroying workbenches
Christopher Allan Webber [Sat, 11 Jun 2011 23:49:04 +0000 (18:49 -0500)]
Tests for creating/destroying workbenches

13 years agoWrote functions and documentation for all the WorkbenchManager
Christopher Allan Webber [Sat, 11 Jun 2011 22:28:58 +0000 (17:28 -0500)]
Wrote functions and documentation for all the WorkbenchManager
functions but haven't actually tested them yet. :)

13 years agoBase structure of workbench manager
Christopher Allan Webber [Sat, 11 Jun 2011 21:48:39 +0000 (16:48 -0500)]
Base structure of workbench manager

13 years agoAdding a copy_locally() method to the StorageInterface and giving it a test.
Christopher Allan Webber [Sat, 11 Jun 2011 17:04:30 +0000 (12:04 -0500)]
Adding a copy_locally() method to the StorageInterface and giving it a test.

13 years agoAllow storage systems to be local and allow for a get_local_path
Christopher Allan Webber [Sat, 11 Jun 2011 16:18:03 +0000 (11:18 -0500)]
Allow storage systems to be local and allow for a get_local_path
method if applicable.

13 years agoTests: Kill the whole testing database after all tests
Elrond [Fri, 10 Jun 2011 19:59:04 +0000 (21:59 +0200)]
Tests: Kill the whole testing database after all tests

nose allows setup and teardown functions at the package
level. So use this to drop the complete database after all
tests have finished.

13 years agocelery_setup: drop param to setup_self and simplify OUR_MODULENAME
Elrond [Fri, 10 Jun 2011 19:20:18 +0000 (21:20 +0200)]
celery_setup: drop param to setup_self and simplify OUR_MODULENAME

setup_self used to look like this:
setup_self(setup_globals_func=setup_globals)
The function isn't called with any param, so drop it.
Rewrite function as needed.

The module var OUR_MODULENAME just has the module's name in
it. This is available as __name__ anyway, so use this to
initialize the var.

13 years agoRefactor filename generation in the public store
Elrond [Wed, 8 Jun 2011 21:22:11 +0000 (23:22 +0200)]
Refactor filename generation in the public store

Just a small refactoring of the filename setup in the
public store. Very simple.

13 years agoThis attribute in quotes, too. :)
Christopher Allan Webber [Wed, 8 Jun 2011 01:39:51 +0000 (20:39 -0500)]
This attribute in quotes, too. :)

13 years agoXML attributes must be in quotes!
Christopher Allan Webber [Wed, 8 Jun 2011 01:38:05 +0000 (20:38 -0500)]
XML attributes must be in quotes!

13 years agoFixing check_filetype...
Christopher Allan Webber [Tue, 7 Jun 2011 05:36:24 +0000 (00:36 -0500)]
Fixing check_filetype...

We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.

13 years agoAdded a comment to clarify that this shouldn't stay here.
Christopher Allan Webber [Mon, 6 Jun 2011 12:57:05 +0000 (07:57 -0500)]
Added a comment to clarify that this shouldn't stay here.

13 years agoMerge remote branch 'remotes/gandaro/324-bad-media-types'
Christopher Allan Webber [Mon, 6 Jun 2011 12:51:17 +0000 (07:51 -0500)]
Merge remote branch 'remotes/gandaro/324-bad-media-types'

13 years agoA setup_fresh_app decorator which should make writing tests a bit easier.
Christopher Allan Webber [Mon, 6 Jun 2011 12:45:18 +0000 (07:45 -0500)]
A setup_fresh_app decorator which should make writing tests a bit easier.
Setting test_register_views() to use it also.

13 years agoA clear_test_buckets() method
Christopher Allan Webber [Mon, 6 Jun 2011 12:44:12 +0000 (07:44 -0500)]
A clear_test_buckets() method

13 years agoDocstring for test_register_views()
Christopher Allan Webber [Sun, 5 Jun 2011 23:16:31 +0000 (18:16 -0500)]
Docstring for test_register_views()

13 years agoMake sure that two users with the same username can't register.
Christopher Allan Webber [Sun, 5 Jun 2011 23:14:48 +0000 (18:14 -0500)]
Make sure that two users with the same username can't register.

13 years agoEmail verification view test works
Christopher Allan Webber [Sun, 5 Jun 2011 22:49:43 +0000 (17:49 -0500)]
Email verification view test works

13 years agoMake sure we can register, and then that we get the verification email
Christopher Allan Webber [Sun, 5 Jun 2011 22:39:47 +0000 (17:39 -0500)]
Make sure we can register, and then that we get the verification email

13 years agoUse render_template utility so we can test whether or not this email
Christopher Allan Webber [Sun, 5 Jun 2011 22:35:20 +0000 (17:35 -0500)]
Use render_template utility so we can test whether or not this email
sends

13 years agoMoved the verification url generation string template to a global variable
Christopher Allan Webber [Sun, 5 Jun 2011 22:31:18 +0000 (17:31 -0500)]
Moved the verification url generation string template to a global variable

13 years agoMake sure that get_test_app() really does wipe the database
Christopher Allan Webber [Sun, 5 Jun 2011 21:43:25 +0000 (16:43 -0500)]
Make sure that get_test_app() really does wipe the database

13 years agoMade a simple template rendering view and switched a bunch of code over to using it
Christopher Allan Webber [Sun, 5 Jun 2011 20:58:35 +0000 (15:58 -0500)]
Made a simple template rendering view and switched a bunch of code over to using it

13 years agoI have a strong preference for aligning all parameters in a function call.
Christopher Allan Webber [Sun, 5 Jun 2011 20:41:08 +0000 (15:41 -0500)]
I have a strong preference for aligning all parameters in a function call.

13 years agoMerge remote branch 'remotes/elrond/idea/shortcuts'
Christopher Allan Webber [Sun, 5 Jun 2011 20:36:51 +0000 (15:36 -0500)]
Merge remote branch 'remotes/elrond/idea/shortcuts'

13 years agoJust a bit of formatting for these unfinished tests ;)
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:48 +0000 (15:33 -0500)]
Just a bit of formatting for these unfinished tests ;)

13 years agoInstructions for running tests with the modern setup
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:28 +0000 (15:33 -0500)]
Instructions for running tests with the modern setup

13 years agoNew password check error message
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:07 +0000 (15:33 -0500)]
New password check error message

13 years agoTest registration form integrity
Christopher Allan Webber [Sun, 5 Jun 2011 20:30:07 +0000 (15:30 -0500)]
Test registration form integrity

13 years agoThe first bit of the registration tests working. Not fully there, but
Christopher Allan Webber [Sun, 5 Jun 2011 15:34:29 +0000 (10:34 -0500)]
The first bit of the registration tests working.  Not fully there, but
it's clear that the webtest part is working, without having tested the
database yet.  :)

13 years agoActually it's a lot better of an idea to load the full application out
Christopher Allan Webber [Sun, 5 Jun 2011 15:33:59 +0000 (10:33 -0500)]
Actually it's a lot better of an idea to load the full application out
of the paste config file the way paste would than to load components
of it ourselves.

Aside from this being nicer, it's also necessary for the sake of
getting the middleware working nicely.  We could do it ourselves, but
why bother when paste can just do it for us?

13 years agoWe should store the template path, not the template object, as the key
Christopher Allan Webber [Sun, 5 Jun 2011 15:31:29 +0000 (10:31 -0500)]
We should store the template path, not the template object, as the key
in our testing cache

13 years agoCreate redirect shortcut and use it around
Elrond [Sun, 5 Jun 2011 13:49:08 +0000 (15:49 +0200)]
Create redirect shortcut and use it around

This is just replacing exc.HTTPFound(location=request.urlgen(...))
by redirect(request, ...). No magic.

13 years agoReformat render_to_response calls
Elrond [Sun, 5 Jun 2011 14:02:12 +0000 (16:02 +0200)]
Reformat render_to_response calls

Just a simple indentation and ordering change, no
functional change.

13 years agoCreate render_to_reponse and use it everywhere.
Elrond [Sun, 5 Jun 2011 13:25:45 +0000 (15:25 +0200)]
Create render_to_reponse and use it everywhere.

Just a shortcut for Response(render_template(...))

13 years agoFirefox 3.X shows hidden fields for some reason, adding display: none;
Christopher Allan Webber [Sun, 5 Jun 2011 14:14:38 +0000 (09:14 -0500)]
Firefox 3.X shows hidden fields for some reason, adding display: none;
to be rid of them for sure

13 years agoMoving all views over to using util.render_template()!
Christopher Allan Webber [Sat, 4 Jun 2011 22:36:36 +0000 (17:36 -0500)]
Moving all views over to using util.render_template()!

13 years agoCache template environments and gettexts so we don't have to reproduce
Christopher Allan Webber [Sat, 4 Jun 2011 21:44:22 +0000 (16:44 -0500)]
Cache template environments and gettexts so we don't have to reproduce
them on every request.

13 years agoAdded new render_template method which will make our lives nicer and
Christopher Allan Webber [Sat, 4 Jun 2011 21:32:13 +0000 (16:32 -0500)]
Added new render_template method which will make our lives nicer and
also will be useful for unit testing purposes :)

13 years agoProper webtest infrastructure... seems to be about right anyway :)
Christopher Allan Webber [Sat, 4 Jun 2011 18:20:48 +0000 (13:20 -0500)]
Proper webtest infrastructure... seems to be about right anyway :)

13 years agoMount media editing under /u/{username}/m/{media}/edit/
Christopher Allan Webber [Sat, 4 Jun 2011 13:48:51 +0000 (08:48 -0500)]
Mount media editing under /u/{username}/m/{media}/edit/

13 years agoLet's redirect back to the media homepage using the slug instead of the id
Christopher Allan Webber [Sat, 4 Jun 2011 13:48:17 +0000 (08:48 -0500)]
Let's redirect back to the media homepage using the slug instead of the id

13 years agoI shouldn't have removed the .save() entirely :)
Christopher Allan Webber [Sat, 4 Jun 2011 12:41:31 +0000 (07:41 -0500)]
I shouldn't have removed the .save() entirely :)

13 years agoTitle first and foremost... anything else looks weird to me.
Christopher Allan Webber [Fri, 3 Jun 2011 23:47:22 +0000 (18:47 -0500)]
Title first and foremost... anything else looks weird to me.

13 years agoMerge branch 'media_edit'
Christopher Allan Webber [Fri, 3 Jun 2011 23:43:20 +0000 (18:43 -0500)]
Merge branch 'media_edit'

13 years agoFind out if such a slug exists via a query instead of via a .save() call
Christopher Allan Webber [Fri, 3 Jun 2011 23:43:08 +0000 (18:43 -0500)]
Find out if such a slug exists via a query instead of via a .save() call

13 years agoPropagate Exceptions up in Celery-Eager-Mode
Elrond [Fri, 3 Jun 2011 21:54:33 +0000 (23:54 +0200)]
Propagate Exceptions up in Celery-Eager-Mode

When running in celery-eager mode, the celery machinery
hides all exceptions inside "celery tasks" (you can find
out about them on the task handle somehow). Currently much
better to propagate them straight up, so they're visible on
the console.

13 years agoRefactored the sending of verification emails.
Aleksandar Micovic [Fri, 3 Jun 2011 01:07:37 +0000 (21:07 -0400)]
Refactored the sending of verification emails.

13 years agoattribute values should be quoted :)
Christopher Allan Webber [Thu, 2 Jun 2011 21:30:06 +0000 (16:30 -0500)]
attribute values should be quoted :)

13 years agoNo reason for 'verification_successful = bool' here.
Christopher Allan Webber [Thu, 2 Jun 2011 21:04:17 +0000 (16:04 -0500)]
No reason for 'verification_successful = bool' here.

13 years agoAdd GNU headers to new *.py
Elrond [Thu, 2 Jun 2011 16:28:26 +0000 (18:28 +0200)]
Add GNU headers to new *.py

13 years agoadd changes in mediagoblin/submit/views.py
Jakob Kramer [Thu, 2 Jun 2011 15:47:38 +0000 (17:47 +0200)]
add changes in mediagoblin/submit/views.py

13 years agoshould fix #324
Jakob Kramer [Thu, 2 Jun 2011 15:35:20 +0000 (17:35 +0200)]
should fix #324

13 years agoHandle Exceptions from save(); Move may_edit_media
Elrond [Thu, 2 Jun 2011 15:43:54 +0000 (17:43 +0200)]
Handle Exceptions from save(); Move may_edit_media

Turn .save() excpetions into a HTTPConflict. Not nice, but
at least the user gets the error.  Until there is a proper
way to validate things and get nice errors.

Move may_edit_media() to lib.py, as it's not a view.

13 years agoPrepare for moving /edit/ under /u/.../edit/
Elrond [Thu, 2 Jun 2011 14:48:15 +0000 (16:48 +0200)]
Prepare for moving /edit/ under /u/.../edit/

To make moving the whole thing under /u/ easier, prepare to
pass in the {user} needed for that.

13 years agoChange edit form to use divs instead of table
Elrond [Thu, 2 Jun 2011 14:39:47 +0000 (16:39 +0200)]
Change edit form to use divs instead of table

13 years agoNo need for a method for generating the verification key as a method
Christopher Allan Webber [Thu, 2 Jun 2011 14:02:13 +0000 (09:02 -0500)]
No need for a method for generating the verification key as a method
on the class, can just do that in the view

13 years agoElrond put that ObjectId thing in the db.util module and wants us to
Christopher Allan Webber [Thu, 2 Jun 2011 13:47:30 +0000 (08:47 -0500)]
Elrond put that ObjectId thing in the db.util module and wants us to
use that one ;)

13 years agoMerge remote branch 'upstream/master'
Elrond [Thu, 2 Jun 2011 12:33:26 +0000 (14:33 +0200)]
Merge remote branch 'upstream/master'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html

13 years agoCheck for edit permission.
Elrond [Thu, 2 Jun 2011 12:25:31 +0000 (14:25 +0200)]
Check for edit permission.

You need to own the media, or be an admin to use the edit form.
As simple as that, for now.

13 years ago0.0.2 of GNU MediaGoblin!
Christopher Allan Webber [Wed, 1 Jun 2011 00:54:26 +0000 (19:54 -0500)]
0.0.2 of GNU MediaGoblin!

13 years agoIf a user doesn't provide a userid and a token to the verify_email function, might...
Christopher Allan Webber [Wed, 1 Jun 2011 00:37:28 +0000 (19:37 -0500)]
If a user doesn't provide a userid and a token to the verify_email function, might as well 404

13 years agoMoving import to outside of this function
Christopher Allan Webber [Wed, 1 Jun 2011 00:31:23 +0000 (19:31 -0500)]
Moving import to outside of this function

13 years agoJust adjusting some spacing so we don't go over 80 chars
Christopher Allan Webber [Wed, 1 Jun 2011 00:30:05 +0000 (19:30 -0500)]
Just adjusting some spacing so we don't go over 80 chars

13 years agoGive a "proper" view for resending verification email
Christopher Allan Webber [Wed, 1 Jun 2011 00:29:36 +0000 (19:29 -0500)]
Give a "proper" view for resending verification email

13 years agoMerge remote branch 'remotes/aleks/aleks'
Christopher Allan Webber [Wed, 1 Jun 2011 00:17:28 +0000 (19:17 -0500)]
Merge remote branch 'remotes/aleks/aleks'

13 years agoAdded the ability to regenerate a verification key.
Aleksandar Micovic [Tue, 31 May 2011 21:14:23 +0000 (17:14 -0400)]
Added the ability to regenerate a verification key.

13 years agoFixed bug where someone who wasn't logged in was asked to verify
Aleksandar Micovic [Tue, 31 May 2011 19:26:00 +0000 (15:26 -0400)]
Fixed bug where someone who wasn't logged in was asked to verify
their emails.

13 years agoAdded a temporary verification page informing the user they need
Aleksandar Micovic [Tue, 31 May 2011 03:51:30 +0000 (23:51 -0400)]
Added a temporary verification page informing the user they need
to authenticate.

13 years agoAdd an index on MediaEntries making sure slugs + uploader combos are unique
Christopher Allan Webber [Mon, 30 May 2011 23:06:12 +0000 (18:06 -0500)]
Add an index on MediaEntries making sure slugs + uploader combos are unique