Fix marshall and validation of allOf

bravado_core/marshal.py

@@ -5,6 +5,7 @@
 from bravado_core import schema
 from bravado_core.exception import SwaggerMappingError
 from bravado_core.model import is_model
+from bravado_core.model import is_object
 from bravado_core.model import MODEL_MARKER
 from bravado_core.schema import get_spec_for_prop
 from bravado_core.schema import handle_null_value
@@ -30,7 +31,7 @@ def marshal_schema_object(swagger_spec, schema_object_spec, value):
     """
     deref = swagger_spec.deref
     schema_object_spec = deref(schema_object_spec)
-    obj_type = schema_object_spec['type']
+    obj_type = schema_object_spec.get('type')
 
     if obj_type in SWAGGER_PRIMITIVES:
         return marshal_primitive(swagger_spec, schema_object_spec, value)
@@ -49,7 +50,7 @@ def marshal_schema_object(swagger_spec, schema_object_spec, value):
         # key for identification.
         return marshal_model(swagger_spec, schema_object_spec, value)
 
-    if obj_type == 'object':
+    if is_object(swagger_spec, schema_object_spec):
         return marshal_object(swagger_spec, schema_object_spec, value)
 
     if obj_type == 'file':

bravado_core/validate.py

@@ -8,6 +8,7 @@
 
 from bravado_core.exception import SwaggerMappingError
 from bravado_core.exception import SwaggerSecurityValidationError
+from bravado_core.model import is_object
 from bravado_core.schema import SWAGGER_PRIMITIVES
 from bravado_core.swagger20_validator import get_validator_type
 
@@ -28,7 +29,7 @@ def validate_schema_object(swagger_spec, schema_object_spec, value):
     elif obj_type == 'array':
         validate_array(swagger_spec, schema_object_spec, value)
 
-    elif obj_type == 'object':
+    elif is_object(swagger_spec, schema_object_spec):
         validate_object(swagger_spec, schema_object_spec, value)
 
     elif obj_type == 'file':

tests/marshal/marshal_schema_object_test.py

@@ -66,3 +66,15 @@ def test_ref(minimal_swagger_dict):
     minimal_swagger_dict['refs'] = {'Foo': foo_spec}
     swagger_spec = Spec(minimal_swagger_dict)
     assert 'foo' == marshal_schema_object(swagger_spec, ref_spec, 'foo')
+
+
+def test_allOf_with_ref(composition_spec):
+    pongclone_spec = composition_spec.spec_dict['definitions']['pongClone']
+    value = {
+        'additionalFeature': 'Badges',
+        'gameSystem': 'NES',
+        'pang': 'value',
+        'releaseDate': 'October',
+    }
+    expected = copy.deepcopy(value)
+    assert expected == marshal_schema_object(composition_spec, pongclone_spec, value)

tests/validate/validate_schema_object_test.py

@@ -9,3 +9,14 @@ def test_unknown_type(minimal_swagger_spec):
     with pytest.raises(SwaggerMappingError) as excinfo:
         validate_schema_object(minimal_swagger_spec, {'type': 'unknown'}, 'foo')
     assert 'Unknown type' in str(excinfo.value)
+
+
+def test_allOf_with_ref(composition_spec):
+    pongclone_spec = composition_spec.spec_dict['definitions']['pongClone']
+    value = {
+        'additionalFeature': 'Badges',
+        'gameSystem': 'NES',
+        'pang': 'value',
+        'releaseDate': 'October',
+    }
+    validate_schema_object(composition_spec, pongclone_spec, value)