encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 05:24:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,844 Commits 18 Branches 132 Tags 105 MiB
f8a0d31d71
Commit Graph

1099 Commits

Author SHA1 Message Date
Tom Christie
76bf8db83a Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-03-13 12:48:27 +00:00
Tom Christie
73ab7dc3f1 Use django-filter 0.6a1 and add database query count tests for paginated, filtered lists. 2013-03-13 12:45:54 +00:00
Tom Christie
a798a5350a Fix duplicated database queries for paginated lists. 
Closes #713.
 2013-03-13 11:42:12 +00:00
Tom Christie
126cadf27e Merge branch 'num-query-checking' of https://github.com/mjtamlyn/django-rest-framework 2013-03-13 11:36:55 +00:00
Tom Christie
0cf94cbd8b Merge pull request #723 from mjumbewu/multitable-inheritance 
Use parent's primary key when model is derived via multitable inheritance
 2013-03-12 13:56:34 -07:00
Tom Christie
377dc2cda2 Only honor X-HTTP-Method-Override for POST requests. 2013-03-12 20:49:20 +00:00
Tom Christie
716d86863f Merge pull request #695 from kuhnza/master 
Support for X-HTTP-Method-Override Header
 2013-03-12 13:40:48 -07:00
Tom Christie
b6b686d285 Merge branch 'master' into basic-nested-serialization 2013-03-12 20:30:14 +00:00
Tom Christie
043d748b53 Tweak 2013-03-12 20:12:28 +00:00
Tom Christie
f513db714d Clean up TokenHasReadWriteScope slightly 2013-03-12 19:07:30 +00:00
Tom Christie
e8db504a98 Merge master 2013-03-12 18:49:38 +00:00
Tom Christie
2f1951910f Descriptive text for NestedValidationError 2013-03-12 18:35:20 +00:00
Tom Christie
d8c5dca9ae Extra tests for nested serializers 2013-03-12 18:34:52 +00:00
Tom Christie
6b4bb48dd4 Initial support for writable nested serialization (Not ModelSerializer) 2013-03-12 13:33:02 +00:00
Dave Kuhn
2e481f3318 Added test for X-HTTP-Method-Override header 2013-03-12 12:00:41 +11:00
Mjumbe Wawatu Ukweli
bd3fe75e1a Further group model inheritance tests 2013-03-11 17:32:32 -04:00
Mjumbe Wawatu Ukweli
354fbc64ba Group the model-inheritance-related tests together 2013-03-11 17:28:55 -04:00
Mjumbe Wawatu Ukweli
bdcecf48e3 Simplify inherited child check to not use isinstance 2013-03-11 16:01:19 -04:00
Mjumbe Wawatu Ukweli
e7e470739f Use parent's primary key when model is derived via multitable inheritance 2013-03-11 03:23:44 -04:00
Bouke Haarsma
126a0f739d Fixed #720 2013-03-10 21:02:34 +01:00
Bouke Haarsma
3cd3235881 Failing test to show problem of #720 2013-03-10 21:01:51 +01:00
Pierre Dulac
eec8efafc3 Add the implementation for TokenHasReadWriteScope permissions w/ oauth 1 2013-03-10 14:40:20 +01:00
Pierre Dulac
e03906a5c4 Add TokenHasReadWriteScope class for permissions based on scopes 2013-03-10 14:08:29 +01:00
Tom Christie
239758e034 Serializers support bulk create. 2013-03-09 10:21:53 +00:00
Tom Christie
69d169f5f6 Neater override hooks and more docs for DjangoModelPermissions. 
Refs #702.
 2013-03-08 23:42:20 +00:00
Tom Christie
fd9d6c664b Fix crazy typo. 2013-03-08 23:08:55 +00:00
Tom Christie
5e993f3929 Merge 2013-03-08 23:00:23 +00:00
Tom Christie
2596c12a21 Fixes for auth header checking. 2013-03-08 22:56:24 +00:00
Tom Christie
28ae26466e Py3k fixes. 2013-03-08 22:43:46 +00:00
Tom Christie
68683b2ea2 Tweak implementation, and use FormSet style errors 2013-03-08 22:19:09 +00:00
Tom Christie
53b58a5059 Merge branch 'master' of https://github.com/bitmonkey/django-rest-framework into list-deserialization 2013-03-08 21:20:52 +00:00
Tom Christie
c5b98f0d10 authtoken abstract if not installed. 
Fixes #705.
 2013-03-08 20:56:30 +00:00
Tom Christie
650d8e6a8e More bits of cleanup 2013-03-08 20:23:25 +00:00
Marc Tamlyn
332c99748f Add some simple numQueries tests. 2013-03-08 17:36:43 +00:00
Marc Tamlyn
a91dca178d Correcy typo. 2013-03-08 17:01:43 +00:00
toran billups
1a8f07def8 GenericAPIView now applies filter_backend for list and retrieve api views 
Before this commit only the MultipleObjectAPIView would apply a
filter_backend, leaving the SingleObjectAPIView to return objects you
might otherwise expect to have been filtered out.

It's worth mentioning that when a SingleObjectAPIView makes a request
for an object that should be excluded, a 404 is the expected result.
 2013-03-08 10:08:53 -06:00
Ian Dash
66605acaf0 Errors during deserializing lists now return a list of tuples with 
index of bad item in data plus usual errors dict
 2013-03-08 15:08:05 +00:00
Tom Christie
a4b33992a5 Merge OAuth2 work. 2013-03-07 17:43:13 +00:00
Tom Christie
1d62594fa9 Clean ups. 2013-03-07 15:44:36 +00:00
Tom Christie
44930f3091 Fix Py3k syntax errors 2013-03-07 09:15:05 +00:00
Tom Christie
4e80541824 Version 2.2.3 2013-03-07 09:05:13 +00:00
Tom Christie
ad336cc636 Fix broken None value for TimeField. 
Refs #707.
 2013-03-07 09:03:53 +00:00
