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

1697 Commits

Author SHA1 Message Date
Tom Christie
90bc07f3f1 Addeded 'APITestClient.credentials()' 2013-06-29 08:05:08 +01:00
Tom Christie
f585480ee1 Added APIClient 2013-06-28 17:50:30 +01:00
Tom Christie
7224b20d58 Added APIRequestFactory 2013-06-28 17:17:39 +01:00
Tom Christie
05d8a90e94 Merge branch 'master' into writable-nested-modelserializer 2013-06-28 09:36:17 +01:00
Tom Christie
4ee9cdc7af Fix compat datetime import when oauth2 provide does not support timezone aware datetimes 2013-06-28 09:35:52 +01:00
Tom Christie
58d38d694e Merge branch 'master' into writable-nested-modelserializer 2013-06-28 09:07:09 +01:00
Tom Christie
379ad8a824 pending deprecations -> deprecated 2013-06-27 20:36:14 +01:00
Tom Christie
3fcc01273c Remove deprecated code 2013-06-27 20:29:52 +01:00
Tom Christie
7ba2f44a0f Version 2.3.6 2013-06-27 13:00:05 +01:00
Tom Christie
e0dddbc5de Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-27 12:32:46 +01:00
Tom Christie
96f41fd12d Use imported views to expose python 2.6 bug. Refs #943 2013-06-27 11:58:34 +01:00
Tom Christie
7e67ad666b Merge pull request #953 from j4mie/prevent-duplicate-routing 
Prevent dynamically routing to a method that is already routed to.
 2013-06-26 15:37:42 -07:00
Jamie Matthews
c127e63c32 Raise exception when attempting to dynamically route to a method that is already routed to. Fixes #940 2013-06-26 23:00:42 +01:00
Tom Christie
91b9fcb0ba Minor test cleanup 2013-06-26 22:43:17 +01:00
Tom Christie
35e4d1cf9c Merge pull request #943 from trwired/utf8safedocs 
Make browsable API views play nice with utf-8
 2013-06-26 14:41:07 -07:00
Tom Christie
69e5e3cc0d Use timezone aware datetimes with oauth2 provider, when supported. Closes #947. 2013-06-26 21:18:13 +01:00
Igor Kalat
c8b0e6c40f Refactored get_view_description, moved appropriate tests to test_description.py 2013-06-26 22:12:02 +02:00
Tom Christie
715bd47dfa Use AUTH_USER_MODEL consistently between various Django versions. Closes #946 2013-06-26 17:56:42 +01:00
Igor Kalat
2bf5f63050 Make browsable API views play nice with utf-8 2013-06-22 19:21:28 +02:00
Tom Christie
8cc63b09f6 Add support for StreamingHttpResponse. Closes #939 2013-06-21 22:42:04 +01:00
Tom Christie
8b0d4115c6 Merge pull request #941 from FreakyDug/master 
Fixed a couple of small problems I found when using the action decorator.
 2013-06-21 14:23:40 -07:00
Tom Christie
209b65f426 Update assertion error to reference 'base_name' argument, not incorrect 'name' argument. Closes #933 2013-06-21 22:13:25 +01:00
Tom Christie
3d4bb4b553 Ensure action kwargs properly handdled. Refs #940. 2013-06-21 22:03:07 +01:00
Philip Douglas
fa9f5fb8dc Allow uppercase methods in action decorator. 
Previously, using uppercase for the method argument would silently fail
to route those methods.
 2013-06-21 16:28:17 +01:00
Tom Christie
6d2ca75d8e Don't raise AttributeError on views with no model or queryset, when using DjangoModelPermissions 2013-06-18 11:10:56 +01:00
Tom Christie
4ad1094968 HyperlinkedModelSerializer supports overriding of 'url' field. Closes #936 2013-06-17 15:09:36 +01:00
Tom Christie
52298480c2 Clean up 2013-06-14 15:39:56 +01:00
Tom Christie
df957c8625 Fix and tests for ScopedRateThrottle. Closes #935 2013-06-14 14:18:40 +01:00
Tom Christie
614d8fec3c Merge pull request #929 from mhsparks/positive-integer-field 
Added test for custom fields with min_value and max_value validators
 2013-06-12 12:39:57 -07:00
Tom Christie
c4ab77b9e9 Merge pull request #926 from davesque/master 
I was having problems with a custom field that used a min_value validator...
 2013-06-12 12:38:35 -07:00
inglesp
b1847412b5 Typo 2013-06-12 20:00:33 +02:00
Mark Hughes
82c515c19c Added test for custom fields with min_value and max_value validators 2013-06-12 17:36:16 +01:00
David Sanders
fcaca73709 Pep8 lint 2013-06-11 16:10:25 -06:00
David Sanders
656897c2da Update ModelField to work with a broader range of fields 
Add support for fields that use min and max value validators.
 2013-06-11 16:09:32 -06:00
Ethan Fremen
d89aade343 Allow the default router to have a custom name. 
Signed-off-by: Ethan Fremen <ethan@matterport.com>
 2013-06-07 19:49:18 -07:00
Ethan Fremen
ae2887ffc4 Set the args and kwargs before initializing the request. 
Allows get_parser_context to function correctly.

Signed-off-by: Ethan Fremen <ethan@matterport.com>
 2013-06-07 19:25:39 -07:00
Tom Christie
db8d61196a Merge pull request #915 from aburgel/fix-oauth-bad-consumer-key 
Fix serialization exception caused by non-existent consumer
 2013-06-06 00:58:54 -07:00
