call_center 1.0.5 → 2.0.0

data/lib/call_center.rb

@@ -37,10 +37,7 @@ module CallCenter
   module ClassMethods
     attr_accessor :call_flow_state_machine_name
 
-    # Calls state_machine ... with :syntax => :alternate
     def call_flow(*args, &blk)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      args << options.merge(:syntax => :alternate)
       state_machine_name = args.first || :state
       if state_machine = CallCenter.cached(self, state_machine_name)
         state_machine = state_machine.duplicate_to(self)

data/lib/call_center/state_machine_ext.rb

@@ -19,6 +19,14 @@ class StateMachine::Machine
     @callback_blocks << CallCenter::AfterFlowCallback.create(state_name, scope, options, blk)
   end
 
+  def actor(name, &blk)
+    StateMachine::StateContext.send(:define_method, name.to_sym) do |event_name, options|
+      event_name = :"#{name}_#{event_name}"
+      event(event_name, options)
+    end
+    flow_actors(name, &blk)
+  end
+
   def block_accessor(accessor, for_state)
     return unless respond_to?(accessor)
     blocks = send(accessor)
@@ -61,53 +69,44 @@ class StateMachine::Machine
       end
     end
   end
+
+  def duplicate_to(clazz)
+    new_copy = self.clone
+    new_copy.owner_class = clazz
+    new_copy.define_helpers
+    new_copy.define_scopes(@plural)
+    new_copy.events.each { |event| event.send(:add_actions) }
+    new_copy.states.each { |state| state.send(:add_predicate) }
+    new_copy
+  end
 end
 
-# Extension for StateMachine::AlternateMachine to provide render blocks inside a state definition
-class StateMachine::AlternateMachine
+# Extension for StateMachine::StateContext to provide render blocks inside a state definition
+class StateMachine::StateContext
+  include StateMachine::MatcherHelpers
+
   attr_accessor :flow_stacks
 
-  def response(state_name = nil, &blk)
-    if @from_state
-      @queued_sends << [[:response, @from_state], blk]
-    else
-      @queued_sends << [[:response, state_name], blk]
+  def event(name, options = {})
+    if flow_stacks && flow_stacks.any?
+      options = flow_stacks.inject(options)
     end
-  end
 
-  def before(scope, options = {}, &blk)
-    if @from_state
-      @queued_sends << [[:before, @from_state, scope, options], blk]
-    end
+    transition(options.update(:on => name))
   end
 
-  def after(scope, options = {}, &blk)
-    if @from_state
-      @queued_sends << [[:after, @from_state, scope, options], blk]
-    end
+  def response(&blk)
+    machine.response(state.name, &blk)
   end
 
-  def actor(name, &blk)
-    (class << self; self; end).send(:define_method, name.to_sym) do |event_name, options|
-      event_name = :"#{name}_#{event_name}"
-      event(event_name, options)
-    end
-    @queued_sends << [[:flow_actors, name], blk]
+  def before(scope, options = {}, &blk)
+    machine.before(state.name, scope, options, &blk)
   end
 
-  def event_with_blocks(*args, &blk)
-    options = args.extract_options!
-
-    if flow_stacks && flow_stacks.any?
-      options = flow_stacks.inject(options)
-    end
-
-    event_without_blocks(*args.push(options), &blk)
+  def after(scope, options = {}, &blk)
+    machine.after(state.name, scope, options, &blk)
   end
 
-  alias_method :event_without_blocks, :event
-  alias_method :event, :event_with_blocks
-
   def flow_if(conditional, &blk)
     self.flow_stacks ||= CallCenter::ConditionalStack.new
     begin

data/lib/call_center/test/dsl.rb

@@ -31,9 +31,8 @@ module CallCenter
               html_document.root
             end
 
-            alias_method_chain :response_from_page_or_rjs, :body
-          elsif instance_methods.include?(:response_from_page_with_rjs) # prototype-rails hacks we do not want
-            alias_method :response_from_page, :response_from_page_without_rjs
+            alias_method :response_from_page_or_rjs_without_body, :response_from_page_or_rjs
+            alias_method :response_from_page_or_rjs, :response_from_page_or_rjs_with_body
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: call_center
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hsume2-state_machine
+  name: state_machine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.2.0
 description: Support for describing call center workflows
 email: hhsu@zendesk.com
 executables: []
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1218219557821151233
+      hash: 1830209325971150874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,10 +81,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1218219557821151233
+      hash: 1830209325971150874
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Support for describing call center workflows