freeswitcher 0.4.10 → 0.5.0

data/lib/fsr/cmd/sofia_contact.rb

@@ -17,7 +17,8 @@ module FSR
       def run(api_method = :api)
         orig_command = "%s %s" % [api_method, raw]
         Log.debug "saying #{orig_command}"
-        @fs_socket.say(orig_command)
+        resp = @fs_socket.say(orig_command)
+        resp["body"].match(%r{^error/}) ? nil : resp["body"]
       end
     
       # This method builds the API command to send to the freeswitch event socket

data/lib/fsr/file_methods.rb

@@ -0,0 +1,14 @@
+module FSR
+  module App
+    module FileMethods
+      def test_files *files
+        files.each do |file|
+          next unless file =~ /^\//
+          next if File.open(file){|io| io.stat.file? }
+          raise(ArgumentError, "No such file - #{file}") 
+        end
+        true
+      end
+    end
+  end
+end

data/lib/fsr/listener/inbound.rb

@@ -18,6 +18,7 @@ module FSR
         @subscribed_events = []
         @subscribed_sub_events = []
         @hooks = {}
+        @output_format = args[:output_format] || "json"
       end
 
       # post_init is called upon each "new" socket connection.
@@ -63,7 +64,21 @@ module FSR
       # param content content from standard Header and Content protocol
       def receive_request(header, content)
         hash_header = headers_2_hash(header)
-        hash_content = headers_2_hash(content)
+        case hash_header[:content_type]
+        when "command/reply"
+          return handle_reply(header, content)
+        when "text/event-plain"
+          hash_content = headers_2_hash(content)
+        when "text/event-json"
+          require "json"
+          hash_content = JSON.parse(content)
+        when "auth/request"
+          return
+        else
+          FSR::Log.warn "Unhandled request (#{header}, #{content})"
+          return
+        end
+        hash_content ||= {}
         event = HeaderAndContentResponse.new({:headers => hash_header, :content => hash_content})
         event_name = event.content[:event_name].to_s.strip
         unless event_name.empty?
@@ -109,9 +124,9 @@ module FSR
         @subscribed_events << event
         @subscribed_sub_events += sub_events
         if custom = @subscribed_events.delete(:CUSTOM)
-          say "event plain #{@subscribed_events.join(" ")} CUSTOM #{@subscribed_sub_events.join(" ")}"
+          say "event #{@output_format} #{@subscribed_events.join(" ")} CUSTOM #{@subscribed_sub_events.join(" ")}"
         else
-          say "event plain #{@subscribed_events.join(" ")}"
+          say "event #{@output_format} #{@subscribed_events.join(" ")}"
         end
       end
 
@@ -129,6 +144,15 @@ module FSR
       def on_event(event)
         event
       end
+      
+      # handle_reply is the callback method when a command_reply is received
+      #
+      # param header The header of the data
+      # param content The content of the data
+      # return [header, content]
+      def handle_reply(header, content)
+        [header, content]
+      end
 
       # add_event_hook adds an Event to listen for.  When that Event is triggered, it will call the defined block
       #

data/lib/fsr/model.rb

@@ -0,0 +1,11 @@
+module FSR
+  module Model
+    def to_hash
+      Hash[fields.map { |f| [f,self.send(f.to_sym)] }]
+    end
+
+    def inspect
+      "<##{self.object_id} #{self.class} - #{self.to_hash}>"
+    end
+  end
+end

data/lib/fsr/model/agent.rb

@@ -0,0 +1,18 @@
+require_relative "../model"
+module FSR
+  module Model
+    class Agent
+      attr_reader :fields, :extension, :full_name
+      include FSR::Model
+
+      def initialize(headers, *data)
+        @fields = headers
+        @fields.each_with_index do |h,i|
+          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
+        end
+
+        @extension, @full_name = name.split("-", 2)
+      end
+    end
+  end
+end

data/lib/fsr/model/call.rb

@@ -1,47 +1,12 @@
 module FSR
   module Model
     class Call
-      attr_reader :created, :created_epoch, :function, :caller_id_name, :caller_id_number,
-                  :caller_destination, :caller_channel_name, :caller_uuid, :callee_id_name,
-                  :callee_id_number, :callee_destination, :callee_channel_name, :callee_uuid
-      def initialize(created,
-                     created_epoch,
-                     function,
-                     caller_cid_name,
-                     caller_cid_num,
-                     caller_dest_num,
-                     caller_chan_name,
-                     caller_uuid,
-                     callee_cid_name,
-                     callee_cid_num,
-                     callee_dest_num,
-                     callee_chan_name,
-                     callee_uuid)
-        @created,
-        @created_epoch,
-        @function,
-        @caller_id_name,
-        @caller_id_number,
-        @caller_destination,
-        @caller_chan_name,
-        @caller_uuid,
-        @callee_id_name,
-        @callee_id_number,
-        @callee_destination,
-        @callee_channel_name,
-        @callee_uuid = created, 
-                       created_epoch,
-                       function,
-                       caller_cid_name,
-                       caller_cid_num,
-                       caller_dest_num,
-                       caller_chan_name,
-                       caller_uuid,
-                       callee_cid_name,
-                       callee_cid_num,
-                       callee_dest_num,
-                       callee_chan_name,
-                       callee_uuid
+      attr_reader :fields
+      def initialize(headers, *data)
+        @fields = headers
+        @fields.each_with_index do |h,i| 
+          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
+        end
       end
     end
   end