Tom Christie
40e09472d8 Never deepcopy validators. Closes #913 2013-06-06 08:56:39 +01:00
Alex Burgel
ecb8a460c9 Fix serialization exception when using non-existent consumer 2013-06-05 17:02:44 -04:00
Tom Christie
f8a0d31d71 Remove ConfigurationError in favor of Django's ImproperlyConfigured 2013-06-05 13:45:28 +01:00
Tom Christie
de00ec95c3 Merge master 2013-06-05 13:33:19 +01:00
Tom Christie
2ca243a114 Fix up tests and tox 2013-06-05 13:20:06 +01:00
Tom Christie
f1251e8c58 Added trailing_slash argument to routers. Closes #905 2013-06-04 20:59:12 +01:00
Tom Christie
c160e49321 Test cases and fix for plain-list relationships (ie not queryset) Closes #878. 2013-06-04 14:05:35 +01:00
Tom Christie
478f6ff94a Regression test for #840. Closes #840. 2013-06-03 21:21:47 +01:00
Tom Christie
87b8cb8524 Merge pull request #904 from menghan/fix-doc-typo 
fix doc typo
 2013-06-03 08:04:32 -07:00
Tom Christie
28c2c46a03 Version 2.3.5 2013-06-03 12:34:18 +01:00
Tom Christie
6e0567c271 request.user should be still be accessible in renderer context if authentication fails 2013-06-03 12:32:57 +01:00
Tom Christie
62e59f8277 Merge pull request #900 from copitux/fix-validation-layer 
Bugfix: Fix run validation layer with invalid data
 2013-06-03 00:49:02 -07:00
Tom Christie
1bb5fb8e4a Merge pull request #895 from linovia/django1.6a1 
Added Django 1.6a1 to the test matrix.
 2013-06-02 13:11:49 -07:00
Tom Christie
a3796f430b Only use test import munging prior to Django 1.6's new test runner 2013-06-02 21:04:47 +01:00
Tom Christie
27d8b848bc Add notes on 'method' argument to '@action' decorator 2013-06-02 20:40:56 +01:00
Tom Christie
b15a6ccef2 Serializer field 'default' argument may be a callable 2013-06-02 20:12:49 +01:00
Tom Christie
01e80ff9f7 Merge branch 'master' of https://github.com/woakas/django-rest-framework 2013-06-02 20:05:37 +01:00
Tom Christie
372ad01b74 Test cleanup 2013-06-02 19:56:15 +01:00
Tom Christie
8b73dce51d view_name argument to HyperlinkedModelSerializer is now properly enforced. Closes #471 2013-06-02 19:50:24 +01:00
Menghan
b8aec1277c fix doc typo 2013-06-02 12:12:14 +08:00
Tom Christie
d7753123f6 HyperlinkedModelSerializer lookup_field option should apply to HyperlinkedIdentityField 2013-05-31 11:50:37 +01:00
Tom Christie
c36ff4e052 Cleaning up imports and whitespace 2013-05-31 11:17:33 +01:00
Tom Christie
fdf9a26740 Remove unused test helper module 2013-05-31 11:14:37 +01:00
David Medina
c176af35e5 Improve avoid validation test: #900 2013-05-30 09:07:30 +02:00
Gustavo Andrés Angulo
de1cc5f8c1 Fix default field when is a simple callable function. 2013-05-29 11:45:54 -05:00
Tom Christie
c98ac3e83e Added get_url hook to HyperlinkedIdentityField in line with HyperlinedRelatedField. Closes #883 2013-05-29 14:09:31 +01:00
David Medina
d11b55648c Bugfix: Fix run validation layer with invalid data 2013-05-29 12:55:42 +02:00
Xavier Ordoquy
732269160f Use absolute name imports for tests if django version is 1.6+. 2013-05-29 10:18:38 +02:00
Tom Christie
85fe7197bf Change test urls to match 1.6 test module name style 2013-05-29 09:00:30 +01:00
Tom Christie
cb49c5d3c0 Rename test modules to 1.6 style 2013-05-29 08:57:11 +01:00
Stephan Groß
f6d7f54fc1 Merge pull request #897 from pborreli/typos 
Fixed typos
 2013-05-28 07:39:56 -07:00
Pascal Borreli
8f35ac4f93 Fixed typos 2013-05-28 15:09:23 +01:00
Tom Christie
22e1950e1c Backwards compatible approach to HyperlinkedIdentityField URLs. Closes #892 2013-05-28 12:08:36 +01:00
Tom Christie
138f0cacdb Raise 404 on incorrect lookup type in URL, not 500. Closes #890. 2013-05-28 11:57:11 +01:00
Tom Christie
2a38aa7291 Version 2.3.4 2013-05-24 23:55:59 +01:00
Tom Christie
fcaee6e580 Clean up OPTIONS implementation 2013-05-24 23:44:23 +01:00
Alex Burgel
112b52f57e Allow action decorator to handle multiple http methods 2013-05-24 18:28:47 -04:00
Tom Christie
760e8642bd Merge branch 'issue-192-expose-fields-for-options' of https://github.com/grimborg/django-rest-framework into improved-options-support 2013-05-24 21:21:56 +01:00
Oscar Vilaplana
a1deb5eac7 simplified, moved field humanizing to Field. broken tests 2013-05-23 08:26:55 +02:00
Tom Christie
7a93fdbe0a Last bits of charset sorting-out-ness 2013-05-22 16:46:15 +01:00
Tom Christie
17699056af Use assertEqual, not assertEquals 2013-05-22 16:45:56 +01:00
Tom Christie
0c2b534d95 Minor cleanup 2013-05-22 09:29:43 +01:00
Tom Christie
06b28f66ed Tweak method ordering for better consistency 2013-05-22 09:07:12 +01:00
Tom Christie
cdc3c37465 Merge and styling fixes 2013-05-21 12:01:56 +01:00
Tom Christie
aef7ac72cc content type may be set explicitly on the response 2013-05-20 21:18:17 +01:00
Tom Christie
f19e0d544f Fix charset issues 2013-05-20 21:00:56 +01:00
David Jones
c3fd7c6685 Updated SlugField to raise validation errors for invalid slugs 2013-05-20 13:04:38 +01:00
Oscar Vilaplana
dea0b6ab7f removed TODO 2013-05-19 15:48:16 +02:00
Oscar Vilaplana
259153b3f9 removed TODO 2013-05-19 15:47:50 +02:00
Oscar Vilaplana
9133ef77ab removed TODO 2013-05-19 15:47:23 +02:00
Oscar Vilaplana
7a5cd090aa fixed tests, added docs, renamed helper method 2013-05-19 15:45:33 +02:00
Oscar Vilaplana
6bbedfd7ae fixed merge conflict 2013-05-19 15:18:40 +02:00
Nikolaus Schlemm
31893cff74 * make test assertion more explicit 
* cleanup
 2013-05-19 15:12:01 +02:00
