Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 69e1a22

Browse files
Renamed HyperLinked to Hyperlinked
1 parent 80b819a commit 69e1a22

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎example/serializers.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def __init__(self, *args, **kwargs):
6868

6969
body_format = serializers.SerializerMethodField()
7070
# single related from model
71-
blog_hyperlinked = relations.HyperLinkedRelatedField(
71+
blog_hyperlinked = relations.HyperlinkedRelatedField(
7272
related_link_view_name='entry-blog',
7373
related_link_url_kwarg='entry_pk',
7474
self_link_view_name='entry-relationships',
@@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs):
7979
comments = relations.ResourceRelatedField(
8080
many=True, read_only=True)
8181
# many related hyperlinked from model
82-
comments_hyperlinked = relations.HyperLinkedRelatedField(
82+
comments_hyperlinked = relations.HyperlinkedRelatedField(
8383
related_link_view_name='entry-comments',
8484
related_link_url_kwarg='entry_pk',
8585
self_link_view_name='entry-relationships',
@@ -98,7 +98,7 @@ def __init__(self, *args, **kwargs):
9898
read_only=True
9999
)
100100
# many related hyperlinked from serializer
101-
suggested_hyperlinked = relations.SerializerMethodHyperLinkedRelatedField(
101+
suggested_hyperlinked = relations.SerializerMethodHyperlinkedRelatedField(
102102
related_link_view_name='entry-suggested',
103103
related_link_url_kwarg='entry_pk',
104104
self_link_view_name='entry-relationships',
@@ -111,7 +111,7 @@ def __init__(self, *args, **kwargs):
111111
featured = relations.SerializerMethodResourceRelatedField(
112112
source='get_featured', model=Entry, read_only=True)
113113
# single related hyperlinked from serializer
114-
featured_hyperlinked = relations.SerializerMethodHyperLinkedRelatedField(
114+
featured_hyperlinked = relations.SerializerMethodHyperlinkedRelatedField(
115115
related_link_view_name='entry-featured',
116116
related_link_url_kwarg='entry_pk',
117117
self_link_view_name='entry-relationships',

‎example/tests/test_relations.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
from rest_framework_json_api.exceptions import Conflict
1010
from rest_framework_json_api.relations import (
11-
HyperLinkedRelatedField,
11+
HyperlinkedRelatedField,
1212
ResourceRelatedField,
13-
SerializerMethodHyperLinkedRelatedField
13+
SerializerMethodHyperlinkedRelatedField
1414
)
1515
from rest_framework_json_api.utils import format_resource_type
1616

@@ -137,10 +137,10 @@ def test_invalid_resource_id_object(self):
137137
}
138138

139139

140-
class TestHyperLinkedFieldBase(TestBase):
140+
class TestHyperlinkedFieldBase(TestBase):
141141

142142
def setUp(self):
143-
super(TestHyperLinkedFieldBase, self).setUp()
143+
super(TestHyperlinkedFieldBase, self).setUp()
144144
self.blog = Blog.objects.create(name='Some Blog', tagline="It's a blog")
145145
self.entry = Entry.objects.create(
146146
blog=self.blog,
@@ -161,10 +161,10 @@ def setUp(self):
161161
self.view = EntryViewSet(request=self.request, kwargs={'entry_pk': self.entry.id})
162162

163163

164-
class TestHyperLinkedRelatedField(TestHyperLinkedFieldBase):
164+
class TestHyperlinkedRelatedField(TestHyperlinkedFieldBase):
165165

166166
def test_single_hyperlinked_related_field(self):
167-
field = HyperLinkedRelatedField(
167+
field = HyperlinkedRelatedField(
168168
related_link_view_name='entry-blog',
169169
related_link_url_kwarg='entry_pk',
170170
self_link_view_name='entry-relationships',
@@ -184,7 +184,7 @@ def test_single_hyperlinked_related_field(self):
184184
self.assertEqual(got, links_expected)
185185

186186
def test_many_hyperlinked_related_field(self):
187-
field = HyperLinkedRelatedField(
187+
field = HyperlinkedRelatedField(
188188
related_link_view_name='entry-comments',
189189
related_link_url_kwarg='entry_pk',
190190
self_link_view_name='entry-relationships',
@@ -205,7 +205,7 @@ def test_many_hyperlinked_related_field(self):
205205
self.assertEqual(got, links_expected)
206206

207207

208-
class TestSerializerMethodHyperLinkedRelatedField(TestHyperLinkedFieldBase):
208+
class TestSerializerMethodHyperlinkedRelatedField(TestHyperlinkedFieldBase):
209209

210210
def test_single_serializer_method_hyperlinked_related_field(self):
211211
serializer = EntryModelSerializerWithHyperLinks(
@@ -271,15 +271,15 @@ class Meta:
271271

272272

273273
class EntryModelSerializerWithHyperLinks(serializers.ModelSerializer):
274-
blog = SerializerMethodHyperLinkedRelatedField(
274+
blog = SerializerMethodHyperlinkedRelatedField(
275275
related_link_view_name='entry-blog',
276276
related_link_url_kwarg='entry_pk',
277277
self_link_view_name='entry-relationships',
278278
many=True,
279279
read_only=True,
280280
source='get_blog'
281281
)
282-
comments = SerializerMethodHyperLinkedRelatedField(
282+
comments = SerializerMethodHyperlinkedRelatedField(
283283
related_link_view_name='entry-comments',
284284
related_link_url_kwarg='entry_pk',
285285
self_link_view_name='entry-relationships',

‎rest_framework_json_api/relations.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ManyRelatedFieldWithNoData(SkipDataMixin, DRFManyRelatedField):
5151
pass
5252

5353

54-
class HyperLinkedMixin(object):
54+
class HyperlinkedMixin(object):
5555
self_link_view_name = None
5656
related_link_view_name = None
5757
related_link_lookup_field = 'pk'
@@ -74,7 +74,7 @@ def __init__(self, self_link_view_name=None, related_link_view_name=None, **kwar
7474
# implicit `self` argument to be passed.
7575
self.reverse = reverse
7676

77-
super(HyperLinkedMixin, self).__init__(**kwargs)
77+
super(HyperlinkedMixin, self).__init__(**kwargs)
7878

7979
def get_url(self, name, view_name, kwargs, request):
8080
"""
@@ -126,7 +126,7 @@ def get_links(self, obj=None, lookup_field='pk'):
126126
return return_data
127127

128128

129-
class HyperLinkedRelatedField(HyperLinkedMixin, SkipDataMixin, RelatedField):
129+
class HyperlinkedRelatedField(HyperlinkedMixin, SkipDataMixin, RelatedField):
130130

131131
@classmethod
132132
def many_init(cls, *args, **kwargs):
@@ -152,7 +152,7 @@ def many_init(cls, *args, **kwargs):
152152
return ManyRelatedFieldWithNoData(**list_kwargs)
153153

154154

155-
class ResourceRelatedField(HyperLinkedMixin, PrimaryKeyRelatedField):
155+
class ResourceRelatedField(HyperlinkedMixin, PrimaryKeyRelatedField):
156156
_skip_polymorphic_optimization = True
157157
self_link_view_name = None
158158
related_link_view_name = None
@@ -382,5 +382,5 @@ def to_representation(self, value):
382382
return super(SerializerMethodResourceRelatedField, self).to_representation(value)
383383

384384

385-
class SerializerMethodHyperLinkedRelatedField(SkipDataMixin, SerializerMethodResourceRelatedField):
385+
class SerializerMethodHyperlinkedRelatedField(SkipDataMixin, SerializerMethodResourceRelatedField):
386386
pass

‎rest_framework_json_api/renderers.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import rest_framework_json_api
1515
from rest_framework_json_api import utils
16-
from rest_framework_json_api.relations import HyperLinkedMixin, ResourceRelatedField, SkipDataMixin
16+
from rest_framework_json_api.relations import HyperlinkedMixin, ResourceRelatedField, SkipDataMixin
1717

1818

1919
class JSONRenderer(renderers.JSONRenderer):
@@ -127,7 +127,7 @@ def extract_relationships(cls, fields, resource, resource_instance):
127127
continue
128128

129129
relation_data = {}
130-
if isinstance(field, HyperLinkedMixin):
130+
if isinstance(field, HyperlinkedMixin):
131131
field_links = field.get_links(resource_instance, field.related_link_lookup_field)
132132
relation_data.update({'links': field_links} if field_links else dict())
133133
data.update({field_name: relation_data})
@@ -199,7 +199,7 @@ def extract_relationships(cls, fields, resource, resource_instance):
199199
{'data': resource.get(field_name)}
200200
)
201201

202-
if isinstance(field.child_relation, HyperLinkedMixin):
202+
if isinstance(field.child_relation, HyperlinkedMixin):
203203
field_links = field.child_relation.get_links(
204204
resource_instance,
205205
field.child_relation.related_link_lookup_field

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /