electric_slide 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a85c9a483bad9fb21fb302c8914f74323d5f41b
-  data.tar.gz: 596262ea3479ca13f5031a46fe84210732b1c558
+  metadata.gz: baa91eec756c74ee16f54754dc6e3233d112ea1d
+  data.tar.gz: 9082bca23ef76e4d3c746bbc379ffb4806fd9c26
 SHA512:
-  metadata.gz: 606297daca9e364dd4ddfa7daa47578183ff6d359fcb1d4b66daacbba7786d36e4cbd36aa180c6c80fbd75645c390b55ecbb5dcf862df6f98ccb3c7cab844f8e
-  data.tar.gz: 1771312a5bbda69e0b2fe802cb3510ee66cc34c158d36b69ec11efc5a0f960c4a955c3869269c333ec81ec2300ceb325d66b0b40e7750d13c76a32476e622b67
+  metadata.gz: 753e438b9d3fdf9d8f9b28ffbe6c230b71b82bca4ca79353e02a1746dc82e20fb1dd8826062acbc146c7ad9a5ce1cbec7d8ea9b55d65ebdc95894e99d83e294f
+  data.tar.gz: 47457cd3078318a5977e3361c63ee1d1409928bdf11856477bfdfeea085d7304987f66ade7e9c655acbe836673b37d05555ddf5b2167ac54f659e8b30af6235c

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/electric_slide)
 
+# [0.4.1](https://github.com/adhearsion/electric_slide/compare/v0.4.0...v0.4.1) - [2016-01-04](https://rubygems.org/gems/adhearsion/versions/0.4.1)
+  * Bugfix: Don't hand out internal CallQueue references to Agents - thread-safety
+
 # [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

data/lib/electric_slide/call_queue.rb

@@ -164,7 +164,7 @@ class ElectricSlide
       abort ArgumentError.new("#add_agent called with nil object") if agent.nil?
       abort DuplicateAgentError.new("Agent is already in the queue") if get_agent(agent.id)
 
-      agent.queue = self
+      agent.queue = current_actor
 
       case @connection_type
       when :call
@@ -177,7 +177,7 @@ class ElectricSlide
       @agents << agent
       @strategy << agent if agent.presence == :available
       # Fake the presence callback since this is a new agent
-      agent.callback :presence_change, self, agent.call, agent.presence, :unavailable
+      agent.callback :presence_change, current_actor, agent.call, agent.presence, :unavailable
 
       async.check_for_connections
     end
@@ -304,7 +304,7 @@ class ElectricSlide
       ignoring_ended_calls do
         if agent.call && agent.call.active?
           logger.warn "Dead call exception in #connect but agent call still alive, reinserting into queue"
-          agent.callback :connection_failed, self, agent.call, queued_call
+          agent.callback :connection_failed, current_actor, agent.call, queued_call
 
           return_agent agent
         end
@@ -367,8 +367,10 @@ class ElectricSlide
       # Stash the caller ID so we don't have to try to get it from a dead call object later
       queued_caller_id = remote_party queued_call
 
+      queue = current_actor
+
       # The call controller is actually run by #dial, here we skip joining if we do not have one
-      dial_options = agent.dial_options_for(self, queued_call)
+      dial_options = agent.dial_options_for(queue, queued_call)
       unless dial_options[:confirm]
         agent_call.on_answer { ignoring_ended_calls { agent_call.join queued_call.uri if queued_call.active? } }
       end
@@ -394,12 +396,12 @@ class ElectricSlide
 
         agent.call = nil
 
-        agent.callback :disconnect, self, agent_call, queued_call
+        agent.callback :disconnect, queue, agent_call, queued_call
 
         unless connected
           if queued_call.active?
             ignoring_ended_calls { priority_enqueue queued_call }
-            agent.callback :connection_failed, self, agent_call, queued_call
+            agent.callback :connection_failed, queue, agent_call, queued_call
 
             logger.warn "Call did not connect to agent! Agent #{agent.id} call ended with #{end_event.reason}; reinserting caller #{queued_caller_id} into queue"
           else
@@ -408,7 +410,7 @@ class ElectricSlide
         end
       end
 
-      agent.callback :connect, self, agent_call, queued_call
+      agent.callback :connect, queue, agent_call, queued_call
 
       agent_call.execute_controller_or_router_on_answer dial_options.delete(:confirm), dial_options.delete(:confirm_metadata)
 
@@ -420,8 +422,9 @@ class ElectricSlide
       queued_caller_id = remote_party queued_call
       agent.call[:queued_call] = queued_call
 
+      queue = current_actor
       agent.call.register_tmp_handler :event, Punchblock::Event::Unjoined do
-        agent.callback :disconnect, self, agent.call, queued_call
+        agent.callback :disconnect, queue, agent.call, queued_call
         ignoring_ended_calls { queued_call.hangup }
         ignoring_ended_calls { conditionally_return_agent agent if agent.call && agent.call.active? }
         agent.call[:queued_call] = nil if agent.call
@@ -431,13 +434,13 @@ class ElectricSlide
         queued_call[:electric_slide_connected_at] = event.timestamp
       end
 
-      agent.callback :connect, self, agent.call, queued_call
+      agent.callback :connect, current_actor, agent.call, queued_call
 
       agent.join queued_call if queued_call.active?
     rescue *ENDED_CALL_EXCEPTIONS
       ignoring_ended_calls do
         if agent.call && agent.call.active?
-          agent.callback :connection_failed, self, agent.call, queued_call
+          agent.callback :connection_failed, current_actor, agent.call, queued_call
 
           logger.info "Caller #{queued_caller_id} failed to connect to Agent #{agent.id} due to caller hangup"
           conditionally_return_agent agent, :auto
@@ -458,7 +461,7 @@ class ElectricSlide
         abort ArgumentError.new("Agent has no active call") unless agent.call && agent.call.active?
         unless agent.call[:electric_slide_callback_set]
           agent.call[:electric_slide_callback_set] = true
-          queue = self
+          queue = current_actor
           agent.call.on_end do
             agent.call = nil
             queue.return_agent agent, :unavailable

data/lib/electric_slide/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: electric_slide
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion