Repository: linw1995/data_extractor

Issue:
Add optional param name for special field name into Item and Field.

Comments:

Patch:
diff --git a/data_extractor/abc.py b/data_extractor/abc.py
index 115b15e..5c3df63 100644
--- a/data_extractor/abc.py
+++ b/data_extractor/abc.py
@@ -52,7 +52,10 @@ class ComplexExtractorMeta(type):
 
                     line = line.strip()
                     raise SyntaxError(
-                        f"{line!r} overwriten the parameter {key!r} of '{name}.__init__' method.",
+                        (
+                            f"{line!r} overwriten the parameter {key!r} of '{name}.__init__' method. "
+                            f"Please using the optional parameter name={key!r} in {attr!r} to avoid overwriting parameter name."
+                        ),
                         (filename, lineno, index, line),
                     )
 
diff --git a/data_extractor/item.py b/data_extractor/item.py
index c3dcbd0..0156388 100644
--- a/data_extractor/item.py
+++ b/data_extractor/item.py
@@ -18,6 +18,7 @@ class Field(AbstractExtractor):
     Extract data by cooperating with extractor.
 
     :param extractor: The object for data extracting base on :class:`data_extractor.abc.SimpleExtractor`.
+    :param name: Optional parameter for special field name.
     :param default: Default value when not found. Default: :data:`data_extractor.utils.sentinel`.
     :param is_many: Indicate the data which extractor extracting is more than one.
 
@@ -28,6 +29,7 @@ class Field(AbstractExtractor):
     def __init__(
         self,
         extractor: SimpleExtractorBase,
+        name: str = None,
         default: Any = sentinel,
         is_many: bool = False,
     ):
@@ -38,11 +40,22 @@ class Field(AbstractExtractor):
             raise ValueError(f"Can't both set default={default} and is_many=True")
 
         self.extractor = extractor
+        self.name = name
         self.default = default
         self.is_many = is_many
 
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self.extractor!r}, default={self.default!r}, is_many={self.is_many})"
+        args = [f"{self.extractor!r}"]
+        if self.name is not None:
+            args.append(f"name={self.name!r}")
+
+        if self.default is not sentinel:
+            args.append(f"default={self.default!r}")
+
+        if self.is_many:
+            args.append(f"is_many={self.is_many!r}")
+
+        return f"{self.__class__.__name__}({', '.join(args)})"
 
     def extract(self, element: Any) -> Any:
         """
@@ -88,7 +101,11 @@ class Item(Field):
         rv = {}
         for field in self.field_names():
             try:
-                rv[field] = getattr(self, field).extract(element)
+                extractor = getattr(self, field)
+                if extractor.name is not None:
+                    field = extractor.name
+
+                rv[field] = extractor.extract(element)
             except ExtractError as exc:
                 exc._append(extractor=self)
                 raise exc


Test patch:
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index 7f8cbe9..747a944 100644
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -1,5 +1,4 @@
 # Standard Library
-import inspect
 import textwrap
 
 # Third Party Library
@@ -9,7 +8,6 @@ import pytest
 from data_extractor.exceptions import ExtractError
 from data_extractor.item import Field, Item
 from data_extractor.json import JSONExtractor
-from data_extractor.lxml import XPathExtractor
 
 
 def test_exception_trace(json0):
@@ -17,7 +15,7 @@ def test_exception_trace(json0):
 
     class User(Item):
         uid = Field(JSONExtractor("id"))
-        name = Field(JSONExtractor("name"))
+        username = Field(JSONExtractor("name"), name="name")
         gender = Field(JSONExtractor("gender"))
 
     class UserResponse(Item):
@@ -41,25 +39,11 @@ def test_exception_trace(json0):
         str(exc.args[0])
         == textwrap.dedent(
             """
