librevox 0.1.1 → 0.2

data/README.md

@@ -37,8 +37,8 @@ techniques:
     require 'librevox'
 
     class MyInbound < Librevox::Listener::Inbound
-      def on_event
-        puts "Got event: #{event.content[:event_name]}"
+      def on_event e
+        puts "Got event: #{e.content[:event_name]}"
       end
      
       # You can add a hook for a certain event:
@@ -46,6 +46,12 @@ techniques:
         # It is instance_eval'ed, so you can use your instance methods etc:
         do_something
       end
+
+      # If your hook block takes an argument, a Librevox::Response object for
+      # the given event is passed on:
+      event :channel_bridge do |e|
+        ...
+      end
      
       def do_something
         ...
@@ -64,15 +70,17 @@ but it only receives events related to that given session.
 ### Dialplan
 
 When a call is made and Freeswitch connects to the outbound event listener,
-the `session` callback is executed. This is where you set up your dialplan:
+`session_initiated` is called. This is where you set up your dialplan:
 
-    session do
+    def session_initiated
       answer
       set "some_var", "some value"
       playback "path/to/file"
       hangup
     end
 
+All channel variables are available as a hash named `session`.
+
 When using applications that expect a reply, such as `play_and_get_digits`,
 you have to use callbacks to read the value, as the function itself returns
 immediately due to the async nature of EventMachine:

data/TODO

@@ -1,10 +1,17 @@
+- inbound listener: only subscribe to events w/ hooks, unless `events :all`
+  specified
+
+- map more commands/applications.
+
+- check command/application input and raise ArgumentError, possibly.
+
+- filter events
+
 - the execute_app/run_app business might be done better, simpler. e.g.
   having to pass the block for every command becomes a bit tedious.
 
 - move test suite from bacon -> test/unit.
 
-- map more commands/applications.
-
 - test how this works in async mode - I imagine that it might mess with
   @command_queue
 
@@ -12,13 +19,7 @@
   do e.g.  originate("user/coltrane", :endpoint => bridge("user/davis"))  and
   it would translate to  "originate user/coltrane &bridge(user/davis)"
 
-- add logger.
-
-- check command/application input and raise ArgumentError.
-
 - maybe let commands handle the response, so something useful could be returned?
 
 - possibly catch all exceptions, so everything doesn't die? or should this be
   be the users responsibilty?
-
-- filter events

data/lib/librevox.rb

@@ -1,9 +1,27 @@
+require 'logger'
 require 'eventmachine'
 require 'librevox/listener/inbound'
 require 'librevox/listener/outbound'
 
 module Librevox
-  VERSION = "0.1.1"
+  VERSION = "0.2"
+
+  def self.options
+    @options ||= {
+      :log_file   => STDOUT,
+      :log_level  => Logger::INFO
+    }
+  end
+
+  def self.logger
+    @logger ||= logger!
+  end
+
+  def self.logger!
+    logger = Logger.new(options[:log_file])
+    logger.level = options[:log_level]
+    logger
+  end
 
   # When called without a block, it will start the listener that is passed as
   # first argument:
@@ -17,6 +35,7 @@ module Librevox
   #     run OtherListner
   #   end
   def self.start(klass=nil, args={}, &block)
+    logger.info "Starting Librevox"
     EM.run {
       block_given? ? instance_eval(&block) : run(klass, args)
     }
@@ -27,11 +46,9 @@ module Librevox
     port = args.delete(:port)
 
     if klass.ancestors.include? Librevox::Listener::Inbound
-      port ||= "8021"
-      EM.connect host, port, klass, args
+      EM.connect host, port || "8021", klass, args
     elsif klass.ancestors.include? Librevox::Listener::Outbound
-      port ||= "8084"
-      EM.start_server host, port, klass, args
+      EM.start_server host, port || "8084", klass, args
     end
   end
 end

data/lib/librevox/applications.rb

@@ -8,10 +8,20 @@ module Librevox
   # Applications *must* pass on any eventual block passed to them.
   module Applications
     # Answers an incoming call or session.
