adhearsion 2.3.5 → 2.4.0.beta1

data/spec/adhearsion/calls_spec.rb

@@ -125,7 +125,7 @@ module Adhearsion
 
       it "is sends a hangup command for the call" do
         call_id = call.id
-        PunchblockPlugin.stub :client => mock('Client')
+        PunchblockPlugin.stub :client => double('Client')
         PunchblockPlugin.client.should_receive(:execute_command).once.with(Punchblock::Command::Hangup.new, :async => true, :call_id => call_id)
 
         subject << call

data/spec/adhearsion/console_spec.rb

@@ -15,15 +15,17 @@ module Adhearsion
       end
     end
 
-    describe 'testing for libedit vs. readline' do
-      it 'should return true when detecting readline' do
-        Readline.should_receive(:emacs_editing_mode).once.and_return true
-        Console.libedit?.should be false
-      end
+    unless defined? JRUBY_VERSION # These tests are not valid on JRuby
+      describe 'testing for readline' do
+        it 'should return false when detecting readline' do
+          Readline.should_receive(:emacs_editing_mode).once.and_return true
+          Console.cruby_with_readline?.should be true
+        end
 
-      it 'should return false when detecting libedit' do
-        Readline.should_receive(:emacs_editing_mode).once.and_raise NotImplementedError
-        Console.libedit?.should be true
+        it 'should return true when detecting libedit' do
+          Readline.should_receive(:emacs_editing_mode).once.and_raise NotImplementedError
+          Console.cruby_with_readline?.should be false
+        end
       end
     end
 
@@ -64,12 +66,21 @@ module Adhearsion
       end
     end
 
+    describe "#originate" do
+      it "should be an alias for Adhearsion::OutboundCall.originate" do
+        foo = nil
+        Adhearsion::OutboundCall.should_receive(:originate).once.with(:foo, :bar).and_yield
+        Console.originate(:foo, :bar) { foo = :bar}
+        foo.should == :bar
+      end
+    end
+
     describe "#take" do
       let(:call)    { Call.new }
       let(:call_id) { rand.to_s }
 
       before do
-        Adhearsion.active_calls.clear!
+        Adhearsion.active_calls.clear
         call.stub(:id => call_id)
       end
 

data/spec/adhearsion/outbound_call_spec.rb

@@ -9,13 +9,14 @@ module Adhearsion
     its(:id) { should be_nil }
     its(:variables) { should be == {} }
 
-    let(:mock_client) { mock 'Punchblock Client' }
+    let(:mock_client) { double 'Punchblock Client' }
 
     before do
       PunchblockPlugin::Initializer.client = mock_client
     end
 
     its(:client) { should be mock_client }
+    its(:start_time) { should be nil }
 
     describe ".originate" do
       let(:to) { 'sip:foo@bar.com' }
@@ -86,7 +87,7 @@ module Adhearsion
     end
 
     describe "event handlers" do
-      let(:response) { mock 'Response' }
+      let(:response) { double 'Response' }
 
       describe "for answered events" do
         let(:event) { Punchblock::Event::Answered.new }
@@ -96,20 +97,43 @@ module Adhearsion
           subject.on_answer { |event| response.call event }
           subject << event
         end
+
+        it "should record the call start time" do
+          originate_time = Time.local(2008, 9, 1, 12, 0, 0)
+          Timecop.freeze originate_time
+          subject.duration.should == 0.0
+
+          mid_point_time = Time.local(2008, 9, 1, 12, 0, 20)
+          Timecop.freeze mid_point_time
+          subject.duration.should == 0.0
+
+          answer_time = Time.local(2008, 9, 1, 12, 0, 40)
+          Timecop.freeze answer_time
+          subject << event
+          subject.start_time.should == answer_time
+
+          later_time = Time.local(2008, 9, 1, 12, 0, 50)
+          Timecop.freeze later_time
+          subject.duration.should == 10.0
+        end
       end
     end
 
     describe "#dial" do
       def expect_message_waiting_for_response(message)
         subject.wrapped_object.should_receive(:write_and_await_response).once.with(message, 60).and_return do
+          message.transport = transport
           message.target_call_id = call_id
+          message.domain = domain
           message
         end
       end
 
-      let(:call_id) { 'abc123' }
-      let(:to)      { '+1800 555-0199' }
-      let(:from)    { '+1800 555-0122' }
+      let(:transport) { 'footransport' }
+      let(:call_id)   { 'abc123' }
+      let(:domain)    { 'rayo.net' }
+      let(:to)        { '+1800 555-0199' }
+      let(:from)      { '+1800 555-0122' }
 
       let(:expected_dial_command) { Punchblock::Command::Dial.new(:to => to, :from => from) }
 
@@ -126,11 +150,21 @@ module Adhearsion
         subject.dial_command.should be == expected_dial_command
       end
 
-      it "should set the call ID from the dial command" do
+      it "should set the URI from the reference" do
+        subject.dial to, :from => from
+        subject.uri.should be == "footransport:abc123@rayo.net"
+      end
+
+      it "should set the call ID from the reference" do
         subject.dial to, :from => from
         subject.id.should be == call_id
       end
 
