adds specs for stage, and updates transaction specs, fixes a couple m…

…inor bugs exposed by the fixed specs

lib/transactor/actor.rb

@@ -36,8 +36,9 @@ def rollback_on_failure?
 
     def perform!(&block)
       @state = :performing
-      perform &block
+      result = perform(&block)
       @state = :performed
+      result
     rescue StandardError => e
       @state = :bombed
       @error = e
@@ -46,8 +47,9 @@ def perform!(&block)
 
     def rollback!(&block)
       @state = :rolling_back
-      rollback &block
+      result = rollback(&block)
       @state = :rolled_back
+      result
     rescue StandardError => e
       @state = :rollback_bombed
       @rollback_error = e

lib/transactor/performance.rb

@@ -7,12 +7,12 @@ def self.perform(actor, *args, &block)
     end
 
     def perform(&block)
-      @result = actor.perform(&block)
+      @result = actor.perform!(&block)
       self
     end
 
     def rollback(&block)
-      actor.rollback(&block)
+      actor.rollback!(&block)
       self
     end
 

lib/transactor/transaction.rb

@@ -51,28 +51,25 @@ def rollback_performances
           performance.rollback
         rescue RollbackNotImplemented => e
           # noop, rollback was not implemented
-        rescue => e
+        rescue StandardError => e
+          # performance rollback failed :(
           raise RollbackBombed.new(e, performance) if Transactor.configuration.stop_rollback_on_failure
         end
       end
     end
 
-    # TODO remove these when specs are cleaned up
-    def perform(actor, *args, &block)
-      stage.perform actor, *args, &block
-    end
-    def improvise(*args, &block)
-      stage.improvise *args, &block
-    end
-
     def performances
       stage.performances
     end
 
-    def bombed_performances
+    def bombed
       performances.select { |performance| performance.bombed? || performance.rolled_back? }
     end
 
+    def rolled_back
+      performances.select { |performance| performance.rolled_back? }
+    end
+
     def bombed_rollbacks
       performances.select { |performance| performance.rollback_bombed? }
     end

spec/support/test_actors.rb

@@ -21,3 +21,13 @@ def rollback
     @rolled_back = true
   end
 end
+
+class BlockActor < Transactor::Actor
+  def perform(&block)
+    instance_eval &block if block_given?
+  end
+
+  def rollback(&block)
+    instance_eval &block if block_given?
+  end
+end

spec/transactor/stage_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+RSpec.describe Transactor::Stage do
+  describe '#perform' do
+    it 'adds a performance to the performances array' do
+      subject.perform(TestActor)
+      expect(subject.performances.length).to eql(1)
+    end
+
+    it 'casts the provided actor in the performance' do
+      subject.perform(TestActor)
+      expect(subject.performances.last.actor).to be_an_instance_of(TestActor)
+    end
+
+    it "triggers the actor's performance" do
+      subject.perform(TestActor)
+      expect(subject.performances.last.actor.performed).to be_true
+    end
+
+    it 'bubbles exceptions as PerformanceBombed errors' do
+      expect { subject.perform(FailingActor) }.to raise_exception(Transactor::PerformanceBombed)
+    end
+  end
+
+  describe '#improvise' do
+    it 'returns an improv performance' do
+      expect(subject.improvise).to be_an_instance_of(Transactor::Improv::Performance)
+    end
+
+    it 'adds a performance to the performances array' do
+      subject.improvise
+      expect(subject.performances.length).to eql(1)
+    end
+
+    it 'casts the default actor in the performance' do
+      subject.improvise
+      expect(subject.performances.last.actor).to be_an_instance_of(Transactor::Improv::Actor)
+    end
+
+    it 'executes the improv block' do
+      subject.improvise { 5+5 }.perform
+      expect(subject.performances.last.result).to eql(10)
+    end
+
+    it 'bubbles exceptions as PerformanceBombed errors' do
+      expect do
+        subject.improvise do
+          raise "Bombing"
+        end.rollback do
+          puts "Rolling Back"
+        end.perform
+      end.to raise_exception(Transactor::PerformanceBombed)
+    end
+  end
+
+  describe '#method_missing' do
+    it 'translates method calls to actor performances' do
+      subject.instance_eval do
+        test_actor
+      end
+      expect(subject.performances.last.actor).to be_an_instance_of(TestActor)
+    end
+  end
+end

spec/transactor/transaction_spec.rb

