call_center 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/call_center.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{call_center}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]
-  s.date = %q{2011-10-25}
+  s.date = %q{2011-11-07}
   s.description = %q{Support for describing call center workflows}
   s.email = %q{hhsu@zendesk.com}
   s.extra_rdoc_files = [

data/lib/call_center/flow_callback.rb

@@ -5,11 +5,11 @@ module CallCenter
     def self.create(state_name, scope, options, block)
       case scope
       when :success
-        FlowCallback.new(state_name, scope, options, block).extend(SuccessFlowCallback)
+        new(state_name, scope, options, block).extend(SuccessFlowCallback)
       when :failure
-        FlowCallback.new(state_name, scope, options, block).extend(FailureFlowCallback)
+        new(state_name, scope, options, block).extend(FailureFlowCallback)
       else
-        FlowCallback.new(state_name, scope, options, block).extend(AlwaysFlowCallback)
+        new(state_name, scope, options, block).extend(AlwaysFlowCallback)
       end
     end
 
@@ -26,22 +26,48 @@ module CallCenter
 
     def setup(context)
       callback = self
-      context.before_transition(transition_parameters(context)) do |call, transition|
+      context.send(transition_hook, transition_parameters(context)) do |call, transition|
         callback.run(call, transition)
       end
     end
 
+    def before
+      true
+    end
+
+    def after
+      false
+    end
+
     private
 
     def transition_parameters(context)
       { context.any => @state_name }
     end
 
+    def transition_hook
+      :before_transition
+    end
+
     def should_run?
       true
     end
   end
 
+  class AfterFlowCallback < FlowCallback
+    def transition_hook
+      :after_transition
+    end
+
+    def before
+      false
+    end
+
+    def after
+      true
+    end
+  end
+
   module AlwaysFlowCallback
     def success; true; end
     def failure; true; end

data/lib/call_center/state_machine_ext.rb

@@ -1,8 +1,7 @@
 # Extension for StateMachine::Machine to store and provide render blocks
 class StateMachine::Machine
   attr_accessor :response_blocks
-  attr_accessor :before_blocks
-  attr_accessor :after_blocks
+  attr_accessor :callback_blocks
   attr_accessor :flow_actor_blocks
 
   def response(state_name, &blk)
@@ -11,13 +10,13 @@ class StateMachine::Machine
   end
 
   def before(state_name, scope, options, &blk)
-    @before_blocks ||= []
-    @before_blocks << CallCenter::FlowCallback.create(state_name, :always, options, blk)
+    @callback_blocks ||= []
+    @callback_blocks << CallCenter::FlowCallback.create(state_name, :always, options, blk)
   end
 
   def after(state_name, scope, options, &blk)
-    @after_blocks ||= []
-    @after_blocks << CallCenter::FlowCallback.create(state_name, scope, options, blk)
+    @callback_blocks ||= []
+    @callback_blocks << CallCenter::AfterFlowCallback.create(state_name, scope, options, blk)
   end
 
   def block_accessor(accessor, for_state)
@@ -32,25 +31,23 @@ class StateMachine::Machine
   end
 
   def setup_call_flow(flow)
-    setup_before_blocks
-    setup_after_blocks
+    setup_success_blocks
+    setup_failure_blocks
     setup_flow_actor_blocks(flow)
     self
   end
 
-  def setup_before_blocks
-    return unless @before_blocks
-    @before_blocks.each { |callback| callback.setup(self) }
+  def setup_success_blocks
+    return unless @callback_blocks
+    @callback_blocks.select { |c| c.before || (c.success && c.after) }.each { |callback| callback.setup(self) }
   end
 
-  def setup_after_blocks
-    return unless @after_blocks
-    @after_blocks.select(&:success).each { |callback| callback.setup(self) }
-
+  def setup_failure_blocks
+    return unless @callback_blocks
     event_names = events.map(&:name)
     event_names.each do |event_name|
       after_failure :on => event_name do |call, transition|
-        callbacks = @after_blocks.select { |callback| callback.state_name == transition.to_name && callback.failure } || []
+        callbacks = @callback_blocks.select { |callback| callback.after && callback.state_name == transition.to_name && callback.failure } || []
         callbacks.each { |callback| callback.run(call, transition) }
       end
     end

data/test/call_center_test.rb

@@ -130,7 +130,7 @@ class CallCenterTest < Test::Unit::TestCase
       assert_select "Response"
     end
 
-    should "execute before callbacks" do
+    should "execute callbacks" do
       @call.state = 'cancelled'
 
       @call.expects(:notify).with(:before_always).times(3)
@@ -150,6 +150,22 @@ class CallCenterTest < Test::Unit::TestCase
       assert(!@call.customer_hangs_up)
     end
 
+    should "execute callbacks in sequence" do
+      seq = sequence('callback_sequence')
+      @call.state = 'cancelled'
+
+      @call.expects(:notify).with(:before_always).in_sequence(seq)
+      @call.expects(:notify).with(:before_always_uniq).in_sequence(seq)
+
+      @call.expects(:notify).with(:after_always).in_sequence(seq)
+      @call.expects(:notify).with(:after_success).in_sequence(seq)
+
+      @call.expects(:notify).with(:after_always_uniq).in_sequence(seq)
+      @call.expects(:notify).with(:after_success_uniq, anything).in_sequence(seq)
+
+      @call.customer_end!
+    end
+
     should "asynchronously perform event" do
       @call.stubs(:agents_available?).returns(true)
       @call.incoming_call!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: call_center
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Henry Hsu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 -07:00
+date: 2011-11-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency