freeswitcher 0.6.8 → 0.6.9

data/lib/fsr/cmd/conference.rb

@@ -9,18 +9,18 @@ module FSR
         @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
+        raise(ArgumentError, "Cannot use conference without :conference_name") unless conference_name
         case @action
           when :dial
-            raise(ArgumentError, "Cannot dial without :target") unless @target
+            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)
+              raise(ArgumentError, ":target_options must be a hash") unless target_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
+            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
+            raise(ArgumentError, "Cannot kick without :target") unless target
           else
             # go with flow, mate
         end
@@ -34,12 +34,10 @@ module FSR
       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
+        target_options = @target_options.keys.sort { |a,b| a.to_s <=> b.to_s }.map { |k| "%s=%s" % [k, @target_options[k]] }.join(",") if @target_options
         conference_name << "@#{profile}" if profile
-        if pin
-          conference_name << "+#{pin}"
-          conference_name << "+#{flags}" if flags
-        end
+        conference_name << "+#{pin}" if pin
+        conference_name << "+#{flags}" if flags
         args = [conference_name]
         args << action if action
 

data/spec/fsr/cmd/conference.rb

@@ -28,11 +28,21 @@ describe "Testing FSR::Cmd::Conference" do
       message.should.match(/Cannot kick without :target/)
   end
 
-  it "Puts callee into conference" do
+  it "Should require target_options to be a hash" do
+    lambda { FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dial, :target => "user/1000", :target_options => 1) }.should.raise(ArgumentError).
+      message.should.match(/:target_options must be a hash/)
+  end
+
+  it "Dials and 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 "Dials with :target_option" do
+    conference = FSR::Cmd::Conference.new(nil, :conference_name => 1001, :action => :dial, :target => "user/1000", :target_options => {:ignore_early_media => true})
+    conference.raw.should == "conference 1001 dial {ignore_early_media=true}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"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -06:00
+date: 2011-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency