fix: drf parser and test

Author: remigermain

README.md

@@ -3,7 +3,7 @@
 [![build](https://github.com/remigermain/nested-multipart-parser/actions/workflows/main.yml/badge.svg)](https://github.com/remigermain/nested-multipart-parser/actions/workflows/main.yml)
 [![pypi](https://img.shields.io/pypi/v/nested-multipart-parser)](https://pypi.org/project/nested-multipart-parser/)
 
-Parser for nested data in multipart form, you can use it anyways, and you have a django rest framework integration
+Parser for nested data for '*multipart/form*', you can use it any python project and you have a django rest framework integration.
 
 # Installation
 
@@ -13,13 +13,18 @@ pip install nested-multipart-parser
 
 # How to use it
 
-## for every framwork
+### Any python project
 
 ```python
 from nested_multipart_parser import NestedParser
 
+options = {
+	"separator": "bracket"
+}
+
 def my_view():
-	parser = NestedParser(data)
+	# options is optional
+	parser = NestedParser(data, options)
 	if parser.is_valid():
 		validate_data = parser.validate_data
 		...
@@ -28,7 +33,7 @@ def my_view():
 
 ```
 
-## for django rest framwork
+### Django rest framwork
 
 ```python
 from nested_multipart_parser.drf import DrfNestedParser
@@ -38,9 +43,10 @@ class YourViewSet(viewsets.ViewSet):
 	parser_classes = (DrfNestedParser,)
 ```
 
+
 ## What is doing
 
-the parser take the request data and transform to dictionary
+The parser take the request data and transform to dictionary
 
 exemple:
 
@@ -90,18 +96,18 @@ exemple:
 
 ## How is work
 
-for this working perfectly you need to follow this rules:
+For this working perfectly you need to follow this rules:
 
-- a first key need to be set ex: 'title[0]' or 'title', in both the first key is 'title'
-- each sub key need to seperate by brackets "[--your-key--]" or dot "." (depends of your options)
-- if sub key are a full number, is converted to list
-- if sub key is Not a number is converted to dictionary
+- a first key need to be set ex: `title[0]` or `title`, in both the first key is `title`
+- each sub key need to be seperate by brackets `[ ]` or dot `.` (depends of your options)
+- if sub key are a full number, is converted to list *ex:* `[0]` or `[42]`
+- if sub key is Not a number is converted to dictionary *ex:* `[username]` or `[article]`
 - by default,the duplicate keys can't be set (see options to override that)
   ex:
 
 ```python
 	data = {
-		'title[0]': 'my-value'
+		'title[0]': 'my-value'``
 	}
 	# output
 	output = {
@@ -162,7 +168,7 @@ for this working perfectly you need to follow this rules:
 	data = {
 		'the[0][chained][key][0][are][awesome][0][0]': 'im here !!'
 	}
-	# with "dot" separator in options is ;look like that
+	# with "dot" separator in options is look like that
 	data = {
 		'the.0.chained.key.0.are.awesome.0.0': 'im here !!'
 	}
@@ -190,39 +196,7 @@ for this working perfectly you need to follow this rules:
 	}
 ```
 
-# How to use it
-
-## for every framwork
-
-```python
-from nested_multipart_parser import NestedParser
-
-options = {
-	"separator": "bracket"
-}
-
-def my_view():
-	# options is optional
-	parser = NestedParser(data, options)
-	if parser.is_valid():
-		validate_data = parser.validate_data
-		...
-	else:
-		print(parser.errors)
-
-```
-
-## for django rest framwork
-
-```python
-from nested_multipart_parser.drf import DrfNestedParser
-...
-
-class YourViewSet(viewsets.ViewSet):
-	parser_classes = (DrfNestedParser,)
-```
-
-## options
+## Options
 
 ```python
 {
@@ -231,13 +205,14 @@ class YourViewSet(viewsets.ViewSet):
 	# with dot:      article.title.authors.0: "jhon doe"
 	'separator': 'bracket' or 'dot', # default is bracket
 
+
 	# raise a expections when you have duplicate keys
 	# ex :
 	# {
 	#	"article": 42,
 	#	"article[title]": 42,
 	# }
-	'raise_duplicate': True,
+	'raise_duplicate': True, # default is True
 
 	# overide the duplicate keys, you need to set "raise_duplicate" to False
 	# ex :
@@ -252,16 +227,16 @@ class YourViewSet(viewsets.ViewSet):
 	# 		"title": 42,
 	#	}
 	# }
-	'assign_duplicate': False
+	'assign_duplicate': False # default is False
 }
 ```
 
-## options with django rest framwork
+## Options with django rest framwork
 
 In your settings.py, add "DRF_NESTED_MULTIPART_PARSER"
 
 ```python
-#settings.py
+# settings.py
 ...
 
 DRF_NESTED_MULTIPART_PARSER = {
@@ -272,6 +247,6 @@ DRF_NESTED_MULTIPART_PARSER = {
 }
 ```
 
-## for frontend javscript
+## Javscript integration
 
-You can use this [multipart-object](https://github.com/remigermain/multipart-object) library to easy convert object to flat nested object formated for this library
+You can use this [multipart-object](https://github.com/remigermain/multipart-object) library to easy convert object to flat nested object formated for this library

nested_multipart_parser/drf.py

@@ -1,6 +1,6 @@
 from .parser import NestedParser as NestPars
-from rest_framework.parsers import MultiPartParser
-from django.http.multipartparser import MultiPartParserError
+from rest_framework.parsers import MultiPartParser, DataAndFiles
+from rest_framework.exceptions import ParseError
 from django.http import QueryDict
 from django.conf import settings
 
@@ -10,6 +10,13 @@ class NestedParser(NestPars):
     def __init__(self, data):
         super().__init__(data, getattr(settings, "DRF_NESTED_MULTIPART_PARSER", {}))
 
+    def convert_value(self, data, key):
+        # all value in querydict as set in list
+        value = data[key]
+        if isinstance(value, list):
+            return value[0]
+        return value
+
     @property
     def validate_data(self):
         dtc = QueryDict(mutable=True)
@@ -21,14 +28,9 @@ def validate_data(self):
 class DrfNestedParser(MultiPartParser):
 
     def parse(self, stream, media_type=None, parser_context=None):
-        parsed = super().parse(stream, media_type, parser_context)
+        clsDataAndFile = super().parse(stream, media_type, parser_context)
 
-        copy = parsed.data.copy()
-        if parsed.files:
-            copy.update(parsed.files)
-        parser = NestedParser(copy)
+        parser = NestedParser(clsDataAndFile.data.dict())
         if parser.is_valid():
-            return parser.validate_data
-        if parser.errors:
-            raise MultiPartParserError(parser.errors)
-        return parsed
+            return DataAndFiles(parser.validate_data, clsDataAndFile.files)
+        raise ParseError(parser.errors)

nested_multipart_parser/parser.py

@@ -43,8 +43,8 @@ def split_key(self, key):
             length = 1
             splitter = k.split(".")
         else:
-            splitter = self._reg.split(k)
             length = 2
+            splitter = self._reg.split(k)
 
         check = -length
 
@@ -67,7 +67,7 @@ def set_type(self, dtc, key, value, full_keys, prev=None, last=False):
             if len(dtc) == key:
                 dtc.append(value)
         elif isinstance(dtc, dict):
-            if key not in dtc or self._options["assign_duplicate"] and last:
+            if key not in dtc or last and self._options["assign_duplicate"]:
                 dtc[key] = value
         else:
             if self._options["raise_duplicate"]:
@@ -82,32 +82,38 @@ def set_type(self, dtc, key, value, full_keys, prev=None, last=False):
     def get_next_type(self, keys):
         return [] if keys.isdigit() else {}
 
+    def convert_value(self, data, key):
+        return data[key]
+
     def construct(self, data):
         dictionary = {}
+        prev = {}
 
         for key in data:
             keys = self.split_key(key)
             tmp = dictionary
-            prev = {
-                'key': keys[0],
-                'dtc': tmp,
-                'type': None
-            }
+
+            # need it for duplicate assignement
+            prev['key'] = keys[0]
+            prev['dtc'] = tmp
+            prev['type'] = None
 
             # optimize with while loop instend of for in with zip function
             i = 0
             lenght = len(keys) - 1
             while i < lenght:
                 set_type = self.get_next_type(keys[i+1])
-                index = self.set_type(
-                    tmp, keys[i], set_type, key, prev=prev)
+                index = self.set_type(tmp, keys[i], set_type, key, prev)
+
                 prev['dtc'] = tmp
                 prev['key'] = index
                 prev['type'] = set_type
+
                 tmp = tmp[index]
                 i += 1
 
-            self.set_type(tmp, keys[-1], data[key], key, prev=prev, last=True)
+            value = self.convert_value(data, key)
+            self.set_type(tmp, keys[-1], value, key, prev, True)
         return dictionary
 
     def is_valid(self):