Remove response codes from resources

Resources now just return if the action was completed or deferred. The
operation determines the proper response code.

Author: lgebhardt

lib/jsonapi/operation.rb

@@ -149,7 +149,7 @@ def apply(context)
       resource = @resource_klass.create(context)
       result = resource.replace_fields(@data)
 
-      return JSONAPI::ResourceOperationResult.new((result ? result : :created), resource)
+      return JSONAPI::ResourceOperationResult.new((result == :deferred ? :accepted : :created), resource)
 
     rescue JSONAPI::Exceptions::Error => e
       return JSONAPI::ErrorsOperationResult.new(e.errors[0].code, e.errors)
@@ -165,9 +165,9 @@ def initialize(resource_klass, options = {})
 
     def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
-      resource.remove
+      result = resource.remove
 
-      return JSONAPI::OperationResult.new(:no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
 
     rescue JSONAPI::Exceptions::Error => e
       return JSONAPI::ErrorsOperationResult.new(e.errors[0].code, e.errors)
@@ -187,7 +187,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.replace_fields(data)
 
-      return JSONAPI::ResourceOperationResult.new(result ? result : :ok, resource)
+      return JSONAPI::ResourceOperationResult.new(result == :deferred ? :accepted : :ok, resource)
     end
   end
 
@@ -205,7 +205,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.replace_has_one_link(@association_type, @key_value)
 
-      return JSONAPI::OperationResult.new(result ? result : :no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
     end
   end
 
@@ -223,7 +223,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.create_has_many_links(@association_type, @data)
 
-      return JSONAPI::OperationResult.new(result ? result : :no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
     end
   end
 
@@ -241,7 +241,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.replace_has_many_links(@association_type, @data)
 
-      return JSONAPI::OperationResult.new(result ? result : :no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
     end
   end
 
@@ -259,7 +259,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.remove_has_many_link(@association_type, @associated_key)
 
-      return JSONAPI::OperationResult.new(result ? result : :no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
     end
   end
 
@@ -276,7 +276,7 @@ def apply(context)
       resource = @resource_klass.find_by_key(@resource_id, context: context)
       result = resource.remove_has_one_link(@association_type)
 
-      return JSONAPI::OperationResult.new(result ? result : :no_content)
+      return JSONAPI::OperationResult.new(result == :deferred ? :accepted : :no_content)
     end
   end
 end

lib/jsonapi/resource.rb

@@ -35,28 +35,27 @@ def is_new?
     end
 
     def change(callback)
-      result = nil
+      deferred = false
 
       if @changing
         run_callbacks callback do
-          yield
+          deferred = true if yield == :deferred
         end
       else
         run_callbacks is_new? ? :create : :update do
           @changing = true
           run_callbacks callback do
-            result = yield
+            deferred = true if yield == :deferred
           end
 
           if @save_needed || is_new?
-            save_result = save
-            result = save_result if save_result
+            deferred = true if save == :deferred
           end
 
         end
       end
 
-      return result
+      return deferred ? :deferred : :completed
     end
 
     def remove
@@ -127,13 +126,13 @@ def _save
       saved = @model.save
       @save_needed = !saved
 
-      return
+      return :completed
     end
 
     def _remove
       @model.destroy
 
-      return
+      return :completed
     end
 
     def _create_has_many_links(association_type, association_key_values)
@@ -151,7 +150,7 @@ def _create_has_many_links(association_type, association_key_values)
         end
       end
 
-      return
+      return :completed
     end
 
     def _replace_has_many_links(association_type, association_key_values)
@@ -160,7 +159,7 @@ def _replace_has_many_links(association_type, association_key_values)
       send("#{association.foreign_key}=", association_key_values)
       @save_needed = true
 
-      return
+      return :completed
     end
 
     def _replace_has_one_link(association_type, association_key_value)
@@ -169,15 +168,15 @@ def _replace_has_one_link(association_type, association_key_value)
       send("#{association.foreign_key}=", association_key_value)
       @save_needed = true
 
-      return
+      return :completed
     end
 
     def _remove_has_many_link(association_type, key)
       association = self.class._associations[association_type]
 
       @model.send(association.type).delete(key)
 
-      return
+      return :completed
     end
 
     def _remove_has_one_link(association_type)
@@ -186,7 +185,7 @@ def _remove_has_one_link(association_type)
       send("#{association.foreign_key}=", nil)
       @save_needed = true
 
-      return
+      return :completed
     end
 
     def _replace_fields(field_data)
@@ -213,7 +212,7 @@ def _replace_fields(field_data)
         replace_has_many_links(association_type, values)
       end if field_data[:has_many]
 
-      return
+      return :completed
     end
 
     class << self

test/fixtures/active_record.rb

@@ -704,7 +704,7 @@ def self.find_by_key(id, options = {})
 
   def _save
     super
-    return :accepted
+    return :deferred
   end
 end