Oscar Vilaplana
e80488b619 Added min_length and max_length 2013-05-19 15:08:41 +02:00
Oscar Vilaplana
edbf65c06e Removed unused imports 2013-05-19 15:06:24 +02:00
Oscar Vilaplana
696c053f4f s/Single Character/String/ 2013-05-19 15:04:43 +02:00
Nikolaus Schlemm
88c94f3720 Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options 2013-05-19 14:58:11 +02:00
Oscar Vilaplana
f1f5f92d89 Added tests, cleaned up imports 2013-05-19 14:55:46 +02:00
Nikolaus Schlemm
efca5f6fec use double quotes for docstring instead of single quotes 2013-05-19 14:54:16 +02:00
Nikolaus Schlemm
b07cfdcf54 FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate 2013-05-19 13:54:13 +02:00
Nikolaus Schlemm
5473f60192 Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options 2013-05-19 13:46:17 +02:00
Nikolaus Schlemm
1154c12b33 don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate 2013-05-19 11:37:12 +02:00
Nikolaus Schlemm
a91841f7fe WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no attribute 'get_serializer'" 2013-05-19 11:29:41 +02:00
Oscar Vilaplana
08e9e2042c Disabled label and help_text in unit test. We should change the test so 
that it sets them up.
 2013-05-19 11:26:56 +02:00
Oscar Vilaplana
b915c1d4d8 Made field label optional in OPTIONS 2013-05-19 11:15:38 +02:00
Nikolaus Schlemm
c0f3a1c397 Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :) 2013-05-19 09:25:02 +02:00
Nikolaus Schlemm
9454e23aa9 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options 2013-05-19 09:02:07 +02:00
Tom Christie
7c945b43f0 Only use object permissions in browsable api form generation if an object exists 2013-05-18 23:52:02 +01:00
Tom Christie
4802177766 Enforce object permissions check when rendering forms in browseable API 2013-05-18 21:19:53 +01:00
Tom Christie
4631b91e14 Fix broken 'binary content' in browseable API 2013-05-18 21:12:44 +01:00
Nikolaus Schlemm
843ae60237 Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options 
Conflicts:
	rest_framework/tests/fields.py
 2013-05-18 18:34:21 +02:00
Nikolaus Schlemm
7f1cc82f96 added unittests for permission check of exposing actions via OPTIONS 2013-05-18 18:29:51 +02:00
Oscar Vilaplana
fecadacab1 added tests for form 2013-05-18 18:27:53 +02:00
Tom Christie
d4721fc1f7 Correct charset on UnicodeJSONRenderer 2013-05-18 17:25:38 +01:00
Tom Christie
bac4bf6e95 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-18 17:22:27 +01:00
Tom Christie
0d3d66cb02 Added proper charset support 2013-05-18 17:21:43 +01:00
Oscar Vilaplana
4dffcb5d77 Added humanized field names and types 2013-05-18 18:10:17 +02:00
Tom Christie
1888f4a1f0 Merge pull request #865 from ryankask/issue-747-lazy-strings-serialized 
Issue 747 lazy strings serialized
 2013-05-18 09:05:42 -07:00
Ryan Kaskel
579f77ceaa Move function to compat. 2013-05-18 17:04:17 +01:00
Tom Christie
6d5cf527c3 Merge pull request #864 from minddust/fix_missing_min_values 
Fix missing min values
 2013-05-18 08:56:24 -07:00
Nikolaus Schlemm
5ab7cc6e6b HEAD and OPTIONS should not be exposed as actions as discussed in a42afa04c3 (commitcomment-3241476) 2013-05-18 17:38:47 +02:00
Markus Törnqvist
99848b0321 Drop another case of u'', this time from #530 code 2013-05-18 18:38:37 +03:00
Markus Törnqvist
1fd66fe8c6 Drop u'', it was used inconsistently and breaks for nothing with Python 3.2 2013-05-18 18:27:36 +03:00
Ryan Kaskel
33f702d306 Merge latest changes from master. 2013-05-18 16:26:17 +01:00
Ryan Kaskel
10e451a85a Handle Python 3 strings and lazy strings. 2013-05-18 16:21:18 +01:00
Stephan Groß
025c40e7d5 Fix order for applying min_value to fields 2013-05-18 17:16:29 +02:00
Nikolaus Schlemm
b225b1d5c9 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options 2013-05-18 17:13:59 +02:00
Markus Törnqvist
48c1b2233b Merge branch 'master' into mjtorn-master 
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py

Fixed conflicts
 2013-05-18 18:13:31 +03:00
