Skip to content

Commit 12ce429

Browse files
committed
Add explicit returns for "complex" methods and early exits.
1 parent 8f95930 commit 12ce429

1 file changed

Lines changed: 23 additions & 21 deletions

File tree

lib/jsonapi/processor.rb

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def _processor_from_resource_type(resource_klass)
2828
processor = JSONAPI.configuration.default_processor_klass
2929
end
3030

31-
processor
31+
return processor
3232
end
3333

3434
def transactional_operation_type?(operation_type)
3535
case operation_type
3636
when :find, :show, :show_related_resource, :show_related_resources
37-
false
37+
return false
3838
else
39-
true
39+
return true
4040
end
4141
end
4242
end
@@ -92,9 +92,7 @@ def find
9292
page_options[:pagination_params] = paginator.links_page_params(page_options)
9393
end
9494

95-
JSONAPI::ResourcesOperationResult.new(:ok,
96-
resource_records,
97-
page_options)
95+
return JSONAPI::ResourcesOperationResult.new(:ok, resource_records, page_options)
9896
end
9997

10098
def show
@@ -107,7 +105,7 @@ def show
107105
context: context,
108106
include_directives: include_directives)
109107

110-
JSONAPI::ResourceOperationResult.new(:ok, resource_record)
108+
return JSONAPI::ResourceOperationResult.new(:ok, resource_record)
111109
end
112110

113111
def show_relationship
@@ -116,9 +114,9 @@ def show_relationship
116114

117115
parent_resource = resource_klass.find_by_key(parent_key, context: context)
118116

119-
JSONAPI::LinksObjectOperationResult.new(:ok,
120-
parent_resource,
121-
resource_klass._relationship(relationship_type))
117+
return JSONAPI::LinksObjectOperationResult.new(:ok,
118+
parent_resource,
119+
resource_klass._relationship(relationship_type))
122120
end
123121

124122
def show_related_resource
@@ -130,7 +128,7 @@ def show_related_resource
130128

131129
related_resource = source_resource.public_send(relationship_type)
132130

133-
JSONAPI::ResourceOperationResult.new(:ok, related_resource)
131+
return JSONAPI::ResourceOperationResult.new(:ok, related_resource)
134132
end
135133

136134
def show_related_resources
@@ -175,7 +173,11 @@ def show_related_resources
175173
opts.merge!(record_count: record_count) if JSONAPI.configuration.top_level_meta_include_record_count
176174
opts.merge!(page_count: page_count) if JSONAPI.configuration.top_level_meta_include_page_count
177175

178-
JSONAPI::RelatedResourcesOperationResult.new(:ok, source_resource, relationship_type, related_resources, opts)
176+
return JSONAPI::RelatedResourcesOperationResult.new(:ok,
177+
source_resource,
178+
relationship_type,
179+
related_resources,
180+
opts)
179181
end
180182

181183
def create_resource
@@ -184,7 +186,7 @@ def create_resource
184186
resource = resource_klass.create(context)
185187
result = resource.replace_fields(data)
186188

187-
JSONAPI::ResourceOperationResult.new((result == :completed ? :created : :accepted), resource)
189+
return JSONAPI::ResourceOperationResult.new((result == :completed ? :created : :accepted), resource)
188190
end
189191

190192
def remove_resource
@@ -193,7 +195,7 @@ def remove_resource
193195
resource = resource_klass.find_by_key(resource_id, context: context)
194196
result = resource.remove
195197

196-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
198+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
197199
end
198200

199201
def replace_fields
@@ -203,7 +205,7 @@ def replace_fields
203205
resource = resource_klass.find_by_key(resource_id, context: context)
204206
result = resource.replace_fields(data)
205207

206-
JSONAPI::ResourceOperationResult.new(result == :completed ? :ok : :accepted, resource)
208+
return JSONAPI::ResourceOperationResult.new(result == :completed ? :ok : :accepted, resource)
207209
end
208210

209211
def replace_to_one_relationship
@@ -214,7 +216,7 @@ def replace_to_one_relationship
214216
resource = resource_klass.find_by_key(resource_id, context: context)
215217
result = resource.replace_to_one_link(relationship_type, key_value)
216218

217-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
219+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
218220
end
219221

220222
def replace_polymorphic_to_one_relationship
@@ -226,7 +228,7 @@ def replace_polymorphic_to_one_relationship
226228
resource = resource_klass.find_by_key(resource_id, context: context)
227229
result = resource.replace_polymorphic_to_one_link(relationship_type, key_value, key_type)
228230

229-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
231+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
230232
end
231233

232234
def create_to_many_relationship
@@ -237,7 +239,7 @@ def create_to_many_relationship
237239
resource = resource_klass.find_by_key(resource_id, context: context)
238240
result = resource.create_to_many_links(relationship_type, data)
239241

240-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
242+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
241243
end
242244

243245
def replace_to_many_relationship
@@ -248,7 +250,7 @@ def replace_to_many_relationship
248250
resource = resource_klass.find_by_key(resource_id, context: context)
249251
result = resource.replace_to_many_links(relationship_type, data)
250252

251-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
253+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
252254
end
253255

254256
def remove_to_many_relationship
@@ -259,7 +261,7 @@ def remove_to_many_relationship
259261
resource = resource_klass.find_by_key(resource_id, context: context)
260262
result = resource.remove_to_many_link(relationship_type, associated_key)
261263

262-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
264+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
263265
end
264266

265267
def remove_to_one_relationship
@@ -269,7 +271,7 @@ def remove_to_one_relationship
269271
resource = resource_klass.find_by_key(resource_id, context: context)
270272
result = resource.remove_to_one_link(relationship_type)
271273

272-
JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
274+
return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
273275
end
274276
end
275277
end

0 commit comments

Comments
 (0)