Browse Source

#644: renamed Subsettable to MutableFields

Rafał Pitoń 8 years ago
parent
commit
a7e586d167

+ 2 - 2
misago/categories/serializers.py

@@ -2,7 +2,7 @@ from rest_framework import serializers
 
 
 from django.urls import reverse
 from django.urls import reverse
 
 
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 from misago.core.utils import format_plaintext_for_html
 from misago.core.utils import format_plaintext_for_html
 
 
 from .models import Category
 from .models import Category
@@ -29,7 +29,7 @@ def last_activity_detail(f):
     return decorator
     return decorator
 
 
 
 
-class CategorySerializer(serializers.ModelSerializer, Subsettable):
+class CategorySerializer(serializers.ModelSerializer, MutableFields):
     parent = serializers.PrimaryKeyRelatedField(read_only=True)
     parent = serializers.PrimaryKeyRelatedField(read_only=True)
     description = serializers.SerializerMethodField()
     description = serializers.SerializerMethodField()
     is_read = serializers.SerializerMethodField()
     is_read = serializers.SerializerMethodField()

+ 1 - 1
misago/core/serializers.py

@@ -1,4 +1,4 @@
-class Subsettable(object):
+class MutableFields(object):
     @classmethod
     @classmethod
     def subset(cls, *fields):
     def subset(cls, *fields):
         fields_in_name = [f.title().replace('_', '') for f in fields]
         fields_in_name = [f.title().replace('_', '') for f in fields]

+ 3 - 3
misago/core/tests/test_serializers.py

@@ -3,12 +3,12 @@ from rest_framework import serializers
 from django.test import TestCase
 from django.test import TestCase
 
 
 from misago.categories.models import Category
 from misago.categories.models import Category
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 from misago.threads import testutils
 from misago.threads import testutils
 from misago.threads.models import Thread
 from misago.threads.models import Thread
 
 
 
 
-class SubsettableSerializerTests(TestCase):
+class MutableFieldsSerializerTests(TestCase):
     def test_create_subset_serializer(self):
     def test_create_subset_serializer(self):
         """classmethod subset creates new serializer"""
         """classmethod subset creates new serializer"""
         category = Category.objects.get(slug='first-category')
         category = Category.objects.get(slug='first-category')
@@ -67,7 +67,7 @@ class SubsettableSerializerTests(TestCase):
         self.assertEqual(serialized_thread['category'], category.pk)
         self.assertEqual(serialized_thread['category'], category.pk)
 
 
 
 
-class TestSerializer(serializers.ModelSerializer, Subsettable):
+class TestSerializer(serializers.ModelSerializer, MutableFields):
     url = serializers.SerializerMethodField()
     url = serializers.SerializerMethodField()
 
 
     class Meta:
     class Meta:

+ 2 - 2
misago/threads/serializers/feed.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 from django.urls import reverse
 from django.urls import reverse
 
 
 from misago.categories.serializers import CategorySerializer
 from misago.categories.serializers import CategorySerializer
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 from misago.threads.models import Post
 from misago.threads.models import Post
 from misago.users.serializers import UserSerializer
 from misago.users.serializers import UserSerializer
 
 
@@ -24,7 +24,7 @@ FeedCategorySerializer = CategorySerializer.subset(
     'name', 'css_class', 'absolute_url')
     'name', 'css_class', 'absolute_url')
 
 
 
 
-class FeedSerializer(PostSerializer, Subsettable):
+class FeedSerializer(PostSerializer, MutableFields):
     poster = FeedUserSerializer(many=False, read_only=True)
     poster = FeedUserSerializer(many=False, read_only=True)
     category = FeedCategorySerializer(many=False, read_only=True)
     category = FeedCategorySerializer(many=False, read_only=True)
 
 

+ 2 - 2
misago/threads/serializers/post.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 from django.urls import reverse
 from django.urls import reverse
 
 
 from misago.categories.serializers import CategorySerializer
 from misago.categories.serializers import CategorySerializer
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 from misago.threads.models import Post
 from misago.threads.models import Post
 from misago.users.serializers import UserSerializer as BaseUserSerializer
 from misago.users.serializers import UserSerializer as BaseUserSerializer
 
 
@@ -15,7 +15,7 @@ UserSerializer = BaseUserSerializer.subset(
     'id', 'username', 'rank', 'avatars', 'signature', 'short_title', 'status', 'absolute_url')
     'id', 'username', 'rank', 'avatars', 'signature', 'short_title', 'status', 'absolute_url')
 
 
 
 
-class PostSerializer(serializers.ModelSerializer, Subsettable):
+class PostSerializer(serializers.ModelSerializer, MutableFields):
     poster = UserSerializer(many=False, read_only=True)
     poster = UserSerializer(many=False, read_only=True)
     poster_ip = serializers.SerializerMethodField()
     poster_ip = serializers.SerializerMethodField()
     content = serializers.SerializerMethodField()
     content = serializers.SerializerMethodField()

+ 2 - 2
misago/threads/serializers/thread.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 from django.urls import reverse
 from django.urls import reverse
 
 
 from misago.categories.serializers import CategorySerializer
 from misago.categories.serializers import CategorySerializer
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 from misago.threads.models import Thread
 from misago.threads.models import Thread
 
 
 from .poll import PollSerializer
 from .poll import PollSerializer
@@ -22,7 +22,7 @@ BasicCategorySerializer = CategorySerializer.subset(
     'absolute_url', 'api_url', 'level', 'lft', 'rght', 'is_read')
     'absolute_url', 'api_url', 'level', 'lft', 'rght', 'is_read')
 
 
 
 
-class ThreadSerializer(serializers.ModelSerializer, Subsettable):
+class ThreadSerializer(serializers.ModelSerializer, MutableFields):
     category = BasicCategorySerializer(many=False, read_only=True)
     category = BasicCategorySerializer(many=False, read_only=True)
 
 
     acl = serializers.SerializerMethodField()
     acl = serializers.SerializerMethodField()

+ 2 - 2
misago/users/serializers/user.py

@@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.urls import reverse
 
 
 from misago.acl import serialize_acl
 from misago.acl import serialize_acl
-from misago.core.serializers import Subsettable
+from misago.core.serializers import MutableFields
 
 
 from . import RankSerializer
 from . import RankSerializer
 
 
@@ -26,7 +26,7 @@ class StatusSerializer(serializers.Serializer):
     banned_until = serializers.DateTimeField()
     banned_until = serializers.DateTimeField()
 
 
 
 
-class UserSerializer(serializers.ModelSerializer, Subsettable):
+class UserSerializer(serializers.ModelSerializer, MutableFields):
     email = serializers.SerializerMethodField()
     email = serializers.SerializerMethodField()
     rank = RankSerializer(many=False, read_only=True)
     rank = RankSerializer(many=False, read_only=True)
     signature = serializers.SerializerMethodField()
     signature = serializers.SerializerMethodField()