Nikolaus Schlemm
a42afa04c3 draft for fields' metadata via OPTIONS - needs review and decision 2013-05-18 17:13:23 +02:00
Nikolaus Schlemm
b4dbfa9832 only catch relevant exceptions ;) 2013-05-18 17:10:13 +02:00
Pablo Recio
b9b2297612 Tests proper encoding in JSONRenderer and UnicodeJSONRenderer 2013-05-18 17:06:54 +02:00
Pablo Recio
6dbbbc16da Better checking if the content can be printable in the BrowsableAPI 2013-05-18 17:06:54 +02:00
Pablo Recio
97f034e3d6 Adds UnicodeJSONRenderer which doesn't ensure ascii 2013-05-18 17:06:54 +02:00
Pablo Recio
c69f960066 Adding a class attribute into JSONRenderer for ensuring ascii, and using it consistently 2013-05-18 17:06:54 +02:00
Stephan Groß
0c81d04170 Add min_value=0 to autogenerated Pos..IntFields 2013-05-18 17:04:20 +02:00
Karol Majta
5bebd29f11 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2013-05-18 16:56:38 +02:00
Karol Majta
ebe959b52a charset param gets now appended to response's Content-Type. Closes #807 2013-05-18 16:45:05 +02:00
Markus Törnqvist
2795e842d6 Two test cases for html rendering of API with labelized model 2013-05-18 17:44:40 +03:00
Markus Törnqvist
e68ea16d7a Update FieldLabelTest to use new BasicModel.verbose_name 2013-05-18 17:43:47 +03:00
Markus Törnqvist
e2a5ec0350 Change BasicModel.verbose_name 
Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
 2013-05-18 17:42:56 +03:00
Tom Christie
3f47eb7a77 Merge pull request #861 from minddust/fix_missing_field_values 
Remove default values - django sets them for us - cause of #710
 2013-05-18 07:32:50 -07:00
Stephan Groß
6714b755f4 Fix missing para.. 2013-05-18 16:32:31 +02:00
Stephan Groß
aeea32030b Add newline 2013-05-18 16:27:11 +02:00
Tom Christie
5f8d353f0b Rename has_user_through_model -> has_through_model 2013-05-18 15:25:49 +01:00
Stephan Groß
9f9cb97d65 Add TestCases for default field values 2013-05-18 16:24:54 +02:00
Tom Christie
e1a3cab400 Merge pull request #854 from ryankask/issue-775 
All relations pointing to ManyToManyFields should default to read-only
 2013-05-18 07:22:22 -07:00
Nikolaus Schlemm
f8c1481d4b expose the fields metadata via OPTIONS as described in https://github.com/tomchristie/django-rest-framework/issues/192 
missing:
 - get fields for method (currently all the same)
 - tests
 - right placement of code
 2013-05-18 16:21:25 +02:00
Tom Christie
cc39b9c925 Merge pull request #858 from minddust/fix_710 
Fix for #710
 2013-05-18 07:19:52 -07:00
Tom Christie
e32a6e4211 Merge pull request #860 from andymckay/master 
startswith can take a tuple
 2013-05-18 07:17:13 -07:00
Pablo Recio
7dca0e6859 Removed unicode literals 2013-05-18 16:12:48 +02:00
Pablo Recio
50ba26822d Merge branch 'master' into 675-empty-label-related-field 2013-05-18 16:11:06 +02:00
Andy McKay
aeba5bed05 startswith can take a tuple 2013-05-18 07:09:24 -07:00
Stephan Groß
b7176065a9 Update getattr 2013-05-18 16:06:30 +02:00
Tom Christie
ea9a3d88bc Merge pull request #859 from craigds/master 
fix for #765
 2013-05-18 07:06:21 -07:00
Markus Törnqvist
e2d3aa65d7 Move and rename LabelModelSerializer for further reuse 2013-05-18 16:56:26 +03:00
Tom Christie
80a2600891 Styling tweaks 2013-05-18 14:55:48 +01:00
Markus Törnqvist
e7ddaf5472 Turns out label and help_text are not always there 2013-05-18 16:50:59 +03:00
Stephan Groß
eb9fdd04fc Remove unused var 2013-05-18 15:50:12 +02:00
Stephan Groß
e6409bbc83 Temp commit for branch change ;-) 2013-05-18 15:48:36 +02:00
Ryan Kaskel
ef383d969c Clean up test case. 2013-05-18 14:31:29 +01:00
Craig de Stigter
208bd991da when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765 2013-05-18 15:23:43 +02:00
Ryan Kaskel
22874e441d Merge latest changes from master. 2013-05-18 14:17:50 +01:00
Stephan Groß
a71acc76d8 Fix for #710 2013-05-18 15:12:54 +02:00
Ryan Kaskel
0b84c5a0ac Merge latest changes from master. 2013-05-18 14:04:27 +01:00
Pablo Recio
392c8556ae Display an empty label into related fields if it isn't required 2013-05-18 15:01:58 +02:00
Markus Törnqvist
1343398868 Renderer uses form field's label and help, not attribute name 2013-05-18 15:15:02 +03:00
Mark McArdle
50a8f114fc Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2013-05-18 13:12:30 +01:00
Ryan Kaskel
770ed3de2e ToMany fields default to read-only if targeting ManyToManyField. 2013-05-18 13:11:40 +01:00
Mark McArdle
611919aa0a Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775 2013-05-18 13:10:05 +01:00
Tom Christie
6d425aa3be Merge pull request #831 from brianz/master 
Allow nested fields to be missing
 2013-05-18 04:36:00 -07:00
Pablo Recio
8fe43236a2 Moved test model into closer to the testcase 2013-05-18 13:23:38 +02:00
Pablo Recio
53a8004401 Merge branch 'master' into 725-blank-choice-dash 
Conflicts:
	rest_framework/tests/fields.py
 2013-05-18 12:51:40 +02:00
Pablo Recio
ab8bd566f9 Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required 2013-05-18 12:41:52 +02:00
Tom Christie
2a3056d038 Merge pull request #851 from linovia/master 
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
 2013-05-18 03:40:38 -07:00
Pablo Recio
de5cc8de42 A model's field is required if is null or blank 2013-05-18 12:40:25 +02:00
Tom Christie
9fe6a103ec Merge pull request #694 from craigds/master 
fix function names and dotted lookups for use in PrimaryKeyRelatedField
 2013-05-18 03:38:36 -07:00