Tom Christie
d4e3610e71 Merge & clean OAuth support 2013-03-07 09:01:53 +00:00
Kevin Stone
2f8d8b499e Patched DateField and DateTimeField to check for None values before trying to perform date(time) conversion. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-06 15:16:37 -08:00
Kevin Stone
6bea275de8 Added failing test cases for giving a DateField or DateTimeField a None value to serialize. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-06 15:15:19 -08:00
Pierre Dulac
8845c0be88 Fix import errors 2013-03-06 22:42:09 +01:00
Pierre Dulac
cda21a306e Only add the django-oauth2-provider apps if the module is installed 
otherwise log a warning
 2013-03-06 19:16:13 +01:00
Tom Christie
cdf7c778d8 Version 2.2.2 2013-03-06 12:29:56 +00:00
Tom Christie
1106596c80 Clean ups to datetime formatting 2013-03-06 12:19:39 +00:00
Tom Christie
c20ebe95f6 Merge datetime formats 2013-03-05 17:50:28 +00:00
Stephan Groß
214e201ff8 Update migration 2013-03-04 17:12:02 +01:00
Stephan Groß
27175c2cf5 Update migration 2013-03-04 17:04:55 +01:00
Stephan Groß
d6391359f5 Fix fix migrate authtoken 2013-03-04 14:04:03 +01:00
Stephan Groß
4cdb6b2959 Fix authtoken migration 2013-03-04 13:53:39 +01:00
Dave Kuhn
104614c600 Modified to allow form overloading to take precedence over header. 2013-03-04 07:14:38 +11:00
Pierre Dulac
c449dd4f4d Properly fail to wrong Authorization token type 2013-03-02 20:17:14 +01:00
Pierre Dulac
8809c46ab5 Add new OAuth2 tests 2013-03-02 20:16:18 +01:00
Dave Kuhn
9dccbcbb38 Support for X-HTTP-Method-Override header 2013-03-03 00:23:32 +11:00
Pierre Dulac
721dc519ec Use django.utils to import the unittest module 
for a cross python versions compatibility
 2013-03-01 23:27:47 +01:00
Stephan Groß
5e5cd6f7f7 Fix for django 1.3 compatibility 2013-03-01 17:15:39 +01:00
Stephan Groß
681ad6f537 Add none testcases to date, datetime, time 2013-03-01 17:04:30 +01:00
Stephan Groß
12905449a5 Add format class attributes 2013-03-01 16:59:47 +01:00
Stephan Groß
9c964cf37b Add new ISO8601 setting + integration 2013-03-01 16:50:18 +01:00
Stephan Groß
a9d36d4726 Add docs update - part 1 2013-03-01 16:50:18 +01:00
Stephan Groß
f208d8d2bb Add drf settings + output format + testcases 2013-03-01 16:50:18 +01:00
Stephan Groß
ef5752f8b5 Fix for python 3 support 2013-03-01 16:48:20 +01:00
Stephan Groß
b2165cc76a Fix for python 3 support - thanks @Linovia 2013-03-01 16:48:20 +01:00
Stephan Groß
9157db5da0 Add better date / datetime validation (pull 2) 
addition to #631 with update to master + timefield support
 2013-03-01 16:48:20 +01:00
Pierre Dulac
d4c2267187 Clean up some print and comments 2013-03-01 12:08:28 +01:00
Pierre Dulac
9d5c306038 Improve the django-oauth2-provider import block 
to avoid naming collision with `oauth2` used for OAuth 1
 2013-03-01 11:53:30 +01:00
Pierre Dulac
aed3c13471 Merge branch 'master' into oauth2-authentication 
Conflicts:
	rest_framework/tests/authentication.py
 2013-03-01 11:50:11 +01:00
Craig de Stigter
84be169353 fix function names and dotted lookups for use in PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already) 2013-03-01 16:13:04 +13:00
Pierre Dulac
da9d7fb8ec Add the OAuth2Authentication class 2013-03-01 02:08:58 +01:00
Pierre Dulac
4e1f77db1a Add django-oauth2-provider to the installed apps 2013-03-01 02:07:53 +01:00
Pierre Dulac
468b5e43e2 Add tests for OAuth2 authentication 2013-03-01 02:06:20 +01:00
Tom Christie
13b3af0d22 Auth is no longer lazy. Closes #667. 
More consistent auth failure behavior.
 2013-02-28 17:58:58 +00:00
Tom Christie
4e14b26fa9 Drop unused import 2013-02-28 13:42:08 +00:00
Tom Christie
183d3ec6a4 Move ModelSerializer field_mapping into an attribute for easier overriding. 2013-02-28 13:41:42 +00:00
Tom Christie
02ee6e5bf0 Fix out of date docstrings. Closes #689. 2013-02-27 22:15:28 +00:00
Tom Christie
a1dbd93f54 assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
swistakm
55ea5b9460 import compat version of unittest 2013-02-27 10:58:13 +01:00
swistakm
a4304458f5 runtest.settings fixed if django-oauth-plus or oauth2 are not installed 
oauth_provider can be added to INSTALLED_APPS only if these packages are installed
 2013-02-26 11:27:06 +01:00
swistakm
d84c2cf275 OAuth tests now are skipped unless django-oauth-plus and oauth2 are installed. 2013-02-26 11:25:27 +01:00
swistakm
59a6f5f463 Move oauth2 and django-oauth-plus imports to compat and fix some minor issues 
- alias oauth2 as oauth
- remove rouge print
- remove docstring markups
- OAuthAuthentication.authenticate() now returns (user, token) two-tuple on success
- don't set request.user because it's already set
 2013-02-26 11:22:21 +01:00