data/lib/fsr/model/channel.rb

@@ -0,0 +1,13 @@
+module FSR
+  module Model
+    class Channel
+      attr_reader :fields
+      def initialize(headers, *data)
+        @fields = headers
+        @fields.each_with_index do |h,i| 
+          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
+        end
+      end
+    end
+  end
+end

data/lib/fsr/model/enum.rb

@@ -0,0 +1,26 @@
+module FSR
+  module Model
+    class Enum 
+      attr_reader :offered_routes, :supported_routes, :order, :pref, :service, :route
+      def initialize(offered_routes,
+                     supported_routes,
+                     order,
+                     pref,
+                     service,
+                     route)
+        @offered_routes,
+        @supported_routes,
+        @order,
+        @pref,
+        @service,
+        @route,
+        = offered_routes, 
+                     supported_routes,
+                     order,
+                     pref,
+                     service,
+                     route
+      end
+    end
+  end
+end

data/lib/fsr/model/queue.rb

@@ -0,0 +1,15 @@
+require_relative "../model"
+module FSR
+  module Model
+    class Queue
+      attr_reader :fields
+      include FSR::Model
+      def initialize(headers, *data)
+        @fields = headers
+        @fields.each_with_index do |h,i| 
+          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
+        end
+      end
+    end
+  end
+end

data/lib/fsr/model/tier.rb

@@ -0,0 +1,15 @@
+require_relative "../model"
+module FSR
+  module Model
+    class Tier
+      attr_reader :fields
+      include FSR::Model
+      def initialize(headers, *data)
+        @fields = headers
+        @fields.each_with_index do |h,i| 
+          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
+        end
+      end
+    end
+  end
+end

data/lib/rack/middleware.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2008-2009 The Rubyists, LLC (effortless systems) <rubyists@rubyists.com>
+# Distributed under the terms of the MIT license.
+# The full text can be found in the LICENSE file included with this software
+#
+module FSR
+  module Rack
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        params = ::Rack::Request.new(env)
+        return @app.call(env) unless params["section"]
+
+        path = params["section"] + "/"
+
+        path << case path
+        when "dialplan/"
+          dp_req(params)
+        when "directory/"
+          dir_req(params)
+        when "configuration/"
+          conf_req(params)
+        end
+
+        env["PATH_INFO"] = "#{env['PATH_INFO']}/#{path}".squeeze('/')
+        @app.call(env)
+      end
+
+      private
+      def dp_req(params)
+        s = [params["Caller-Context"]]
+        s << params["Caller-Destination-Number"]
+        s << params["Caller-Caller-ID-Number"]
+        s.compact.join("/")
+      end
+
+      def dir_req(params)
+        s = []
+        if params["purpose"]
+          s << params["purpose"].gsub("-","_")
+          s << params["sip_profile"]
+        elsif params["action"] && params["action"] == "sip_auth"
+          s << "register"
+          s << params["sip_profile"]
+          s << params["sip_auth_username"]
+        elsif params["user"]
+          if params["action"] == "message-count"
+            s << "messages"
+            s << params["user"]
+            s << params["key_value"] if params["tag_name"] == "domain"
+          elsif params["Event-Calling-Function"]
+            case params["Event-Calling-Function"].to_s
+            when /voicemail/
+              s << "voicemail"
+              s << (params["sip_profile"] || "default")
+              s << params["user"]
+            when "user_outgoing_channel"
+              s << "user_outgoing"
+              s << params["user"]
+              s << params["domain"] if params["domain"]
+            when "user_data_function"
+              s << "user_data"
+              s << params["user"]
+              s << params["domain"] if params["domain"]
+            end
+          end
+        end
+        s.join("/")
+      end
+
+      def conf_req(params)
+        s = []
+        if params["key_name"] == "name"
+          s << params["key_value"]
+        end
+        s.join("/")
+      end
+
+    end
+  end
+end

data/spec/fsr/app.rb

@@ -4,5 +4,7 @@ describe "Basic FSR::App module" do
     require "fsr/app"
     FSA.should == FSR::App 
   end
