heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
507 Commits 1 Branch 0 Tags
Commit Graph

390 Commits

Author SHA1 Message Date
Christopher Allan Webber
a01d04a017 Provide a migration to add description_html to MediaEntries that don't have it 2011-06-19 20:42:48 -05:00
Christopher Allan Webber
4bf8e8888c Adds util.cleaned_markdown_conversion() and uses it in the submission process 
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
 2011-06-19 20:41:40 -05:00
Christopher Allan Webber
0692c01e4c Merge remote branch 'remotes/jwandborg/issue_363' 
Conflicts:
	setup.py
 2011-06-19 20:00:35 -05:00
Christopher Allan Webber
0798684894 Merge remote branch 'remotes/cmoylan/test_auth_views_364' 2011-06-19 19:56:25 -05:00
Christopher Allan Webber
eaca78748c Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again. 
Basically, if we don't do this celery sets itself up before it should
and improperly. :\
 2011-06-19 16:43:23 -05:00
Christopher Allan Webber
68bf5b1942 Documenting the setup_globals function. 2011-06-19 16:24:31 -05:00
Christopher Allan Webber
218b8124ca Document our new global objects added during the configobj branch 2011-06-19 16:23:17 -05:00
Christopher Allan Webber
d802498a2c Merge remote branch 'remotes/elrond/idea/globals_check' 
Conflicts:
	mediagoblin/tests/test_globals.py
 2011-06-19 16:22:41 -05:00
Christopher Allan Webber
668e8c26ad Reset the globals parameters while testing parameters 
(This way we can be sure that the database is torn down if necessary
but this was the only test that passed last.)
 2011-06-19 16:03:13 -05:00
Christopher Allan Webber
78e1c5f1ed Actually we need pkg_resources again in test_celery_setup :) 
This got removed in master at the same time that it got used in the
configobj branch...
 2011-06-19 13:00:49 -05:00
Christopher Allan Webber
fa4e6b279b Merge branch 'configobj' 2011-06-19 12:59:19 -05:00
Chris Moylan
12c231c8ac added test coverage for redirecting after login with the next param 2011-06-19 12:28:53 -05:00
Christopher Allan Webber
07f35dad60 Removing a couple of unused imports from util.py 2011-06-19 11:41:48 -05:00
Christopher Allan Webber
a32f17c969 Removing "paste config" phrasing where we're no longer using paste's config 2011-06-19 11:39:35 -05:00
Christopher Allan Webber
3c7d11ff28 renaming storage_system_from_paste_config()->storage_system_from_config() 
As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config.  Thanks Elrond!
 2011-06-19 11:36:52 -05:00
Christopher Allan Webber
0a7805f913 util.read_config_file() no longer needed; removing. 2011-06-19 11:10:45 -05:00
Chris Moylan
0a4cecdc66 Added tests for all sorts of login form abuse. 
Added tests for log out
 2011-06-19 00:22:47 -05:00
Christopher Allan Webber
8abeaf2fb6 Preparing celery unit tests for new setup. 
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
 2011-06-18 20:15:46 -05:00
Christopher Allan Webber
72c3ae046a ./bin/gmg commands upgraded to work with the new setup. 2011-06-18 20:14:51 -05:00
Christopher Allan Webber
623bee73b1 Nosetests should now be able to run using the new configobj / app init setup 
Lots of changes:
 - CELERY_CONFIG_FILE does not need to be set to the from_tests module
   to run tests anymore, in fact it *should not be set at all* and is
   specifically forbidden.
 - moved around the configuration to the new 2-file format
 - and generally adjusting the code appropriately.
 2011-06-18 20:14:33 -05:00
Christopher Allan Webber
908d045939 Only kill the database if it's really set up. 2011-06-18 20:02:59 -05:00
Christopher Allan Webber
becb77ee8c It's a good idea for us to pass the application itself into mg_globals :) 2011-06-18 19:00:01 -05:00
Christopher Allan Webber
924c586b72 Updating celery_setup.from_celery to use new config loading / app init 
- The code for this is significantly simpler now.  The app sets up
   everything but celery, and from_celery finishes the job.
 - There's no more specifying the mediagoblin section in the file,
   which doesn't make sense anymore and was already confusing.
 2011-06-18 18:59:42 -05:00
Christopher Allan Webber
52f20ff337 Removing option to set celery config section. 
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
 2011-06-18 18:31:56 -05:00
Christopher Allan Webber
d01744dd75 Removing type conversions from setup_celery_from_config. 
These simply aren't needed any more, not now that the config validator
stuff does type conversion for us.

Also fixed the docstring to explain force_celery_always_eager.
 2011-06-18 18:30:14 -05:00
