encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 13:46:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
637 Commits 18 Branches 132 Tags 104 MiB
ba1e3b4699
Commit Graph

331 Commits

Author SHA1 Message Date
Tom Christie
6e6dc21376 Fix version test. 2011-12-21 00:52:41 +00:00
Marko Tibold
8162303bc7 Merge branch 'alazaro-master' 2011-12-21 01:10:10 +01:00
Marko Tibold
90ddec03b7 Fixes #94 
Modified alazaro's commit sot that both markdown < 2.1 and >= 2.1 are
supported

The test checks if either matches the old or the new style.
 2011-12-21 01:06:24 +01:00
Anthony Nemitz
9f63e8dd1d ADMIN_MEDIA_PREFIX is deprecated in django1.4 2011-12-19 22:09:09 -08:00
alazaro
4a60575132 Fixed test broken by markdown update 
Removed unused code. No longer needed with  markdown 2.1.0.
 2011-12-14 23:36:13 +01:00
Tom Christie
8cabab2703 CSRF for non-dict like .DATA. Fixes #85 2011-12-14 20:19:17 +00:00
Tom Christie
d53f7f45b4 Use 1.4's CSRFMiddleware, so that PUT and DELETE get CSRF validation if session authentication is being used 2011-12-14 20:10:06 +00:00
Tom Christie
050f07e7b1 Ensure that external projects do not need to add 'djangorestframework.tests' to INSTALLED_APPS during testing. 2011-12-14 19:23:48 +00:00
Marco Westerhof
2be350293b fix for unhandled _SkipField exception in Serializer.serialize_model 2011-12-13 11:14:23 +01:00
Tom Christie
cb8931a014 Typo. 2011-12-12 15:33:45 +00:00
Tom Christie
d69581e2af 0.2.4 release. 2011-12-12 12:27:11 +00:00
Tom Christie
5c6adb1cca Drop unused import 2011-12-12 12:09:12 +00:00
Marko Tibold
7b6a6caa96 fix copy-paste typo. 2011-12-12 12:09:10 +01:00
Tom Christie
3a4ca88a6c Add OPTIONS to auto-documenting API 2011-12-11 18:52:55 +00:00
Craig Blaszczyk
e84bf2140c fix merge 2011-12-11 18:30:43 +00:00
Craig Blaszczyk
0632e946f9 add xml parser 2011-12-11 18:27:40 +00:00
Tom Christie
4f42303035 Typo. 2011-12-09 13:39:56 +00:00
Tom Christie
5db422c9d3 Add pagination. Thanks @devioustree! 2011-12-09 13:37:53 +00:00
Tom Christie
42cdd00591 Merge meurig's absolute_url fix. 2011-12-09 12:54:11 +00:00
Tom Christie
325ee1e3a4 Merge pull request #62 from txels/master 
HTTP OPTIONS support
 2011-12-09 04:40:14 -08:00
Tom Christie
20f8956c8f Merge monseiur drummond's pagination niceness 2011-12-09 12:35:42 +00:00
Tom Christie
34a2526fd0 Fix docstring. 2011-12-09 11:27:34 +00:00
Tom Christie
a3f483a6b1 Drop tests that are broken, because the functionality isn't implemented. 
Could be slightly nicer behavior about preserving .POST usability, but
it's not there yet.  These two test check for that but are currently
broken.  Leave them out for now.
 2011-12-09 11:27:34 +00:00
Meurig Freeman
e704705383 whitespace fix 2011-10-31 04:02:40 +00:00
Meurig Freeman
5541f0af44 make use of original prefix when generating absolute urls 2011-10-31 03:58:00 +00:00
Tom Christie
249eb6f931 Make sure to check for "is not None" so that depth=0 gets assigned properly. Thanks thomasst. 2011-09-29 19:47:20 +02:00
Mason Tang
c50637287b Fix in permissions, user.is_staff is a field, not a function. 2011-08-24 07:49:16 -03:00
Tom Christie
0542382489 Merge pull request #57 from ulmus/master 
Fixed documentstring misalign in ModelResource
 2011-08-04 04:42:21 -07:00
