Merge branch 'release/2.3.3'

comparaonline · May 8, 2013 · c1d4102 · c1d4102
2 parents 46bff2b + 0482f65
commit c1d4102
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.3.3](https://github.com/adhearsion/adhearsion/compare/v2.3.2...v2.3.3) - [2013-05-08](https://rubygems.org/gems/adhearsion/versions/2.3.3)
+  * Bugfix: Support Celluloid 0.14's new block semantics
+
 # [2.3.2](https://github.com/adhearsion/adhearsion/compare/v2.3.1...v2.3.2) - [2013-05-03](https://rubygems.org/gems/adhearsion/versions/2.3.2)
   * Bugfix: Correctly register readiness to handle calls with VoIP platform.
   * Bugfix: Don't raise when the router tries to clear up after a CallController which outlived its Call actor.

diff --git a/adhearsion.gemspec b/adhearsion.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', ["~> 3.0"]
   s.add_runtime_dependency 'adhearsion-loquacious', ["~> 1.9"]
   s.add_runtime_dependency 'bundler', ["~> 1.0"]
-  s.add_runtime_dependency 'celluloid', ["~> 0.13"]
+  s.add_runtime_dependency 'celluloid', ["~> 0.14"]
   s.add_runtime_dependency 'countdownlatch'
   s.add_runtime_dependency 'deep_merge'
   s.add_runtime_dependency 'ffi', ["~> 1.0"]

diff --git a/lib/adhearsion.rb b/lib/adhearsion.rb
@@ -16,20 +16,19 @@ module Adhearsion
 
   Error = Class.new StandardError
 
-  autoload :Process
   autoload :Call
   autoload :CallController
   autoload :Calls
   autoload :Configuration
   autoload :Console
-  autoload :Conveniences
   autoload :Dispatcher
   autoload :Events
   autoload :Generators
   autoload :Initializer
   autoload :Logging
   autoload :OutboundCall
   autoload :Plugin
+  autoload :Process
   autoload :Router
   autoload :Statistics
 

diff --git a/lib/adhearsion/call.rb b/lib/adhearsion/call.rb
@@ -16,6 +16,8 @@ class Call
     include Celluloid
     include HasGuardedHandlers
 
+    execute_block_on_receiver :register_handler, :register_tmp_handler, :register_handler_with_priority, :register_event_handler, :on_joined, :on_unjoined, :on_end, :execute_controller
+
     def self.new(*args, &block)
       super.tap do |proxy|
         def proxy.method_missing(*args)

diff --git a/lib/adhearsion/outbound_call.rb b/lib/adhearsion/outbound_call.rb
@@ -2,6 +2,8 @@
 
 module Adhearsion
   class OutboundCall < Call
+    execute_block_on_receiver :register_handler, :register_tmp_handler, :register_handler_with_priority, :register_event_handler, :on_joined, :on_unjoined, :on_end, :execute_controller, :on_answer, :execute_controller_or_router_on_answer
+
     attr_reader :dial_command
 
     delegate :to, :from, :to => :dial_command, :allow_nil => true

diff --git a/lib/adhearsion/version.rb b/lib/adhearsion/version.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end