adhearsion 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb14c1255a1538690eeda472f1eb7ca04b8fc9d6
-  data.tar.gz: 1d44d386568202e8250ab989f2d3fa76d9ada702
+  metadata.gz: ab3c831d82fb4d801c196646eb3fd399637c26b3
+  data.tar.gz: 690e4fbb38d071cd8eb46458301c66324a9b340b
 SHA512:
-  metadata.gz: cfb2b6fe75db610496304c8de2ccb4b81a004c8820d2998758a0a5b2f2742ea4a47f0082f847ad9da33f4f7247ab0396e7c550447f857326a976226210246e27
-  data.tar.gz: 2f3dc960267aead3512dcafcf44b5db6e239d35f58f74133f5d9592876941b2dbeef2af8f457a9b6b39291b22cc51672a99262862e8a5969bd92086ce3c20ff8
+  metadata.gz: a4319a75bd1f3b55a629231e4aa5db96d69f0584f8288a29eb691278dc577eff0d186a56203df6b73c324f9835365b271f8af2368c585cdbc6f4b017e0e3d286
+  data.tar.gz: 8b1de59e7c0db84375687fd91ac2e2d1af2cdd4e715b1e4b3fa3902c70eaf6b6bdf8569ce166af2792f98f4d96a46b946582bc7531cc314c7f2b11c788d88fb5

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-script: bundle exec rake --trace
 rvm:
   - 1.9.2
   - 1.9.3
@@ -11,6 +10,7 @@ matrix:
   allow_failures:
     - rvm: rbx-19mode
     - rvm: ruby-head
