punchblock 0.6.2 → 0.7.0

data/spec/punchblock/translator/asterisk_spec.rb

@@ -6,18 +6,22 @@ module Punchblock
       let(:ami_client) { mock 'RubyAMI::Client' }
       let(:connection) { mock 'Connection::Asterisk' }
 
-      subject { Asterisk.new ami_client, connection }
+      let(:translator) { Asterisk.new ami_client, connection }
+
+      subject { translator }
 
       its(:ami_client) { should be ami_client }
       its(:connection) { should be connection }
 
+      after { translator.terminate }
+
       describe '#execute_command' do
         describe 'with a call command' do
           let(:command) { Command::Answer.new }
           let(:call_id) { 'abc123' }
 
           it 'executes the call command' do
-            subject.actor_subject.expects(:execute_call_command).with do |c|
+            subject.wrapped_object.expects(:execute_call_command).with do |c|
               c.should be command
               c.call_id.should == call_id
             end
@@ -25,18 +29,16 @@ module Punchblock
           end
         end
 
-        describe 'with a component command' do
+        describe 'with a global component command' do
           let(:command)       { Component::Stop.new }
-          let(:call_id)       { 'abc123' }
           let(:component_id)  { '123abc' }
 
           it 'executes the component command' do
-            subject.actor_subject.expects(:execute_component_command).with do |c|
+            subject.wrapped_object.expects(:execute_component_command).with do |c|
               c.should be command
-              c.call_id.should == call_id
               c.component_id.should == component_id
             end
-            subject.execute_command command, :call_id => call_id, :component_id => component_id
+            subject.execute_command command, :component_id => component_id
           end
         end
 
@@ -44,7 +46,7 @@ module Punchblock
           let(:command) { Command::Dial.new }
 
           it 'executes the command directly' do
-            subject.actor_subject.expects(:execute_global_command).with command
+            subject.wrapped_object.expects(:execute_global_command).with command
             subject.execute_command command
           end
         end
@@ -64,11 +66,21 @@ module Punchblock
           subject.call_with_id(call_id).should be call
         end
 
-        it 'should make the call accessible by ID' do
+        it 'should make the call accessible by channel' do
           subject.call_for_channel(channel).should be call
         end
       end
 
+      describe '#register_component' do
+        let(:component_id) { 'abc123' }
+        let(:component)    { mock 'Asterisk::Component::Asterisk::AMIAction', :id => component_id }
+
+        it 'should make the component accessible by ID' do
+          subject.register_component component
+          subject.component_with_id(component_id).should be component
+        end
+      end
+
       describe '#execute_call_command' do
         let(:call_id) { 'abc123' }
         let(:call)    { Translator::Asterisk::Call.new 'SIP/foo', subject }
@@ -86,18 +98,13 @@ module Punchblock
       end
 
       describe '#execute_component_command' do
-        let(:call_id) { 'abc123' }
-        let(:call)    { Translator::Asterisk::Call.new 'SIP/foo', subject }
-
         let(:component_id)  { '123abc' }
         let(:component)     { mock 'Translator::Asterisk::Component', :id => component_id }
 
-        let(:command) { mock 'Component::Stop', :call_id => call_id, :component_id => component_id }
+        let(:command) { mock 'Component::Stop', :component_id => component_id }
 
         before do
-          call.stubs(:id).returns call_id
-          call.register_component component
-          subject.register_call call
+          subject.register_component component
         end
 
         it 'sends the command to the component for execution' do
@@ -116,13 +123,19 @@ module Punchblock
             Component::Asterisk::AMI::Action.new :name => 'Status', :params => { :channel => 'foo' }
           end
 
-          let(:mock_action) { mock 'Asterisk::Component::Asterisk::AMIAction' }
+          let(:mock_action) { stub_everything 'Asterisk::Component::Asterisk::AMIAction' }
 
           it 'should create a component actor and execute it asynchronously' do
             Asterisk::Component::Asterisk::AMIAction.expects(:new).once.with(command, subject).returns mock_action
             mock_action.expects(:execute!).once
             subject.execute_global_command command
           end
+
+          it 'registers the component' do
+            Asterisk::Component::Asterisk::AMIAction.expects(:new).once.with(command, subject).returns mock_action
+            subject.wrapped_object.expects(:register_component).with mock_action
+            subject.execute_global_command command
+          end
         end
       end
 
@@ -192,12 +205,12 @@ module Punchblock
             end
           end
 
