transactor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8d6c6a970b35c85e5a2a609ac666587c91179c
-  data.tar.gz: 3065ef3b42767dff92f403034c3fa1b568e8cb86
+  metadata.gz: 0392c2682f4ed22ea823090f2d75a4b6b4125361
+  data.tar.gz: e1081c5a720c23bc9f11992b14d7fa23b3994d00
 SHA512:
-  metadata.gz: 4dc2cde00f77e7742000a41d5f8b3487cde6fbfc039f554fc07abdb844a35a61d233d26b18d86c96cf5fd47703160ee10833599a5e6cf0332afb8b7d8f2c4c89
-  data.tar.gz: a739ebfc8a4751838aa3e31a04e5f28a66d4d92c614fe333dee4dabec830574e57283f8e992e8c618a0c0c9daca3e5de6c0e97f05f03e98a7fd954df9c183a74
+  metadata.gz: 2f97d27444ceb76a2f3a6ff52728702086be33847064abfbe64231214c1ec708efb579f147e83eec4b738778f5990d50f10151237979e91dfcb7b5cbd364b6b2
+  data.tar.gz: 67643d51a70a006ca5fdddb8df47d492a008a8bf80195c8a48d70a3a9f4c08a42390e3ad82cc3dc1cf661f3b39d93b67cb35f09ee629ff15cd20c94354bd8093

data/lib/transactor.rb

@@ -1,4 +1,6 @@
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/string/output_safety'
 require 'canfig'
@@ -17,7 +19,11 @@ module Transactor
     config.rollback_failed_actors = false
   end
 
-  def self.transaction(&block)
-    Transactor::Transaction.new &block
+  def self.transaction(*args, &block)
+    Transactor::Transaction.new *args, &block
+  end
+
+  def self.improvise(*args, &block)
+    Transactor::Improv::Transaction.new *args, &block
   end
 end

data/lib/transactor/actor.rb

@@ -17,24 +17,21 @@ module Transactor
       end
     end
 
+    def rollback_on_failure!
+      @rollback_on_failure = true
+    end
+
     def rollback_on_failure?
-      self.class.rollback_on_failure?
+      return self.class.rollback_on_failure? if @rollback_on_failure.nil?
+      @rollback_on_failure
     end
 
     def perform(&block)
-      if block_given?
-        instance_eval &block
-      else
-        raise PerformNotImplemented, "#{self.class.name}##{__method__} has not been implemented"
-      end
+      raise PerformNotImplemented, "#{self.class.name}##{__method__} has not been implemented"
     end
 
     def rollback(&block)
-      if block_given?
-        instance_eval &block
-      else
-        raise RollbackNotImplemented, "#{self.class.name}##{__method__} has not been implemented"
-      end
+      raise RollbackNotImplemented, "#{self.class.name}##{__method__} has not been implemented"
     end
 
     def state

data/lib/transactor/improv.rb

@@ -1,25 +1,8 @@
-module Transactor
-  class Improv < Performance
-    def perform(&block)
-      if block_given?
-        super(&block)
-      else
-        super { nil }
-      end
-    end
-
-    def rollback(&block)
-      if block_given?
-        super(&block)
-      else
-        super { nil }
-      end
-    end
+require 'transactor/improv/performance'
+require 'transactor/improv/actor'
+require 'transactor/improv/transaction'
 
-    protected
-
-    def initialize(*args)
-      super(Actor, *args)
-    end
+module Transactor
+  module Improv
   end
 end

data/lib/transactor/improv/actor.rb

@@ -0,0 +1,13 @@
+module Transactor
+  module Improv
+    class Actor < Transactor::Actor
+      def perform(&block)
+        block_given? ? instance_eval(&block) : super
+      end
+
+      def rollback(&block)
+        block_given? ? instance_eval(&block) : super
+      end
+    end
+  end
+end

data/lib/transactor/improv/performance.rb

@@ -0,0 +1,34 @@
+module Transactor
+  module Improv
+    class Performance < Transactor::Performance
+
+      def perform(&block)
+        if block_given?
+          @perform_block = block
+        else
+          super(&perform_block)
+        end
+        self
+      rescue => e
+        raise PerformanceBombed.new(e, self)
+      end
+
+      def rollback(&block)
+        if block_given?
+          @rollback_block = block
+        else
+          super(&rollback_block)
+        end
+        self
+      end
+
+      def perform_block
+        @perform_block ||= Proc.new {}
+      end
+
+      def rollback_block
+        @rollback_block ||= Proc.new {}
+      end
+    end
+  end
+end