+      it "should set the call domain from the reference" do
+        subject.dial to, :from => from
+        subject.domain.should be == domain
+      end
+
       it "should set the to from the dial command" do
         subject.dial to, :from => from
         subject.to.should be == to

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -15,8 +15,6 @@ module Adhearsion
           config.port               = nil
           config.certs_directory    = nil
           config.root_domain        = nil
-          config.calls_domain       = nil
-          config.mixers_domain      = nil
           config.connection_timeout = 60
           config.reconnect_attempts = 1.0/0.0
           config.reconnect_timer    = 5
@@ -36,8 +34,6 @@ module Adhearsion
           config.port               = options[:port] if options.has_key?(:port)
           config.certs_directory    = options[:certs_directory] if options.has_key?(:certs_directory)
           config.root_domain        = options[:root_domain] if options.has_key?(:root_domain)
-          config.calls_domain       = options[:calls_domain] if options.has_key?(:calls_domain)
-          config.mixers_domain      = options[:mixers_domain] if options.has_key?(:mixers_domain)
           config.connection_timeout = options[:connection_timeout] if options.has_key?(:connection_timeout)
           config.reconnect_attempts = options[:reconnect_attempts] if options.has_key?(:reconnect_attempts)
           config.reconnect_timer    = options[:reconnect_timer] if options.has_key?(:reconnect_timer)
@@ -52,7 +48,7 @@ module Adhearsion
       let(:call_id)     { rand }
       let(:offer)       { Punchblock::Event::Offer.new :target_call_id => call_id }
       let(:mock_call)   { Call.new }
-      let(:mock_client) { mock 'Client' }
+      let(:mock_client) { double 'Client' }
 
       before do
         mock_call.stub :id => call_id
@@ -90,14 +86,6 @@ module Adhearsion
           subject.root_domain.should be_nil
         end
 
-        it "should set properly the calls_domain value" do
-          subject.calls_domain.should be_nil
-        end
-
-        it "should set properly the mixers_domain value" do
-          subject.mixers_domain.should be_nil
-        end
-
         it "should properly set the reconnect_attempts value" do
           subject.reconnect_attempts.should be == 1.0/0.0
         end
@@ -123,14 +111,14 @@ module Adhearsion
       end
 
       it "starts the client with any overridden settings" do
-        Punchblock::Connection::XMPP.should_receive(:new).once.with(username: 'userb@127.0.0.1/foo', password: '123', host: 'foo.bar.com', port: 200, certs: '/foo/bar', connection_timeout: 20, root_domain: 'foo.com', calls_domain: 'call.foo.com', mixers_domain: 'mixer.foo.com', media_engine: :swift, default_voice: :hal).and_return mock_client
-        initialize_punchblock username: 'userb@127.0.0.1/foo', password: '123', host: 'foo.bar.com', port: 200, certs_directory: '/foo/bar', connection_timeout: 20, root_domain: 'foo.com', calls_domain: 'call.foo.com', mixers_domain: 'mixer.foo.com', media_engine: :swift, default_voice: :hal
+        Punchblock::Connection::XMPP.should_receive(:new).once.with(username: 'userb@127.0.0.1/foo', password: '123', host: 'foo.bar.com', port: 200, certs: '/foo/bar', connection_timeout: 20, root_domain: 'foo.com', media_engine: :swift, default_voice: :hal).and_return mock_client
+        initialize_punchblock username: 'userb@127.0.0.1/foo', password: '123', host: 'foo.bar.com', port: 200, certs_directory: '/foo/bar', connection_timeout: 20, root_domain: 'foo.com', media_engine: :swift, default_voice: :hal
       end
 
       describe "#connect" do
         it 'should block until the connection is established' do
           reset_default_config
-          mock_connection = mock :mock_connection
+          mock_connection = double :mock_connection
           mock_connection.should_receive(:register_event_handler).once
           Punchblock::Client.should_receive(:new).once.and_return mock_connection
           mock_connection.should_receive(:run).once
@@ -184,7 +172,7 @@ module Adhearsion
       end
 
       describe 'using Asterisk' do
-        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :certs => nil, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com', :media_engine => :swift, :default_voice => :hal} }
+        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :certs => nil, :connection_timeout => 20, :root_domain => 'foo.com', :media_engine => :swift, :default_voice => :hal} }
 
         it 'should start an Asterisk PB connection' do
           Punchblock::Connection::Asterisk.should_receive(:new).once.with(overrides).and_return mock_client
@@ -193,7 +181,7 @@ module Adhearsion
       end
 
       describe 'using FreeSWITCH' do
-        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :certs => nil, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com', :media_engine => :swift, :default_voice => :hal} }
+        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :certs => nil, :connection_timeout => 20, :root_domain => 'foo.com', :media_engine => :swift, :default_voice => :hal} }
 
         it 'should start a FreeSWITCH PB connection' do
           Punchblock::Connection::Freeswitch.should_receive(:new).once.with(overrides).and_return mock_client
@@ -255,8 +243,8 @@ module Adhearsion
       end
 
       describe "dispatching a component event" do