Craig de Stigter
c992b600f7 add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 2013-05-18 12:32:48 +02:00
Markus Törnqvist
764299843c ManyHyperlinkedRelatedField comes form rest_framework.relations now 2013-05-18 13:30:39 +03:00
Tom Christie
a73c16b85f serializers.Field respects ordering on dicts if it exists. Closes #832 2013-05-18 11:27:48 +01:00
Markus Törnqvist
3691cd2ffd Use smart_text() instead of nonexistant smart_unicode() 2013-05-18 13:26:59 +03:00
Markus Törnqvist
85faebbb75 Merge branch 'mikee2185-master' into mjtorn-master 
Conflicts:
	rest_framework/fields.py
	rest_framework/serializers.py
	rest_framework/tests/models.py
	rest_framework/tests/serializer.py

Fixed all the conflicts.
 2013-05-18 13:24:36 +03:00
Craig de Stigter
930bd4d0e1 add tests for related field source for HyperlinkedRelatedField. #694 2013-05-18 12:23:12 +02:00
Craig de Stigter
0cd7c80e6e add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694 2013-05-18 12:16:30 +02:00
Xavier Ordoquy
ed0bd195f5 Updated the dependencies version and added the ALLOWED_HOSTS for tests. 2013-05-18 12:07:44 +02:00
Tom Christie
aea040161a Forms in Broseable API support dynamic serializers based on request method 2013-05-18 09:36:09 +01:00
Craig de Stigter
c56d5f8f63 Merge remote-tracking branch 'upstream/master' 2013-05-18 10:23:26 +02:00
Tom Christie
34776da924 Minor mixin refactoring 2013-05-17 22:09:23 +01:00
Tom Christie
b6fb377c2b Fix PendingDeprecation warnings in tests 2013-05-17 21:57:11 +01:00
Tom Christie
14ded26167 PendingDeprecation warning to allow_empty 2013-05-17 21:28:33 +01:00
Andy Freeland
abe207b869 HyperlinkedIdentityField uses lookup_field kwarg. 
According to the [Serializers API Guide][1], `HyperlinkedIdentityField`
takes `lookup_field` as a kwarg like the other related fields and the
generic views. However, this was not actually implemented.

