freeswitcher 0.6.6 → 0.6.7

data/lib/fsr/cmd/conference.rb

@@ -0,0 +1,63 @@
+require "fsr/cmd"
+module FSR
+  module Cmd
+    class Conference < Command
+      attr_reader :fs_socket, :conference_name, :profile, :pin, :flags, :action, :target, :target_options, :digits
+      def initialize(fs_socket = nil, args = {})
+        raise(ArgumentError, "args (Passed: <<<#{args}>>>) must be a hash") unless args.kind_of?(Hash)
+        @conference_name, @pin, @profile, @flags = args.values_at(:conference_name, :pin, :profile, :flags)
+        @action, @target, @target_options = args.values_at(:action, :target, :target_options)
+        @digits = args[:digits]
+        @fs_socket = fs_socket
+        raise(ArgumentError, "Cannot use conference without :conference_name") unless @conference_name
+        case @action
+          when :dial
+            raise(ArgumentError, "Cannot dial without :target") unless @target
+            if @target_options
+              raise(ArgumentError, ":target_options must be a hash if :target_options is set") unless @orginate_options.kind_of?(Hash)
+            end
+          when :dtmf
+            raise(ArgumentError, "Cannot send dtmf without :target") unless @target
+            raise(ArgumentError, "Cannot send dtmf without :digits") unless @digits
+          when :kick
+            raise(ArgumentError, "Cannot kick without :target") unless @target
+          else
+            # go with flow, mate
+        end
+      end
+
+      # Send the command to the event socket, using bgapi by default.
+      def run(api_method = :bgapi)
+        conf_command = "%s %s" % [api_method, raw]
+        Log.debug "saying #{conf_command}"
+        @fs_socket.say(conf_command)
+      end
+
+      def arguments
+        target_options = target_options.keys.sort { |a,b| a.to_s <=> b.to_s }.map { |k| "%s=%s" % [k, orginate_options[k]] }.join(",") if target_options
+        conference_name << "@#{profile}" if profile
+        if pin
+          conference_name << "+#{pin}"
+          conference_name << "+#{flags}" if flags
+        end
+        args = [conference_name]
+        args << action if action
+
+        if target
+          @target = "{#{target_options}}#{target}" if target_options
+          args << target
+        end
+
+        args << digits if action == :dtmf
+        args.compact
+      end
+
+      def raw
+        ["conference", *arguments].join(" ")
+      end
+
+    end
+
+    register(:conference, Conference)
+  end
+end

data/lib/fsr/listener/inbound.rb

@@ -59,6 +59,7 @@ module FSR
       def authorize_and_register_for_events
         FSR::Log.info "Connection established. Authorizing..."
         say("auth #{@auth}")
+        FSR::Log.info "#{@host} Connected."
         before_session
       end
 

data/lib/fsr/version.rb

@@ -1,3 +1,3 @@
 module FSR
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/fsr/cmd/conference.rb

@@ -0,0 +1,55 @@
+require 'spec/helper'
+require "fsr/cmd"
+FSR::Cmd.load_command("conference")
+
+describe "Testing FSR::Cmd::Conference" do
+  it "Cannot use conference without :conference_name" do
+    lambda { FSR::Cmd::Conference.new(nil) }.should.raise(ArgumentError).
+      message.should.match(/Cannot use conference without :conference_name/)
+  end
+
+  it "Cannot dial without :target" do
+    lambda { FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dial) }.should.raise(ArgumentError).
+      message.should.match(/Cannot dial without :target/)
+  end
+
+  it "Cannot send dtmf without :target" do
+    lambda { FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dtmf) }.should.raise(ArgumentError).
+      message.should.match(/Cannot send dtmf without :target/)
+  end
+
+  it "Cannot send dtmf without :digits" do
+    lambda { FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dtmf, :target => 1) }.should.raise(ArgumentError).
+      message.should.match(/Cannot send dtmf without :digits/)
+  end
+
+  it "Cannot send kick without :target" do
+    lambda { FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :kick) }.should.raise(ArgumentError).
+      message.should.match(/Cannot kick without :target/)
+  end
+
+  it "Puts callee into conference" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dial, :target => "user/1000")
+    conference.raw.should == "conference 1001 dial user/1000"
+  end
+
+  it "Kicks member out of conference" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => "1001", :action => :kick, :target => 1)
+    conference.raw.should == "conference 1001 kick 1"
+  end
+
+  it "Sends dtmf digits to a member" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => "1001", :action => :dtmf, :target => 1, :digits => 134)
+    conference.raw.should == "conference 1001 dtmf 1 134"
+  end
+
+  it "Sends dtmf digits to all members" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => "1001", :action => :dtmf, :target => "all", :digits => 134)
+    conference.raw.should == "conference 1001 dtmf all 134"
+  end
+
+  it "Sends dtmf digits to last member" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => "1001", :action => :dtmf, :target => "last", :digits => 134)
+    conference.raw.should == "conference 1001 dtmf last 134"
+  end
+end

data/spec/fsr/loading.rb

@@ -16,7 +16,7 @@ describe "Testing FSR module loading methods" do
 
   # When you add commands  you must modify the expected cmds_loaded behavior
   it "Loads all commands" do
-    all_commands = [:uuid_dump, :originate, :sofia, :fsctl, :sofia_contact, :status, :calls, :call_center, :channels, :enum, :sched_hangup, :sched_transfer, :uuid_transfer, :uuid_send_dtmf] # If you add a command add it to this set
+    all_commands = [:uuid_dump, :originate, :sofia, :fsctl, :sofia_contact, :status, :calls, :call_center, :channels, :enum, :sched_hangup, :sched_transfer, :uuid_transfer, :uuid_send_dtmf, :conference] # If you add a command add it to this set
     cmds_loaded = FSR.load_all_commands
     cmds_loaded.kind_of?(Array).should == true
     all_commands.each do |cmd|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -06:00
+date: 2011-03-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/fsr/cmd/call_center.rb
 - lib/fsr/cmd/calls.rb
 - lib/fsr/cmd/channels.rb
+- lib/fsr/cmd/conference.rb
 - lib/fsr/cmd/enum.rb
 - lib/fsr/cmd/fsctl.rb
 - lib/fsr/cmd/originate.rb
@@ -162,6 +163,7 @@ files:
 - spec/fsr/cmd/call_center.rb
 - spec/fsr/cmd/calls.rb
 - spec/fsr/cmd/channels.rb
+- spec/fsr/cmd/conference.rb
 - spec/fsr/cmd/enum.rb
 - spec/fsr/cmd/originate.rb
 - spec/fsr/cmd/sched_hangup.rb
@@ -415,6 +417,7 @@ test_files:
 - spec/fsr/cmd/call_center.rb
 - spec/fsr/cmd/calls.rb
 - spec/fsr/cmd/channels.rb
+- spec/fsr/cmd/conference.rb
 - spec/fsr/cmd/enum.rb
 - spec/fsr/cmd/originate.rb
 - spec/fsr/cmd/sched_hangup.rb