adhearsion 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c56e8ead6437f2554eea0fba508eaea1971133
-  data.tar.gz: 00795ee77e30cfb4ec49e5214c6a84cd82ac164f
+  metadata.gz: b3cc409522daab633c1bc664407fdfc6a5108694
+  data.tar.gz: 5c9a537a64f4a571916f1fd90bce584b9ea4ab95
 SHA512:
-  metadata.gz: 65d347d4f9141f0e99643c69b8df7e0d2008ca6ac51fa936641ffa27b9e848defe7435f45482593b12b21020677fa46707b4b4b9a259ee02d27c6d78d8b21944
-  data.tar.gz: fd7ae40b068100dfeab3b2ddc5aa22cec816076bb30ac719800eddd8b558fa227b401e1cb7f47c00c5054eb25a1f6593624759ba747bdbca78434e3029be4033
+  metadata.gz: 5a1567863c4da74228af44de62df55dc68cc4d2dca383e9c3719b7d079131035462c42a8687b956459115f514a59edf6a5affd7059c34a3199aaa1a856538a3d
+  data.tar.gz: 2de7f4d8e52804198127af271104a7c52335c67a4bf3a20b613a3bef858afd6b4bb9d6b2135ef267c535d77701ad09e2c0968fe12036c80de24b83f72d4f5275

data/.lgtm

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

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.2.0
   - 2.2.1
   - 2.2.2
-  - jruby-9.0.0.0.pre2
+  - jruby-9.0.0.0
   - ruby-head
 jdk:
   - openjdk7 # for jruby
@@ -13,3 +13,6 @@ matrix:
     - rvm: ruby-head
 env: ARUBA_TIMEOUT=120 AHN_ENV=development
 sudo: false