Christopher Allan Webber
3f5cf663c0 Move entire app structure over to using the new config system. 
This is a huge change!  This means several things.

 - From the python point of view, launching the application is a heck
   of a lot cleaner.  You just need to pass in the config file path to
   MediaGoblinApp's __init__() and whether or not this funtion should
   setup celery and you're good.
 - There are now two separate config files, separating the server
   setup from the application setup.
   - server.ini: the paste deploy config file, which configures the
     applications and server setup but *NOT* the mediagoblin application
     itself.
   - mediagoblin.ini: where you configure mediagoblin (and possibly celery)
 - Launching the application is now different.  Instead of:
     ./bin/paster serve mediagoblin.ini --reload
   We launch like:
     ./bin/paster serve server.ini --reload
 2011-06-18 17:59:38 -05:00
Christopher Allan Webber
d5234024b0 Tests for mediagoblin.config functions 
Tests for:
  - read_mediagoblin_config()
  - generate_validation_report()
 2011-06-18 16:52:40 -05:00
Christopher Allan Webber
e5aa1ec6b4 CONFIG_SPEC_PATH should be config_spec here, fixing. 2011-06-18 16:51:35 -05:00
Christopher Allan Webber
f2f3fe33e9 Removing unused pkg_resources import from test_celery_setup 2011-06-18 15:29:16 -05:00
Christopher Allan Webber
9dba44de84 Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally! 2011-06-18 15:18:25 -05:00
Christopher Allan Webber
4fd487f72e Validation error reporting functionality. 
Changed a few things so we can report errors to users properly in the
config loading system.

 - We now return from read_mediagoblin_config both a loaded config and
   the validation results
 - We now have a helper function generate_validation_report that can
   generate a proper validation report saying if there are errors in a
   way that's useful to users.
 - Moved conf->config in the read_mediagoblin_config function, which
   looks nicer IMO.
 2011-06-18 15:01:32 -05:00
Christopher Allan Webber
efc8f1a0d0 Let's specifically import string_list()s in the config_spec. 2011-06-18 14:08:58 -05:00
Christopher Allan Webber
c897283849 Merge branch 'master' into configobj 
Conflicts:
	setup.py
 2011-06-18 11:10:46 -05:00
Christopher Allan Webber
d4ff1606c3 Merge remote branch 'remotes/cmoylan/test_auth_views_364' 2011-06-17 08:59:55 -05:00
Chris Moylan
757690cc2e logins are now somewhat tested 2011-06-17 00:15:24 -05:00
cfdv
4cf2287a11 adds link from gallery back to user page 2011-06-16 17:28:46 -05:00
cfdv
850746677f adds link to user gallery in mediagoblin_header_right of user page 2011-06-16 13:00:41 -05:00
cfdv
4b5f5a08d3 user_gallery controller calls render_to_reponse 2011-06-16 13:00:11 -05:00
cfdv
184f2240cb adds routing.py and view.py changes 2011-06-16 12:59:48 -05:00
Caleb Forbes Davis V
d49cf0e29c issue #330 - creates a user gallery template 2011-06-16 12:51:26 -05:00
Christopher Allan Webber
e2c6436e3e Configuration file loading via ConfigObj. 
Uses ConfigObj to open the config file.  Also does validation via the
config spec, so defaults are provided, strings are interpolated, types
are converted.
 2011-06-16 08:21:51 -05:00
Christopher Allan Webber
0fcfff5a3a Basic config "requirements" file. 
Not used yet, but this will be used by ConfigObj to transform values,
set defaults, etc.
 2011-06-15 21:17:55 -05:00
Joar Wandborg
44e51d3464 Made changes according to http://bugs.foocorp.net/issues/363#note-5 2011-06-15 23:07:54 +02:00
Joar Wandborg
9e883ed3b2 Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-06-15 22:18:24 +02:00
Christopher Allan Webber
0e9dd2a286 Merge remote branch 'remotes/elrond/dev/workbench_class' 2011-06-14 17:17:03 -05:00
Elrond
b67a983a02 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.
 2011-06-14 20:39:14 +02:00
Elrond
8bfa533f8b 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.
 2011-06-14 20:01:39 +02:00
Christopher Allan Webber
a68ee5556e A super strict HTML cleaner method with mediocre tests. 2011-06-13 21:01:19 -05:00
Christopher Allan Webber
48a7ba1e1c Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean' 
Conflicts:
	mediagoblin/process_media/__init__.py
 2011-06-12 17:42:26 -05:00
Elrond
52426ae01f Create a Workbench class and use it everywhere. 
Some references to Workbench.dir look ugly, I'm happy to
hear suggestions there.
 2011-06-13 00:39:41 +02:00