[1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer
 2013-05-16 11:48:35 -04:00
Tom Christie
aff88d15f7 Version 2.3.3 2013-05-16 15:08:12 +01:00
Tom Christie
af88a5b175 Test and fix which closes #652. 2013-05-15 14:25:25 +01:00
Tom Christie
092d5223eb Fix searchfilter issues 2013-05-15 10:29:51 +01:00
Tom Christie
2f54decd3e Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-14 21:41:39 +01:00
Tom Christie
e939e1755a Base automatic filterset model on the queryset model. Fixes #834. 2013-05-14 21:40:55 +01:00
Tom Christie
dd3c434f6c Merge pull request #824 from jsummerfield/patch-1 
Remove trailing unmatched </div> in login_base.html template. Reformat i...
 2013-05-14 10:36:31 -07:00
Tom Christie
d62414147f Fix assert messaging on fields/exclude checking. Closes #833 2013-05-14 17:53:37 +01:00
Tom Christie
a303d0f38c Fix filter test renaming 2013-05-14 11:37:59 +01:00
Tom Christie
ce1a04a603 Merge branch 'master' of https://github.com/avinash240/django-rest-framework 2013-05-14 11:34:47 +01:00
Tom Christie
2cff6e69db Added OrderingFilter 2013-05-14 11:27:08 +01:00
Tom Christie
6a037f63ed Added OrderingFilter 2013-05-14 11:27:03 +01:00
Tom Christie
08bc976269 Rename filter tests 2013-05-14 10:16:46 +01:00
Tom Christie
b2bf5f1f88 SearchFilter may be comma and/or whitespace seperated 2013-05-14 10:10:44 +01:00
Tom Christie
752c01420f Fix Django 1.3 compat with routers 2013-05-14 10:01:05 +01:00
Brian Zambrano
24c9c455fe Allow for missing non-required nested objects. 
Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null.
 2013-05-13 14:41:12 -07:00
James Summerfield
5074bbe4b2 Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency. 2013-05-13 07:51:23 +02:00
Marlon Bailey
5e2d8052d4 fix test case to work with Python 3 and make it more explicit 2013-05-12 09:22:14 -04:00
Marlon Bailey
9d2580dccf added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base 2013-05-11 22:26:34 -04:00
Tom Christie
fd4a66cfc7 Fix py3k compat with functools.reduce 2013-05-10 23:06:42 +01:00
Tom Christie
dd51d369c8 Unicode string fix 2013-05-10 23:02:24 +01:00
Tom Christie
293dc3e6d8 Added SearchFilter 2013-05-10 22:33:11 +01:00
Tom Christie
8ce36d2bf1 SearchFilter and tests 2013-05-10 21:57:20 +01:00
Tom Christie
773a92eab3 Move models into test modules, out of models module 2013-05-10 21:57:05 +01:00
Tom Christie
0176a5391b Fix HyperlinkedModelSerializer not respecting lookup_fields 2013-05-09 17:09:40 +01:00
Tom Christie
939cc5adba Tweak inheritance 2013-05-09 13:35:01 +01:00
Tom Christie
31f94ab409 Added GenericViewSet and docs tweaking 2013-05-09 13:31:42 +01:00
Mark Aaron Shirley
14482a9661 Fix deprecation warnings in relations_nested tests 2013-05-08 22:44:23 -07:00
Mark Aaron Shirley
e550740b3d Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer 
Conflicts:
	rest_framework/tests/relations_nested.py
 2013-05-08 22:39:48 -07:00
Tom Christie
4ab7b8f257 Version 2.3.2 2013-05-08 20:49:49 +01:00
Tom Christie
b443560080 Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798 2013-05-08 20:38:50 +01:00
Tom Christie
de69a28b9e Test and fix for #814. 2013-05-08 20:18:01 +01:00
Tom Christie
429e078eee Allow None filename on uploaded files 2013-05-08 20:07:51 +01:00
Tom Christie
d7c08222f1 Fix breadcrumb rendering issue 2013-05-07 14:11:48 +01:00
Tom Christie
ed2cf180c9 Version 2.3.0 2013-05-07 13:29:38 +01:00
Tom Christie
3353889ae8 Docs for FileUploadParser 2013-05-07 13:27:27 +01:00
Tom Christie
642970a1b8 Merge pull request #806 from wronglink/master 
Added FileUploadParser
 2013-05-07 05:09:09 -07:00
Tom Christie
3c2bb06660 Support for multiple filter classes 2013-05-07 13:00:44 +01:00
Tom Christie
d71a5533f9 allow_empty -> pending deprecation in preference of overridden get_queryset. 2013-05-07 12:25:41 +01:00
Tom Christie
b70c9cc107 Merge master 2013-05-05 18:12:35 +01:00
Tom Christie
75b2afcb23 Merge branch 'master' into 2.3 2013-05-05 16:48:46 +01:00
Tom Christie
660d240517 .action attribute on viewsets 2013-05-05 16:48:00 +01:00
Tom Christie
538d2e35e7 lookup_field on hyperlink serializers 2013-05-05 16:47:45 +01:00
Michael Elovskikh
a514232815 Raise ParseError if can't handle the uploaded file 2013-05-04 17:18:41 +06:00
Michael Elovskikh
e36e4f48ad Codebase improvements on FileUploadParser 
* Added docstrings.
* Added `FileUploadParser.get_filename` to make it easier to override.
* Added url kwargs filename detection step.
* Updated tests corresponding to these changes.
 2013-05-04 14:58:21 +06:00
Michael Elovskikh
318fdaabe5 Tests for FileUploadParser 2013-05-03 01:39:08 +06:00
Michael Elovskikh
0c85768435 Added FileUploadParser refs #7 2013-05-03 01:37:25 +06:00
Tom Christie
387250bee4 Automagically determine base_name in router class 2013-05-02 12:07:37 +01:00
Tom Christie
e4067bfb75 introduce lookup_field and add pendingdeprecationwarnings 2013-05-02 12:07:18 +01:00
Victor Shih
8cabae22c5 Example and spelling fixes. Change "browseable" to "browsable" for consistency. 2013-05-01 21:26:40 -07:00
Tom Christie
35f99cddc4 lookup_field on hyperlinked fields, and overriddable hyperlinked fields. Closes #688 2013-05-01 09:03:09 +01:00
Danilo Bargen
e5040fbf94 Catch ImproperlyConfigured exception in compat.py (fixes #803) 2013-04-30 23:24:33 +02:00
Tom Christie
22af28d146 Merge master 2013-04-30 19:32:34 +01:00
Tom Christie
b65b065375 Add DjangoModelPermissionsOrAnonReadOnly 2013-04-30 14:34:28 +01:00
Tom Christie
8dff8d2fdc Add get_breadcrumbs hook to BrowseableAPIRenderer. Closes #733. 2013-04-30 14:34:03 +01:00
Tom Christie
21ae3a6691 Drop out attribute 2013-04-30 08:24:33 +01:00
Tom Christie
0c1ab584d3 Tweaks for preferring .queryset over .model 2013-04-29 14:08:38 +01:00
Tom Christie
53f9d4a380 fields shortcut on views 2013-04-29 13:20:15 +01:00
Tom Christie
d17e2d852f Remove AutoRouter. (Adding shortcut to generic views/viewsets means it's unneccessary) 2013-04-29 12:46:57 +01:00
Tom Christie
dc7b1d6430 2.2's PendingDeprecationWarnings now become DeprecationWarnings. 2.3's PendingDeprecationWarnings added. 2013-04-29 12:45:00 +01:00
JC
8cbb715f4c Changed definition of NestedModelSerializer to correct depth handling 2013-04-27 13:23:55 -07:00
JC
3b0fa3ebaa Changed DepthTest to have depth=2 2013-04-27 13:10:39 -07:00
Tom Christie
018d8b8dce Bits of cleanup 2013-04-26 15:11:11 +01:00
Tom Christie
8fa79a7fd3 Deal with List/Instance suffixes for viewsets 2013-04-26 14:59:21 +01:00
Tom Christie
d985aec3c9 DecimalField 2013-04-26 13:59:06 +01:00
Tom Christie
7268a5c571 Added AutoRouter. Don't know if this is a good idea. 2013-04-25 17:41:47 +01:00
Tom Christie
5d01ae661f Simplify paginate_queryset method 2013-04-25 17:40:17 +01:00
Tom Christie
95abe6e844 Cleanup docstrings 2013-04-25 12:47:34 +01:00
Tom Christie
b94da2468c Various clean up and lots of docs 2013-04-24 22:40:24 +01:00
Tom Christie
835d3f89d3 Merge remove-django-generics 2013-04-23 11:59:13 +01:00
Tom Christie
4bf1a09bae Ensure implementation of reverse relations in 'fields' is backwards compatible 2013-04-23 11:31:38 +01:00
Mark Aaron Shirley
7e0a93f0ee Don't use field when saving related data 2013-04-19 10:46:57 -07:00
Mark Aaron Shirley
fdc5cc3d81 Fix model serializer nestesd delete behavior 2013-04-18 10:28:20 -07:00
forgingdestiny
03c736338f extend base login template 2013-04-17 10:15:02 -04:00
forgingdestiny
33f494fcc8 add branding and style blocks 2013-04-17 10:14:36 -04:00
Tom Christie
bcf4cb2b4e Merge branch 'include_reverse_relations' of https://github.com/tomchristie/django-rest-framework into include_reverse_relations 2013-04-17 09:26:34 +01:00
Tom Christie
ea55143a23 Version 2.2.7 2013-04-17 09:07:20 +01:00
Tom Christie
37fe0bf0de Remove unneccessary tests from #789, and bit of cleanup. 2013-04-17 09:03:24 +01:00
Tom Christie
700df90da1 Merge https://github.com/shezi/django-rest-framework 2013-04-17 08:51:36 +01:00
Mark Aaron Shirley
c7e000e46e Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer 
Conflicts:
	docs/api-guide/serializers.md
 2013-04-16 09:55:47 -07:00
Tom Christie
23289b023d Explicit error if dev does not return a response from the view 2013-04-16 14:32:46 +01:00
Stephan Groß
cac6697025 Return Decimal instance instead of string 2013-04-15 15:24:14 +02:00
Stephan Groß
9d80f01bce Fix init call 2013-04-15 15:15:55 +02:00
Stephan Groß
c329d2f085 Add DecimalField to field_mapping 2013-04-15 13:11:41 +02:00
Stephan Groß
37f7d8bc0f Fix unicodes 2013-04-15 13:02:18 +02:00
Stephan Groß
ad436d966f Add DecimalField support 2013-04-15 13:02:18 +02:00
Johannes Spielmann
750451f5b4 adding test case for generic view with overriden get_object() 2013-04-14 18:30:44 +02:00
Tom Christie
5a5a602f8a Allow overriding get_object to work correctly. Fixes #784 2013-04-13 20:07:36 +01:00
Tom Christie
e0020c5b03 Simplify get_object 2013-04-11 15:48:18 +01:00
Tom Christie
76e039d70e First pass on automatically including reverse relationship 2013-04-10 22:38:02 +01:00
Tom Christie
3f91379e4e Fix 1.3 compat issue. Closes #780 2013-04-10 09:24:24 +01:00
Tom Christie
07af437361 Cleaning up around bits of API that will be pending deprecation 2013-04-09 19:47:16 +01:00
Tom Christie
9bb1277e51 Cleaning up around bits of API that will be pending deprecation 2013-04-09 19:37:19 +01:00
Tom Christie
1de6cff11b Cleaning up get_object and get_queryset 2013-04-09 19:06:49 +01:00
Tom Christie
dc45bc7bfa Add lookup_kwarg 2013-04-09 19:01:01 +01:00
Tom Christie
099163f81f Removed SingleObjectMixin and MultipleObjectMixin 2013-04-09 18:45:15 +01:00
Tom Christie
c73d0e1e39 Minor cleaning up on View 2013-04-09 18:22:39 +01:00
Mark Aaron Shirley
73efa96de9 one-many writable nested modelserializer support 2013-04-06 08:43:21 -07:00
Tom Christie
371698331c Tweaks 2013-04-04 22:24:30 +01:00
Tom Christie
c2280e34ec Version 2.2.6 2013-04-04 21:53:15 +01:00
Tom Christie
fd3f538e9f Fix up view name/description tests 2013-04-04 21:48:23 +01:00
Tom Christie
f68721ade8 Factor view names/descriptions out of View class 2013-04-04 21:42:26 +01:00
Tom Christie
9e24db022c Commenting 2013-04-04 20:38:42 +01:00
Tom Christie
fb41d2ac8f Add support for action and link routing 2013-04-04 20:35:40 +01:00
Tom Christie
c785628300 Fleshing out viewsets/routers 2013-04-04 20:00:44 +01:00
glic3rinu
b6c7730d7f Fixed comma detection in break_long_headers templatetag 2013-04-04 14:01:47 +02:00
glic3rinu
92b5db5939 Added break_long_headers on templatetags and base template 2013-04-04 12:11:04 +02:00
Tom Christie
35b86ee52a Merge pull request #772 from preed/preed/ModelSerializer-bool-fix 
Don't have the ModelSerializer trust deserialized objects to not have re...
 2013-04-03 04:53:52 -07:00
Atle Frenvik Sveen
80d28de034 Fix the fact that InvalidConsumerError and InvalidTokenError wasn't imported correctly from oauth_provider 2013-04-03 13:10:41 +02:00
Tom Christie
a18d3df0f6 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-04-03 09:21:04 +01:00
Tom Christie
74fbd5ccc5 Fix bug with inactive user accessing OAuth 2013-04-03 09:20:36 +01:00
J. Paul Reed
889558365b Don't have the ModelSerializer trust deserialized objects to not have redefine bool()ean-ness. 
If the model we're using the ModelSerializer for has redefined methods that act as a boolean (__bool__ or __len__), it may not return the object even though it is_valid(), and should.
 2013-04-02 01:41:40 -07:00
glic3rinu
76d1c47905 Fixed IPv6 support for urlize_quoted_links 2013-04-01 20:15:05 +02:00
Tom Christie
ec076a0078 Add viewsets/routers to indexs etc 2013-03-31 11:36:58 +01:00
Tom Christie
b4945f476c Merge branch 'master' into resources-routers 2013-03-30 15:41:38 +00:00
Tom Christie
a69262a1cd Merge pull request #767 from tomchristie/fix-oauth2-token-only 
Fix OAuth 2 token only
 2013-03-29 06:42:24 -07:00
Tom Christie
ff3ebd979d Merge pull request #766 from glic3rinu/master 
Refactored urlize_quoted_links based on Dango 1.5 urlize
 2013-03-29 06:40:23 -07:00
Kevin Stone
4531ded061 Removed pagination regression special case for Django<1.4. Having DjangoFilterBackend return an actual query set fixes this issue. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-28 18:48:48 -07:00
glic3rinu
9c32f048b5 Cleaned imports on templatetags/rest_framework module 2013-03-28 12:01:47 +01:00
glic3rinu
3774ba3ed2 Added force_text to compat 2013-03-28 12:01:08 +01:00
Kevin Stone
d4df617f8c Added unit test for failing DjangoFilterBackend on SingleObjectMixin that was resolved in b10663e024 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-27 18:29:50 -07:00
Kevin Stone
b10663e024 Fixed DjangoFilterBackend not returning a query set. 
Fixed bug unveiled in #682.

Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-27 17:55:36 -07:00
Pierre Dulac
fa61b2b2f1 Remove oauth2-provider backends reference from compat.py 2013-03-28 01:05:51 +01:00
Pierre Dulac
8ec60a22e1 Remove client credentials from all OAuth 2 tests 2013-03-28 00:57:23 +01:00
Fernando Rocha
b2cea84fae Complete remove of client checks from oauth2 
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-03-27 19:00:36 -03:00
glic3rinu
2c0363ddae Added quotes to TRAILING_PUNCTUATION used by urlize_quoted_links 2013-03-27 22:58:11 +01:00
glic3rinu
5f48b4a77e Refactored urlize_quoted_links code, now based on Django 1.5 urlize 2013-03-27 22:43:41 +01:00
Fernando Rocha
f1b8fee4f1 client credentials should be optional (fix #759) 
client credentials should only be required on token
request

Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-03-27 14:05:46 -03:00
Tom Christie
92c929094c Version 2.2.5 2013-03-26 07:48:53 +00:00
Tom Christie
7eefcf7e53 Bulk update, allow_add_remove flag 2013-03-25 20:26:34 +00:00
Tom Christie
d97e72cdb2 Cleanup one-one nested tests and implementation 2013-03-25 17:28:23 +00:00
Matteo Suppo
b5640bb778 Forcing translations of lazy translatable strings in Field to_native method 2013-03-23 14:18:55 +01:00
Matteo Suppo
0081d744b9 Added tests for issue 747 in serializer.py 2013-03-23 14:18:11 +01:00
Tom Christie
3f79a9a3d3 one-one writable nested modelserializers 2013-03-22 22:39:45 +00:00
Tom Christie
addf7e9b36 Defer the writable nested modelserializers work 2013-03-22 22:27:03 +00:00
Tom Christie
9bf7c9b714 Merge master 2013-03-22 21:57:37 +00:00
Tom Christie
870d5c7d78 Merge pull request #744 from tomchristie/basic-bulk-edit 
Basic bulk create and bulk update
 2013-03-22 14:47:29 -07:00
Tom Christie
4055129662 If oauth is not attempted don't throw an error. Fixes #748. 2013-03-22 21:31:50 +00:00
Tom Christie
13794baf70 Bit of extra tidying and plenty of docs 2013-03-22 17:01:06 +00:00
Tom Christie
b4210f9a56 Test moved out of serializer.py into serializer_bulk_update 2013-03-22 12:46:03 +00:00
Tom Christie
c32d9969ac Add extra tests for errors from incorrect data with multiple create/update 2013-03-22 12:33:09 +00:00
Tom Christie
8adde506e8 Default date/time fields now return python date/time objects again by default 2013-03-21 08:41:54 +00:00
Tom Christie
20fd738c85 iso formated datetime aware fields with +0000 offset should use 'Z' suffix instead 2013-03-20 13:05:59 +00:00
Tom Christie
b2dc664485 Basic bulk create and bulk update 2013-03-19 14:26:48 +00:00
Tom Christie
deb5e653e4 Added bulk create tests 2013-03-18 21:35:06 +00:00
Tom Christie
ad3ffe20f0 Merge branch 'master' into basic-nested-serialization 2013-03-18 21:12:05 +00:00
Tom Christie
09e4ee7ae3 Remove dumbass unneeded test 2013-03-18 21:11:40 +00:00
Tom Christie
922ee61d86 Remove erronous pre_save 2013-03-18 21:05:13 +00:00
Tom Christie
74fb366c59 Merge branch 'master' into resources-routers 2013-03-18 21:03:05 +00:00
Craig de Stigter
101fa26ebc use writablefield style for serializer handling of self.default 2013-03-18 16:05:34 +13:00
Craig de Stigter
d6d5b1d82a allow default values in writable serializer fields 2013-03-18 14:50:21 +13:00
Craig de Stigter
c8416df0c4 accept all WritableField kwargs for writable serializers (eg required=True) 2013-03-18 14:27:15 +13:00
Tom Christie
66bdd608e1 Fixes to save_object 2013-03-16 07:35:44 +00:00
Tom Christie
3ff103ad04 Fixes to save_object 2013-03-16 07:35:27 +00:00
Tom Christie
ccf551201f Clean up and comment restore_object 2013-03-16 07:32:50 +00:00
Tom Christie
56653111a6 Remove unneeded arguments to save_object 2013-03-15 19:57:57 +00:00
Tom Christie
32e0e5e18c Remove erronous _delete attribute 2013-03-15 19:55:32 +00:00
Tom Christie
47492e3ef4 Clean out ModelSerializer special casing from Serializer.field_from_native 2013-03-15 19:22:31 +00:00
Tom Christie
fb3b57803f one 2 one nested relationships 2013-03-15 19:17:54 +00:00
Mark Aaron Shirley
3006e3825f One-to-one writable, nested serializer support 2013-03-14 15:17:13 -07:00
Tom Christie
acc8c1faa4 force_insert, force_update arguments. Closes #484. 
Confirmed by `assertNumQueries(…)` in tests.
 2013-03-13 20:40:39 +00:00
Tom Christie
4b68089d44 Version 2.2.4 2013-03-13 13:07:46 +00:00
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