freeswitcher 0.6.17 → 0.6.18

data/lib/fsr/cmd/channels.rb

@@ -13,7 +13,7 @@ module FSR
 
       def initialize(fs_socket = nil, filter = nil)
         @filter = filter
-        @filter = nil if (@filter === true || @filter === false)
+        @filter = nil if @filter === false
         @fs_socket = fs_socket # FSR::CommandSocket obj
       end
 
@@ -22,21 +22,28 @@ module FSR
         orig_command = "%s %s" % [api_method, raw]
         Log.debug "saying #{orig_command}"
         resp = @fs_socket.say(orig_command)
-        unless resp["body"] == "0 total."
-          call_info, count = resp["body"].split("\n\n")
-          require "fsr/model/channel"
-          require "csv"
-          channels = CSV.parse(call_info) 
-          headers = channels[0]
-          @channels = channels[1 .. -1].map { |c| FSR::Model::Channel.new(headers ,*c) }
-          return @channels
+        if resp["body"] =~ /USAGE/
+          Log.warn "This server does not support #{raw}, trying Calls"
+          return Calls.new(@fs_socket, :detailed).run
+        else
+          unless resp["body"] == "0 total."
+            call_info, count = resp["body"].split("\n\n")
+            require "fsr/model/channel"
+            require "csv"
+            channels = CSV.parse(call_info) 
+            headers = channels[0]
+            @channels = channels[1 .. -1].map { |c| FSR::Model::Channel.new(headers ,*c) }
+            return @channels
+          end
+          []
         end
-        []
       end
 
       # This method builds the API command to send to the freeswitch event socket
       def raw
-        if @filter.nil?
+        if @filter === true
+          'show distinct_channels'
+        elsif @filter.nil?
           'show channels'
         elsif @filter.is_a?(Fixnum)
           'show channels %d' % @filter

data/lib/fsr/version.rb

@@ -1,3 +1,3 @@
 module FSR
-  VERSION = "0.6.17"
+  VERSION = "0.6.18"
 end

data/spec/fsr/cmd/channels.rb

@@ -13,8 +13,8 @@ describe "Testing FSR::Cmd::Channels" do
 
   it "FSR::Cmd::Channels (true as the filter) should send show channels" do
     sofia = FSR::Cmd::Channels.new(nil, true)
-    sofia.raw.should == "show channels"
-    sofia.instance_variable_get("@filter").should.be.nil
+    sofia.raw.should == "show distinct_channels"
+    sofia.instance_variable_get("@filter").should === true
   end
 
   it "FSR::Cmd::Channels (string as the filter) should add the filter" do

metadata

@@ -2,7 +2,7 @@
 name: freeswitcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.17
+  version: 0.6.18
 platform: ruby
 authors: 
 - Jayson Vaughn