-    def answer(&b)
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_answer
+    def answer &b
       execute_app "answer", &b
     end
 
+    # Make an attended transfer
+    # @example
+    #   att_xfer("user/davis")
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_att_xfer
+    # @todo Add support for origination_cancel_key
+    def att_xfer endpoint, &b
+      execute_app "att_xfer", endpoint, &b
+    end
+
     # Binds an application to the specified call legs.
     # @example 
     #   bind_meta_app :key          => 2,
@@ -20,28 +30,98 @@ module Librevox
     #                 :application  => "execute_extension",
     #                 :parameters   => "dx XML features"
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_bind_meta_app
-    def bind_meta_app(args={}, &b)
-      key         = args[:key]
-      listen_to   = args[:listen_to]
-      respond_on  = args[:respond_on]
-      application = args[:application]
-      parameters  = args[:parameters] ? "::#{args[:parameters]}" : ""
-
-      arg_string = "%s %s %s %s%s" % [key, listen_to, respond_on, application,
-        parameters]
+    def bind_meta_app args={}, &b
+      arg_string =
+        args.values_at(:key, :listen_to, :respond_on, :application).join(" ")
+      arg_string += "::#{args[:parameters]}" if args[:parameters]
 
       execute_app "bind_meta_app", arg_string, &b
     end
 
-    # Bridges an incoming call to an endpoint
+
+    # Bridges an incoming call to an endpoint, optionally taking an array of
+    # channel variables to set. If given an array of arrays, each contained
+    # array of endpoints will be called simultaneously, with the next array
+    # of endpoints as failover. See the examples below for different constructs
+    # and the callstring it sends to FreeSWITCH.
     # @example
     #   bridge "user/coltrane", "user/backup-office"
+    #   #=> user/coltrane,user/backup-office
+    # @example With channel variables
+    #   bridge "user/coltrane", "user/backup-office", :some_var => "value"
+    #   #=> {some_var=value}user/coltrane,user/backup-office
+    # @example With failover
+    #   bridge ['user/coltrane', 'user/davis'], ['user/sun-ra', 'user/taylor']
+    #   #=> user/coltrane,user/davis|user/sun-ra,user/taylor
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_bridgecall
-    def bridge(*endpoints, &b)
-      execute_app "bridge", endpoints.join(","), &b
+    def bridge *args, &b
+      variables = if args.last.is_a? Hash
+                    # We need to sort the key/value pairs to facilitate testing.
+                    # This can be removed once 1.8-compat is dropped.
+                    key_value_pairs = args.pop.sort {|x,y| x.to_s <=> y.to_s}
+                    key_value_pairs.map! {|k,v| "#{k}=#{v}"}
+                    "{#{key_value_pairs.join(",")}}"
+                  else
+                    ""
+                  end
+
+      endpoints = if args.first.is_a? Array
+                    args.map {|e| e.join(",")}.join("|")
+                  else
+                    args.join ","
+                  end
+
+      execute_app "bridge", variables + endpoints, &b
+    end
+
+    # Deflect a call by sending a REFER. Takes a SIP URI as argument, rerouting
+    # the call to that SIP URI.
+    #
+    # Beware that REFER only can be used on established calls. If a call hasn't
+    # been established with e.g. the {#answer} application, you should use 
+    # {#redirect} instead.
+    # @example
+    #   deflect "sip:miles@davis.com"
+    # @see #redirect
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_deflect
+    def deflect uri, &b
+      execute_app "deflect", uri, &b
+    end
+
+    # Exports a channel variable from the A leg to the B leg. Variables and
+    # their values will be replicated in any new channels created from the one
+    # export was called.
+    # 
+    # Set :local => false if the variable should only be exported to the B-leg.
+    #
+    # @example
+    #   export "some_var"
+    # @example Only export to B-leg
+    #   export "some_var", :local => false
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_export
+    def export var, args={}, &b
+      nolocal = args[:local] == false ? "nolocal:" : "" # ugly!!111
+
+      execute_app "export", "#{nolocal}#{var}", &b
+    end
+
+    # Generate TGML tones
+    # @example Generate a 500ms beep at 800Hz
+    #   gentones "%(500,0,800)"
+    # @example  Generate a DTMF string
+    #   gentones "0800500005"
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_gentones
+    def gentones tgml, &b 
+      execute_app "gentones", tgml, &b
     end
 
