Skip to content

Commit 4941416

Browse files
committed
Return nil instead of :default in resource methods
1 parent 8bd45db commit 4941416

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/jsonapi/operation.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def apply(context)
149149
resource = @resource_klass.create(context)
150150
result = resource.replace_fields(@data)
151151

152-
return JSONAPI::ResourceOperationResult.new(result == :default ? :created : result, resource)
152+
return JSONAPI::ResourceOperationResult.new((result ? result : :created), resource)
153153

154154
rescue JSONAPI::Exceptions::Error => e
155155
return JSONAPI::ErrorsOperationResult.new(e.errors[0].code, e.errors)
@@ -187,7 +187,7 @@ def apply(context)
187187
resource = @resource_klass.find_by_key(@resource_id, context: context)
188188
result = resource.replace_fields(data)
189189

190-
return JSONAPI::ResourceOperationResult.new(result == :default ? :ok : result, resource)
190+
return JSONAPI::ResourceOperationResult.new(result ? result : :ok, resource)
191191
end
192192
end
193193

@@ -205,7 +205,7 @@ def apply(context)
205205
resource = @resource_klass.find_by_key(@resource_id, context: context)
206206
result = resource.replace_has_one_link(@association_type, @key_value)
207207

208-
return JSONAPI::OperationResult.new(result == :default ? :no_content : result)
208+
return JSONAPI::OperationResult.new(result ? result : :no_content)
209209
end
210210
end
211211

@@ -223,7 +223,7 @@ def apply(context)
223223
resource = @resource_klass.find_by_key(@resource_id, context: context)
224224
result = resource.create_has_many_links(@association_type, @data)
225225

226-
return JSONAPI::OperationResult.new(result == :default ? :no_content : result)
226+
return JSONAPI::OperationResult.new(result ? result : :no_content)
227227
end
228228
end
229229

@@ -241,7 +241,7 @@ def apply(context)
241241
resource = @resource_klass.find_by_key(@resource_id, context: context)
242242
result = resource.replace_has_many_links(@association_type, @data)
243243

244-
return JSONAPI::OperationResult.new(result == :default ? :no_content : result)
244+
return JSONAPI::OperationResult.new(result ? result : :no_content)
245245
end
246246
end
247247

@@ -259,7 +259,7 @@ def apply(context)
259259
resource = @resource_klass.find_by_key(@resource_id, context: context)
260260
result = resource.remove_has_many_link(@association_type, @associated_key)
261261

262-
return JSONAPI::OperationResult.new(result == :default ? :no_content : result)
262+
return JSONAPI::OperationResult.new(result ? result : :no_content)
263263
end
264264
end
265265

@@ -276,7 +276,7 @@ def apply(context)
276276
resource = @resource_klass.find_by_key(@resource_id, context: context)
277277
result = resource.remove_has_one_link(@association_type)
278278

279-
return JSONAPI::OperationResult.new(result == :default ? :no_content : result)
279+
return JSONAPI::OperationResult.new(result ? result : :no_content)
280280
end
281281
end
282282
end

lib/jsonapi/resource.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def _save
124124
saved = @model.save
125125
@save_needed = !saved
126126

127-
return :default
127+
return
128128
end
129129

130130
def _remove
@@ -146,7 +146,7 @@ def _create_has_many_links(association_type, association_key_values)
146146
end
147147
end
148148

149-
return :default
149+
return
150150
end
151151

152152
def _replace_has_many_links(association_type, association_key_values)
@@ -155,7 +155,7 @@ def _replace_has_many_links(association_type, association_key_values)
155155
send("#{association.foreign_key}=", association_key_values)
156156
@save_needed = true
157157

158-
return :default
158+
return
159159
end
160160

161161
def _replace_has_one_link(association_type, association_key_value)
@@ -170,7 +170,7 @@ def _remove_has_many_link(association_type, key)
170170

171171
@model.send(association.type).delete(key)
172172

173-
return :default
173+
return
174174
end
175175

176176
def _remove_has_one_link(association_type)

0 commit comments

Comments
 (0)