Danilo Bargen
e476dcb8c7 Changed AttributeError to AssertionError 2013-02-26 09:38:57 +01:00
Danilo Bargen
ec4d79bcaf Show class name in exception message 2013-02-25 23:02:42 +01:00
Danilo Bargen
3e6f99e273 Improved exception message for missing serializer model meta option 2013-02-25 22:34:05 +01:00
swistakm
1aed9c1604 add OAuthAuthentication class 2013-02-25 16:58:16 +01:00
swistakm
ced22db7cf add django-oauth-plus & oauth2 to installed apps in runtests settings.py 2013-02-25 16:57:45 +01:00
swistakm
1062d71f8b add tests for OAuth authentication 2013-02-25 16:56:14 +01:00
Omer Katz
c2c12858e5 Replaced status numbers with the statuses constants from the status model. 2013-02-25 16:59:40 +03:00
Omer Katz
62be5470b3 Fixed misspelled remark in comments. 2013-02-25 16:48:21 +03:00
Omer Katz
3221a088ab Fixed misspelled remark in comments. 2013-02-25 16:47:47 +03:00
Omer Katz
c05340c91b Fixed misspelled remarks in comments. 2013-02-25 16:47:07 +03:00
Omer Katz
cc13e95d5e Fixed misspelled remark in comments. 2013-02-25 16:44:44 +03:00
Omer Katz
8d806d0cef Fixed misspelled remark in comments. 2013-02-25 16:44:19 +03:00
Tom Christie
e1f0001f92 Fix and test for #645 
Yuck, pickle is weird.  Closes #645.
 2013-02-22 23:00:07 +00:00
Tom Christie
9f98455362 Formatting 2013-02-22 23:00:07 +00:00
Tom Christie
26ba11101b Merge pull request #669 from yprez/datetimefield_fail 
DateTimeField validation with non-str value
 2013-02-22 14:15:57 -08:00
Tom Christie
bba918fb2a Fix and test case for #653 
Closes #653
 2013-02-22 22:13:06 +00:00
Tom Christie
bc87bf13b4 Tests and fix for #666. 
Closes #666.
 2013-02-22 22:02:42 +00:00
Tom Christie
d44eb20942 Version 2.2.1 2013-02-22 20:47:41 +00:00
Tom Christie
3357a36e37 assert package requirements are met for YAMLRenderer 2013-02-22 20:46:43 +00:00
Tom Christie
0c7d6062b2 Py3/2 compat fixes for uncode view names/descriptions 2013-02-22 20:18:16 +00:00
Tom Christie
09f2bdd219 Added test for utf8 strings in docstrings of views. 2013-02-22 20:17:47 +00:00
Tom Christie
78da724964 Merge with master 2013-02-22 19:48:25 +00:00
Tom Christie
a39de47cc7 XML cleanup 2013-02-22 19:46:47 +00:00
Tom Christie
569c3a28e6 Add forbid_dtd flag, since we don't need any DTDs. 2013-02-22 19:41:09 +00:00
Tom Christie
3ad5ebaea6 Fix name fallback for BrowsableAPIRenderer 2013-02-22 13:38:20 +00:00
Tom Christie
44b59969ce Merge pull request #672 from wronglink/unicode__doc__ 
Fixed UnicodeDecodeError on get_name and get_description methods
 2013-02-22 05:37:15 -08:00
Tom Christie
dcee027fa9 defusedxml for security fix. 
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
 2013-02-22 13:17:22 +00:00
Michael Elovskikh
aa95ccbab7 Fixed UnicodeDecodeError on get_name and get_description methods 2013-02-22 18:50:09 +06:00
Tom Christie
b261515afa XML cleanup 2013-02-22 12:36:52 +00:00
Michael Elovskikh
7b9e134a8f Minimal appearance fixes in addition to #663 2013-02-22 17:49:10 +06:00
Tom Christie
048ef6a039 Polishing touches to #663 2013-02-22 08:39:26 +00:00
Yuri Prezument
5f531fc1ea Catch TypeError as well as ValueError when parsing dates, ref #699 2013-02-21 15:54:31 +02:00
Yuri Prezument
8fa82822a0 Add assertion in test 2013-02-21 15:39:14 +02:00
Yuri Prezument
1b4c078db2 Failing test case for #669 2013-02-21 12:22:09 +02:00
Tom Christie
03afaee423 Merge branch 'browsable_api_patch' of https://github.com/wronglink/django-rest-framework into generic-form-input 2013-02-20 12:18:57 +00:00
Michael Elovskikh
2fb6fa2dd3 Minimal forms appearance improvements 2013-02-20 17:15:12 +06:00
Tom Christie
160d10d348 Fix docstring 2013-02-20 08:46:00 +00:00
Michael Elovskikh
533e472352 Added tabs between object form and generic content form on POST form 2013-02-15 18:25:36 +06:00
Michael Elovskikh
3195f72784 POST form using new form.html template 2013-02-15 16:39:24 +06:00
Michael Elovskikh
d3f6536365 Added tests for PATCH form in the Browsable API 2013-02-15 15:44:11 +06:00
Tom Christie
367909e2c2 Merge pull request #657 from dgaus/master 
Make is_simple_callable consider default arguments
 2013-02-15 01:13:14 -08:00
Tom Christie
6dd867c8fe Merge pull request #660 from pelme/timefield 
Added a serializer TimeField
 2013-02-15 01:12:03 -08:00
Tom Christie
c1a40c5899 Drop unused import. 2013-02-15 09:06:05 +00:00
Michael Elovskikh
8fdf925015 Added tabs between object form and generic content form on PUT/PATCH form 
Some extra behaviour to `BrowsableAPIRenderer` to handle PATCH form.
Added PATCH button on generic content PUT form.
Tabs between object form and generic content form on PUT/PATCH form wich are
both allways visible now.

Fix #570
Refs #591
 2013-02-15 14:41:12 +06:00