-    def hangup(cause="", &b)
+    # Hang up current channel
+    # @example
+    #   hangup
+    # @example Hang up with a reason
+    #   hangup "USER_BUSY"
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_hangup
+    def hangup cause="", &b
       execute_app "hangup", cause, &b
     end
 
@@ -55,7 +135,7 @@ module Librevox
     #     :timeout      => 5000,
     #     :regexp       => '\d+'
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_play_and_get_digits
-    def play_and_get_digits(file, invalid_file, args={}, &b)
+    def play_and_get_digits file, invalid_file, args={}, &b
       min         = args[:min]          || 1
       max         = args[:max]          || 2
       tries       = args[:tries]        || 3
@@ -76,12 +156,20 @@ module Librevox
     # @example
     #   playback "/path/to/file.wav"
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_playback
-    def playback(file, &b)
+    def playback file, &b
       execute_app "playback", file, &b
     end
 
+    # Pre-answer establishes early media but does not answer.
+    # @example
+    #   pre_anser
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_pre_answer
+    def pre_answer &b
+      execute_app "pre_answer", &b
+    end
+
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_read
-    def read(file, args={}, &b)
+    def read file, args={}, &b
       min         = args[:min]          || 1
       max         = args[:max]          || 2
       terminators = args[:terminators]  || "#"
@@ -103,16 +191,31 @@ module Librevox
     # @example With 20 second limit
     #   record "/path/to/new/file.wac", :limit => 20
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_record
-    def record(path, params={}, &b)
+    def record path, params={}, &b
       args = [path, params[:limit]].compact.join(" ")
       execute_app "record", args, &b
     end
 
+    # Redirect a channel to another endpoint. You must take care to not
+    # redirect incompatible channels, as that wont have the desired effect.
+    # I.e. if you redirect to a SIP URI, it should be a SIP channel.
+    #
+    # #{redirect} can only be used on non-established calls, i.e. calls that
+    # has not been answered with the #{answer} application yet. If the call has
+    # been answered, use #{deflect} instead.
+    # @example
+    #   redirect "sip:freddie@hubbard.org"
+    # @see #{deflect}
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_redirect
+    def redirect uri, &b
+      execute_app "redirect", uri, &b
+    end
+
     # Sets a channel variable.
     # @example
     #   set "some_var", "some value"
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_set
-    def set(variable, value, &b)
+    def set variable, value, &b
       execute_app "set", "#{variable}=#{value}", &b
     end
 
@@ -120,8 +223,24 @@ module Librevox
     # @example
     #   transfer "new_context"
     # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_transfer
-    def transfer(context, &b)
+    def transfer context, &b
       execute_app "transfer", context, &b
     end
+
+    # Unbinds a previously bound key with bind_meta_app
+    # @example
+    #   unbind_meta_app 3
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_unbind_meta_app
+    def unbind_meta_app key, &b
+      execute_app "unbind_meta_app", key.to_s, &b
+    end
+
+    # Unset a channel variable.
+    # @example
+    #   unset "foo"
+    # @see http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_unset
+    def unset variable, &b
+      execute_app "unset", variable, &b
+    end
   end
 end

data/lib/librevox/listener/base.rb

@@ -38,7 +38,7 @@ module Librevox
 
       def run_cmd(cmd, &block)
         send_data "#{cmd}\n\n"
-        @api_queue << (block || lambda {})
+        @command_queue << (block || lambda {})
       end
 
       attr_accessor :response
@@ -46,33 +46,37 @@ module Librevox
 
       def post_init
         @command_delegate = CommandDelegate.new(self)