-          before { subject.actor_subject.stubs :handle_pb_event }
+          before { subject.wrapped_object.stubs :handle_pb_event }
 
           it 'should be able to look up the call by channel ID' do
             subject.handle_ami_event ami_event
             call_actor = subject.call_for_channel('SIP/1234-00000000')
-            call_actor.actor_subject.should be_a Asterisk::Call
+            call_actor.wrapped_object.should be_a Asterisk::Call
             call_actor.agi_env.should be_a Hash
             call_actor.agi_env[:agi_request].should == 'async'
           end
@@ -227,12 +240,12 @@ module Punchblock
           end
 
           before do
-            subject.actor_subject.stubs :handle_pb_event
+            subject.wrapped_object.stubs :handle_pb_event
             subject.register_call call
           end
 
           it 'sends the AMI event to the call and to the connection as a PB event' do
-            subject.actor_subject.expects(:handle_pb_event).once
+            subject.wrapped_object.expects(:handle_pb_event).once
             call.expects(:process_ami_event!).once.with ami_event
             subject.handle_ami_event ami_event
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2156247020 !ruby/object:Gem::Requirement
+  requirement: &2152241520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156247020
+  version_requirements: *2152241520
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &2156233680 !ruby/object:Gem::Requirement
+  requirement: &2152240540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,21 +34,10 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156233680
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &2156232040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156232040
+  version_requirements: *2152240540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156214220 !ruby/object:Gem::Requirement
+  requirement: &2152237640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +45,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156214220
+  version_requirements: *2152237640
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2156212640 !ruby/object:Gem::Requirement
+  requirement: &2152235840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +56,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156212640
+  version_requirements: *2152235840
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2156189020 !ruby/object:Gem::Requirement
+  requirement: &2152460240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +67,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156189020
+  version_requirements: *2152460240
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2156162060 !ruby/object:Gem::Requirement
+  requirement: &2152456100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,32 +78,32 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156162060
+  version_requirements: *2152456100
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2156159460 !ruby/object:Gem::Requirement
+  requirement: &2152468640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156159460
+  version_requirements: *2152468640
 - !ruby/object:Gem::Dependency
   name: ruby_ami
-  requirement: &2156158160 !ruby/object:Gem::Requirement
+  requirement: &2152466340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156158160
+  version_requirements: *2152466340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156155900 !ruby/object:Gem::Requirement
+  requirement: &2152477180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +111,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156155900
+  version_requirements: *2152477180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156042060 !ruby/object:Gem::Requirement
+  requirement: &2152471200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +122,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156042060
+  version_requirements: *2152471200
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156026360 !ruby/object:Gem::Requirement
+  requirement: &2152483240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +133,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2156026360
+  version_requirements: *2152483240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2155997320 !ruby/object:Gem::Requirement
+  requirement: &2152495500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +144,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2155997320
+  version_requirements: *2152495500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151923240 !ruby/object:Gem::Requirement
+  requirement: &2152493260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151923240
+  version_requirements: *2152493260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151910900 !ruby/object:Gem::Requirement
+  requirement: &2152489000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151910900
+  version_requirements: *2152489000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151908900 !ruby/object:Gem::Requirement
+  requirement: &2152501500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151908900
+  version_requirements: *2152501500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151907680 !ruby/object:Gem::Requirement
+  requirement: &2152499180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +188,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151907680
+  version_requirements: *2152499180
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2151906080 !ruby/object:Gem::Requirement
+  requirement: &2152495980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152495980
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &2152510640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,12 +210,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151906080
+  version_requirements: *2152510640
 description: Like Rack is to Rails and Sinatra, Punchblock provides a consistent API
   on top of several underlying third-party call control protocols.
 email: punchblock@adhearsion.com
-executables:
-- punchblock-console
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -224,6 +223,7 @@ files:
 - .rspec
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
@@ -232,7 +232,6 @@ files:
 - assets/ozone/ozone-1.0.xsd
 - assets/ozone/say-1.0.xsd
 - assets/ozone/transfer-1.0.xsd
-- bin/punchblock-console
 - lib/punchblock.rb
 - lib/punchblock/client.rb
 - lib/punchblock/client/component_registry.rb
@@ -254,9 +253,11 @@ files:
 - lib/punchblock/component/asterisk/agi/command.rb
 - lib/punchblock/component/asterisk/ami.rb
 - lib/punchblock/component/asterisk/ami/action.rb
+- lib/punchblock/component/component_node.rb
 - lib/punchblock/component/input.rb
 - lib/punchblock/component/output.rb
 - lib/punchblock/component/record.rb