Andreas Pelme
5a5df18d18 Added a serializer TimeField 2013-02-14 21:19:51 +01:00
Tom Christie
af686ec11a request.DATA should use empty QueryDict for no data, not None. 2013-02-14 13:02:28 +00:00
Tom Christie
9d3153ed04 Fix broken clone_request 2013-02-14 12:50:55 +00:00
Tom Christie
24ed0fa4b9 Drop accidental (uneeded) validation logic. 2013-02-14 12:26:02 +00:00
Diego Gaustein
40b13a869b Make is_simple_callable consider fields which have default arguments 2013-02-13 20:34:23 -03:00
Tom Christie
f17bae8aac Version 2.2.0 2013-02-13 14:05:57 +00:00
Tom Christie
72412b69f0 Set PASSWORD_HASHERS to massively speed up tests (almost x10) 2013-02-13 12:36:05 +00:00
Tom Christie
b58e763287 Fix pk relations tests which were not running. 2013-02-13 12:33:04 +00:00
Tom Christie
d7417022f3 Kick travis again. 2013-02-13 11:51:03 +00:00
Tom Christie
31f45907e5 Kick travis. Meh. 2013-02-13 11:42:57 +00:00
Tom Christie
018298deb8 Relational fields use same field_to_native logic as regular fields. 
Fixes #637. Closes #638.
 2013-02-12 23:03:04 +00:00
Tom Christie
f341ead499 Test for None in 'dotted.source' component. 
Closes #643.
 2013-02-12 23:01:20 +00:00
Tom Christie
15fa42b647 Unicode literal fix 2013-02-12 23:00:43 +00:00
Tom Christie
f505b2e440 Clean up field_to_native logic 2013-02-12 22:59:01 +00:00
Tom Christie
724906c516 Test for #637. 2013-02-12 22:58:38 +00:00
Tom Christie
7f797abc19 Remove deprecated APIs from tests 2013-02-12 20:07:35 +00:00
Tom Christie
41ac1e8f32 Raise warnings if 'request' not in context for hyperlinked fields. 2013-02-12 13:54:50 +00:00
Tom Christie
388e617366 Raise warnings on implicit many serialization 2013-02-12 13:53:45 +00:00
Tom Christie
23fbbb1e16 Drop six module from coverage. 2013-02-12 08:58:29 +00:00
Tom Christie
f5a0275547 Tidy up internal view permission checking logic. 
Also document correctly - these methods are now public and will fall
under the deprecation policy from now on.
 2013-02-12 08:58:28 +00:00
Tom Christie
09b01887f2 New style object-level permission checks 2013-02-12 08:58:28 +00:00
Tom Christie
aa03425c09 Merge pull request #651 from fernandogrd/master 
DictWithMetadata.__getstate__ was never called (Fix for 645)
 2013-02-11 23:27:35 -08:00