Andrew McCloud
968c5e43f3 Removed rogue import for LimitBytes to fix issue #63 2011-07-31 13:21:06 -07:00
Carles Barrobés
3b413dbb40 Added support for OPTIONS method, including a few unit tests 2011-07-30 22:23:53 +02:00
Danilo Bargen
e3c00e4c1e Fixed TypeError that occurs without request data. 
If no request data gets sent, allowed_extra_fields is a set and can't be joined to a tuple using the + operator.
 2011-07-27 18:32:19 +03:00
Tom Christie
746b817ad3 Whitespace tweaks 2011-07-22 04:03:04 -07:00
Tom Christie
524954b246 Whitespace tweak 2011-07-22 04:01:38 -07:00
Tom Christie
b9fcea093c Edited djangorestframework/permissions.py via GitHub 2011-07-19 14:33:02 -07:00
Jens Alm
7dcd2738a5 Fixed misaligned documentation on ModelResource. 
Added basic documentation for nested resources

Signed-off-by: Jens Alm <jens.alm@mac.com>
 2011-07-19 22:09:35 +02:00
Tom Christie
d03bdba54c Merge pull request #53 from ulmus/master 
ModelResource __init__ doesn't handle depth and stack arguments
 2011-07-19 12:46:19 -07:00
Tom Christie
e956d5177e Revert "Added pagination mixin. Need to write tests" 
This reverts commit 1eb2dfcc3a.
 2011-07-19 20:39:20 +01:00
Tom Christie
20a95db60a Revert "Now throws a 404 if page isn't an int" 
This reverts commit ae059c78da.
 2011-07-19 20:39:15 +01:00
Tom Christie
8136a94ebe Revert pagination stuff 
This reverts commit d1af049698.
 2011-07-19 20:38:13 +01:00
Tom Drummond
d1af049698 Added tests for pagination 2011-07-19 18:00:50 +01:00
Tom Drummond
ae059c78da Now throws a 404 if page isn't an int 2011-07-19 17:54:37 +01:00
Tom Drummond
1eb2dfcc3a Added pagination mixin. Need to write tests 2011-07-19 17:06:56 +01:00
Jens Alm
88fa45edc2 Fixed __init__ arguments on ModelResource 
Signed-off-by: Jens Alm <jens.alm@mac.com>
 2011-07-19 00:07:00 +02:00
Tom Drummond
a53101bea9 More tests for overloaded json requests and normal json requests 2011-07-15 17:19:12 +01:00
Tom Drummond
7e2e3cbf6e Added more tests related to request.POST and request.DATA 2011-07-15 16:59:50 +01:00
Tom Drummond
6bbfbf77e2 Added tests to ensure you can access request.POST with UserLoggedInAuthentication 2011-07-15 16:14:35 +01:00
garciasolero
cc7a77c477 Test for serialitation of dictionaries with keys that collide with 
dictionary method names
 2011-07-13 14:12:34 +02:00
Tom Christie
39d9ac9d1b Improve coverage reporting 2011-07-13 12:37:52 +01:00
Tom Christie
4c590df712 typo in test 2011-07-11 20:53:05 +01:00
Tom Christie
d1ed9884d8 Merge pull request #46 from jakul/m2m_create_through 
Update to existing pull request "Support for creating objects with m2m relationsM2m"
 2011-07-11 12:33:52 -07:00
Tom Christie
5433cb3e27 Merge pull request #44 from fzunino/m2m_create 
Support for creating objects with m2m relations
 2011-07-11 12:33:40 -07:00
