tests for schema naming, bug fixes

README.rst

@@ -119,13 +119,16 @@ You can use resulting schema everywhere marshmallow.Schema can be used, e.g.
     class MyOtherSchema(m.Schema):
         items = f.List(f.Nested(MyUberSchema))
 
+Building OneOfSchema with a decorator
+------------------------------------
+
 When creating "one of" schemas with many options it can become cumbersome to maintain `type_schemas` dict manually.
-In this case you can leave it empty at first and register member schemas to your OneOfSchema with a decorator:
+In this case you can leave it empty at first and register member schemas to your OneOfSchema with the following decorator:
 
 .. code:: python
 
     class MyUberSchema(OneOfSchema):
-        pass
+        type_schemas = {}
 
 
     @MyUberSchema.register_one_of
@@ -143,6 +146,8 @@ By default schemas are named with class name with removed "Schema" suffix, which
 
 
     class MyUberSchema(OneOfSchema):
+        type_schemas = {}
+
         def schema_name(schema_class):
             return schema_class._model_class.__name__
 

marshmallow_oneofschema/one_of_schema.py

@@ -187,7 +187,10 @@ def schema_name(schema_class):
         """Key used for schema classes in type_schemas dict. The default is
         schema class name stripped of the word 'Schema', if present.
         """
-        return schema_class.__name__.replace("Schema", "")
+        schema_class_name = schema_class.__name__
+        if schema_class_name.endswith("Schema"):
+            schema_class_name = schema_class_name[: -len("Schema")]
+        return schema_class_name
 
     @classmethod
     def register_one_of(cls, schema_class):
@@ -199,3 +202,4 @@ def register_one_of(cls, schema_class):
         >>>     ...
         """
         cls.type_schemas[cls.schema_name(schema_class)] = schema_class
+        return schema_class

tests/test_one_of_schema_building.py

@@ -2,23 +2,26 @@
 import marshmallow.fields as f
 from marshmallow_oneofschema import OneOfSchema
 
-from .test_one_of_schema import Foo, Bar, Baz
+from test_one_of_schema import Foo, Bar, Baz
 
 
 class MySchemaWithDefaultNames(OneOfSchema):
-    pass
+    type_schemas = {}
 
 
 class MySchemaWithCustomNames(OneOfSchema):
+    type_schemas = {}
+
     counter = 0
     known_types = [Foo, Bar, Baz]
 
     def get_obj_type(self, obj):
         return self.known_classes.index(obj.__class__)
 
-    def schema_name(self, schema_class):
-        self.counter += 1
-        return str(self.counter - 1)
+    @classmethod
+    def schema_name(cls, schema_class):
+        cls.counter += 1
+        return str(cls.counter - 1)
 
 
 @MySchemaWithCustomNames.register_one_of
@@ -77,3 +80,15 @@ def test_schemas_building_with_register_one_of():
         MySchemaWithCustomNames.type_schemas
         == MyVerboseSchemaWithCustomNames.type_schemas
     )
+
+
+def test_default_schema_naming():
+    class SomeObjectSchema:
+        pass
+
+    assert OneOfSchema.schema_name(SomeObjectSchema) == "SomeObject"
+
+    class AnyOtherSchemaClass:
+        pass
+
+    assert OneOfSchema.schema_name(AnyOtherSchemaClass) == "AnyOtherSchemaClass"