-            ExtractError(Field(JSONExtractor('gender'), default=sentinel, is_many=False), element={'id': 3, 'name': 'Janine Gross'})
-            |-UserResponse(JSONExtractor('data'), default=sentinel, is_many=False)
-              |-User(JSONExtractor('users[*]'), default=sentinel, is_many=True)
-                |-Field(JSONExtractor('gender'), default=sentinel, is_many=False)
+            ExtractError(Field(JSONExtractor('gender')), element={'id': 3, 'name': 'Janine Gross'})
+            |-UserResponse(JSONExtractor('data'))
+              |-User(JSONExtractor('users[*]'), is_many=True)
+                |-Field(JSONExtractor('gender'))
                   |-{'id': 3, 'name': 'Janine Gross'}
             """
         ).strip()
     )
-
-
-def test_field_name_overwrite_item_parameter():
-    with pytest.raises(SyntaxError) as catch:
-
-        class Parameter(Item):
-            name = Field(XPathExtractor("./span[@class='name']"))
-            default = Field(XPathExtractor("./span[@class='default']"))
-
-    exc = catch.value
-    assert exc.filename == __file__
-    assert exc.lineno == inspect.currentframe().f_lineno - 4
-    assert exc.offset == 12
-    assert exc.text == "default = Field(XPathExtractor(\"./span[@class='default']\"))"
diff --git a/tests/test_item.py b/tests/test_item.py
index 8181efb..13fe5a7 100644
--- a/tests/test_item.py
+++ b/tests/test_item.py
@@ -1,4 +1,6 @@
 # Standard Library
+import inspect
+
 from pathlib import Path
 
 # Third Party Library
@@ -277,7 +279,7 @@ def test_complex_item_extract_json_data(json0):
 
     class User(Item):
         uid = Field(JSONExtractor("id"))
-        name = Field(JSONExtractor("name"))
+        username = Field(JSONExtractor("name"), name="name")
         gender = Field(JSONExtractor("gender"), default=None)
 
     class UserResponse(Item):
@@ -312,3 +314,64 @@ def test_misplacing():
 
     with pytest.raises(ValueError):
         Field(extractor=ComplexExtractor(extractor=JSONExtractor("users[*]")))
+
+
+def test_field_name_overwrite_item_parameter():
+    with pytest.raises(SyntaxError) as catch:
+
+        class User(Item):
+            uid = Field(JSONExtractor("id"))
+            name = Field(JSONExtractor("name"))
+
+    exc = catch.value
+    assert exc.filename == __file__
+    assert exc.lineno == inspect.currentframe().f_lineno - 4
+    assert exc.offset == 12
+    assert exc.text == 'name = Field(JSONExtractor("name"))'
+
+
+def test_avoid_field_name_overwriting_item_parameter(json0):
+    data = json0
+
+    with pytest.raises(SyntaxError):
+
+        class User(Item):
+            uid = Field(JSONExtractor("id"))
+            name = Field(JSONExtractor("name"))
+
+    class User(Item):  # noqa
+        uid = Field(JSONExtractor("id"))
+        username = Field(JSONExtractor("name"), name="name")
+
+    assert User(JSONExtractor("data.users[*]")).extract(data) == {
+        "uid": 0,
+        "name": "Vang Stout",
+    }
+
+
+def test_special_field_name(json0):
+    data = json0
+
+    class User(Item):
+        uid = Field(JSONExtractor("id"))
+        username = Field(JSONExtractor("name"), name="user.name")
+
+    assert User(JSONExtractor("data.users[*]")).extract(data) == {
+        "uid": 0,
+        "user.name": "Vang Stout",
+    }
+
+
+def test_special_field_name_in_the_nested_class_definition(json0):
+    data = json0
+
+    class User(Item):
+        uid = Field(JSONExtractor("id"))
+        username = Field(JSONExtractor("name"), name="name")
+
+    class UserResponse(Item):
+        _ = User(JSONExtractor("users[*]"), name="data")
+
+    first_row = {"uid": 0, "name": "Vang Stout"}
+    assert User(JSONExtractor("data.users[*]")).extract(data) == first_row
+    assert UserResponse(JSONExtractor("data")).extract(data) == {"data": first_row}