Merge pull request #342 from cerebris/fix_transactional

Fix transactional

Author: dgeb

lib/jsonapi/operation.rb

@@ -17,12 +17,12 @@ class FindOperation < Operation
     attr_reader :filters, :include_directives, :sort_criteria, :paginator
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @filters = options[:filters]
       @include_directives = options[:include_directives]
       @sort_criteria = options.fetch(:sort_criteria, [])
       @paginator = options[:paginator]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def record_count
@@ -70,10 +70,10 @@ class ShowOperation < Operation
     attr_reader :id, :include_directives
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @id = options.fetch(:id)
       @include_directives = options[:include_directives]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -94,10 +94,10 @@ class ShowRelationshipOperation < Operation
     attr_reader :parent_key, :relationship_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @parent_key = options.fetch(:parent_key)
       @relationship_type = options.fetch(:relationship_type)
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -116,11 +116,11 @@ class ShowRelatedResourceOperation < Operation
     attr_reader :source_klass, :source_id, :relationship_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @source_klass = options.fetch(:source_klass)
       @source_id = options.fetch(:source_id)
       @relationship_type = options.fetch(:relationship_type)
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -139,14 +139,14 @@ class ShowRelatedResourcesOperation < Operation
     attr_reader :source_klass, :source_id, :relationship_type, :filters, :sort_criteria, :paginator
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @source_klass = options.fetch(:source_klass)
       @source_id = options.fetch(:source_id)
       @relationship_type = options.fetch(:relationship_type)
       @filters = options[:filters]
       @sort_criteria = options[:sort_criteria]
       @paginator = options[:paginator]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -168,8 +168,8 @@ class CreateResourceOperation < Operation
     attr_reader :data
 
     def initialize(resource_klass, options = {})
-      @data = options.fetch(:data)
       super(resource_klass, options)
+      @data = options.fetch(:data)
     end
 
     def apply
@@ -186,8 +186,8 @@ def apply
   class RemoveResourceOperation < Operation
     attr_reader :resource_id
     def initialize(resource_klass, options = {})
-      @resource_id = options.fetch(:resource_id)
       super(resource_klass, options)
+      @resource_id = options.fetch(:resource_id)
     end
 
     def apply
@@ -205,9 +205,9 @@ class ReplaceFieldsOperation < Operation
     attr_reader :data, :resource_id
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
-      super(resource_klass, options)
     end
 
     def apply
@@ -222,10 +222,10 @@ class ReplaceToOneRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type, :key_value
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @key_value = options.fetch(:key_value)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -240,11 +240,11 @@ class ReplacePolymorphicToOneRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type, :key_value, :key_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @key_value = options.fetch(:key_value)
       @key_type = options.fetch(:key_type)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -259,10 +259,10 @@ class CreateToManyRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type, :data
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -277,10 +277,10 @@ class ReplaceToManyRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type, :data
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -295,10 +295,10 @@ class RemoveToManyRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type, :associated_key
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @associated_key = options.fetch(:associated_key)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -313,9 +313,9 @@ class RemoveToOneRelationshipOperation < Operation
     attr_reader :resource_id, :relationship_type
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply

lib/jsonapi/operations_processor.rb

@@ -33,10 +33,8 @@ def process(request)
       # Use transactions if more than one operation and if one of the operations can be transactional
       # Even if transactional transactions won't be used unless the derived OperationsProcessor supports them.
       @transactional = false
-      if @operations.length > 1
-        @operations.each do |operation|
-          @transactional |= operation.transactional
-        end
+      @operations.each do |operation|
+        @transactional |= operation.transactional
       end
 
       run_callbacks :operations do