freeswitcher 0.6.13 → 0.6.14

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 === true || @filter === false)
         @fs_socket = fs_socket # FSR::CommandSocket obj
       end
 
@@ -29,18 +29,21 @@ module FSR
           channels = CSV.parse(call_info) 
           headers = channels[0]
           @channels = channels[1 .. -1].map { |c| FSR::Model::Channel.new(headers ,*c) }
-          if @filter
-            return @channels.select { |f| f.match @filter }
-          else
-            return @channels
-          end
         end
         []
       end
 
       # This method builds the API command to send to the freeswitch event socket
       def raw
-        "show channels"
+        if @filter.nil?
+          'show channels'
+        elsif @filter.is_a?(Fixnum)
+          'show channels %d' % @filter
+        elsif @filter.is_a?(String)
+          'show channels like "%s"' % @filter
+        else
+          'show channels'
+        end
       end
     end
 

data/lib/fsr/version.rb

@@ -1,3 +1,3 @@
 module FSR
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 end

data/spec/fsr/cmd/channels.rb

@@ -8,16 +8,23 @@ describe "Testing FSR::Cmd::Channels" do
   it "FSR::Cmd::Channels (false as the filter) should send show channels" do
     sofia = FSR::Cmd::Channels.new(nil, false)
     sofia.raw.should == "show channels"
+    sofia.instance_variable_get("@filter").should.be.nil
   end
 
   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
   end
 
-  it "FSR::Cmd::Channels (regex as the filter) should send show channels" do
-    sofia = FSR::Cmd::Channels.new(nil, /something/)
-    sofia.raw.should == "show channels"
+  it "FSR::Cmd::Channels (string as the filter) should add the filter" do
+    sofia = FSR::Cmd::Channels.new(nil, 'something')
+    sofia.raw.should == 'show channels like "something"'
+  end
+
+  it "FSR::Cmd::Channels (number as the filter) should just limit the calls to that number" do
+    sofia = FSR::Cmd::Channels.new(nil, 3)
+    sofia.raw.should == "show channels 3"
   end
 
 end

metadata

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