+
+
 end
 

data/spec/fsr/app/play_and_get_digits.rb

@@ -49,3 +49,18 @@ describe "Testing FSR::App::PlayAndGetDigits" do
   end
 
 end
+
+describe "Testing FSR::App::PlayAndGetDigits - handling of non-existant files" do
+
+  it "Raise if files specifed absolutely aren't present" do
+    lambda { FSR::App::PlayAndGetDigits.new("/path/soundfile.wav", "/path/invalid.wav") }.
+      should.raise(Errno::ENOENT)
+  end
+
+  it "Not raise if files specifed absolutely aren't present" do
+    file_name = File.expand_path(__FILE__)
+    lambda { FSR::App::PlayAndGetDigits.new(file_name, "invalid.wav") }.
+      should.not.raise(Errno::ENOENT)
+  end
+  
+end

data/spec/fsr/app/playback.rb

@@ -9,3 +9,18 @@ describe "Testing FSR::App::Playback" do
   end
 
 end
+
+describe "Testing FSR::App::Playback - handling of non-existant files" do
+
+  it "Raise if files specifed absolutely aren't present" do
+    lambda { FSR::App::Playback.new("/path/non-existing.wav") }.
+      should.raise(Errno::ENOENT)
+  end
+
+  it "Not raise if not an absolute file" do
+    file_name = File.expand_path(__FILE__)
+    lambda { FSR::App::Playback.new("shout://scfire-ntc-aa01.stream.aol.com/stream/1035") }.
+      should.not.raise(Errno::ENOENT)
+  end
+
+end

data/spec/fsr/cmd/call_center.rb

@@ -0,0 +1,58 @@
+require './spec/helper'
+require "fsr/cmd"
+FSR::Cmd.load_command("call_center")
+
+describe "Testing FSR::Cmd::Callcenter" do
+  ## Call Center ##
+  # Interface to mod_callcenter
+  it "FSR::Cmd::Callcenter should list agents " do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.list.raw.should == "callcenter_config agent list"
+  end
+
+  it "FSR::Cmd::Callcenter should add an agent defaulting callback" do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.add("1000@default").raw.should == "callcenter_config agent add '1000@default' callback"
+  end
+
+  it "FSR::Cmd::Callcenter should add an agent uuidstandby set" do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.add("1000@default", "uuid-standby").raw.should == "callcenter_config agent add '1000@default' uuid-standby"
+  end
+
+  it "FSR::Cmd::Callcenter should delete an agent " do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.del("1000@default").raw.should == "callcenter_config agent del 1000@default"
+  end
+
+  it "FSR::Cmd::Callcenter should set an attribute of an agent " do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.set("1000@default", :contact, 'user/1000').raw.should == "callcenter_config agent set contact '1000@default' 'user/1000'"
+  end
+
+  it "FSR::Cmd::Callcenter should set an attribute with dashes in it on an agent " do
+    cmd = FSR::Cmd::CallCenter.new nil, :agent
+    cmd.set("1000@default", :max_no_answer, 10).raw.should == "callcenter_config agent set max_no_answer '1000@default' 10"
+  end
+
+  it "FSR::Cmd::Callcenter should list tiers " do
+    cmd = FSR::Cmd::CallCenter.new nil, :tier
+    cmd.list("helpdesk@default").raw.should == "callcenter_config tier list helpdesk@default"
+  end
+
+  it "FSR::Cmd::Callcenter should add a tier " do
+    cmd = FSR::Cmd::CallCenter.new nil, :tier
+    cmd.add("1000@default", "helpdesk@default").raw.should == "callcenter_config tier add helpdesk@default 1000@default 1"
+  end
+
+  it "FSR::Cmd::Callcenter should delete a tier " do
+    cmd = FSR::Cmd::CallCenter.new nil, :tier
+    cmd.del("1000@default", "helpdesk@default").raw.should == "callcenter_config tier del helpdesk@default 1000@default"
+  end
+
+  it "FSR::Cmd::Callcenter should set an attribute of a tier entry " do
+    cmd = FSR::Cmd::CallCenter.new nil, :tier
+    cmd.set("1000@default", "helpdesk@default", :state, "Logged Out").raw.should == "callcenter_config tier set state helpdesk@default 1000@default 'Logged Out'"
+  end
+
+end

data/spec/fsr/cmd/calls.rb

@@ -6,8 +6,8 @@ describe "Testing FSR::Cmd::Calls" do
   ## Calls ##
   # Interface to calls
   it "FSR::Cmd::Calls should send show calls" do
-    sofia = FSR::Cmd::Calls.new
-    sofia.raw.should == "show calls"
+    cmd = FSR::Cmd::Calls.new
+    cmd.raw.should == "show calls"
   end
 
 end