Fernando Rocha
ea004b5e7a Make use o issubclass instead of isinstance (fix issue #645) 
Because __mro__ is a list of classes and not instances.
DictWithMetadata.__getstate__ was never called

Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-02-11 19:18:22 -03:00
Tom Christie
baacdd821f Add object permissions tests. 2013-02-10 20:08:46 +00:00
Tom Christie
870f10486c Fix incorrect 401 vs 403 response, if lazy authentication has not taken place. 2013-02-10 20:08:36 +00:00
Tom Christie
29136ef2c6 Enforce PUT-as-create permissions 2013-02-10 16:50:46 +00:00
Tom Christie
69dcf13da9 Bugfix for DjangoModelPermissions. Fixes #437 
Turns out that Django's default permissions backend always returns
False when checking object-level permissions, even if the user does
have valid global permissions.
 2013-02-10 16:43:52 +00:00
Tom Christie
4c8bd40465 Tests for DjangoModelPermissions. 2013-02-10 16:42:24 +00:00
Tom Christie
670ac25b25 Allow serializers to handle dicts as well as objects. Fixes #447. 2013-02-07 12:57:40 +00:00
Tom Christie
8113d66126 Use new style of required=<bool> not blank or null 2013-02-07 09:24:34 +00:00
Tom Christie
5813a09512 Use new many=True relations style. 2013-02-07 09:14:58 +00:00
Tom Christie
c18fb0d695 Added a post_save hook. Closes #558. 2013-02-06 21:28:03 +00:00
Tom Christie
123c6cbc7c Merge pull request #640 from mjtamlyn/remove-naked-excepts 
Purge naked excepts.
 2013-02-06 05:21:01 -08:00
Marc Tamlyn
11610e7c3c Try the correct NoReverseMatch location. 2013-02-06 13:10:54 +00:00
Marc Tamlyn
bd7977eed7 Purge naked excepts. 
Most of these had obvious exceptions which would be thrown. Some I'm not
sure about but they should at least catch only Exception so as not to
ignore SystemExit and other inappropriate Error classes.
 2013-02-06 13:05:17 +00:00
Tom Christie
55fd646631 Set many explicitly from mixins. Refs #564. 2013-02-06 13:04:11 +00:00
Tom Christie
4788c87b76 Fix mismatch between template blocks and docs. 
Fixes #639.
 2013-02-06 12:35:05 +00:00
Tom Christie
efb798cebc Don't deprecate 'exclude' 
Need to track outcome of Django's #19733, and decide on approach
accordingly.
 2013-02-06 08:48:41 +00:00
Tom Christie
7dc4bce4e2 Fix 2.6 compat 2013-02-04 21:35:47 +00:00
Tom Christie
937ef00808 Merge branch 'master' into 2.2 2013-02-04 21:19:11 +00:00
Tom Christie
221e77d357 Fix incorrect test name. Fixes #635 2013-02-04 21:18:54 +00:00
Tom Christie
0a38bc9db8 Deal with parser encodings properly 2013-02-04 21:16:34 +00:00
Tom Christie
b052c92ac3 Cleanup imports 
Mostly adding `from __future__ import unicode_literals` everywhere.
 2013-02-04 20:55:35 +00:00
Tom Christie
b82227e517 remove broken import 2013-02-04 20:38:18 +00:00
Tom Christie
8e846bdf52 Merge branch 'py3k' into 2.2 
Conflicts:
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_slug.py
 2013-02-04 20:37:09 +00:00
Tom Christie
97f2b99495 Don't use deprecated xml style 2013-02-04 19:51:50 +00:00
Tom Christie
2c634c0e5c Use request.QUERY_PARAMS internally 
(instead of request.GET)
 2013-02-04 19:51:31 +00:00
Tom Christie
00752dcd2a Py3k cleanup 2013-02-01 15:07:51 +00:00
Tom Christie
f4f237e3ee 3.2, 3.3 compat 2013-02-01 14:03:28 +00:00
Tom Christie
d9c7b1c585 Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working 
Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py
 2013-02-01 11:58:55 +00:00
Tom Christie
d9b73e15c8 Serializers take many=<bool> argument. 2013-01-31 17:06:23 +00:00
Tom Christie
f1e665673f Tidying 2013-01-30 20:38:11 +00:00
Tom Christie
e4ac566625 Add dprecation warnings 2013-01-30 20:33:50 +00:00
Tom Christie
e24d29ec05 Tweak empty list implementation 2013-01-30 14:21:18 +00:00
Tom Christie
be6df3ae3c Merge branch 'master' into many-fields 
Conflicts:
	rest_framework/relations.py
 2013-01-30 13:41:56 +00:00
Tom Christie
9a4d01d687 Formatting fixes 2013-01-30 12:41:26 +00:00
Tom Christie
4601487248 Use many=True style for pk relations. 2013-01-30 12:41:18 +00:00
Fernando Rocha
41364b3be0 Added regretion test for issue #632 
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-01-30 09:22:36 -03:00
Fernando Rocha
fceacd830f Fix processing of ManyToManyField when it is empty 
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-01-29 18:46:05 -03:00
Andrea de Marco
85e6360792 Update rest_framework/serializers.py 2013-01-28 22:08:40 +01:00
Tom Christie
a3a06d11cc Ensure model field validation is performed for ModelSerializers with a custom restore_object method. Fixes #623. 2013-01-28 12:56:42 +00:00
Michael Elovskikh
cb5cc70cba Login page styles fix. Closes #618. Made with 🍪 2013-01-28 18:01:44 +06:00
Tom Christie
b5d8f50f9d Merge branch 'master' into many-fields 2013-01-26 21:37:43 +00:00
Tom Christie
a75db4cfb8 Version 2.1.17 2013-01-26 20:59:15 +00:00
Tom Christie
4d43e9f7de Test for custom pagination serializers. Also refs #604. 2013-01-26 20:55:09 +00:00
Tom Christie
a51bca32fd Fix issues with custom pagination serializers 2013-01-26 20:54:41 +00:00
Tom Christie
b41f258ee5 Serializers should accept source='*' argument. Fixes #604. 
(Test also incoming)
 2013-01-26 20:54:03 +00:00
Tom Christie
b783887c33 Test for GFK, using RelatedField. Refs #607. 2013-01-25 14:36:27 +00:00
Tom Christie
b73d7e9bb4 Cleaning up GFK test module. Refs #607. 2013-01-25 13:58:19 +00:00
Tom Christie
d6628d4e78 Test for #552. 2013-01-24 08:58:19 +00:00
Tom Christie
4a4fe60e33 Merge pull request #603 from minddust/validation_error 
Add failed testcase for fieldvalidation + fix
 2013-01-23 01:21:26 -08:00
Tom Christie
b7abf14d3a Pass PaginationSerializer context through to child ModelSerializer on init. Fixes #595. Fixes #552. 2013-01-23 07:38:13 +00:00
Stephan Groß
69e62457ef Improve validate_<fieldname> fix 2013-01-23 07:53:54 +01:00
Stephan Groß
f0071dbccd Add separate test for failed custom validation 2013-01-23 07:52:56 +01:00
Tom Christie
b7ab2aee46 Merge branch 'master' into unauthenticated_response 
Conflicts:
	docs/api-guide/authentication.md
 2013-01-22 09:11:38 +00:00
Tom Christie
65b62d64ec WWW-Authenticate responses 2013-01-21 21:29:49 +00:00
Tom Christie
778b0dddef Merge pull request #602 from kevinastone/master 
TestCase for `format_suffix_patterns`
 2013-01-21 09:51:33 -08:00
Tom Christie
98bffa68e6 Don't do an inverted if test. 2013-01-21 17:42:39 +00:00
Kevin Stone
e7916ae0b1 Tweaked some method names to be more clear and added a docstring to the test case class. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-01-21 09:37:50 -08:00
Stephan Groß
2250ab6418 Add possible solution for field validation error 2013-01-21 12:50:39 +01:00
Stephan Groß
dc1c57d595 Add failed testcase for fieldvalidation 2013-01-21 12:45:30 +01:00
Kevin Stone
71bd2faa79 Added test case for format_suffix_patterns to validate changes introduced with issue #593. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-01-20 13:03:38 -08:00
Tom Christie
771821af7d Include kwargs in included URLs 2013-01-19 18:39:39 +00:00
Tom Christie
69083c3668 Drop print statement 2013-01-19 18:36:25 +00:00
Tom Christie
2c05faa52a format_suffix_patterns now support include-style nested URL patterns. Fixes #593 2013-01-19 16:56:48 +00:00
Tom Christie
37d49429ca Raise assertion errors if @api_view decorator is applied incorrectly. Fixes #596. 2013-01-19 15:51:14 +00:00
Tom Christie
a98049c5de Drop unneeded test 2013-01-19 15:25:32 +00:00
Tom Christie
4eb5861f36 Starting migration from ManyField to Field(many=True) 2013-01-18 23:36:35 +00:00
Tom Christie
211bb89eec Raise Validation Errors when relationships receive incorrect types. Fixes #590. 2013-01-18 21:29:21 +00:00
Tom Christie
6385ac519d Revert accidental merge. 2013-01-18 19:47:57 +00:00
Mark Aaron Shirley
221f7326c7 Use None to delete nested object as opposed to _delete flag 2013-01-16 16:04:20 -08:00
Mark Aaron Shirley
34e14b01e4 Move nested serializer logic into .field_from_native() 2013-01-16 16:04:20 -08:00
Mark Aaron Shirley
2d62bcd5aa Add one-to-one nested update and delete functionality 2013-01-16 16:04:20 -08:00
Mark Aaron Shirley
8e5003a1f6 Update errant test comment 2013-01-16 16:04:20 -08:00
Mark Aaron Shirley
46eea97380 Update one-to-one test names 2013-01-16 16:04:19 -08:00
Mark Aaron Shirley
e66eeb4af8 Remove commented out debug code 2013-01-16 16:04:19 -08:00
Mark Aaron Shirley
72c04d570d Add nested create for 1to1 reverse relationships 2013-01-16 16:04:19 -08:00
Tom Christie
eb3d4d0e93 Drop bits of relations_slug tests which don't mirror existing tests. 2013-01-16 14:32:51 +00:00
Tom Christie
875841c76a Merge branch 'master' of https://github.com/steve-gregory/django-rest-framework into slug-field-fixes 2013-01-16 13:24:09 +00:00
Tom Christie
4a7139e41d Tweaks 2013-01-15 21:49:24 +00:00
Steven Gregory
87029122c2 Added a new file 'relations_slug.py' that tests Nullable Foreign Keys and the SlugRelatedField 2013-01-15 13:49:48 -07:00
Tom Christie
71e55cc4f6 Merge with latest master 2013-01-15 17:53:24 +00:00
Tom Christie
52847a215d Fix implementation 2013-01-15 17:50:51 +00:00
Tom Christie
685706ff2b Merge pull request #584 from radiosilence/master 
Adding timedelta support to JSONEncoder, and an example of how to add decode support to a serializer.
 2013-01-15 05:25:24 -08:00
James Cleveland
4fc3b1ba56 Add timedelta encoder to the JSONEncoder class. 
Whilst this commit adds *encoding* of timedeltas to a string of a floating
point value of the seconds, you must add your own serializer field for
whatever timedelta model field you are using. This is because Django doesn't
support any kind of timedelta field out-of-the-box, so you have to either
implement your own or use django-timedelta.

If this is the case and you want to serialise timedelta input, you will have
to implement your own special field to use for the timedelta, which is not
included in core as it is based on a 3rd party library. Here is an example:

    import datetime
    import timedelta
    from django import forms
    from django.core import validators
    from django.core.exceptions import ValidationError
    from django.utils.translation import ugettext_lazy as _
    from rest_framework.fields import WritableField

    class TimedeltaField(WritableField):
        type_name = 'TimedeltaField'
        form_field_class = forms.FloatField

        default_error_messages = {
            'invalid': _("'%s' value must be in seconds."),
        }

        def from_native(self, value):
            if value in validators.EMPTY_VALUES:
                return None

            try:
                return datetime.timedelta(seconds=float(value))
            except (TypeError, ValueError):
                msg = self.error_messages['invalid'] % value
                raise ValidationError(msg)

Which is based on the FloatField. This field can then be used in
your serializer like this:

    from yourapp.fields import TimedeltaField

    class YourSerializer(serializers.ModelSerializer):
        duration = TimedeltaField()
 2013-01-15 13:08:52 +00:00
Johannes Spielmann
e67b23f1ac correcting template: closing tag was missing 2013-01-15 13:46:41 +01:00
Tom Christie
da6b9576c5 Update docstrings 2013-01-15 10:51:10 +00:00
Tom Christie
191135d7b0 Version 2.1.16 2013-01-14 09:20:44 +00:00
Tom Christie
d9acec3e6d PK fields should only be read-only if they are an AutoField. Fixes #563 2013-01-12 09:43:14 +00:00
Tom Christie
73c4e5c460 auto_now and auto_now_add fields should be read only by default 2013-01-12 09:43:14 +00:00
Juan Riaza
268f60999c unused imports 2013-01-10 15:48:22 +01:00
Mark Aaron Shirley
81691ff900 Merge remote-tracking branch 'upstream/master' into null-one-to-one 2013-01-08 08:33:01 -08:00
Tom Christie
431ced66e4 Merge pull request #566 from mjtamlyn/patch-1 
ObtainAuthToken pluggable Serializer.
 2013-01-08 07:38:18 -08:00
Tom Christie
37a8458687 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-01-08 15:05:34 +00:00
Tom Christie
c1f194b0a5 Fix inconsistent view_name logic. Fixes #567. 2013-01-08 15:03:14 +00:00
Marc Tamlyn
49cd5e59a8 ObtainAuthToken pluggable Serializer. 
It should have serializer_class in the same way as any other API view.
 2013-01-08 12:20:01 +00:00
Mark Aaron Shirley
a897eb5480 Create separate *NullableOneToOneTests TestCase 2013-01-07 16:27:31 -08:00
Xavier Ordoquy
510d6a3c55 Introduced HTTP_HEADER_ENCODING. 2013-01-07 23:26:14 +01:00
Tom Christie
4e8f55887d Clean up test slightly. Refs #552 2013-01-07 21:37:44 +00:00
Tom Christie
4bb504732d Respect blank=True on relational fields. Fixes #537 2013-01-07 21:08:55 +00:00
Tom Christie
36fa722ebb Merged to latest master 2013-01-07 21:04:52 +00:00
Marc Tamlyn
5bded1ecf0 Use ResolveMatch.view_name so namespaces work. 2013-01-07 14:34:45 +00:00
Marc Tamlyn
c736b80290 Be more informative when reporting import errors. 2013-01-07 12:52:20 +00:00
Michael Mior
9b67a33b92 Use the correct static template tag in Django 1.5 2013-01-06 15:49:12 -05:00
Juan Riaza
a061e3d9e2 deprecate simplejson 2013-01-05 13:40:02 +01:00
Mark Aaron Shirley
213981cef3 Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one 2013-01-04 21:11:03 +01:00
Tom Christie
26f9acb45a Validation errors instead of exceptions when serializers receive incorrect types. Fixes #402. 2013-01-04 14:11:05 +00:00
Tom Christie
eb14278a3b Add proper validation for updating relational fields with incorrect types. Fixes #446. 2013-01-04 13:50:40 +00:00
Tom Christie
4c86fd46d7 Rename module for basic relational field tests 2013-01-04 13:05:31 +00:00
Tom Christie
6e9865cb71 Fix for #446. Note: Also needs applying to other relational types. 2013-01-03 23:17:31 +00:00
Tom Christie
ad671022e1 Version 2.1.15 2013-01-03 22:14:11 +00:00
Tom Christie
7ed81c3c66 Tweak comment. 2013-01-03 22:06:55 +00:00
Tom Christie
6da21fa796 Merge pull request #541 from yprez/default_and_partial_serializers2 
Fix "default" values and partial serializers.  Fixes #532.
 2013-01-03 14:05:36 -08:00
Tom Christie
bfea7f64ee Tweak behavior of hyperlinked fields that include an explicit format suffix. 2013-01-03 21:49:29 +00:00
Tom Christie
92ae08207a Drop unused private save_m2m flag 2013-01-03 21:49:01 +00:00
Xavier Ordoquy
06ae47752f Also use the compat module in that file. 2013-01-03 12:49:57 +01:00
Xavier Ordoquy
60250f22c8 Move the various compat things to the compat module. 2013-01-03 11:41:07 +01:00
Xavier Ordoquy
cf51dcc9bb Straight import is enough. 2013-01-03 10:48:43 +01:00
Mark Aaron Shirley
8fd1f09dad Move relation tests models into models.py 2013-01-03 10:23:13 +01:00
Yuri Prezument
3f5e938247 Some cleanup 2013-01-03 08:28:17 +02:00
Yuri Prezument
f2625fc38c FileField validation - handle case when files=None, fixes #542 2013-01-02 22:12:26 +02:00
Yuri Prezument
1c8fccfdcd Regression test for #542 2013-01-02 22:07:23 +02:00
Xavier Ordoquy
4b77b3c5ad Move the urlparse lib compatibility to the compat file. 2013-01-02 19:06:55 +01:00
Xavier Ordoquy
c95fa81cb2 Use new exception style 2013-01-02 19:06:28 +01:00
Xavier Ordoquy
9c7524fc33 Fixed unicode errors. 2013-01-02 19:06:02 +01:00
Xavier Ordoquy
45d48dd52f urlparse not used here. 2013-01-02 18:54:55 +01:00
Tom Christie
6da9cd5429 Add .patch() method for RetrieveUpdateAPIView 2013-01-02 17:43:43 +00:00
Xavier Ordoquy
1e6927b40d Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02 16:17:07 +01:00
Xavier Ordoquy
737349d238 Merge remote-tracking branch 'reference/py3k' into p3k 2013-01-02 16:09:21 +01:00
Yuri Prezument
3873bc8a85 Add explaining comment 2013-01-02 15:57:00 +02:00
Yuri Prezument
6b962cfcf7 Fix "default" and partial serializers, fixes #532 2013-01-02 15:56:46 +02:00
Tom Christie
ef73160599 Added RetrieveUpdateAPIView 2013-01-02 13:46:19 +00:00
Tom Christie
b807f3d52a Keep API backwards compatible. 2013-01-02 13:39:24 +00:00
Tom Christie
eff40391fb Merge branch 'patch-support' of https://github.com/ahankinson/django-rest-framework into patch 2013-01-02 13:27:00 +00:00
Mark Aaron Shirley
44771e81b2 Update HyperlinkedForeignKeyTests to match PKForeignKeyTests 2013-01-01 17:51:39 +01:00
Andrew Hankinson
389ca3b3b1 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into patch-support 2013-01-01 11:36:23 -05:00
Mark Aaron Shirley
a617a3758f Don't persist relation changes in ModelSerializer#restore_object() 2012-12-31 14:33:24 +01:00
Tom Christie
eff833b39d Version 2.1.14 2012-12-31 08:53:49 +00:00
Tom Christie
8fad0a727a Relation fields move into relations.py 2012-12-31 08:53:40 +00:00
Andrew Hankinson
c6f212238c Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into patch-support 2012-12-30 14:03:08 -04:00
Andrew Hankinson
df1880185c Renaming DRFRequestFactory to RequestFactory 
Updated tests to reflect the new name.
 2012-12-30 13:58:08 -04:00
Andrew Hankinson
b9e48e8413 Removing Partial Update classes 
PATCH methods merged into RetrieveUpdateDestroy class
 2012-12-30 13:56:59 -04:00
Tom Christie
33580c82b3 Cleanup runtests/runcoverage 2012-12-30 08:06:11 +00:00
Sebastien Beal
b1e6b58c97 missing rest_framework templatetags for statics in login template 2012-12-30 13:24:05 +09:00
Tom Christie
12c4f1ecf7 Add reverse FK update tests 2012-12-29 18:26:47 +00:00
Tom Christie
18590a1568 Add test for hyperlinked reverse FK create. Refs #511 2012-12-29 18:17:48 +00:00
Tom Christie
0176fab475 Add TODO 2012-12-29 17:12:40 +00:00
Tom Christie
031a656667 Added hyperlinked FK create test 2012-12-29 17:12:07 +00:00
Tom Christie
caaf1c80f5 Support reverse FK creation 2012-12-29 16:51:41 +00:00
Tom Christie
51e2664491 Add FK create tests 2012-12-29 15:51:32 +00:00
Tom Christie
bf69205cd3 Tests for retrieving nullable relations 2012-12-29 13:33:03 +00:00
Tom Christie
809f5de330 Merge pull request #515 from yprez/blank_fields_issue 
Fix for #514
 2012-12-29 05:25:43 -08:00
Tom Christie
923f81d269 Nested serializers now support nullable relationships, plus test. Fixes #384 2012-12-29 13:19:05 +00:00
Tom Christie
250a7231d3 Add tests for nested FKs 2012-12-29 13:10:43 +00:00
Tom Christie
f7a82b6aee Version 2.1.13 2012-12-28 12:45:05 +00:00
Tom Christie
acdb69be52 Include 'static' template tag to enable 1.3 compatible staticfiles behaviour 2012-12-28 12:36:28 +00:00
Tom Christie
3e4242fc43 django.contrib.staticfiles no longer needs to be in INSTALLED_APPS 2012-12-28 12:33:24 +00:00
Tom Christie
eefd5b05fb Use compat import of urlpatterns 2012-12-27 20:20:01 +00:00
Tom Christie
24ed6dcfda Update runtest settings to include staticfiles app. 2012-12-27 17:35:00 +00:00
Roman Akinfold
5ae7786930 Replace get_static_prefix templatetag with static 
so now static files urls in html view are correct if we use cloud
storage to serve static files
 2012-12-27 05:35:03 +08:00
Yuri Prezument
36e1987f59 Regression test for #532 - values overriden by "default" setting 2012-12-25 18:50:00 +02:00
Michal Dvorak
5d7d51ed9d Merge remote-tracking branch 'upstream/master' 2012-12-23 22:05:16 +01:00
Tom Christie
0576241b19 Merge pull request #523 from maspwr/related-required 
RelatedField should respect self.required
 2012-12-23 10:48:35 -08:00
Mark Aaron Shirley
f8a1256b1c Update RelatedField#field_from_native coding style 2012-12-21 11:33:01 -08:00
Michal Dvorak (cen38289)
5ba2437f2d Merge remote-tracking branch 'tom/master' 
Conflicts:
	rest_framework/tests/serializer.py
 2012-12-21 10:53:23 +01:00
Tom Christie
79aea2f0d0 Version 2.1.12 2012-12-21 09:18:35 +00:00
Tom Christie
04119245ec Make nested tests consistent with pk and hyperlink tests 2012-12-21 09:15:28 +00:00
Tom Christie
37acea5240 Fix up test url model now filename has changed 2012-12-21 09:15:08 +00:00
Tom Christie
83feda6a69 Rename relationship tests so they show up together 2012-12-21 09:10:16 +00:00
Tom Christie
98919031db Merge pull request #522 from maspwr/writable-serializers 
Writable Serializers - READ tests
 2012-12-21 01:05:37 -08:00
Mark Hughes
125f027d2d Added setter to the auth property 2012-12-20 23:48:10 +00:00
Andrew Hankinson
e61eab43f4 Adjust PATCH test cases to use the new DRFRequestFactory 2012-12-20 00:28:01 -05:00
Andrew Hankinson
2b5deefe56 Subclass Django's RequestFactory to provide PATCH support 2012-12-20 00:27:29 -05:00
Mark Aaron Shirley
2f5582a1a6 Merge remote-tracking branch 'upstream/master' into related-required 2012-12-19 15:24:22 -08:00
Mark Aaron Shirley
ef475eb9bd Merge remote-tracking branch 'upstream/master' into writable-serializers 2012-12-19 15:21:06 -08:00
Tom Christie
a493c83248 urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability 2012-12-19 23:12:27 +00:00
Tom Christie
46b313315a Merge pull request #510 from joual/master 
Fixes #509
 2012-12-19 14:39:11 -08:00
Mark Aaron Shirley
ae6ca7456f Merge remote-tracking branch 'upstream/master' into writable-serializers 2012-12-19 14:37:44 -08:00
Tom Christie
598ae3286a Fix #521. (Browseable API exception on delete) 2012-12-19 22:05:35 +00:00
Tom Christie
d90d5380d7 pep8 2012-12-19 22:05:00 +00:00
Mark Aaron Shirley
5c680c36e4 Check if RelatedField is required. 2012-12-19 09:26:40 -08:00
Yuri Prezument
c13f132a21 Failing test with partial serializer and foreign keys 2012-12-19 09:24:11 -08:00
Mark Aaron Shirley
c6a6d7ac15 remove all but the 'read' nested serializer tests 2012-12-19 07:33:49 -08:00
Trey Hunner
8a41d4aa54 Fix assertion for nested create test (missing id) 2012-12-19 07:30:19 -08:00
Trey Hunner
2910bfb527 Add two functions for more DRY reverse fk tests 2012-12-19 07:30:19 -08:00
Trey Hunner
cbf3429005 Add test for deleting a reverse fk relation 2012-12-19 07:30:19 -08:00
Trey Hunner
f92c5b28ad Add test for creating a reverse fk relation 2012-12-19 07:30:19 -08:00
Trey Hunner
24e14b7d53 Add tests for retrieving/updating reverse fks 2012-12-19 07:30:18 -08:00
Tom Christie
ab86990ac8 HyperlinkedRealtedField tests. Refs #442. 2012-12-18 19:20:31 +00:00
Tom Christie
6611514134 Whitespace 2012-12-18 19:20:10 +00:00
Tom Christie
6693d2d277 Fix for pks returning as strings when set in pre_save. Fixes #482. Thanks to @n8agrin for the bug report. 2012-12-18 18:21:58 +00:00
Tom Christie
8f23b7f2f9 Version 2.1.11 2012-12-17 22:01:50 +00:00
Tom Christie
aa72f8d63d Fix bug with M2M in browseable API 2012-12-17 21:59:51 +00:00
Michal Dvorak (cen38289)
8ac77eaae8 Merge remote-tracking branch 'tom/master' 
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py
 2012-12-17 17:01:00 +01:00
Yuri Prezument
c68f7ca580 blank=True fields are not required - fixes #514 2012-12-17 16:57:11 +02:00
Yuri Prezument
967f22e7d1 Failing test case for #514 
Serializer errors are: {'title': [u'This field is required.']}
 2012-12-17 16:50:20 +02:00
Yuri Prezument
6f6aeadf5f CharField in model should be null=True according Django docs 
All tests should still pass

Ref #514
 2012-12-17 16:48:03 +02:00
Tom Christie
70714c2346 Version 2.1.10 2012-12-17 09:08:28 +00:00
Andrew Hankinson
18338a37d3 Adding PATCH support to Django REST Framework 2012-12-16 14:49:18 -05:00
Andrew Hankinson
4f96951be9 Add 'patch' http method support to the Django View object 2012-12-16 13:11:59 -05:00
toran billups
008dafce17 ManyPrimaryKeyRelatedField now supports create for one-to-many rel 2012-12-15 20:55:36 -06:00
Joel Marcotte
262d9c2489 Final commit to restore the fix 
Signed-off-by: Joel Marcotte <skaner@gmail.com>
 2012-12-15 16:52:28 -05:00