-        let(:component)   { mock 'ComponentNode' }
-        let(:mock_event)  { mock 'Event' }
+        let(:component)   { double 'ComponentNode' }
+        let(:mock_event)  { double 'Event' }
 
         before { mock_event.stub target_call_id: call_id, source: component }
 
@@ -271,7 +259,7 @@ module Adhearsion
       end
 
       describe "dispatching a call event" do
-        let(:mock_event)  { mock 'Event' }
+        let(:mock_event)  { double 'Event' }
 
         before { mock_event.stub target_call_id: call_id }
 

data/spec/adhearsion/punchblock_plugin_spec.rb

@@ -13,7 +13,7 @@ module Adhearsion
     describe '#execute_component' do
       let(:message)     { Punchblock::Command::Accept.new }
       let(:response)    { :foo }
-      let(:mock_client) { mock 'Client' }
+      let(:mock_client) { double 'Client' }
 
       let(:execute_expectation) { PunchblockPlugin.client.should_receive(:execute_command).once }
 

data/spec/adhearsion/router_spec.rb

@@ -9,7 +9,7 @@ module Adhearsion
     describe 'a new router' do
       subject { Router.new {} }
 
-      let(:call) { mock 'Adhearsion::Call' }
+      let(:call) { double 'Adhearsion::Call' }
       before { call.stub id: 'abc123' }
 
       it "should make the router available to the block" do

data/spec/spec_helper.rb

@@ -2,27 +2,15 @@
 
 $testing = true
 
-unless ENV['SKIP_RCOV']
-  require 'simplecov'
-  require 'simplecov-rcov'
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-      SimpleCov::Formatter::HTMLFormatter.new.format(result)
-      SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-  SimpleCov.start do
-    add_filter "/vendor/"
-    add_filter "/spec/"
-  end
-end
+require 'coveralls'
+Coveralls.wear!
 
 %w{
   bundler/setup
   active_support
   stringio
   countdownlatch
+  timecop
   adhearsion
 }.each { |f| require f }
 
@@ -39,6 +27,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.color_enabled = true
 
+  config.mock_with :rspec do |mocks|
+    mocks.add_stub_and_should_receive_to Celluloid::AbstractProxy, ThreadSafeArray
+  end
+
   config.before :suite do
     Adhearsion::Logging.start Adhearsion::Logging.default_appenders, :trace, Adhearsion.config.platform.logging.formatter
   end
@@ -46,6 +38,10 @@ RSpec.configure do |config|
   config.before :each do
     Adhearsion.router = nil
   end
+
+  config.after :each do
+    Timecop.return
+  end
 end
 
 Adhearsion::Events.exeption do |e|

data/spec/support/call_controller_test_helpers.rb

@@ -11,7 +11,7 @@ module CallControllerTestHelpers
     test_case.subject { controller }
 
     test_case.before do
-      call.stub :write_command => true, :id => call_id
+      call.wrapped_object.stub :write_command => true, :id => call_id
     end
   end
 
@@ -50,7 +50,7 @@ module CallControllerTestHelpers
 
   def expect_input_component_complete_event(utterance)
     complete_event = Punchblock::Event::Complete.new
-    complete_event.stub reason: mock(utterance: utterance, name: :input)
+    complete_event.stub reason: double(utterance: utterance, name: :input)
     Punchblock::Component::Input.any_instance.stub(complete?: true, complete_event: complete_event)
   end
 end

data/spec/support/punchblock_mocks.rb

@@ -2,8 +2,8 @@
 
 def mock_offer(id = nil, headers = {})
   id ||= rand
-  mock("Offer: #{id}").tap do |offer|
-    offer.stub :call_id => id, :headers_hash => headers
+  double("Offer: #{id}").tap do |offer|
+    offer.stub :call_id => id, :headers => headers
     offer.as_null_object
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0.beta1
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
   requirement: !ruby/object:Gem::Requirement
@@ -173,14 +179,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +207,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +314,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: ruby_gntp
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -322,7 +328,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -336,7 +342,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -350,7 +356,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -389,6 +409,7 @@ files:
 - features/cli_create.feature
 - features/cli_daemon.feature
 - features/cli_generate.feature
+- features/cli_plugin.feature
 - features/cli_restart.feature
 - features/cli_start.feature
 - features/cli_stop.feature
@@ -423,6 +444,9 @@ files:
 - lib/adhearsion/calls.rb
 - lib/adhearsion/cli.rb
 - lib/adhearsion/cli_commands.rb
+- lib/adhearsion/cli_commands/ahn_command.rb
+- lib/adhearsion/cli_commands/plugin_command.rb
+- lib/adhearsion/cli_commands/thor_errors.rb
 - lib/adhearsion/configuration.rb
 - lib/adhearsion/console.rb
 - lib/adhearsion/events.rb
@@ -547,9 +571,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -562,6 +586,7 @@ test_files:
 - features/cli_create.feature
 - features/cli_daemon.feature
 - features/cli_generate.feature
+- features/cli_plugin.feature
 - features/cli_restart.feature
 - features/cli_start.feature
 - features/cli_stop.feature