data/lib/transactor/improv/transaction.rb

@@ -0,0 +1,36 @@
+module Transactor
+  module Improv
+    class Transaction
+      attr_reader :performance
+
+      def perform
+        @transaction.performances << @performance
+        @transaction.transaction! do
+          performances.last.perform
+        end
+      end
+
+      def rollback(&block)
+        @performance.rollback(&block)
+        self
+      end
+
+      def actor
+        @performance.actor
+      end
+
+      def result
+        @performance.result
+      end
+
+      protected
+
+      def initialize(*args, &block)
+        @transaction = Transactor::Transaction.new
+        @performance = Improv::Performance.new(Improv::Actor, *args)
+        @performance.actor.rollback_on_failure!
+        @performance.perform(&block)
+      end
+    end
+  end
+end

data/lib/transactor/transaction.rb

@@ -2,7 +2,7 @@ module Transactor
   class Transaction
     attr_reader :performances, :result
 
-    def in_transaction(&block)
+    def in_transaction(*args, &block)
       begin
         @result = instance_eval &block if block_given?
       rescue Exception => e # yes, we want to catch everything
@@ -16,22 +16,23 @@ module Transactor
       end
     end
 
-    def transaction!(&block)
+    def transaction!(*args, &block)
       if defined?(ActiveRecord::Base) && ActiveRecord::Base.respond_to?(:transaction)
-        ActiveRecord::Base.transaction { in_transaction &block }
+        ActiveRecord::Base.transaction { in_transaction *args, &block }
       else
-        in_transaction &block
+        in_transaction *args, &block
       end
       self
     end
 
-    def transaction(&block)
-      transaction!(&block)
+    def transaction(*args, &block)
+      transaction!(*args, &block)
     rescue => e
       false
     end
 
     def perform(actor, *args, &block)
+      args = performance_args(*args)
       performance = Performance.new(actor, *args)
       performances << performance
       performance.perform(&block)
@@ -41,10 +42,14 @@ module Transactor
     end
 
     def improvise(*args, &block)
-      performance = Improv.new(*args)
+      block ||= Proc.new {}
+      args = performance_args(*args)
+      performance = Improv::Performance.new(Improv::Actor, *args)
       performances << performance
       performance.perform(&block)
       performance
+    rescue PerformanceBombed => e
+      raise e
     rescue => e
       raise PerformanceBombed.new(e, performance)
     end
@@ -77,29 +82,47 @@ module Transactor
       end
     end
 
-    def last_performance
-      performances.last
+    def set_context!(*args)
+      @context = args.extract_options!.symbolize_keys
     end
 
-    def rollback_last_performance?
-      # only rollback the last performance if it didn't bomb OR if
-      # it did and is configured to rollback on failure
-      !last_performance.failed? || (last_performance.failed? && last_performance.rollback_on_failure?)
+    def clear_context!
+      @context = {}
     end
 
     def method_missing(meth, *args, &block)
-      perform meth, *args, &block
-    end
+      if meth.to_s.match(/=\Z/)
+        key = meth.to_s.gsub(/=/,'').to_sym
+        return (@context[key] = args.first) if @context.key?(key)
+      else
+        return @context[meth] if @context.key?(meth)
+      end
 
-    def respond_to_missing?(meth, include_private=false)
-      true # *shrug* we try to perform just about anything
+      perform meth, *args, &block
     end
 
     protected
 
     def initialize(*args, &block)
       @performances = []
+      set_context! *args
       transaction! &block if block_given?
     end
+
+    def performance_args(*args)
+      context = @context.merge(args.extract_options!.symbolize_keys)
+      args << context
+      args
+    end
+
+    def last_performance
+      performances.last
+    end
+
+    def rollback_last_performance?
+      # only rollback the last performance if it didn't bomb OR if
+      # it did and is configured to rollback on failure
+      !last_performance.failed? || (last_performance.failed? && last_performance.rollback_on_failure?)
+    end
   end
 end

data/lib/transactor/version.rb

@@ -1,3 +1,3 @@
 module Transactor
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/transactor/actor_spec.rb

@@ -19,8 +19,8 @@ RSpec.describe Transactor::Actor do
 
   describe '#perform' do
     context 'when passed a block' do
-      it 'executes the block and returns the value' do
-        expect(subject.perform { 5+5 }).to eql(10)
+      it 'raises a PerformNotImplemented error' do
+        expect { subject.perform }.to raise_exception(Transactor::PerformNotImplemented)
       end
     end
 