Craig Blaszczyk
91b9d0b2a3 remove hardcoded model._meta.many_to_many[0]; update mixin tests to test with 0, 1, or multiple groups 2011-07-08 18:14:52 +01:00
Craig Blaszczyk
344db0d733 update mixin to work with m2m data using a through field, by storing the name of the field and manually creating an object in the related table 2011-07-08 18:04:22 +01:00
Craig Blaszczyk
6e6b35b5c0 add unit tests which show m2m creation failing for through table 2011-07-08 17:37:20 +01:00
Fernando Zunino
8a2944acdf Tests for CreateModelMixin (unit and integration test via ListOrCreateModelView). 2011-07-07 23:33:39 -03:00
Sébastien Piquemal
11ee385743 fixed a bug in serializers 2011-07-06 14:18:48 +03:00
Sébastien Piquemal
e53c3cd417 now cleans data from parameters used for overloads 2011-07-06 14:05:57 +03:00
Fernando Zunino
a634d10cbf Support for creating objects with m2m relations 2011-07-05 02:25:39 -03:00
Sébastien Piquemal
3161475562 debugged serializers 2011-07-04 11:31:46 +03:00
Tom Christie
2dc042f0cf Picky. :) 2011-07-02 10:37:51 -07:00
Jens Alm
3e0a978dd9 Fixed YAMLParser = None 2011-07-02 19:19:45 +02:00
Jens Alm
20c7e605c9 Sloppy copy-pasting... 2011-07-02 19:12:43 +02:00
Jens Alm
f73588eb42 parsers.DEFAULT_PARSERS added to be consistent with renderers.DEFAULT_RENDERERS 2011-07-02 19:03:26 +02:00
Fernando Zunino
3b81453fd1 Fix: Crash when yaml isn't installed. 2011-07-02 12:56:57 -03:00
Tom Christie
83b47c4b76 Typo 2011-07-02 04:33:47 -07:00
Tom Christie
f7b7778a79 pull in markos changes, minor tweaks to yaml stuff 2011-07-01 17:44:08 +01:00
Tom Christie
8d51759dd1 Fix bitbucket issue 39. All further issues should be on github 2011-07-01 12:29:42 +01:00
Tom Christie
ca4b7560cb merge 2011-07-01 11:31:04 +01:00
Tom Christie
16d8c3255d Fix #36 2011-07-01 03:30:28 -07:00
Fernando Zunino
60cd5363ab FIX: ModelViews can have Resources whose models have unique fields. 
ReadModelMixin and UpdateModelMixin store model instance as a property. This allows ModelResource to bind the ModelForm using the model instance making the form validate the input data against the model instance and not a brand new instance. When the latter happened and the model used unique fields, the form validation failed whenever a PUT was maintaining the previuos value of the unique field.
 2011-07-01 03:32:04 -03:00
Tom Christie
8bafa01abd Tidy up oauth imports slightly 2011-06-30 08:52:55 +01:00
Tom Christie
93e95bac8d merge from astraw 2011-06-30 08:41:51 +01:00
Andrew Straw
f6e4578656 return 400 BAD REQUEST rather than Django traceback/500 error on failed multipart parse 2011-06-29 23:02:00 +02:00
Tom Christie
e5e019b0b3 Pull in David's initial oauth tests 2011-06-28 08:53:53 +01:00
Tom Christie
d714901a60 Remove erronous traceback 2011-06-27 10:30:00 +01:00
Michael Fötsch
d8bec115ad Allow .json .html .xml style urls and also allow these formats to be specified in a "?format=..." query string. 2011-06-26 16:03:36 +02:00
markotibold
9be3d38aa0 Very basic YAML support. Probably needs some tweaking, and definitely needs tests. 2011-06-26 01:35:38 +02:00
markotibold
7f536c1db3 Very basic YAML support. Probably needs some tweaking, and definitely needs tests. 2011-06-26 01:34:52 +02:00
markotibold
0b18b58c17 On 403's no forms will be displayed anymore 2011-06-26 01:32:27 +02:00
markotibold
43c63c60ce Smaller version in the header 2011-06-25 23:07:06 +02:00
David Larlet
fe7e3ba3ae Adding tests for OAuth authentication through django-oauth-plus, a dedicated example project is still missing though 2011-06-25 18:42:03 +02:00
Tom Christie
d3024ff181 Try to be marginally less awful if we can't reverse resolve the URL for a model. TODO: Give up on even trying to do such black magic in the first place? 2011-06-25 17:13:32 +01:00
Tom Christie
14586916e2 Urg. Fixed bug in assigning headers 2011-06-25 16:13:58 +01:00
Tom Christie
d2b5ea107e Typo in url 2011-06-25 14:58:26 +01:00
Tom Christie
d3557bdcd0 Allow HEAD method 2011-06-25 14:53:48 +01:00
Carles Barrobés
0626b618ad Support for HEAD method 2011-06-25 12:35:17 +02:00
Tom Christie
50efa10652 Add version to html 2011-06-25 10:25:26 +01:00
Tom Christie
82de0cf50a Decimals are a protected_type - let's leave them up to the renderer to deal with 2011-06-21 23:01:41 +01:00
Tom Christie
f02a4e1890 Additional test for JSON 2011-06-15 16:25:59 +01:00
Tom Christie
8b3c807fd4 Version 0.2.3 2011-06-15 14:41:53 +01:00
Tom Christie
1cb84cd4e8 Merge throttling and fix up a coupla things 2011-06-15 14:41:09 +01:00
Tom Christie
7dcb851c7f Allow related models to be fully serialized 2011-06-15 14:09:01 +01:00
Tom Christie
412b5fc2d5 Support for nesting resources etc... 
--HG--
rename : djangorestframework/tests/resources.py => djangorestframework/tests/serializer.py
 2011-06-14 18:22:13 +01:00