+notifications:
+  slack:
+    secure: Y7EqF/9FY7mca63c1DM7kEr34fNtFclWXJj9vLqVQJwR3rCDZUZSD8DlqHJDwE6KRCCDsSkyV4lihCim+GEM28CRcJir0AEUJhXHvIMckjH7n38W9OGN26RuJGZTapjgCSMOBeq0YpSe6dAnZeRpZRJxsTFtP5ptLD5RRjIMzZM=

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [3.0.0.beta2](https://github.com/adhearsion/adhearsion/compare/v3.0.0.beta1...v3.0.0.beta2) - [2015-12-18](https://rubygems.org/gems/adhearsion/versions/3.0.0.beta2)
+  * Bugfix: Ensure components are deregistered from asterisk translator once the call is ended ([#582](https://github.com/adhearsion/adhearsion/pull/582))
+  * Change: Define configuration per-environment for any environment name and without colliding with plugin names. See [#442](https://github.com/adhearsion/adhearsion/issues/442). Syntax is now `config.env(:development).foo = :bar` instead of `config.development.foo = :bar`.
+  * Feature: Introduce the concept of application specific config. Similar to a plugin, an Application can specify config and an initialiser, and is the place to put such application-wide and unshareable things.
+  * Bugfix: Calls remain inactive even after they shut down. Previously, to reliably check if a call was up or down it was necessary to consider the case where the call actor had been shut down. This is irrelevant to the `Adhearsion::Call#active?` question, which should *always* return a boolean. It now does.
+  * Bugfix: Process joined events on Asterisk 13 in any order, avoiding Join command timeout
+  * Bugfix: Handle correct event for confirming that a component stop was completed on Asterisk 13
+  * Bugfix: Avoid race conditions in processing calls with interactions between them
+
 # [3.0.0.beta1](https://github.com/adhearsion/adhearsion/compare/v2.6.1...v3.0.0.beta1) - [2015-06-24](https://rubygems.org/gems/adhearsion/versions/3.0.0.beta1)
   * Change: Removed `Adhearsion.ahn_root=` which was deprecated in favour of `Adhearsion.root=`
   * Change: Remove integration with `RAILS_ENV`
@@ -18,6 +27,7 @@
   * Change: Ruby 1.9 is no longer supported. Minimum supported versions are Ruby 2.2.0 and JRuby 9.0.0.0
   * Change: Rename "platform" to "core" relating to the config system, because "platform" is overloaded. Settings are now `config.core.*` or `AHN_CORE_*`.
   * Change: Permit application environment to be set only by AHN_ENV. The config system depends on the environment, and the previous dependency was circular.
+  * Change: Define configuration per-environment for any environment name and without colliding with plugin names. See [#442](https://github.com/adhearsion/adhearsion/issues/442). Syntax is now `config.env(:development).foo = :bar` instead of `config.development.foo = :bar`.
   * Feature: Add i18n support via `CallController#t`
   * Feature: Integrate a Rack-based HTTP server from the Virginia plugin
   * Feature: Permit timing out when calling `Call#wait_for_end`

data/MAINTAINERS

@@ -0,0 +1,2 @@
+Ben Langfeld <ben@langfeld.me> (@benlangfeld)
+Ben Klang <bklang@mojolingo.com> (@bklang)

data/README.markdown

@@ -28,7 +28,7 @@ Adhearsion rests above a lower-level telephony platform, for example [Asterisk](
 * [ruby_speech dependencies](https://github.com/benlangfeld/ruby_speech#dependencies)
 * A VoIP platform:
   * Asterisk 11+
-  * A Rayo server (Prism 11+ with rayo-server, or FreeSWITCH with mod_rayo)
+  * FreeSWITCH 1.4+
 * An interest in building cool new things
 
 **Ruby 1.9 is no longer supported by Adhearsion or the Ruby core team. You should upgrade to Ruby 2.2 as a matter of urgency in order to continue receiving security fixes.**

data/adhearsion.gemspec

@@ -25,14 +25,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'adhearsion-loquacious', ["~> 1.9"]
   s.add_runtime_dependency 'blather', ["~> 1.0"]
   s.add_runtime_dependency 'bundler', ["~> 1.0"]
-  s.add_runtime_dependency 'celluloid', ["~> 0.16"]
+  s.add_runtime_dependency 'celluloid', ["~> 0.16.0"]
   s.add_runtime_dependency 'countdownlatch'
   s.add_runtime_dependency 'deep_merge'
   s.add_runtime_dependency 'ffi', ["~> 1.0"]
   s.add_runtime_dependency 'future-resource', ["~> 1.0"]
   s.add_runtime_dependency 'has-guarded-handlers', ["~> 1.6", ">= 1.6.3"]
+  s.add_runtime_dependency 'http', ["~> 0.9.8"] # Pin back so Reel doesn't break
   s.add_runtime_dependency 'i18n', ["~> 0.6"]
-  s.add_runtime_dependency 'logging', ["~> 1.8"]
+  s.add_runtime_dependency 'logging', ["~> 2.0"]
   s.add_runtime_dependency 'nokogiri', ["~> 1.5", ">= 1.5.6"]
   s.add_runtime_dependency 'pry'
   s.add_runtime_dependency 'rake'
@@ -45,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor', "~> 0.18.0"
   s.add_runtime_dependency 'virtus', ["~> 1.0"]
 
-  s.add_development_dependency 'aruba', "~> 0.5"
+  s.add_development_dependency 'aruba', "~> 0.6.0"
   s.add_development_dependency 'ci_reporter_rspec'
   s.add_development_dependency 'ci_reporter_cucumber'
   s.add_development_dependency 'cucumber'

data/features/cli_create.feature

@@ -24,6 +24,7 @@ Feature: Adhearsion Ahn CLI (Create)
       | app/assets/audio/en/hello_world.wav       |
       | app/call_controllers/simon_game.rb        |
       | config/adhearsion.rb                      |
+      | config/app.rb                             |
       | config/environment.rb                     |
       | config/events.rb                          |
       | config/routes.rb                          |
@@ -43,6 +44,10 @@ Feature: Adhearsion Ahn CLI (Create)
     logging.level
     config.core.username
     """
+    And the file "config/app.rb" should contain each of these content parts:
+    """
+    config do
+    """
     And the file "config/events.rb" should contain each of these content parts:
     """
     Adhearsion::Events.draw do
@@ -88,6 +93,7 @@ Feature: Adhearsion Ahn CLI (Create)
       | .gitignore            |
       | .rspec                |
       | config/adhearsion.rb  |
+      | config/app.rb         |
       | config/environment.rb |
       | config/events.rb      |
       | config/routes.rb      |

data/features/cli_plugin.feature

@@ -27,7 +27,7 @@ Feature: Adhearsion Ahn CLI (Plugin)
     And I type "SECRET_CODE"
     Then the output should contain:
     """
-    Access Denied. Please sign up for an account at http://rubygems.org
+    Access Denied.
     """
 
   Scenario: Command create_github_hook

data/lib/adhearsion.rb

@@ -47,10 +47,6 @@ module Adhearsion
       @environment = other ? other.to_sym : other
     end
 
-    def environments
-      config.valid_environments
-    end
-
     def config=(config)
       @config = config
     end

data/lib/adhearsion/application.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'adhearsion/plugin'
+
+Adhearsion::Application = Adhearsion::Plugin

data/lib/adhearsion/call.rb

@@ -23,6 +23,12 @@ module Adhearsion
       rescue ::Celluloid::DeadActorError
         raise ExpiredError, "This call is expired and is no longer accessible. See http://adhearsion.com/docs/calls for further details."
       end
+
+      def active?
+        alive? && super
+      rescue ExpiredError
+        false
+      end
     end
 
     include Celluloid
@@ -535,7 +541,7 @@ module Adhearsion
     def execute_controller(controller = nil, completion_callback = nil, &block)
       raise ArgumentError, "Cannot supply a controller and a block at the same time" if controller && block_given?
       controller ||= CallController.new current_actor, &block
-      logger.info "Executing controller #{controller.inspect}"
+      logger.info "Executing controller #{controller.class}"
       controller.bg_exec completion_callback
     end
 

data/lib/adhearsion/call_controller.rb

@@ -18,7 +18,7 @@ module Adhearsion
 
     class_attribute :callbacks
 
-    self.callbacks = {:before_call => [], :after_call => [], :on_error => []}
+    self.callbacks = {:before => [], :after => [], :on_error => []}
 
     self.callbacks.keys.each do |name|
       class_eval <<-STOP
@@ -49,6 +49,16 @@ module Adhearsion
       def mixin(mod)
         include mod
       end
+
+      def before_call(*args, &block)
+        Adhearsion.deprecated :before
+        before(*args, &block)
+      end
+
+      def after_call(*args, &block)
+        Adhearsion.deprecated :after
+        after(*args, &block)
+      end
     end
 
     # @return [Call] The call object on which the controller is executing
@@ -113,7 +123,7 @@ module Adhearsion
     # @private
     def execute!(*options)
       call.async.register_controller self
-      execute_callbacks :before_call
+      execute_callbacks :before
       run
     rescue Call::Hangup, Call::ExpiredError
     rescue SyntaxError, StandardError => e
@@ -121,7 +131,7 @@ module Adhearsion
       on_error e
       raise
     ensure
-      after_call
+      after
       logger.debug "Finished executing controller #{self.inspect}"
     end
 
@@ -189,8 +199,8 @@ module Adhearsion
     end
 
     # @private
-    def after_call
-      @after_call ||= execute_callbacks :after_call
+    def after
+      @after ||= execute_callbacks :after
     end
 
     # @private
@@ -234,7 +244,7 @@ module Adhearsion
     end
 
     #
-    # Hangup the call, and execute after_call callbacks
+    # Hangup the call, and execute after callbacks
     #
     # @param [Hash] headers
     #

data/lib/adhearsion/call_controller/dial.rb

@@ -74,7 +74,7 @@ module Adhearsion
         attr_accessor :status
 
         def initialize(to, options, call)
-          raise Call::Hangup unless call.alive? && call.active?
+          raise Call::Hangup unless call.active?
           @id = SecureRandom.uuid
           @options, @call = options, call
           @targets = to.respond_to?(:has_key?) ? to : Array(to)
@@ -168,7 +168,7 @@ module Adhearsion
                 condition.wait
               end
 
-              if new_call.alive? && new_call.active? && status.result != :answer
+              if new_call.active? && status.result != :answer
                 logger.info "#dial joining call #{new_call.id} to #{@call.id}"
                 pre_join_tasks new_call
                 @call.answer

data/lib/adhearsion/call_controller/input/result.rb

@@ -9,7 +9,7 @@ module Adhearsion
         end
 
         def inspect
-          "#<#{self.class} status=#{status.inspect}, confidence=#{confidence.inspect}, utterance=#{utterance.inspect}, interpretation=#{interpretation.inspect}, nlsml=#{nlsml.inspect}>"
+          "#<#{self.class} status=#{status.inspect}, confidence=#{confidence.inspect}, utterance=#{utterance.inspect}, interpretation=#{interpretation.inspect}, nlsml='#{nlsml && nlsml.to_xml.split("\n").join(' ')}'>"
         end
 
         def utterance=(other)

data/lib/adhearsion/configuration.rb

@@ -30,7 +30,7 @@ module Adhearsion
     #
     # @return [Adhearsion::Configuration]
     def initialize(env = :development, &block)
-      initialize_environments env
+      @active_environment = env
 
       Loquacious.env_config = true
       Loquacious.env_prefix = "AHN"
@@ -122,33 +122,14 @@ module Adhearsion
       self
     end
 
-    def initialize_environments(active_environment)
-      # Create a method per each valid environment that, when invoked, may execute
-      # the block received if the environment is active
-      valid_environments.each do |env|
-        define_singleton_method env.to_sym do |*args, &block|
-          logger.trace "Ignoring configuration for inactive environment #{env}"
-        end
-      end
-
-      define_singleton_method active_environment do |*args, &block|
-        self.instance_eval(&block) unless block.nil?
-        self
-      end
-
-      if valid_environment?(active_environment)
-        logger.warn "You tried to initialize with an invalid environment name #{active_environment}; environment-specific config may not load successfully. Valid values are #{valid_environments}."
+    def env(environment)
+      if environment == @active_environment
+        yield self
+      else
+        logger.trace "Ignoring configuration for inactive environment #{environment}"
       end
     end
 
-    def valid_environment?(env)
-      env && self.valid_environments.include?(env.to_sym)
-    end
-
-    def valid_environments
-      @valid_environments ||= [:production, :development, :staging, :test]
-    end
-
     ##
     # Direct access to a specific configuration object
     #

data/lib/adhearsion/events.rb

@@ -60,17 +60,27 @@ module Adhearsion
       end
 
       def queue
-        @queue || refresh!
+        unless @queue && @queue.alive?
+          init
+        end
+
+        @queue
       end
 
       def init
-        @queue = Worker.pool(size: Adhearsion.config.core.event_threads)
+        size = Adhearsion.config.core.event_threads
+        logger.debug "Initializing event worker pool of size #{size}"
+        @queue = Worker.pool(size: size)
       end
 
       def refresh!
+        clear
+        init
+      end
+
+      def clear
         @queue = nil
         Handler.instance.clear_handlers
-        init
       end
     end
 

data/lib/adhearsion/generators/app/templates/adhearsion.erb

@@ -17,8 +17,8 @@ Adhearsion.config do |config|
   #          config.<plugin-name>.<key> = <value>
   #        end
 <% end %>
-  config.development do |dev|
-    dev.core.logging.level = :debug
+  config.env :development do
+    config.core.logging.level = :debug
   end
 
   ##

data/lib/adhearsion/generators/app/templates/config/app.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+class DemoApp < Adhearsion::Application
+  app_name :demo
+
+  # Actions to perform when initialising the application
+  #
+  init do
+    logger.info "This is the Adhearsion Demo application as generated by `ahn create`. It should work well on FreeSWITCH, and will soon also work on Asterisk."
+  end
+
+  # Basic configuration for the application
+  #
+  config do
+    greeting "Hello. Welcome to the Simon Game. Lets play.", desc: "What to use to greet users before playing the Simon Game"
+  end
+end

data/lib/adhearsion/initializer.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'adhearsion/application'
 require 'adhearsion/linux_proc_name'
 require 'adhearsion/rayo/initializer'
 require 'adhearsion/http_server'
@@ -28,6 +29,7 @@ module Adhearsion
       catch :boot_aborted do
         configure_plugins
         load_lib_folder
+        load_app_file
         load_config_file
         load_events_file
         load_routes_file
@@ -138,6 +140,11 @@ module Adhearsion
       true
     end
 
+    def load_app_file
+      path = "#{Adhearsion.config.root}/config/app.rb"
+      load path if File.exists?(path)
+    end
+
     def load_config_file
       load "#{Adhearsion.config.root}/config/adhearsion.rb"
     end

data/lib/adhearsion/plugin.rb

@@ -140,10 +140,12 @@ module Adhearsion
           self.plugin_name = name
         end
       end
+      alias :app_name :plugin_name
 
       def plugin_name=(name)
         @plugin_name = name
       end
+      alias :app_name= :plugin_name=
 
       # Class method that will be used by subclasses to configure the plugin
       # @param name Symbol plugin config name

data/lib/adhearsion/rayo/initializer.rb

@@ -148,6 +148,7 @@ module Adhearsion
             call.async.deliver_message event
           else
             logger.warn "Event received for inactive call #{event.target_call_id}: #{event.inspect}"
+            Events.trigger :inactive_call, event
           end
         end
 

data/lib/adhearsion/router/route.rb

@@ -40,7 +40,7 @@ module Adhearsion
 
         call.execute_controller controller, lambda { |call_actor|
           begin
-            if call_actor.alive? && call_actor.active?
+            if call_actor.active?
               if call_actor.auto_hangup
                 logger.info "Call #{call_id} routing completed. Hanging up now."
                 call_actor.hangup

data/lib/adhearsion/translator/asterisk.rb

@@ -70,6 +70,10 @@ module Adhearsion
         @components[component.id] ||= component
       end
 
+      def deregister_component(id)
+        @components.delete id
+      end
+
       def component_with_id(component_id)
         @components[component_id]
       end
@@ -145,7 +149,7 @@ module Adhearsion
           if call = call_with_id(command.uri)
             command.response = Adhearsion::ProtocolError.new.setup(:conflict, 'Call ID already in use')
           else
-            call = Call.new command.to, current_actor, ami_client, connection, nil, command.uri
+            call = Call.new command.to, self, ami_client, connection, nil, command.uri
             register_call call
             call.dial command
           end
@@ -225,7 +229,7 @@ module Adhearsion
 
         return if env[:agi_extension] == 'h' || env[:agi_type] == 'Kill'
 
-        call = Call.new event['Channel'], current_actor, ami_client, connection, env
+        call = Call.new event['Channel'], self, ami_client, connection, env
         register_call call
         call.send_offer
       end

data/lib/adhearsion/translator/asterisk/call.rb

@@ -139,7 +139,8 @@ module Adhearsion
           when 'BridgeEnter'
             if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'])
               if other_call = translator.call_for_channel(other_call_channel)
-                join_command  = other_call.pending_joins.delete channel
+                join_command   = @pending_joins.delete other_call_channel
+                join_command ||= other_call.pending_joins.delete channel
                 join_command.response = true if join_command
 
                 event = Adhearsion::Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time

data/lib/adhearsion/translator/asterisk/component.rb

@@ -28,6 +28,7 @@ module Adhearsion
             event = Adhearsion::Event::Complete.new reason: reason, recording: recording
             send_event event
             call.deregister_component id if call
+            translator.deregister_component id
           end
 
           def send_event(event)

data/lib/adhearsion/translator/asterisk/component/stop_by_redirect.rb

@@ -18,7 +18,7 @@ module Adhearsion
           end
 
           def stop_by_redirect(complete_reason)
-            call.register_handler :ami, [{name: 'AsyncAGI', [:[], 'SubEvent'] => 'Start'}, {name: 'AsyncAGIExec'}] do |event|
+            call.register_handler :ami, [{name: 'AsyncAGI', [:[], 'SubEvent'] => 'Start'}, {name: 'AsyncAGIStart'}] do |event|
               send_complete_event complete_reason
             end
             call.redirect_back

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '3.0.0.beta1'
+  VERSION = '3.0.0.beta2'
 end

data/spec/adhearsion/call_controller_spec.rb

@@ -142,15 +142,15 @@ module Adhearsion
     describe "#invoke" do
       class InvokeController < CallController
         def run
-          before
+          do_before
           metadata[:invoke_result] = invoke second_controller, :foo => 'bar'
-          after
+          do_after
         end
 
-        def before
+        def do_before
         end
 
-        def after
+        def do_after
         end
 
         def second_controller
@@ -168,9 +168,9 @@ module Adhearsion
       end
 
       it "should invoke another controller before returning to the current controller" do
-        expect(subject).to receive(:before).once.ordered
+        expect(subject).to receive(:do_before).once.ordered
         expect(call).to receive(:answer).once.ordered
-        expect(subject).to receive(:after).once.ordered
+        expect(subject).to receive(:do_after).once.ordered
 
         subject.exec
       end
@@ -189,9 +189,9 @@ module Adhearsion
       it "should allow the outer controller to cease execution and handle remote hangups" do
         subject[:second_controller] = SecondControllerWithRemoteHangup
 
-        expect(subject).to receive(:before).once.ordered
+        expect(subject).to receive(:do_before).once.ordered
         expect(call).to receive(:answer).once.ordered
-        expect(subject).to receive(:after).never.ordered
+        expect(subject).to receive(:do_after).never.ordered
 
         subject.exec
       end
@@ -200,21 +200,22 @@ module Adhearsion
     describe "#pass" do
       let(:pass_controller) do
         Class.new CallController do
-          after_call :foobar
+          after :foobar
+          after :doodaz
 
           def run
-            before
+            do_before
             pass SecondController, :foo => 'bar'
-            after
+            do_after
           end
 
-          def before
+          def do_before
           end
 
-          def after
+          def do_after
           end
 
-          def foobar
+          def doodaz
           end
         end
       end
@@ -230,16 +231,17 @@ module Adhearsion
       end
 
       it "should cease execution of the current controller, and instruct the call to execute another" do
-        expect(subject).to receive(:before).once.ordered
+        expect(subject).to receive(:do_before).once.ordered
         expect(call).to receive(:answer).once.ordered
-        expect(subject).to receive(:after).never.ordered
+        expect(subject).to receive(:do_after).never.ordered
 
         subject.exec
       end
 
-      it "should execute after_call callbacks before passing control" do
-        expect(subject).to receive(:before).once.ordered
+      it "should execute after callbacks before passing control" do
+        expect(subject).to receive(:do_before).once.ordered
         expect(subject).to receive(:foobar).once.ordered
+        expect(subject).to receive(:doodaz).once.ordered
         expect(call).to receive(:answer).once.ordered
 
         subject.exec
@@ -622,11 +624,13 @@ module Adhearsion
 end
 
 class ExampleCallController < Adhearsion::CallController
-  before_call { setup_models }
+  before { setup_models }
+  before :setup_models
   before_call :setup_models
 
   after_call { clean_up_models }
-  after_call :clean_up_models
+  after { clean_up_models }
+  after :clean_up_models
 
   on_error { apologize_for_failure }
   on_error :apologize_for_failure
@@ -661,22 +665,22 @@ describe ExampleCallController do
     allow(call.wrapped_object).to receive_messages :write_and_await_response => nil
   end
 
-  it "should execute the before_call callbacks before processing the call" do
-    expect(subject).to receive(:setup_models).twice.ordered
+  it "should execute the before callbacks before processing the call" do
+    expect(subject).to receive(:setup_models).exactly(3).times.ordered
     expect(subject).to receive(:join_to_conference).once.ordered
     subject.exec
   end
 
-  it "should execute the after_call callbacks after the call is hung up" do
+  it "should execute the after callbacks after the call is hung up" do
     expect(subject).to receive(:join_to_conference).once.ordered
-    expect(subject).to receive(:clean_up_models).twice.ordered
+    expect(subject).to receive(:clean_up_models).exactly(3).times.ordered
     expect(subject).to receive(:foobar).never
     subject.exec
   end
 
   it "should capture errors in callbacks" do
-    expect(subject).to receive(:setup_models).twice.and_raise StandardError
-    expect(subject).to receive(:clean_up_models).twice.and_raise StandardError
+    expect(subject).to receive(:setup_models).exactly(3).times.and_raise StandardError
+    expect(subject).to receive(:clean_up_models).exactly(3).times.and_raise StandardError
     latch = CountDownLatch.new 4
     Adhearsion::Events.exception do |e, l|
       expect(e).to be_a StandardError
@@ -695,11 +699,11 @@ describe ExampleCallController do
   end
 
   describe "when the controller finishes without a hangup" do
-    it "should execute the after_call callbacks" do
+    it "should execute the after callbacks" do
       subject[:skip_hangup] = true
       expect(subject).to receive(:join_to_conference).once.ordered
       expect(subject).to receive(:foobar).once.ordered
-      expect(subject).to receive(:clean_up_models).twice.ordered
+      expect(subject).to receive(:clean_up_models).exactly(3).times.ordered
       subject.exec
     end
   end

data/spec/adhearsion/call_spec.rb

@@ -633,6 +633,7 @@ module Adhearsion
             subject << end_event
             sleep 2.1
             expect(subject.alive?).to be false
+            expect(subject.active?).to be false
             expect { subject.id }.to raise_error Call::ExpiredError, /expired and is no longer accessible/
           end
         end
@@ -653,8 +654,10 @@ module Adhearsion
             subject << end_event
             sleep 1.1
             expect(subject.alive?).to be true
+            expect(subject.active?).to be false
             sleep 1
             expect(subject.alive?).to be false
+            expect(subject.active?).to be false
             expect { subject.id }.to raise_error Call::ExpiredError, /expired and is no longer accessible/
           end
         end

data/spec/adhearsion/configuration_spec.rb

@@ -98,17 +98,17 @@ describe Adhearsion::Configuration do
       end
 
       before do
-        subject.production do |env|
-          env.core.my_level = 0
+        subject.env :production do
+          subject.core.my_level = 0
         end
-        subject.development do |env|
-          env.core.my_level = 1
+        subject.env :development do
+          subject.core.my_level = 1
         end
-        subject.staging do |env|
-          env.core.my_level = 2
+        subject.env :staging do
+          subject.core.my_level = 2
         end
-        subject.test do |env|
-          env.core.my_level = 3
+        subject.env :test do
+          subject.core.my_level = 3
         end
       end
 
@@ -133,31 +133,6 @@ describe Adhearsion::Configuration do
     end
   end
 
-  describe "while defining the environment" do
-
-    before do
-      Adhearsion.config = nil
-    end
-
-    after do
-      Adhearsion.environment = nil
-      Adhearsion.config = nil
-    end
-
-    [:development, :production, :staging, :test].each do |env|
-      it "should respond to #{env}" do
-        expect(Adhearsion.config).to respond_to(env)
-      end
-    end
-
-    it "should allow to add a new environment" do
-      expect(Adhearsion.config.valid_environment?(:another_environment)).to eq(false)
-      Adhearsion.environments << :another_environment
-      expect(Adhearsion.config.valid_environment?(:another_environment)).to eq(true)
-    end
-
-  end
-
   describe "while retrieving configuration descriptions" do
     before do
       Adhearsion.config = nil
@@ -222,17 +197,17 @@ describe Adhearsion::Configuration do
           end
 
           before do
-            config.production do |env|
-              env.my_plugin.name = "production"
+            config.env :production do
+              config.my_plugin.name = "production"
             end
-            config.development do |env|
-              env.my_plugin.name = "development"
+            config.env :development do
+              config.my_plugin.name = "development"
             end
-            config.staging do |env|
-              env.my_plugin.name = "staging"
+            config.env :staging do
+              config.my_plugin.name = "staging"
             end
-            config.test do |env|
-              env.my_plugin.name = "test"
+            config.env :test do
+              config.my_plugin.name = "test"
             end
           end
 

data/spec/adhearsion/rayo/initializer_spec.rb

@@ -162,6 +162,7 @@ describe Adhearsion::Rayo::Initializer do
     end
 
     it 'should not attempt to reconnect if Adhearsion is shutting down' do
+      skip 'Strange interaction with specs restarting Celluloid; TODO re-consider along with migration to actors for Process/connection management'
       Adhearsion::Process.booted
       Adhearsion::Process.shutdown
       allow(mock_client).to receive(:run).and_raise Adhearsion::Rayo::DisconnectedError
@@ -295,6 +296,11 @@ describe Adhearsion::Rayo::Initializer do
         expect(Adhearsion::Logging.get_logger(described_class)).to receive(:warn).once.with("Event received for inactive call #{call_id}: #{mock_event.inspect}")
         described_class.dispatch_call_event mock_event
       end
+
+      it "should trigger an inactive call event" do
+        expect(Adhearsion::Events).to receive(:trigger).once.with(:inactive_call, mock_event)
+        described_class.dispatch_call_event mock_event
+      end
     end
 
     describe "when the registry contains a dead call" do

data/spec/adhearsion/translator/asterisk/call_spec.rb

@@ -832,11 +832,11 @@ module Adhearsion
                 Adhearsion::Rayo::Command::Join.new call_uri: other_call_id
               end
 
-              let :ami_event do
+              let :second_ami_event do
                 RubyAMI::Event.new 'BridgeEnter',
                 'Privilege' => "call,all",
                 'BridgeUniqueid'  => bridge_uniqueid,
-                'Channel'  => call_channel
+                'Channel'  => other_channel
               end
 
               let :expected_joined do
@@ -850,27 +850,49 @@ module Adhearsion
               end
 
               before do
-                translator.bridges[bridge_uniqueid] = other_channel
+                translator.register_call subject
                 translator.register_call other_call
-
-                other_call.pending_joins[channel] = command
                 command.request!
                 expect(subject).to receive(:execute_agi_command).and_return code: 200
                 subject.execute_command command
+                translator.handle_ami_event ami_event
               end
 
               it 'sends the correct Joined events' do
                 expect(translator).to receive(:handle_pb_event).with expected_joined
                 expect(translator).to receive(:handle_pb_event).with expected_joined_other
-                subject.process_ami_event ami_event
+                translator.handle_ami_event second_ami_event
                 expect(command.response(0.5)).to eq(true)
               end
+
+              context 'out of order' do
+                let :ami_event do
+                  RubyAMI::Event.new 'BridgeEnter',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => other_channel
+                end
+
+                let :second_ami_event do
+                  RubyAMI::Event.new 'BridgeEnter',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => call_channel
+                end
+
+                it 'sends the correct Joined events' do
+                  expect(translator).to receive(:handle_pb_event).with expected_joined
+                  expect(translator).to receive(:handle_pb_event).with expected_joined_other
+                  translator.handle_ami_event second_ami_event
+                  expect(command.response(0.5)).to eq(true)
+                end
+              end
             end
           end
 
           context 'with a BridgeLeave event' do
             let(:bridge_uniqueid) { "1234-5678" }
-            let(:call_channel) { "SIP/foo-1234" }
+            let(:call_channel) { "SIP/foo" }
             let :ami_event do
               RubyAMI::Event.new 'BridgeLeave',
                 'Privilege' => "call,all",
@@ -892,11 +914,11 @@ module Adhearsion
               end
               let(:other_call_id) { other_call.id }
 
-              let :ami_event do
+              let :second_ami_event do
                 RubyAMI::Event.new 'BridgeLeave',
                 'Privilege' => "call,all",
                 'BridgeUniqueid'  => bridge_uniqueid,
-                'Channel'  => call_channel
+                'Channel'  => other_channel
               end
 
               let :expected_unjoined do
@@ -910,14 +932,37 @@ module Adhearsion
               end
 
               before do
-                translator.bridges[bridge_uniqueid + '_leave'] = other_channel
+                translator.register_call subject
                 translator.register_call other_call
+                translator.handle_ami_event ami_event
               end
 
               it 'sends the correct Unjoined events' do
                 expect(translator).to receive(:handle_pb_event).with expected_unjoined
                 expect(translator).to receive(:handle_pb_event).with expected_unjoined_other
-                subject.process_ami_event ami_event
+                translator.handle_ami_event second_ami_event
+              end
+
+              context 'out of order' do
+                let :ami_event do
+                  RubyAMI::Event.new 'BridgeLeave',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => other_channel
+                end
+
+                let :second_ami_event do
+                  RubyAMI::Event.new 'BridgeLeave',
+                  'Privilege' => "call,all",
+                  'BridgeUniqueid'  => bridge_uniqueid,
+                  'Channel'  => call_channel
+                end
+
+                it 'sends the correct Unjoined events' do
+                  expect(translator).to receive(:handle_pb_event).with expected_unjoined
+                  expect(translator).to receive(:handle_pb_event).with expected_unjoined_other
+                  translator.handle_ami_event second_ami_event
+                end
               end
             end
           end

data/spec/adhearsion/translator/asterisk/component/stop_by_redirect_spec.rb

@@ -42,7 +42,7 @@ module Adhearsion
 
               it "sets the command response to true" do
                 expect(mock_call).to receive(:redirect_back)
-                expect(mock_call).to receive(:register_handler).once.with(:ami, [{:name => 'AsyncAGI', [:[], 'SubEvent']=>'Start'}, {:name => 'AsyncAGIExec'}])
+                expect(mock_call).to receive(:register_handler).once.with(:ami, [{:name => 'AsyncAGI', [:[], 'SubEvent']=>'Start'}, {:name => 'AsyncAGIStart'}])
 
                 subject.execute_command command
                 expect(command.response(0.1)).to eq(true)

data/spec/adhearsion/translator/asterisk/component_spec.rb

@@ -58,6 +58,15 @@ module Adhearsion
               expect(subject).to receive(:send_complete_event).once.with Adhearsion::Event::Complete::Hangup.new
               subject.call_ended
             end
+
+            it "should deregister component from translator" do
+              translator.register_component(subject)
+              expect(translator.component_with_id(subject.id)).not_to be nil
+              expect(translator).to receive(:handle_pb_event).once
+              subject.call_ended
+              expect(translator.component_with_id(subject.id)).to be nil
+            end
+
           end
 
           describe '#execute_command' do

data/spec/adhearsion_spec.rb

@@ -36,13 +36,6 @@ describe Adhearsion do
     end
   end
 
-  describe "#environments" do
-    it "should be the collection of valid environments" do
-      Adhearsion.config.valid_environments << :foo
-      expect(Adhearsion.environments).to include :foo
-    end
-  end
-
   describe "#router" do
     describe '#router' do
       subject { super().router }

data/spec/spec_helper.rb

@@ -48,11 +48,11 @@ RSpec.configure do |config|
 
   config.after :each do
     Timecop.return
+    Adhearsion::Events.clear
     if defined?(:Celluloid)
       Celluloid.shutdown
       Adhearsion.active_calls = nil
       Celluloid.boot
-      Adhearsion::Events.refresh!
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: countdownlatch
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -185,14 +199,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -359,14 +373,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
@@ -544,6 +558,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".lgtm"
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
@@ -552,6 +567,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE
+- MAINTAINERS
 - README.markdown
 - Rakefile
 - adhearsion.gemspec
@@ -568,6 +584,7 @@ files:
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - lib/adhearsion.rb
+- lib/adhearsion/application.rb
 - lib/adhearsion/call.rb
 - lib/adhearsion/call_controller.rb
 - lib/adhearsion/call_controller/dial.rb
@@ -623,6 +640,7 @@ files:
 - lib/adhearsion/generators/app/templates/Rakefile
 - lib/adhearsion/generators/app/templates/adhearsion.erb
 - lib/adhearsion/generators/app/templates/config.ru
+- lib/adhearsion/generators/app/templates/config/app.rb
 - lib/adhearsion/generators/app/templates/config/environment.rb
 - lib/adhearsion/generators/app/templates/en.yml
 - lib/adhearsion/generators/app/templates/events.erb