@@ -44,62 +44,10 @@
     end
   end
 
-  describe '#perform' do
-    it 'adds a performance to the performances array' do
-      subject.perform(TestActor)
-      expect(subject.performances.length).to eql(1)
-    end
-
-    it 'casts the provided actor in the performance' do
-      subject.perform(TestActor)
-      expect(subject.performances.last.actor).to be_an_instance_of(TestActor)
-    end
-
-    it "triggers the actor's performance" do
-      subject.perform(TestActor)
-      expect(subject.performances.last.actor.performed).to be_true
-    end
-
-    it 'bubbles exceptions as PerformanceBombed errors' do
-      expect { subject.perform(FailingActor) }.to raise_exception(Transactor::PerformanceBombed)
-    end
-  end
-
-  describe '#improvise' do
-    it 'returns an improv performance' do
-      expect(subject.improvise).to be_an_instance_of(Transactor::Improv::Performance)
-    end
-
-    it 'adds a performance to the performances array' do
-      subject.improvise
-      expect(subject.performances.length).to eql(1)
-    end
-
-    it 'casts the default actor in the performance' do
-      subject.improvise
-      expect(subject.performances.last.actor).to be_an_instance_of(Transactor::Improv::Actor)
-    end
-
-    it 'executes the improv block' do
-      subject.improvise { 5+5 }.perform
-      expect(subject.performances.last.result).to eql(10)
-    end
-
-    it 'bubbles exceptions as PerformanceBombed errors' do
-      expect do
-        subject.improvise do
-          raise "Bombing"
-        end.rollback do
-          puts "Rolling Back"
-        end.perform
-      end.to raise_exception(Transactor::PerformanceBombed)
-    end
-  end
-
   describe '#rollback' do
     context 'when there are no failed performances' do
       it 'rolls back all performances' do
-        3.times { subject.perform(TestActor) }
+        3.times { subject.stage.perform(TestActor) }
         subject.performances.each do |performance|
           expect(performance.actor.performed).to be_true
         end
@@ -113,7 +61,7 @@
     context 'when the last performance failed' do
       context 'and is configured to rollback on failure' do
         it 'rolls back all performances' do
-          3.times { subject.perform(TestActor) }
+          3.times { subject.stage.perform(TestActor) }
           subject.performances.each do |performance|
             expect(performance.actor.performed).to be_true
           end
@@ -132,7 +80,7 @@
       context 'and is configured not to rollback on failure' do
         it 'rolls back all performances except the one that failed' do
           TestActor.instance_variable_set :@rollback_on_failure, false
-          3.times { subject.perform(TestActor) }
+          3.times { subject.stage.perform(TestActor) }
           subject.performances.each do |performance|
             expect(performance.actor.performed).to be_true
           end
@@ -146,12 +94,42 @@
     end
   end
 
-  describe '#method_missing' do
-    it 'translates method calls to actor performances' do
-      subject.transaction! do
-        test_actor
-      end
-      expect(subject.performances.last.actor).to be_an_instance_of(TestActor)
+  describe '#performances' do
+    it 'returns the stage performances' do
+      3.times { subject.stage.perform(TestActor) }
+      expect(subject.performances).to eql(subject.stage.performances)
+    end
+  end
+
+  describe '#bombed' do
+    it 'returns an array of bombed or rolled back performances' do
+      5.times { subject.stage.perform(TestActor) }
+      subject.performances[0].rollback
+      subject.performances[2].actor.instance_variable_set :@state, :bombed
+      expect(subject.bombed).to eql([subject.performances[0], subject.performances[2]])
+    end
+  end
+
+  describe '#rolled_back' do
+    it 'returns an array of rolled back performances' do
+      5.times { subject.stage.perform(TestActor) }
+      subject.performances[0].rollback
+      subject.performances[2].rollback
+      expect(subject.rolled_back).to eql([subject.performances[0], subject.performances[2]])
     end
   end
+
+  describe '#bombed_rollbacks' do
+    it 'returns an array of bombed rollbacks' do
+      5.times { subject.stage.perform(BlockActor) }
+      begin
+      subject.performances[0].rollback { raise 'fail' }
+      rescue; end
+      begin
+      subject.performances[2].rollback { raise 'fail' }
+      rescue; end
+      expect(subject.bombed_rollbacks).to eql([subject.performances[0], subject.performances[2]])
+    end
+  end
+
 end