From c94272650915eef368cdc5d157644884c3eecccb Mon Sep 17 00:00:00 2001
From: Jens Alm <jens.alm@mac.com>
Date: Mon, 15 Oct 2012 13:46:44 +0200
Subject: [PATCH] Added docs, integer fields and refactored models.TextField to
 use CharField

I realized that per the django forms, there is no need for a separate
TextField, an unlimited CharField is perfectly good.
Also added default field for the different IntegerField types
---
 docs/api-guide/fields.md      | 17 +++++++++++++++++
 rest_framework/serializers.py |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index df54ea021..dc9ab0452 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -73,18 +73,35 @@ These fields represent basic datatypes, and support both reading and writing val
 
 ## BooleanField
 
+A Boolean representation, corresponds to `django.db.models.fields.BooleanField`.
+
 ## CharField
 
+A text representation, optionally validates the text to be shorter than `max_length` and longer than `min_length`, corresponds to `django.db.models.fields.CharField`
+or `django.db.models.fields.TextField`.
+
+**Signature:** `CharField([max_length=<Integer>[, min_length=<Integer>]])`
+
 ## EmailField
 
+A text representation, validates the text to be a valid e-mail adress. Corresponds to `django.db.models.fields.EmailField`
+
 ## DateField
 
+A date representation. Corresponds to `django.db.models.fields.DateField`
+
 ## DateTimeField
 
+A date and time representation. Corresponds to `django.db.models.fields.DateTimeField`
+
 ## IntegerField
 
+An integer representation. Corresponds to `django.db.models.fields.IntegerField`, `django.db.models.fields.SmallIntegerField`, `django.db.models.fields.PositiveIntegerField` and `django.db.models.fields.PositiveSmallIntegerField`
+
 ## FloatField
 
+A floating point representation. Corresponds to `django.db.models.fields.FloatField`.
+
 ---
 
 # Relational Fields
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 5afbced29..13f8cde21 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -377,11 +377,14 @@ class ModelSerializer(Serializer):
         field_mapping = {
             models.FloatField: FloatField,
             models.IntegerField: IntegerField,
+            models.PositiveIntegerField: IntegerField,
+            models.SmallIntegerField: IntegerField,
+            models.PositiveSmallIntegerField: IntegerField,
             models.DateTimeField: DateTimeField,
             models.DateField: DateField,
             models.EmailField: EmailField,
             models.CharField: CharField,
-            models.TextField: TextField,
+            models.TextField: CharField,
             models.CommaSeparatedIntegerField: CharField,
             models.BooleanField: BooleanField,
         }