Tom Christie
323d52e7c4 Bits of cleaning up for the throttling 2011-06-14 11:08:29 +01:00
Tom Christie
fb26b11a75 Add PerViewThrottling and PerResourceThrottling to __all__ 2011-06-14 10:31:18 +01:00
Tom Christie
612d335c4c Add PerViewThrottling and PerResourceThrottling to __all__ 2011-06-14 10:30:29 +01:00
markotibold
49a2817eb5 deleted pre-Django 1.2 work-around and added a usage string. 2011-06-13 20:55:31 +02:00
markotibold
437a062b6c implemeneted #28 2011-06-13 20:42:37 +02:00
Tom Christie
b07c5108e9 0.2.2 release 2011-06-13 18:15:03 +01:00
markotibold
5a188d8c90 Merge with 10e5aa19eecaec9be297dd8f090eb56c60089a6d 2011-06-12 00:37:24 +02:00
Tom Christie
ebc5a9974d Fix file uploads 2011-06-12 20:23:40 +01:00
markotibold
5be359fb29 * implemented Tom's nice config string for the trotlle rate e.g. '3/sec' 
* We now have per-user, per-view and per-resource throttling

* Added a new exxception class as a convenience to detect pointless throttles

* refactored
 2011-06-11 20:34:54 +02:00
markotibold
f0b3b9d7ea small fix 2011-06-11 20:29:01 +02:00
markotibold
7bed352e97 refactored and added new tests for per-user, per-view, and per-resource htrottling 2011-06-11 20:21:24 +02:00
markotibold
f854bc9065 * fixed test_request_throttling_is_per_user - it didn't make a request for the 2nd user 
* implemented per_resource_throttling  + test

needs refactoring
 2011-06-11 03:16:35 +02:00
markotibold
87db5fbda5 implemented per user throttling 
(commit to permissions.py fixes a bug that came out of the unittest)
 2011-06-11 01:49:22 +02:00
markotibold
8ef333a29f implemented testing of per user throttling 2011-06-11 01:48:10 +02:00
markotibold
63d086ea11 added some throttling tetst. Can't get per-user-throttling testing to work though. :( any help? 2011-06-10 23:53:32 +02:00
markotibold
f708b1a11c made it possible to pass args to runtests to specify the Testcase, or more specifically the mtest_method to run. 2011-06-10 23:52:31 +02:00
Tom Christie
a336f09157 Drop test_fail() 2011-06-10 16:00:22 +01:00
Alen Mujezinovic
06177b8d4b bound_form.cleaned_data already returns the file data if there was any. 
`bound_form.files` returns a `MultiValueDict` which errors when passing
`.CONTENT` into a model constructor.
 2011-06-10 12:36:04 +01:00
Alen Mujezinovic
d034c0fe4f Removed unused imports 2011-06-09 16:27:45 +01:00
Alen Mujezinovic
a848923a39 Returning the dict from parse_qs in FormParser fails on forms. 
Use `QueryDict` instead to return a value that is compatible with forms.
 2011-06-09 16:24:27 +01:00
