Allow extra parameters to Object fields

Fixes #895
Fixes #905

Author: honzakral

elasticsearch_dsl/field.py

@@ -169,7 +169,7 @@ def empty(self):
     def to_dict(self):
         d = self._mapping.to_dict()
         _, d = d.popitem()
-        d["type"] = self.name
+        d.update(super(Object, self).to_dict())
         return d
 
     def _collect_fields(self):

test_elasticsearch_dsl/test_field.py

@@ -142,6 +142,13 @@ def test_object_dynamic_values():
         f = field.Object(dynamic=dynamic)
         assert f.to_dict()['dynamic'] == dynamic
 
+def test_object_disabled():
+    f = field.Object(enabled=False)
+    assert f.to_dict() == {
+        "type": "object",
+        "enabled": False
+    }
+
 
 def test_object_constructor():
     expected = {'type': 'object', 'properties': {'inner_int': {'type': 'integer'}}}