Merge branch 'release/0.4.0'

.lgtm

@@ -0,0 +1,2 @@
+approvals = 1
+pattern = "(?i):shipit:|:\\+1:|LGTM"

CHANGELOG.md

@@ -1,4 +1,10 @@
 # [develop](https://github.com/adhearsion/electric_slide)
+
+# [0.4.0](https://github.com/adhearsion/electric_slide/compare/v0.3.0...v0.4.0) - [2015-12-17](https://rubygems.org/gems/adhearsion/versions/0.4.0)
+  * Change `ElectricSlide::Agent` `#presence=` method name to `#update_presence`. It will also accept one more parameter called `extra_params`, a hash that holds application specific parameters that are passed to the presence change callback.
+  * `ElectricSlide::CallQueue#add_agent` will no longer wait for a connection attempt to complete before returning
+
+# [0.3.0](https://github.com/adhearsion/electric_slide/compare/v0.2.0...v0.3.0) - [2015-12-01](https://rubygems.org/gems/adhearsion/versions/0.3.0)
   * Trigger an agent "presence change" callback when the agent is removed from the queue
   * Bugfix: Fix `NameError` exception when referencing namespaced constant `Adhearsion::Call::ExpiredError` in injected `Adhearsion::Call#active?` method
   * Provide Electric Slide with a way to check if a queue with a given set of attributes is valid/can be instantiated before Electric Slide adds it to the supervision group. The supervisor will crash if its attempt to create the queue raises an exception.

MAINTAINERS

@@ -0,0 +1,2 @@
+Ben Langfeld <[email protected]> (@benlangfeld)
+Ben Klang <[email protected]> (@bklang)

lib/electric_slide/agent.rb

@@ -2,7 +2,8 @@
 
 class ElectricSlide
   class Agent
-    attr_accessor :id, :address, :presence, :call, :queue
+    attr_accessor :id, :address, :call, :queue
+    attr_reader :presence
 
     # @param [Hash] opts Agent parameters
     # @option opts [String] :id The Agent's ID
@@ -14,10 +15,10 @@ def initialize(opts = {})
       @presence = opts[:presence] || :available
     end
 
-    def presence=(new_presence)
+    def update_presence(new_presence, extra_params = {})
       old_presence = @presence
       @presence = new_presence
-      callback :presence_change, queue, @call, new_presence, old_presence
+      callback :presence_change, queue, @call, new_presence, old_presence, extra_params
     end
 
     def callback(type, *args)

lib/electric_slide/call_queue.rb

@@ -131,7 +131,7 @@ def available_agent_summary
     def checkout_agent
       agent = @strategy.checkout_agent
       if agent
-        agent.presence = :on_call
+        agent.update_presence(:on_call)
       end
       agent
     end
@@ -179,7 +179,7 @@ def add_agent(agent)
       # Fake the presence callback since this is a new agent
       agent.callback :presence_change, self, agent.call, agent.presence, :unavailable
 
-      check_for_connections
+      async.check_for_connections
     end
 
     # Marks an agent as available to take a call. To be called after an agent completes a call
@@ -192,7 +192,7 @@ def return_agent(agent, new_presence = :available, address = nil)
 
       return false unless get_agent(agent.id)
 
-      agent.presence = new_presence
+      agent.update_presence(new_presence)
       agent.address = address if address
 
       case agent.presence
@@ -216,9 +216,10 @@ def return_agent!(*args)
 
     # Removes an agent from the queue entirely
     # @param [Agent] agent The {Agent} to be removed from the queue
+    # @param [Hash] extra_params Application specific extra params
     # @return [Agent, Nil] The Agent object if removed, Nil otherwise
-    def remove_agent(agent)
-      agent.presence = :unavailable
+    def remove_agent(agent, extra_params = {})
+      agent.update_presence(:unavailable, extra_params)
       @strategy.delete agent
       @agents.delete agent
       logger.info "Removing agent #{agent} from the queue"

lib/electric_slide/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class ElectricSlide
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

spec/electric_slide/agent_spec.rb

@@ -44,6 +44,23 @@ def foo
     called = false
     ElectricSlide::Agent.on_presence_change { |queue, agent_call, presence| called = true }
     agent = ElectricSlide::Agent.new presence: :unavailable
-    agent.presence = :busy
+    agent.update_presence(:busy)
+
+    expect(called).to be_truthy
+  end
+
+  it 'sends `extra_params` and `old_presence` to the presence change callback' do
+    presence_change_attributes = []
+    ElectricSlide::Agent.on_presence_change do |*attrs|
+      presence_change_attributes = attrs
+    end
+
+    agent = ElectricSlide::Agent.new presence: :unavailable
+    agent.update_presence(:busy, triggered_by: 'auto')
+
+    queue, agent_call, presence, old_presence, extra_params = presence_change_attributes
+
+    expect(old_presence).to eq :unavailable
+    expect(extra_params[:triggered_by]).to eq 'auto'
   end
 end

spec/electric_slide/call_queue_spec.rb

@@ -137,7 +137,7 @@
               # prevent the agent from being returned to the queue so the queued
               # call isn't grabbed by the agent again, changing queued call state
               # before the example can check it
-              agent.presence = :unavailable
+              agent.update_presence(:unavailable)
             end
 
             it 'unsets the `:agent` call variable on the queued call' do
@@ -264,7 +264,15 @@
       }.to change(queue, :checkout_agent).from(nil).to(agent)
     end
 
-    it "connects the agent to waiting queued calls"
+    it "connects the agent to waiting queued calls" do
+      call = Adhearsion::OutboundCall.new
+      queue.enqueue call
+
+      queue.add_agent agent
+      sleep 0.5
+      expect(agent.presence).to eq(:on_call)
+      expect(call[:agent]).to eq(agent)
+    end
 
     context 'when given an agent already in the queue' do
       before do
@@ -352,7 +360,7 @@
       called = false
       ElectricSlide::Agent.on_presence_change { |queue, agent_call, presence| called = true }
       queue.remove_agent agent
-      expect(called).to be
+      expect(called).to be_truthy
     end
 
     it 'takes the agent out of the call rotation' do