-        @api_queue = []
+        @command_queue = []
       end
 
       def receive_request(header, content)
         @response = Librevox::Response.new(header, content)
 
         if response.event?
-          on_event
-          invoke_event response.event
-        elsif response.api_response? && @api_queue.any?
-          invoke_api_queue
+          on_event response.dup
+          invoke_event_hooks
+        elsif response.api_response? && @command_queue.any?
+          invoke_command_queue
         end
       end
 
       # override
-      def on_event
+      def on_event(event)
       end
 
+      alias :done :close_connection_after_writing
+
       private
-      def invoke_event(event_name)
-        self.class.hooks.each do |name,block| 
-          instance_eval(&block) if name == event_name.downcase.to_sym
-        end
+      def invoke_event_hooks
+        self.class.hooks.each {|name,block| 
+          if name == response.event.downcase.to_sym
+            instance_exec response.dup, &block 
+          end
+        }
       end
 
-      def invoke_api_queue
-        block = @api_queue.shift
+      def invoke_command_queue
+        block = @command_queue.shift
         block.call(response)
       end
     end

data/lib/librevox/listener/outbound.rb

@@ -4,14 +4,6 @@ require 'librevox/applications'
 module Librevox
   module Listener
     class Outbound < Base
-      class << self
-        attr_reader :session_callback
-
-        def session(&block)
-          @session_callback = block
-        end
-      end
-
       include Librevox::Applications
 
       def execute_app(app, args="", params={}, &block)
@@ -25,10 +17,10 @@ module Librevox
         @read_channel_var = params[:read_var]
 
         if @read_channel_var
-          @command_queue << lambda {update_session}
+          @application_queue << lambda {update_session}
         end
 
-        @command_queue << (block || lambda {})
+        @application_queue << (block || lambda {})
       end
 
       # This should probably be in Application#sendmsg instead.
@@ -37,46 +29,47 @@ module Librevox
       end
 
       attr_accessor :session
+      
+      # Called when a new session is initiated.
+      def session_initiated
+      end
 
       def post_init
         super
         @session = nil
-        @command_queue = []
+        @application_queue = []
 
         send_data "connect\n\n"
         send_data "myevents\n\n"
-        @command_queue << lambda {}
+        @application_queue << lambda {}
         send_data "linger\n\n"
-        @command_queue << lambda {}
+        @application_queue << lambda {}
       end
 
       def receive_request(*args)
         super(*args)
         
         if session.nil?
-          @session = response
-          instance_eval &self.class.session_callback
+          @session = response.headers
+          session_initiated
         elsif response.event? && response.event == "CHANNEL_DATA"
-          @session = response
+          @session = response.content
           resume_with_channel_var
         elsif response.command_reply? && !response.event?
-          @command_queue.shift.call if @command_queue.any?
+          @application_queue.shift.call if @application_queue.any?
         end
       end
 
       def resume_with_channel_var
         if @read_channel_var
           variable = "variable_#{@read_channel_var}".to_sym
-          value = @session.content[variable]
-          @command_queue.shift.call(value) if @command_queue.any?
+          value = @session[variable]
+          @application_queue.shift.call(value) if @application_queue.any?
         end
       end
 
       def update_session
-        send_data("api uuid_dump #{session.headers[:unique_id]}\n\n")
-      end
-
-      def session_initiated
+        send_data("api uuid_dump #{session[:unique_id]}\n\n")
       end
     end
   end

data/librevox.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "librevox"
-  s.version  = "0.1.1"
-  s.date     = "2010-01-05"
+  s.version  = "0.2"
+  s.date     = "2010-01-26"
   s.summary  = "Ruby library for interacting with FreeSWITCH."
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/ichverstehe/librevox"

data/spec/librevox/listener.rb

@@ -25,13 +25,18 @@ shared "events" do
 
     @class.event(:some_event) {send_data "something"}
     @class.event(:other_event) {send_data "something else"}
