adhearsion 2.2.0 → 2.2.1

data/.travis.yml

@@ -3,9 +3,12 @@ script: bundle exec rake --trace
 rvm:
   - 1.9.2
   - 1.9.3
-  # - jruby-19mode # JRuby in 1.9 mode
-  # - rbx-19mode # currently in active development, may or may not work for your project
-  # - ruby-head
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
 env: ARUBA_TIMEOUT=120 RAILS_ENV=development AHN_ENV=development
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.2.1](https://github.com/adhearsion/adhearsion/compare/v2.2.0...v2.2.1) - [2013-01-06](https://rubygems.org/gems/adhearsion/versions/2.2.1)
+  * Bugfix: No longer crash logging randomly
+  * Bugfix: Correctly route outbound calls
+  * Bugfix: Handle calls when daemonized correctly
+  * Bugfix: Test suites now pass on JRuby and Ruby 2.0.0
+
 # [2.2.0](https://github.com/adhearsion/adhearsion/compare/v2.1.3...v2.2.0) - [2012-12-17](https://rubygems.org/gems/adhearsion/versions/2.2.0)
   * Feature: Statistics API providing counts of calls dialed, offered, rejected, routed and active
 

data/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing
+
+Please refer to [the contribution guidelines](http://adhearsion.com/docs/contributing).

data/lib/adhearsion.rb

@@ -1,13 +1,10 @@
 # encoding: utf-8
 
-abort "ERROR: You are running Adhearsion on an unsupported version of Ruby (Ruby #{RUBY_VERSION} #{RUBY_RELEASE_DATE})! Please upgrade to at least Ruby v1.9.2, JRuby 1.6.5 or Rubinius 2.0." if RUBY_VERSION < "1.9.2"
+abort "ERROR: You are running Adhearsion on an unsupported version of Ruby (Ruby #{RUBY_VERSION} #{RUBY_RELEASE_DATE})! Please upgrade to at least Ruby v1.9.2, JRuby 1.7.0 or Rubinius 2.0." if RUBY_VERSION < "1.9.2"
 
 %w{
   active_support/all
   punchblock
-  ruby_speech
-  countdownlatch
-  loquacious
   celluloid
 
   adhearsion/version
@@ -99,21 +96,18 @@ module Adhearsion
     end
 
     def active_calls
-      if instance_variable_defined?(:@calls) && @calls.alive?
-        @calls
-      else
-        @calls = Calls.new
-      end
+      Celluloid::Actor[:active_calls] || Calls.supervise_as(:active_calls)
+      Celluloid::Actor[:active_calls]
     end
 
     #
     # @return [Adhearsion::Statistics] a statistics aggregator object capable of producing stats dumps
     def statistics
-      if instance_variable_defined?(:@statistics) && @statistics.alive?
-        @statistics
-      else
-        @statistics = Statistics.new.tap(&:setup_event_handlers)
+      unless Celluloid::Actor[:statistics]
+        Statistics.supervise_as :statistics
+        Statistics.setup_event_handlers
       end
+      Celluloid::Actor[:statistics]
     end
 
     def status

data/lib/adhearsion/call.rb

@@ -140,10 +140,6 @@ module Adhearsion
       end
     end
 
-    def finalize
-      ::Logging::Repository.reset
-    end
-
     ##
     # Registers a callback for when this call is joined to another call or a mixer
     #

data/lib/adhearsion/call_controller.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'countdownlatch'
+
 module Adhearsion
   class CallController
     extend ActiveSupport::Autoload

data/lib/adhearsion/call_controller/dial.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'countdownlatch'
+
 module Adhearsion
   class CallController
     module Dial

data/lib/adhearsion/call_controller/output/abstract_player.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'ruby_speech'
+
 module Adhearsion
   class CallController
     module Output

data/lib/adhearsion/call_controller/output/formatter.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'ruby_speech'
+
 module Adhearsion
   class CallController
     module Output

data/lib/adhearsion/call_controller/utility.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'ruby_speech'
+
 module Adhearsion
   class CallController
     module Utility

data/lib/adhearsion/configuration.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'loquacious'
+
 module Adhearsion
   class Configuration
 

data/lib/adhearsion/initializer.rb

@@ -38,12 +38,12 @@ module Adhearsion
     end
 
     def start
-      Adhearsion.statistics
       resolve_pid_file_path
       load_lib_folder
       load_config_file
       initialize_log_paths
       daemonize! if should_daemonize?
+      Adhearsion.statistics
       start_logging
       debugging_log
       launch_console if need_console?

data/lib/adhearsion/outbound_call.rb

@@ -76,8 +76,7 @@ module Adhearsion
 
     def run_router
       catching_standard_errors do
-        dispatcher = Adhearsion.router.handle current_actor
-        dispatcher.call current_actor
+        Adhearsion.router.handle current_actor
       end
     end
 

data/lib/adhearsion/plugin.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'loquacious'
+
 module Adhearsion
 
   # Plugin is the core of extension of Adhearsion framework and provides the easiest

data/lib/adhearsion/router/route.rb

@@ -8,6 +8,7 @@ module Adhearsion
       include HasGuardedHandlers
 
       attr_reader :name, :target, :guards
+      attr_accessor :controller_metadata
 
       def initialize(name, target = nil, *guards, &block)
         @name = name
@@ -17,6 +18,7 @@ module Adhearsion
           @target, @guards = target, guards
         end
         @guards.compact!
+        @controller_metadata = {}
       end
 
       def match?(call)
@@ -47,15 +49,6 @@ module Adhearsion
         }
       end
 
-      def controller_metadata=(metadata)
-        @controller_metadata = metadata
-      end
-
-      def controller_metadata
-        return {} unless instance_variable_defined?(:@controller_metadata)
-        @controller_metadata
-      end
-
       def evented?
         false
       end

data/lib/adhearsion/statistics.rb

@@ -6,6 +6,41 @@ module Adhearsion
 
     exclusive
 
+    # @private
+    def self.setup_event_handlers
+      Events.punchblock(Punchblock::Event::Offer) do
+        begin
+          Celluloid::Actor[:statistics].register_call_offered
+        ensure
+          throw :pass
+        end
+      end
+
+      Events.call_dialed do
+        begin
+          Celluloid::Actor[:statistics].register_call_dialed
+        ensure
+          throw :pass
+        end
+      end
+
+      Events.call_rejected do
+        begin
+          Celluloid::Actor[:statistics].register_call_rejected
+        ensure
+          throw :pass
+        end
+      end
+
+      Events.call_routed do |data|
+        begin
+          Celluloid::Actor[:statistics].register_call_routed data
+        ensure
+          throw :pass
+        end
+      end
+    end
+
     def initialize
       @calls_dialed = @calls_offered = @calls_routed = @calls_rejected = 0
       @calls_by_route = Hash.new { |h,k| h[k] = 0 }
@@ -40,43 +75,6 @@ module Adhearsion
       @calls_rejected += 1
     end
 
-    # @private
-    def setup_event_handlers
-      stats = current_actor
-
-      Events.punchblock(Punchblock::Event::Offer) do
-        begin
-          stats.register_call_offered
-        rescue Celluloid::DeadActorError
-        end
-        throw :pass
-      end
-
-      Events.call_dialed do
-        begin
-          stats.register_call_dialed
-        rescue Celluloid::DeadActorError
-        end
-        throw :pass
-      end
-
-      Events.call_rejected do
-        begin
-          stats.register_call_rejected
-        rescue Celluloid::DeadActorError
-        end
-        throw :pass
-      end
-
-      Events.call_routed do |data|
-        begin
-          stats.register_call_routed data
-        rescue Celluloid::DeadActorError
-        end
-        throw :pass
-      end
-    end
-
     def to_s
       "#<#{self.class} dump=#{dump}>"
     end

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -9,11 +9,11 @@ module Adhearsion
 
       let(:to) { 'sip:foo@bar.com' }
       let(:other_call_id)   { new_uuid }
-      let(:other_mock_call) { flexmock OutboundCall.new, :id => other_call_id }
+      let(:other_mock_call) { flexmock OutboundCall.new, :id => other_call_id, :write_command => true }
 
       let(:second_to)               { 'sip:baz@bar.com' }
       let(:second_other_call_id)    { new_uuid }
-      let(:second_other_mock_call)  { flexmock OutboundCall.new, :id => second_other_call_id }
+      let(:second_other_mock_call)  { flexmock OutboundCall.new, :id => second_other_call_id, :write_command => true }
 
       let(:mock_answered) { Punchblock::Event::Answered.new }
 
@@ -349,7 +349,7 @@ module Adhearsion
 
           context "when a call is answered and joined, and the other ends with an error" do
             it "has an overall dial status of :answer" do
-            flexmock(call).should_receive(:answer).once
+              flexmock(call).should_receive(:answer).once
               flexmock(other_mock_call).should_receive(:join).once.with(call)
               flexmock(second_other_mock_call).should_receive(:hangup).once
 

data/spec/adhearsion/call_controller/input_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller/output/async_player_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller/output/formatter_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller/output/player_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController
@@ -44,10 +45,9 @@ module Adhearsion
             lambda { subject.output content }.should raise_error(PlaybackError)
           end
 
-          it "raises a Playback Error if the component ends due to an error" do
-            e = Call::Hangup.new
-            expect_component_execution Punchblock::Component::Output.new(:ssml => content), e
-            lambda { subject.output content }.should raise_error(e)
+          it "raises a Call::Hangup exception if the component ends due to an error" do
+            expect_component_execution Punchblock::Component::Output.new(:ssml => content), Call::Hangup
+            lambda { subject.output content }.should raise_error(Call::Hangup)
           end
         end
 

data/spec/adhearsion/call_controller/output_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller/record_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller/utility_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'ruby_speech'
 
 module Adhearsion
   class CallController

data/spec/adhearsion/call_controller_spec.rb

@@ -299,10 +299,10 @@ module Adhearsion
         before { subject.pause! }
 
         it "should unblock when the controller is unpaused" do
-          t1 = t2 = nil
+          t2 = nil
           latch = CountDownLatch.new 1
+          t1 = Time.now
           Thread.new do
-            t1 = Time.now
             subject.block_until_resumed
             t2 = Time.now
             latch.countdown!

data/spec/adhearsion/configuration_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'loquacious'
 
 describe Adhearsion::Configuration do
 

data/spec/adhearsion/plugin_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'loquacious'
 
 include InitializerStubs
 

data/spec/adhearsion/punchblock_plugin_spec.rb

@@ -32,13 +32,13 @@ module Adhearsion
       it "blocks until a response is received" do
         slow_command = Punchblock::Command::Dial.new
         slow_command.request!
+        starting_time = Time.now
         Thread.new do
           sleep 0.5
           slow_command.response = response
         end
-        starting_time = Time.now
         PunchblockPlugin.execute_component slow_command
-        (Time.now - starting_time).should >= 0.5
+        (Time.now - starting_time).should >= 0.4
       end
 
       describe "with a successful response" do

data/spec/adhearsion/statistics_spec.rb

@@ -3,12 +3,19 @@
 require 'spec_helper'
 
 describe Adhearsion::Statistics do
+  before(:all) do
+    Adhearsion::Statistics.setup_event_handlers
+  end
+
+  subject { Celluloid::Actor[:statistics] }
+
   before do
-    subject.setup_event_handlers
+    Celluloid::Actor[:statistics] = described_class.new
     flexmock(Adhearsion.active_calls).should_receive(:count).and_return 0
   end
 
   after do
+    Celluloid::Actor.clear_registry
     Adhearsion.router = nil
   end
 

data/spec/adhearsion_spec.rb

@@ -86,6 +86,8 @@ describe Adhearsion do
       original.terminate
       original.should_not be_alive
 
+      sleep 0.25
+
       current = Adhearsion.active_calls
       current.should be_alive
       current.should_not be original
@@ -106,6 +108,8 @@ describe Adhearsion do
       original.terminate
       original.should_not be_alive
 
+      sleep 0.25
+
       current = Adhearsion.statistics
       current.should be_alive
       current.should_not be original

data/spec/spec_helper.rb

@@ -40,12 +40,12 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.color_enabled = true
 
-  config.before :each do
-    Adhearsion.router = nil
+  config.before :suite do
+    Adhearsion::Logging.start Adhearsion::Logging.default_appenders, :trace, Adhearsion.config.platform.logging.formatter
   end
 
-  config.after :each do
-    Celluloid.shutdown
+  config.before :each do
+    Adhearsion.router = nil
   end
 end
 
@@ -54,8 +54,6 @@ Adhearsion::Events.exeption do |e|
   puts e.backtrace.join("\n")
 end
 
-Adhearsion::Logging.silence!
-
 # Test modules for #mixin methods
 module TestBiscuit
   def throwadogabone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -464,6 +464,7 @@ files:
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -636,7 +637,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4557802099463492271
+      hash: 2773669927993814773
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -645,7 +646,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4557802099463492271
+      hash: 2773669927993814773
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24