Renamed HyperLinked to Hyperlinked

Author: Anton-Shutik

example/serializers.py

@@ -68,7 +68,7 @@ def __init__(self, *args, **kwargs):
 
     body_format = serializers.SerializerMethodField()
     # single related from model
-    blog_hyperlinked = relations.HyperLinkedRelatedField(
+    blog_hyperlinked = relations.HyperlinkedRelatedField(
         related_link_view_name='entry-blog',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',
@@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs):
     comments = relations.ResourceRelatedField(
         many=True, read_only=True)
     # many related hyperlinked from model
-    comments_hyperlinked = relations.HyperLinkedRelatedField(
+    comments_hyperlinked = relations.HyperlinkedRelatedField(
         related_link_view_name='entry-comments',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',
@@ -98,7 +98,7 @@ def __init__(self, *args, **kwargs):
         read_only=True
     )
     # many related hyperlinked from serializer
-    suggested_hyperlinked = relations.SerializerMethodHyperLinkedRelatedField(
+    suggested_hyperlinked = relations.SerializerMethodHyperlinkedRelatedField(
         related_link_view_name='entry-suggested',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',
@@ -111,7 +111,7 @@ def __init__(self, *args, **kwargs):
     featured = relations.SerializerMethodResourceRelatedField(
         source='get_featured', model=Entry, read_only=True)
     # single related hyperlinked from serializer
-    featured_hyperlinked = relations.SerializerMethodHyperLinkedRelatedField(
+    featured_hyperlinked = relations.SerializerMethodHyperlinkedRelatedField(
         related_link_view_name='entry-featured',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',

example/tests/test_relations.py

@@ -8,9 +8,9 @@
 
 from rest_framework_json_api.exceptions import Conflict
 from rest_framework_json_api.relations import (
-    HyperLinkedRelatedField,
+    HyperlinkedRelatedField,
     ResourceRelatedField,
-    SerializerMethodHyperLinkedRelatedField
+    SerializerMethodHyperlinkedRelatedField
 )
 from rest_framework_json_api.utils import format_resource_type
 
@@ -137,10 +137,10 @@ def test_invalid_resource_id_object(self):
         }
 
 
-class TestHyperLinkedFieldBase(TestBase):
+class TestHyperlinkedFieldBase(TestBase):
 
     def setUp(self):
-        super(TestHyperLinkedFieldBase, self).setUp()
+        super(TestHyperlinkedFieldBase, self).setUp()
         self.blog = Blog.objects.create(name='Some Blog', tagline="It's a blog")
         self.entry = Entry.objects.create(
             blog=self.blog,
@@ -161,10 +161,10 @@ def setUp(self):
         self.view = EntryViewSet(request=self.request, kwargs={'entry_pk': self.entry.id})
 
 
-class TestHyperLinkedRelatedField(TestHyperLinkedFieldBase):
+class TestHyperlinkedRelatedField(TestHyperlinkedFieldBase):
 
     def test_single_hyperlinked_related_field(self):
-        field = HyperLinkedRelatedField(
+        field = HyperlinkedRelatedField(
             related_link_view_name='entry-blog',
             related_link_url_kwarg='entry_pk',
             self_link_view_name='entry-relationships',
@@ -184,7 +184,7 @@ def test_single_hyperlinked_related_field(self):
         self.assertEqual(got, links_expected)
 
     def test_many_hyperlinked_related_field(self):
-        field = HyperLinkedRelatedField(
+        field = HyperlinkedRelatedField(
             related_link_view_name='entry-comments',
             related_link_url_kwarg='entry_pk',
             self_link_view_name='entry-relationships',
@@ -205,7 +205,7 @@ def test_many_hyperlinked_related_field(self):
         self.assertEqual(got, links_expected)
 
 
-class TestSerializerMethodHyperLinkedRelatedField(TestHyperLinkedFieldBase):
+class TestSerializerMethodHyperlinkedRelatedField(TestHyperlinkedFieldBase):
 
     def test_single_serializer_method_hyperlinked_related_field(self):
         serializer = EntryModelSerializerWithHyperLinks(
@@ -271,15 +271,15 @@ class Meta:
 
 
 class EntryModelSerializerWithHyperLinks(serializers.ModelSerializer):
-    blog = SerializerMethodHyperLinkedRelatedField(
+    blog = SerializerMethodHyperlinkedRelatedField(
         related_link_view_name='entry-blog',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',
         many=True,
         read_only=True,
         source='get_blog'
     )
-    comments = SerializerMethodHyperLinkedRelatedField(
+    comments = SerializerMethodHyperlinkedRelatedField(
         related_link_view_name='entry-comments',
         related_link_url_kwarg='entry_pk',
         self_link_view_name='entry-relationships',

rest_framework_json_api/relations.py

@@ -51,7 +51,7 @@ class ManyRelatedFieldWithNoData(SkipDataMixin, DRFManyRelatedField):
     pass
 
 
-class HyperLinkedMixin(object):
+class HyperlinkedMixin(object):
     self_link_view_name = None
     related_link_view_name = None
     related_link_lookup_field = 'pk'
@@ -74,7 +74,7 @@ def __init__(self, self_link_view_name=None, related_link_view_name=None, **kwar
         # implicit `self` argument to be passed.
         self.reverse = reverse
 
-        super(HyperLinkedMixin, self).__init__(**kwargs)
+        super(HyperlinkedMixin, self).__init__(**kwargs)
 
     def get_url(self, name, view_name, kwargs, request):
         """
@@ -126,7 +126,7 @@ def get_links(self, obj=None, lookup_field='pk'):
         return return_data
 
 
-class HyperLinkedRelatedField(HyperLinkedMixin, SkipDataMixin, RelatedField):
+class HyperlinkedRelatedField(HyperlinkedMixin, SkipDataMixin, RelatedField):
 
     @classmethod
     def many_init(cls, *args, **kwargs):
@@ -152,7 +152,7 @@ def many_init(cls, *args, **kwargs):
         return ManyRelatedFieldWithNoData(**list_kwargs)
 
 
-class ResourceRelatedField(HyperLinkedMixin, PrimaryKeyRelatedField):
+class ResourceRelatedField(HyperlinkedMixin, PrimaryKeyRelatedField):
     _skip_polymorphic_optimization = True
     self_link_view_name = None
     related_link_view_name = None
@@ -382,5 +382,5 @@ def to_representation(self, value):
         return super(SerializerMethodResourceRelatedField, self).to_representation(value)
 
 
-class SerializerMethodHyperLinkedRelatedField(SkipDataMixin, SerializerMethodResourceRelatedField):
+class SerializerMethodHyperlinkedRelatedField(SkipDataMixin, SerializerMethodResourceRelatedField):
     pass

rest_framework_json_api/renderers.py

@@ -13,7 +13,7 @@
 
 import rest_framework_json_api
 from rest_framework_json_api import utils
-from rest_framework_json_api.relations import HyperLinkedMixin, ResourceRelatedField, SkipDataMixin
+from rest_framework_json_api.relations import HyperlinkedMixin, ResourceRelatedField, SkipDataMixin
 
 
 class JSONRenderer(renderers.JSONRenderer):
@@ -127,7 +127,7 @@ def extract_relationships(cls, fields, resource, resource_instance):
                 continue
 
             relation_data = {}
-            if isinstance(field, HyperLinkedMixin):
+            if isinstance(field, HyperlinkedMixin):
                 field_links = field.get_links(resource_instance, field.related_link_lookup_field)
                 relation_data.update({'links': field_links} if field_links else dict())
                 data.update({field_name: relation_data})
@@ -199,7 +199,7 @@ def extract_relationships(cls, fields, resource, resource_instance):
                         {'data': resource.get(field_name)}
                     )
 
-                if isinstance(field.child_relation, HyperLinkedMixin):
+                if isinstance(field.child_relation, HyperlinkedMixin):
                     field_links = field.child_relation.get_links(
                         resource_instance,
                         field.child_relation.related_link_lookup_field