+    @class.event(:hook_with_arg) {|e| send_data "got event arg: #{e.object_id}"}
+
+    def @listener.on_event(e)
+      send_data "from on_event: #{e.object_id}"
+    end
 
     # Establish session
     @listener.receive_data("Content-Length: 0\nTest: Testing\n\n")
   end
 
   should "add event hook" do
-    @class.hooks.size.should == 2
+    @class.hooks.size.should == 3
   end
 
   should "execute callback for event" do
@@ -42,11 +47,28 @@ shared "events" do
     @listener.read_data.should == "something"
   end
 
+  should "pass response duplicate as arg to hook block" do
+    @listener.receive_data("Content-Length: 25\n\nEvent-Name: HOOK_WITH_ARG\n\n")
+    reply = @listener.read_data
+    reply.should =~ /^got event arg: /
+    reply.should.not =~ /^got event arg: #{@listener.response.object_id}$/
+  end
+
   should "expose response as event" do
     @listener.receive_data("Content-Length: 23\n\nEvent-Name: OTHER_EVENT\n\n")
     @listener.event.class.should == Librevox::Response
     @listener.event.content[:event_name].should == "OTHER_EVENT"
   end
+
+  should "call on_event" do
+    @listener.receive_data("Content-Length: 23\n\nEvent-Name: THIRD_EVENT\n\n")
+    @listener.read_data.should =~ /^from on_event/
+  end
+
+  should "call on_event with response duplicate as argument" do
+    @listener.receive_data("Content-Length: 23\n\nEvent-Name: THIRD_EVENT\n\n")
+    @listener.read_data.should.not =~ /^from on_event: #{@listener.response.object_id}$/
+  end
 end
 
 module Librevox::Commands
@@ -66,6 +88,9 @@ shared "api commands" do
   describe "multiple api commands" do
     before do
       @listener.outgoing_data.clear