+- lib/punchblock/component/stop.rb
 - lib/punchblock/component/tropo.rb
 - lib/punchblock/component/tropo/ask.rb
 - lib/punchblock/component/tropo/conference.rb
@@ -269,9 +270,7 @@ files:
 - lib/punchblock/connection/xmpp.rb
 - lib/punchblock/core_ext/blather/stanza.rb
 - lib/punchblock/core_ext/blather/stanza/presence.rb
-- lib/punchblock/core_ext/celluloid.rb
 - lib/punchblock/core_ext/ruby.rb
-- lib/punchblock/dsl.rb
 - lib/punchblock/event.rb
 - lib/punchblock/event/answered.rb
 - lib/punchblock/event/asterisk.rb
@@ -300,7 +299,6 @@ files:
 - lib/punchblock/translator/asterisk/component/asterisk/agi_command.rb
 - lib/punchblock/translator/asterisk/component/asterisk/ami_action.rb
 - lib/punchblock/version.rb
-- log/.gitkeep
 - punchblock.gemspec
 - spec/punchblock/client/component_registry_spec.rb
 - spec/punchblock/client_spec.rb
@@ -317,6 +315,7 @@ files:
 - spec/punchblock/command_node_spec.rb
 - spec/punchblock/component/asterisk/agi/command_spec.rb
 - spec/punchblock/component/asterisk/ami/action_spec.rb
+- spec/punchblock/component/component_node_spec.rb
 - spec/punchblock/component/input_spec.rb
 - spec/punchblock/component/output_spec.rb
 - spec/punchblock/component/record_spec.rb
@@ -324,7 +323,6 @@ files:
 - spec/punchblock/component/tropo/conference_spec.rb
 - spec/punchblock/component/tropo/say_spec.rb
 - spec/punchblock/component/tropo/transfer_spec.rb
-- spec/punchblock/component_spec.rb
 - spec/punchblock/connection/asterisk_spec.rb
 - spec/punchblock/connection/xmpp_spec.rb
 - spec/punchblock/event/answered_spec.rb
@@ -386,6 +384,7 @@ test_files:
 - spec/punchblock/command_node_spec.rb
 - spec/punchblock/component/asterisk/agi/command_spec.rb
 - spec/punchblock/component/asterisk/ami/action_spec.rb
+- spec/punchblock/component/component_node_spec.rb
 - spec/punchblock/component/input_spec.rb
 - spec/punchblock/component/output_spec.rb
 - spec/punchblock/component/record_spec.rb
@@ -393,7 +392,6 @@ test_files:
 - spec/punchblock/component/tropo/conference_spec.rb
 - spec/punchblock/component/tropo/say_spec.rb
 - spec/punchblock/component/tropo/transfer_spec.rb
-- spec/punchblock/component_spec.rb
 - spec/punchblock/connection/asterisk_spec.rb
 - spec/punchblock/connection/xmpp_spec.rb
 - spec/punchblock/event/answered_spec.rb

data/bin/punchblock-console