+    - rvm: jruby-19mode
 env: ARUBA_TIMEOUT=120 RAILS_ENV=development AHN_ENV=development
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [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.
+  * Bugfix: Don't share metadata between all controllers invoked by a route. This was causing concurrent mutation bugs and all sorts of weirdness.
+  * Bugfix: Ensure that a CallController can still log safely even if its Call (and therefore scoped logger) is gone.
+  * Bugfix: Fix some spec false positives and failures due to dependency changes.
+
 # [2.3.1](https://github.com/adhearsion/adhearsion/compare/v2.3.0...v2.3.1) - [2013-03-28](https://rubygems.org/gems/adhearsion/versions/2.3.1)
   * Bugfix: Fix a leftover Celluloid deprecation warning
 

data/adhearsion.gemspec

@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'punchblock', ["~> 1.4"]
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'ruby_speech', ["~> 1.0"]
-  s.add_runtime_dependency 'thor'
+  s.add_runtime_dependency 'thor', "~> 0.18.0"
 
-  s.add_development_dependency 'aruba', "~> 0.4"
+  s.add_development_dependency 'aruba', "~> 0.5"
   s.add_development_dependency 'ci_reporter'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'guard-cucumber'

data/features/cli_create.feature

@@ -20,6 +20,6 @@ Feature: Adhearsion Ahn CLI (Create)
     When I run `ahn create`
     Then the output should contain:
     """
-    ahn create requires at least 1 argument: "ahn create /path/to/directory".
+    no arguments
     """
     And the exit status should be 1

data/features/step_definitions/cli_steps.rb

@@ -1,10 +1,7 @@
 # encoding: utf-8
 
-require 'timeout'
-
 Then /^I should see the usage message$/ do
   steps %Q{
-    Then the output should contain "Tasks:"
     Then the output should contain "ahn create"
     Then the output should contain "ahn start"
     Then the output should contain "ahn daemon"
@@ -13,11 +10,6 @@ Then /^I should see the usage message$/ do
   }
 end
 
-# TODO: Remove after pull request is merged in cucumber.rb from Aruba
-When /^I terminate the interactive process$/ do
-  terminate_processes!
-end
-
 When /^I wait (\d+) seconds?$/ do |arg1|
   sleep arg1.to_i
 end

data/lib/adhearsion/call_controller.rb

@@ -60,7 +60,7 @@ module Adhearsion
     attr_reader :block
 
     delegate :[], :[]=, :to => :@metadata
-    delegate :variables, :logger, :to => :call
+    delegate :variables, :to => :call
 
     #
     # Create a new instance
@@ -269,5 +269,16 @@ module Adhearsion
     def inspect
       "#<#{self.class} call=#{call.alive? ? call.id : ''}, metadata=#{metadata.inspect}>"
     end
+
+    def eql?(other)
+      other.instance_of?(self.class) && call == other.call && metadata == other.metadata
+    end
+    alias :== :eql?
+
+    def logger
+      call.logger
+    rescue Celluloid::DeadActorError
+      super
+    end
   end#class
 end

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

@@ -36,11 +36,8 @@ module Adhearsion
         end
 
         def uri?(string)
-          uri = URI.parse string
-          !!uri.scheme
-        rescue URI::BadURIError
-          false
-        rescue URI::InvalidURIError
+          !! URI.parse(string).scheme
+        rescue URI::BadURIError, URI::InvalidURIError
           false
         end
 

data/lib/adhearsion/generators/app/templates/README.md

@@ -23,6 +23,8 @@ If you are using Asterisk 1.8, you will need to add an additional context with t
 ```xml
 <extension name='Adhearsion'>
   <condition field="destination_number" expression="^10$">
+    <action application="set" data="hangup_after_bridge=false"/>
+    <action application="set" data="park_after_bridge=true"/>
     <action application='park'/>
   </condition>
 </extension>

data/lib/adhearsion/punchblock_plugin/initializer.rb

@@ -43,7 +43,7 @@ module Adhearsion
           self.client = Punchblock::Client.new :connection => connection
 
           # Tell the Punchblock connection that we are ready to process calls.
-          Events.register_callback :after_initialization do
+          Events.register_callback :after_initialized do
             connection.ready!
           end
 

data/lib/adhearsion/router/route.rb

@@ -18,7 +18,7 @@ module Adhearsion
           @target, @guards = target, guards
         end
         @guards.compact!
-        @controller_metadata = {}
+        @controller_metadata = nil
       end
 
       def match?(call)
@@ -43,7 +43,7 @@ module Adhearsion
             else
               call_actor.hangup
             end
-          rescue Call::Hangup
+          rescue Call::Hangup, Call::ExpiredError
           end
           callback.call if callback
         }

data/lib/adhearsion/version.rb

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

data/spec/adhearsion/call_controller/input_spec.rb

@@ -310,13 +310,13 @@ module Adhearsion
         end
 
         context "with a block passed" do
-          it "should set that block as the buffer validator" do
-            foo = nil
-            subject.should_receive(:play_sound_files_for_menu).and_return("1")
-            subject.ask sound_files, :limit => 0 do |buffer|
-              foo = :bar
-            end.menu.execute_validator_hook
-            foo.should be == :bar
+          it "validates the buffer using that block, terminating on something truthy" do
+            subject.should_receive(:play_sound_files_for_menu).twice.and_return("1")
+            result = subject.ask sound_files, limit: 3 do |buffer|
+              buffer == '11'
+            end
+            result.status.should == :validator_terminated
+            result.response.should == '11'
           end
         end
 

data/spec/adhearsion/call_controller_spec.rb

@@ -28,6 +28,15 @@ module Adhearsion
     its(:logger)    { should be call.logger }
     its(:variables) { should be call.variables }
 
+    context "when the call is dead" do
+      before { call.terminate }
+
+      it "should use an unnamed logger" do
+        subject.logger.should be_a ::Logging::Logger
+        subject.logger.name.should == "Adhearsion::CallController"
+      end
+    end
+
     describe "execution on a call" do
       before do
         subject.stub :execute_component_and_await_completion => nil
@@ -381,6 +390,40 @@ module Adhearsion
         (Time.now - starting_time).should > 0.5
       end
     end
+
+    describe "equality" do
+      context "when of the same type, operating on the same call, with the same metadata" do
+        let(:other) { CallController.new call, metadata }
+
+        it "should be equal" do
+          subject.should == other
+        end
+      end
+
+      context "when of a different type" do
+        let(:other) { Class.new(CallController).new call, metadata }
+
+        it "should not be equal" do
+          subject.should_not == other
+        end
+      end
+
+      context "when operating on a different call" do
+        let(:other) { CallController.new Call.new, metadata }
+
+        it "should not be equal" do
+          subject.should_not == other
+        end
+      end
+
+      context "with different metadata" do
+        let(:other) { CallController.new call, something: 'else' }
+
+        it "should not be equal" do
+          subject.should_not == other
+        end
+      end
+    end
   end
 end
 

data/spec/adhearsion/outbound_call_spec.rb

@@ -62,9 +62,8 @@ module Adhearsion
         context "with controller metadata specified" do
           it "should set the metadata on the controller" do
             mock_call.should_receive(:dial).once.with(to, {})
-            mock_call.should_receive(:execute_controller).once do |c|
-              c.is_a?(controller) && c.metadata == {:foo => 'bar'}
-            end
+            expected_controller = controller.new mock_call, foo: 'bar'
+            mock_call.should_receive(:execute_controller).with(expected_controller, kind_of(Proc)).once
             call = OutboundCall.originate to, :controller => controller, :controller_metadata => {:foo => 'bar'}
             call << Punchblock::Event::Answered.new
           end

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -54,6 +54,7 @@ module Adhearsion
 
       before do
         mock_call.stub :id => call_id
+        mock_client.as_null_object
         mock_client.stub :event_handler= => true
         Events.refresh!
         Adhearsion::Process.stub :fqdn => 'hostname'
@@ -190,7 +191,7 @@ module Adhearsion
       describe 'using FreeSWITCH' do
         let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com', :media_engine => :swift, :default_voice => :hal} }
 
-        it 'should start an Asterisk PB connection' do
+        it 'should start a FreeSWITCH PB connection' do
           Punchblock::Connection::Freeswitch.should_receive(:new).once.with(overrides).and_return mock_client
           initialize_punchblock overrides.merge(:platform => :freeswitch)
         end

data/spec/adhearsion/router/route_spec.rb

@@ -109,7 +109,7 @@ module Adhearsion
 
         let(:latch) { CountDownLatch.new 1 }
 
-        before { call.wrapped_object.should_receive :write_and_await_response }
+        before { call.wrapped_object.stub :write_and_await_response }
 
         context "via a call controller" do
           let(:controller)  { CallController }
@@ -139,6 +139,26 @@ module Adhearsion
             latch.wait(2).should be true
           end
 
+          context "when the CallController mutates its metadata" do
+            let :controller do
+              Class.new CallController do
+                def run
+                  metadata[:foo] = 'bar'
+                end
+              end
+            end
+
+            before do
+              route.dispatch call
+            end
+
+            it "gives the next call fresh metadata" do
+              expected_controller = controller.new call, nil
+              call.should_receive(:execute_controller).once.with expected_controller, kind_of(Proc)
+              route.dispatch call
+            end
+          end
+
           context 'with the :ahn_prevent_hangup call variable set' do
             before { call[:ahn_prevent_hangup] = true }
 
@@ -159,6 +179,23 @@ module Adhearsion
               end.should_not raise_error
             end
           end
+
+          context "if the call is dead when trying to clear it up" do
+            let :controller do
+              Class.new CallController do
+                def run
+                  call.terminate
+                end
+              end
+            end
+
+            it "should not raise an exception" do
+              lambda do
+                route.dispatch call, lambda { latch.countdown! }
+                latch.wait(2).should be true
+              end.should_not raise_error
+            end
+          end
         end
 
         context "via a block" do

data/spec/support/call_controller_test_helpers.rb

@@ -5,6 +5,7 @@ module CallControllerTestHelpers
     test_case.let(:call_id)     { new_uuid }
     test_case.let(:call)        { Adhearsion::Call.new }
     test_case.let(:block)       { nil }
+    test_case.let(:metadata)    { {doo: :dah} }
     test_case.let(:controller)  { new_controller test_case.describes }
 
     test_case.subject { controller }
@@ -21,7 +22,7 @@ module CallControllerTestHelpers
       target
     when Module, nil
       Class.new Adhearsion::CallController
-    end.new call, :doo => :dah, &block
+    end.new call, metadata, &block
   end
 
   def expect_message_waiting_for_response(message = nil, fail = false, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -227,30 +227,30 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +410,6 @@ files:
 - features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
-- features/support/aruba_helper.rb
 - features/support/env.rb
 - features/support/utils.rb
 - lib/adhearsion.rb
@@ -584,7 +583,6 @@ test_files:
 - features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
-- features/support/aruba_helper.rb
 - features/support/env.rb
 - features/support/utils.rb
 - spec/adhearsion/call_controller/dial_spec.rb

data/features/support/aruba_helper.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-module Aruba
-  module Api
-    # output() blocks for stderr and stdout it seems
-    def assert_partial_output_interactive(expected)
-      unescape(_read_interactive).include?(unescape(expected)) ? true : false
-    end
-
-    def _read_interactive
-      @interactive.read_stdout(@aruba_keep_ansi)
-    end
-  end
-
-  class Process
-    def read_stdout(keep_ansi)
-      wait_for_io do
-        @process.io.stdout.flush
-        content = filter_ansi(open(@out.path).read, keep_ansi)
-      end
-    end
-  end
-end
-