+
+      def @listener.on_event(e) end # Don't send anything, kthx.
+
       @class.event(:api_test) {
         api :sample_cmd, "foo" do
           api :sample_cmd, "foo", "bar baz"

data/spec/librevox/listener/spec_outbound.rb

@@ -10,7 +10,7 @@ module Librevox::Applications
 end
 
 class OutboundTestListener < Librevox::Listener::Outbound
-  session do
+  def session_initiated
     send_data "session was initiated"
   end
 end
@@ -34,7 +34,7 @@ describe "Outbound listener" do
   end
 
   should "establish a session" do
-    @listener.session.class.should.equal Librevox::Response
+    @listener.session.class.should.equal Hash
   end
 
   should "call session callback after establishing new session" do
@@ -42,7 +42,7 @@ describe "Outbound listener" do
   end
 
   should "make channel variables available through session" do
-    @listener.session.headers[:caller_caller_id_number].should.equal "8675309"
+    @listener.session[:caller_caller_id_number].should.equal "8675309"
   end
 
   behaves_like "events"
@@ -54,7 +54,7 @@ describe "Outbound listener" do
 end
 
 class OutboundListenerWithNestedApps < Librevox::Listener::Outbound
-  session do
+  def session_initiated
     sample_app "foo" do
       sample_app "bar"
     end
@@ -106,7 +106,7 @@ module Librevox::Applications
 end
 
 class OutboundListenerWithReader < Librevox::Listener::Outbound
-  session do
+  def session_initiated
     reader_app do |data|
       send_data "read this: #{data}"
     end
@@ -136,7 +136,7 @@ describe "Outbound listener with app reading data" do
   should "update session with new data" do
     @listener.receive_data("Content-Type: command/reply\nContent-Length: 3\n\n+OK\n\n")
     @listener.receive_data("Content-Type: command/reply\nContent-Length: 44\n\nEvent-Name: CHANNEL_DATA\nSession-Var: Second\n\n")
-    @listener.session.content[:session_var].should == "Second"
+    @listener.session[:session_var].should == "Second"
   end
 
   should "pass value of channel variable to block" do
@@ -148,7 +148,7 @@ end
 
 class OutboundListenerWithNonNestedApps < Librevox::Listener::Outbound
   attr_reader :queue
-  session do
+  def session_initiated
     sample_app "foo"
     reader_app do |data|
       send_data "the end: #{data}"
@@ -190,7 +190,7 @@ module Librevox::Commands
 end
 
 class OutboundListenerWithAppsAndApi < Librevox::Listener::Outbound
-  session do
+  def session_initiated
     sample_app "foo" do
       api :sample_cmd, "bar" do
         sample_app "baz"

data/spec/librevox/spec_applications.rb

@@ -1,7 +1,7 @@
 require 'spec/helper'
 require 'librevox/applications'
 
-module ApplicationTest
+module AppTest
   include Librevox::Applications
 
   extend self
@@ -17,16 +17,24 @@ module ApplicationTest
 end
 
 describe Librevox::Applications do
-  A = ApplicationTest
+  describe "answer" do
+    should "answer" do
+      app = AppTest.answer
+      app[:name].should == "answer"
+    end
+  end
 
-  should "answer" do
-    app = A.answer
-    app[:name].should == "answer"
+  describe "att_xfer" do
+    should "transfer to endpoint" do
+      app = AppTest.att_xfer("user/davis")
+      app[:name].should == "att_xfer"
+      app[:args].should == "user/davis"
+    end
   end
 
   describe "bind_meta_app" do
     should "bind meta app" do
-      app = A.bind_meta_app :key => "2",
+      app = AppTest.bind_meta_app :key => "2",
                             :listen_to => :a,
                             :respond_on => :s,
                             :application => "hangup"
@@ -36,7 +44,7 @@ describe Librevox::Applications do
     end
 
     should "bind meta app with parameters" do
-      app = A.bind_meta_app :key => "2",
+      app = AppTest.bind_meta_app :key => "2",
                             :listen_to => :a,
                             :respond_on => :s,
                             :application => "execute_extension",
@@ -47,33 +55,85 @@ describe Librevox::Applications do
     end
   end
 
-  should "bridge" do
-    app = A.bridge('user/coltrane')
-    app[:name].should == "bridge"
-    app[:args].should == 'user/coltrane'
+  describe "bridge" do
+    should "bridge to endpoints" do
+      app = AppTest.bridge('user/coltrane')
+      app[:name].should == "bridge"
+      app[:args].should == 'user/coltrane'
+
+      app = AppTest.bridge('user/coltrane', 'user/davis')
+      app[:args].should == 'user/coltrane,user/davis'
+    end
+
+    should "bridge with variables" do
+      app = AppTest.bridge('user/coltrane', 'user/davis', :foo => 'bar', :lol => 'cat')
+      app[:name].should == "bridge"
+
+      # fragile. hashes are not ordered in ruby 1.8
+      app[:args].should == "{foo=bar,lol=cat}user/coltrane,user/davis"
+    end
+
+    should "bridge with failover" do
+      app = AppTest.bridge(
+        ['user/coltrane', 'user/davis'], ['user/sun-ra', 'user/taylor']
+      )
+
+      app[:name].should == "bridge"
+      app[:args].should == "user/coltrane,user/davis|user/sun-ra,user/taylor"
+    end
+
+    # should "bridge with per endpoint variables" do
+    # end
+  end
+
+  describe "deflect" do
+    should "deflect call" do
+      app = AppTest.deflect "sip:miles@davis.org"
+      app[:name].should == "deflect"
+      app[:args].should == "sip:miles@davis.org"
+    end
+  end
+
+  describe "export" do
+    should "export variable" do
+      app = AppTest.export 'some_var'
+      app[:name].should == "export"
+      app[:args].should == "some_var"
+    end
 
-    app = A.bridge('user/coltrane', 'user/davis')
-    app[:args].should == 'user/coltrane,user/davis'
+    should "only export to b-leg " do
+      app = AppTest.export 'some_var', :local => false
+      app[:name].should == "export"
+      app[:args].should == "nolocal:some_var"
+    end
+  end
+
+  describe "gentones" do
+    should "generate tones" do
+      app = AppTest.gentones("%(500,0,800)")
+      app[:name].should == "gentones"
+      app[:args].should == "%(500,0,800)"
+    end
   end
 
   should "hangup" do
-    app = A.hangup
+    app = AppTest.hangup
     app[:name].should == "hangup"
 
-    app = A.hangup("some cause")
+    app = AppTest.hangup("some cause")
     app[:args].should == "some cause"
   end
 
   describe "play_and_get_digits" do
     should "have defaults" do
-      app = A.play_and_get_digits "please-enter", "wrong-try-again"
+      app = AppTest.play_and_get_digits "please-enter", "wrong-try-again"
       app[:name].should == "play_and_get_digits"
       app[:args].should == "1 2 3 5000 # please-enter wrong-try-again read_digits_var \\d+"
       app[:params][:read_var].should == "read_digits_var"
     end
 
     should "take params" do
-      app = A.play_and_get_digits "please-enter", "invalid-choice",
+      app = AppTest.play_and_get_digits "please-enter", "invalid-choice",
         :min          => 2,
         :max          => 3,
         :tries        => 4,
@@ -88,21 +148,28 @@ describe Librevox::Applications do
   end
 
   should "playback" do
-    app = A.playback("uri://some/file.wav")
+    app = AppTest.playback("uri://some/file.wav")
     app[:name].should == "playback"
     app[:args].should == "uri://some/file.wav"
   end
 
+  describe "pre_answer" do
+    should "pre_answer" do
+      app = AppTest.pre_answer
+      app[:name].should == "pre_answer"
+    end
+  end
+
   describe "read" do
     should "read with defaults" do
-      app = A.read "please-enter.wav"
+      app = AppTest.read "please-enter.wav"
       app[:name].should == "read"
       app[:args].should == "1 2 please-enter.wav read_digits_var 5000 #"
       app[:params][:read_var].should == "read_digits_var"
     end
 
     should "take params" do
-      app = A.read "please-enter.wav",
+      app = AppTest.read "please-enter.wav",
         :min          => 2,
         :max          => 3,
         :terminators  => "0",
@@ -116,27 +183,51 @@ describe Librevox::Applications do
 
   describe "record" do
     should "start recording" do
-      app = A.record "/path/to/file.mp3"
+      app = AppTest.record "/path/to/file.mp3"
       app[:name].should == "record"
       app[:args].should == "/path/to/file.mp3"
     end
 
     should "start recording with time limit" do
-      app = A.record "/path/to/file.mp3", :limit => 15
+      app = AppTest.record "/path/to/file.mp3", :limit => 15
       app[:name].should == "record"
       app[:args].should == "/path/to/file.mp3 15"
     end
   end
 
+  describe "redirect" do
+    should "redirect to URI" do
+      app = AppTest.redirect("sip:miles@davis.org")
+      app[:name].should == "redirect"
+      app[:args].should == "sip:miles@davis.org"
+    end
+  end
+
   should "set" do
-    app = A.set("foo", "bar")
+    app = AppTest.set("foo", "bar")
     app[:name].should == "set"
     app[:args].should == "foo=bar"
   end
 
   should "transfer" do
-    app = A.transfer "new_extension"
+    app = AppTest.transfer "new_extension"
     app[:name].should == "transfer"
     app[:args].should == "new_extension"
   end
+
+  describe "unbind_meta_app" do
+    should "unbind" do
+      app = AppTest.unbind_meta_app 3
+      app[:name].should == "unbind_meta_app"
+      app[:args].should == "3"
+    end
+  end
+
+  describe "unset" do
+    should "unset a variable" do
+      app = AppTest.unset('foo')
+      app[:name].should == "unset"
+      app[:args].should == "foo"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: librevox
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - Harry Vangberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +01:00
 default_executable: 
 dependencies: []