@@ -1,140 +0,0 @@
-#!/usr/bin/env ruby
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
-require 'bundler/setup'
-require 'punchblock'
-require 'pry'
-require 'logger'
-require 'optparse'
-
-puts <<-DEPRECATION
-********************
-WARNING: This utility is deprecated and will be removed from a future version of Punchblock without further notice. You should use the punchblock-console gem instead.
-********************
-DEPRECATION
-
-include Punchblock
-
-Thread.abort_on_exception = true
-
-options = { :username => 'usera@127.0.0.1', :password => '1', :wire_log_file => 'log/rayo-wire.log', :transport_log_file => 'log/rayo-transport.log', :auto_reconnect => false }
-
-connection_class = Connection::XMPP
-
-option_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: punchblock-console [-u usera@127.0.0.1] [-p abc123]"
-  opts.on("-u", "--username USERNAME", String, "Specify the XMPP JID to connect to") do |u|
-    options[:username] = u
-  end
-  opts.on("-p", "--password PASSWORD", String, "Specify the XMPP password to use") do |p|
-    options[:password] = p
-  end
-  opts.on("-d", "--rayo-domain DOMAIN", String, "Specify the domain Rayo is running on") do |d|
-    options[:rayo_domain] = d
-  end
-  opts.on("--wire-log-file log/wirelog.log", String, "Specify the file to which the wire log should be written") do |wlf|
-    options[:wire_log_file] = wlf
-  end
-  opts.on("--transport-log-file log/transportlog.log", String, "Specify the file to which the transport log should be written") do |tlf|
-    options[:transport_log_file] = tlf
-  end
-  opts.on("--asterisk", "Use Asterisk") do |tlf|
-    connection_class = Connection::Asterisk
-    options[:host] = '127.0.0.1'
-    options[:port] = 5038
-  end
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-  opts.on_tail("-v", "--version", "Show version") do
-    puts VERSION
-    exit
-  end
-end
-
-begin
-  option_parser.parse!
-rescue
-  puts $!
-  option_parser.parse '--help'
-end
-
-options[:wire_logger] = Logger.new options.delete(:wire_log_file)
-options[:wire_logger].level = Logger::DEBUG
-options[:wire_logger].debug "Starting up..."
-options[:transport_logger] = Logger.new options.delete(:transport_log_file)
-options[:transport_logger].level = Logger::DEBUG
-options[:transport_logger].debug "Starting up..."
-options[:logger] = options[:wire_logger]
-
-connection = connection_class.new options
-client = Client.new :connection => connection
-
-[:INT, :TERM].each do |signal|
-  trap signal do
-    puts "Shutting down!"
-    client.stop
-  end
-end
-
-client_thread = Thread.new do
-  begin
-    client.run
-  rescue => e
-    puts "Exception in XMPP thread! #{e.message}"
-    puts e.backtrace.join("\t\n")
-  end
-end
-
-CALL_QUEUES = {}
-
-### DISPATCHER THREAD
-# This thread multiplexes the event stream from the underlying connection handler and routes them
-# to the correct queue for each call.  It also starts a call handler, the run_call method) after creating
-# the queue.
-Thread.new do
-  loop do
-    event = client.event_queue.pop
-    if event == Connection::Connected
-      puts event
-      puts "Waiting for a call..."
-      next
-    end
-    unless event.call_id
-      puts "Ad-hoc event: #{event.inspect}"
-      next
-    end
-    puts "#{event.class} event for call: #{event.call_id}"
-    case event
-    when Event::Offer
-      raise "Duplicate call ID for #{event.call_id}" if CALL_QUEUES.has_key?(event.call_id)
-      CALL_QUEUES[event.call_id] = Queue.new
-      CALL_QUEUES[event.call_id].push event
-      run_call client, event
-    when Event
-      CALL_QUEUES[event.call_id].push event
-    else
-      puts "Unknown event: #{event.inspect}"
-    end
-  end
-end
-
-def run_call(client, offer)
-  ### CALL THREAD
-  # One thread is spun up to handle each call.
-  Thread.new do
-    raise "Unknown call #{offer.call_id}" unless CALL_QUEUES.has_key?(offer.call_id)
-    queue = CALL_QUEUES[offer.call_id]
-    call = queue.pop
-    dsl = DSL.new client, offer.call_id, queue
-
-    puts "Incoming offer to #{offer.to} from #{offer.headers_hash[:from]} #{offer}"
-    dsl.pry
-
-    # Clean up the queue.
-    CALL_QUEUES[offer.call_id] = nil
-  end
-end
-
-client_thread.join

data/lib/punchblock/core_ext/celluloid.rb

@@ -1,11 +0,0 @@
-module Celluloid
-  class Actor
-    attr_reader :subject
-  end
-
-  class ActorProxy
-    def actor_subject
-      @actor.subject
-    end
-  end
-end

data/lib/punchblock/dsl.rb

@@ -1,45 +0,0 @@
-##
-# DO NOT USE THIS API!
-# This file is temporary, to help make testing Punchblock easier.
-# THIS IS IMPERMANENT AND WILL DISAPPEAR
-module Punchblock
-  class DSL
-    def initialize(client, call_id, queue) # :nodoc:
-      @client, @call_id, @queue = client, call_id, queue
-    end
-
-    def accept # :nodoc:
-      write Command::Accept.new
-    end
-
-    def answer # :nodoc:
-      write Command::Answer.new
-    end
-
-    def hangup # :nodoc:
-      write Command::Hangup.new
-    end
-
-    def reject(reason = nil) # :nodoc:
-      write Command::Reject.new(:reason => reason)
-    end
-
-    def redirect(dest) # :nodoc:
-      write Command::Redirect.new(:to => dest)
-    end
-
-    def record(options = {})
-      write Component::Record.new(options)
-    end
-
-    def say(string, type = :text) # :nodoc:
-      component = Component::Tropo::Say.new(type => string)
-      write component
-      component.complete_event.resource
-    end
-
-    def write(command) # :nodoc:
-      @client.execute_command command, :call_id => @call_id, :async => false
-    end
-  end
-end