@@ -33,8 +33,8 @@ RSpec.describe Transactor::Actor do
 
   describe '#rollback' do
     context 'when passed a block' do
-      it 'executes the block and returns the value' do
-        expect(subject.rollback { 5+5 }).to eql(10)
+      it 'raises a PerformNotImplemented error' do
+        expect { subject.rollback }.to raise_exception(Transactor::RollbackNotImplemented)
       end
     end
 

data/spec/transactor/improv/actor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+RSpec.describe Transactor::Improv::Actor do
+  subject { Transactor::Improv::Actor.new(test_one: 'one', test_two: 2) }
+
+  describe '#perform' do
+    context 'when passed a block' do
+      it 'executes the block and returns the value' do
+        expect(subject.perform { 5+5 }).to eql(10)
+      end
+    end
+
+    context 'when not passed a block' do
+      it 'raises a PerformNotImplemented error' do
+        expect { subject.perform }.to raise_exception(Transactor::PerformNotImplemented)
+      end
+    end
+  end
+
+  describe '#rollback' do
+    context 'when passed a block' do
+      it 'executes the block and returns the value' do
+        expect(subject.rollback { 5+5 }).to eql(10)
+      end
+    end
+
+    context 'when not passed a block' do
+      it 'raises a PerformNotImplemented error' do
+        expect { subject.rollback }.to raise_exception(Transactor::RollbackNotImplemented)
+      end
+    end
+  end
+end

data/spec/transactor/improv_spec.rb

@@ -1,9 +1,4 @@
 require 'spec_helper'
 
 RSpec.describe Transactor::Improv do
-  describe '#initialize' do
-    it 'uses the default actor' do
-      expect(subject.actor).to be_an_instance_of(Transactor::Actor)
-    end
-  end
 end

data/spec/transactor/transaction_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Transactor::Transaction do
 
   describe '#improvise' do
     it 'returns an improv performance' do
-      expect(subject.improvise).to be_an_instance_of(Transactor::Improv)
+      expect(subject.improvise).to be_an_instance_of(Transactor::Improv::Performance)
     end
 
     it 'adds a performance to the performances array' do
@@ -77,11 +77,11 @@ RSpec.describe Transactor::Transaction do
 
     it 'casts the default actor in the performance' do
       subject.improvise
-      expect(subject.performances.last.actor).to be_an_instance_of(Transactor::Actor)
+      expect(subject.performances.last.actor).to be_an_instance_of(Transactor::Improv::Actor)
     end
 
     it 'executes the improv block' do
-      subject.improvise { 5+5 }
+      subject.improvise { 5+5 }.perform
       expect(subject.performances.last.result).to eql(10)
     end
 
@@ -89,7 +89,9 @@ RSpec.describe Transactor::Transaction do
       expect do
         subject.improvise do
           raise "Bombing"
-        end
+        end.rollback do
+          puts "Rolling Back"
+        end.perform
       end.to raise_exception(Transactor::PerformanceBombed)
     end
   end

data/spec/transactor_spec.rb

@@ -7,11 +7,9 @@ RSpec.describe Transactor do
     end
   end
 
-  context 'configuration' do
-    describe 'rollback_failed_actors' do
-      it 'defaults to false' do
-        expect(Transactor.configuration.rollback_failed_actors).to be_false
-      end
+  describe '#improvise' do
+    it 'returns a Transactor::Improv::Transaction' do
+      expect(Transactor.improvise).to be_an_instance_of(Transactor::Improv::Transaction)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,9 @@ files:
 - lib/transactor/actor.rb
 - lib/transactor/errors.rb
 - lib/transactor/improv.rb
+- lib/transactor/improv/actor.rb
+- lib/transactor/improv/performance.rb
+- lib/transactor/improv/transaction.rb
 - lib/transactor/performance.rb
 - lib/transactor/props.rb
 - lib/transactor/transaction.rb
@@ -84,6 +87,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/test_actors.rb
 - spec/transactor/actor_spec.rb
+- spec/transactor/improv/actor_spec.rb
 - spec/transactor/improv_spec.rb
 - spec/transactor/performance_spec.rb
 - spec/transactor/transaction_spec.rb
@@ -115,6 +119,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/test_actors.rb
 - spec/transactor/actor_spec.rb
+- spec/transactor/improv/actor_spec.rb
 - spec/transactor/improv_spec.rb
 - spec/transactor/performance_spec.rb
 - spec/transactor/transaction_spec.rb