Alen Mujezinovic
cf637e886b Nested tuples serialisation test 2011-06-08 16:03:01 +01:00
Alen Mujezinovic
253663aee8 Added possibility to specify what attributes of ForeignKeys and OneToOne fields to include via nested tuples 2011-06-08 15:45:04 +01:00
Tom Christie
d38a3ae7cc Update version for 0.2.0 bugfixes 2011-06-07 14:14:13 +01:00
Tom Christie
44dfa05397 Typo. Authenticat<i>on 2011-06-07 14:12:02 +01:00
Tom Christie
bf9ea978bc Updating docs for 0.2 2011-06-02 15:22:14 +01:00
Tom Christie
b50492853f pull in -dev as 0.2.0 2011-06-02 12:58:10 +01:00
Tom Christie
c4d800ef32 proper manifest. setup groks version from __init__ 2011-06-02 12:17:21 +01:00
Tom Christie
fc1640de75 Fix query parameters getting lost 2011-05-31 14:40:30 +01:00
Tom Christie
bb5b0eb80a strip _accept when validating 2011-05-27 16:12:03 +01:00
Tom Christie
e2052f858b Fixes github #17 2011-05-27 16:11:06 +01:00
Tom Christie
21d2dcc294 Allow .form specified on view. Allow get_form, put_form, post_form. Add .PARAMS. 2011-05-27 14:40:19 +01:00
Tom Christie
9e9ae60949 forms/models can be set on the view as well as the resource 2011-05-27 10:35:43 +01:00
Tom Christie
cefc6a25c2 forms/models can be set on the view as well as the resource 2011-05-27 09:58:21 +01:00
Tom Christie
894bf34451 tidy up last bits of renderer media type handling 2011-05-24 16:31:17 +01:00
Tom Christie
ce6e5fdc01 Renderers can now cope with parameterised args. ResponseMixin gets cleaned up & added Renderer.can_handle_response(), mirroring Parsers.can_handle_request() 2011-05-24 13:29:30 +01:00
Tom Christie
eafda85508 Fix up breadcrumbs to only breadcrumb for REST framework Views 2011-05-24 10:40:35 +01:00
Tom Christie
370274f564 Allow views to return HttpResponses. Add initial() hook method 2011-05-24 10:27:24 +01:00
Tom Christie
698df527a3 check in marko's docs 2011-05-23 17:09:29 +01:00
Tom Christie
c531759147 name and description 2011-05-23 17:07:31 +01:00
markotibold
82c4ca9612 The core is now documented from the docstrings in the source. 2011-05-19 19:36:30 +02:00
Tom Christie
e7f8c06dbb Merge in marko's doc markup 2011-05-19 08:49:57 +01:00
Tom Christie
8c3280f9c0 data flattening needs to go into resource 2011-05-19 08:36:55 +01:00
markotibold
92c015e049 Most of the actual work so far has been markup really. 2011-05-18 22:13:48 +02:00
Tom Christie
49d4e50342 Better do this before I forget 2011-05-17 09:46:33 +01:00
Tom Christie
bfbb8ceccf Merge Marko's doc improvements. 2011-05-17 09:15:35 +01:00
Tom Christie
3f6b6e437b Remove validators (logic into resources) 2011-05-17 08:21:35 +01:00
markotibold
40573b2793 Nicely marked up source code. 2011-05-17 01:27:27 +02:00
markotibold
66b9bda9bf All top level modules are included. Ready for diving into the modules and documenting/ enhancing already existing docs. 2011-05-17 00:18:45 +02:00
Tom Christie
3039f6f6c2 validators tests -> resources tests 2011-05-16 16:52:39 +01:00
Tom Christie
1e04790d50 Fixing some of the last blocking issues 2011-05-16 14:11:36 +01:00
Tom Christie
e92002ddde nested resources now working 2011-05-16 09:14:01 +01:00
Tom Christie
47645319c9 Ensure there is always a resource attribute set 2011-05-13 17:46:31 +01:00
Tom Christie
c1b9af8453 Docs on resources 2011-05-13 17:39:52 +01:00
Tom Christie
325e63a3a7 Sorting out resources. Doing some crazy magic automatic url resolving stuff. Yum. 2011-05-13 17:19:12 +01:00
Tom Christie
8f6bcac7f3 cleanup 2011-05-13 09:59:36 +01:00
Tom Christie
44c8b89c60 _perform_form_overloading becomes transparent 2011-05-12 16:03:14 +01:00
Tom Christie
a31a68d6cb yet more API cleanup 2011-05-12 15:14:22 +01:00