bougyman-freeswitcher 0.1.2 → 0.1.3

data/lib/fsr.rb

@@ -6,7 +6,7 @@ require 'pp'
 module FSR
   # Global configuration options
   #
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   FS_INSTALL_PATHS = ["/usr/local/freeswitch", "/opt/freeswitch", "/usr/freeswitch"]
   DEFAULT_CALLER_ID_NUMBER = '8675309'
   DEFAULT_CALLER_ID_NAME   = "FSR"

data/lib/fsr/app/limit.rb

@@ -0,0 +1,19 @@
+require "fsr/app"
+module FSR
+  module App
+    class Limit < Application
+
+      def initialize(id = nil, realm = "$${domain}", limit = 5)
+        @realm, @id, @limit = realm, id, limit
+        raise "Must supply a valid id" if @id.nil?
+      end
+
+      def arguments
+        [@realm, @id, @limit]
+      end
+
+    end
+
+    register(:limit, Limit)
+  end
+end

data/spec/fsr/app/limit.rb

@@ -0,0 +1,26 @@
+require 'spec/helper'
+require "fsr/app"
+FSR::App.load_application("limit")
+
+describe "Testing FSR::App::Limit" do
+  ## Calls ##
+  # Interface to calls
+  it "FSR::App::Limit should send proper limit command only passing an id" do
+    limit = FSR::App::Limit.new("fsr_caller")
+    limit.raw.should == "limit($${domain} fsr_caller 5)"
+    limit.sendmsg.should == "call-command: execute\nexecute-app-name: limit\nexecute-app-arg: $${domain} fsr_caller 5\n\n"
+  end
+
+  it "FSR::App::Limit should send proper limit command passing id and realm" do
+    limit = FSR::App::Limit.new("fsr_caller", "foodomain")
+    limit.raw.should == "limit(foodomain fsr_caller 5)"
+    limit.sendmsg.should == "call-command: execute\nexecute-app-name: limit\nexecute-app-arg: foodomain fsr_caller 5\n\n"
+  end
+
+  it "FSR::App::Limit should send proper limit command passing id, realm, and limit" do
+    limit = FSR::App::Limit.new("fsr_caller", "foodomain", 10)
+    limit.raw.should == "limit(foodomain fsr_caller 10)"
+    limit.sendmsg.should == "call-command: execute\nexecute-app-name: limit\nexecute-app-arg: foodomain fsr_caller 10\n\n"
+  end
+
+end

data/spec/fsr/loading.rb

@@ -4,7 +4,7 @@ require 'spec/helper'
 describe "Testing FSR module loading methods" do
   # When you add applications  you must modify the expected apps_loaded behavior
   it "Loads all applications" do
-    all_apps = [:play_and_get_digits, :uuid_dump, :uuid_setvar, :uuid_getvar, :read, :set, :transfer, :speak, :fs_sleep, :playback, :answer, :fifo, :bridge, :hangup, :conference, :fs_break, :log]
+    all_apps = [:play_and_get_digits, :uuid_dump, :uuid_setvar, :uuid_getvar, :read, :set, :transfer, :speak, :fs_sleep, :playback, :answer, :fifo, :bridge, :hangup, :conference, :fs_break, :log, :limit]
     # Add any apps which will load to this set
     apps_loaded = FSR.load_all_applications
     apps_loaded.kind_of?(Array).should == true
@@ -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 = [:originate, :sofia, :fsctl, :sofia_contact, :status, :calls, :limit] # If you add a command add it to this set
+    all_commands = [:originate, :sofia, :fsctl, :sofia_contact, :status, :calls] # 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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bougyman-freeswitcher
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -60,6 +60,7 @@ files:
 - lib/fsr/app/fs_break.rb
 - lib/fsr/app/fs_sleep.rb
 - lib/fsr/app/hangup.rb
+- lib/fsr/app/limit.rb
 - lib/fsr/app/log.rb
 - lib/fsr/app/play_and_get_digits.rb
 - lib/fsr/app/playback.rb
@@ -74,7 +75,6 @@ files:
 - lib/fsr/cmd
 - lib/fsr/cmd/calls.rb
 - lib/fsr/cmd/fsctl.rb
-- lib/fsr/cmd/limit.rb
 - lib/fsr/cmd/originate.rb
 - lib/fsr/cmd/sofia
 - lib/fsr/cmd/sofia/profile.rb
@@ -268,6 +268,7 @@ test_files:
 - spec/fsr/app/conference.rb
 - spec/fsr/app/fifo.rb
 - spec/fsr/app/hangup.rb
+- spec/fsr/app/limit.rb
 - spec/fsr/app/log.rb
 - spec/fsr/app/play_and_get_digits.rb
 - spec/fsr/app/playback.rb
@@ -276,7 +277,6 @@ test_files:
 - spec/fsr/app.rb
 - spec/fsr/cmd
 - spec/fsr/cmd/calls.rb
-- spec/fsr/cmd/limit.rb
 - spec/fsr/cmd/originate.rb
 - spec/fsr/cmd/sofia
 - spec/fsr/cmd/sofia/profile.rb

data/lib/fsr/cmd/limit.rb

@@ -1,31 +0,0 @@
-require "fsr/app"
-module FSR
-  module Cmd
-    class Limit < Command
-
-      def initialize(fs_socket = nil, id = nil, realm = "$${domain}", limit = 5)
-        @fs_socket = fs_socket # FSR::CommandSocket obj
-        @realm, @id, @limit = realm, id, limit
-        raise "Must supply a valid id" if @id.nil?
-      end
-
-      # Send the command to the event socket, using bgapi by default.
-      def run(api_method = :api)
-        orig_command = "%s %s" % [api_method, raw]
-        Log.debug "saying #{orig_command}"
-        @fs_socket.say(orig_command)
-      end
-
-      def arguments
-        [@realm, @id, @limit]
-      end
-
-      # This method builds the API command to send to the freeswitch event socket
-      def raw
-        orig_command = "limit %s %s %s" % arguments
-      end
-    end
-
-    register(:limit, Limit)
-  end
-end

data/spec/fsr/cmd/limit.rb

@@ -1,23 +0,0 @@
-require 'spec/helper'
-require "fsr/cmd"
-FSR::Cmd.load_command("limit")
-
-describe "Testing FSR::Cmd::Limit" do
-  ## Calls ##
-  # Interface to calls
-  it "FSR::Cmd::Limit should send proper limit command only passing an id" do
-    limit = FSR::Cmd::Limit.new(nil, "fsr_caller")
-    limit.raw.should == "limit $${domain} fsr_caller 5"
-  end
-
-  it "FSR::Cmd::Limit should send proper limit command passing id and realm" do
-    limit = FSR::Cmd::Limit.new(nil, "fsr_caller", "foodomain")
-    limit.raw.should == "limit foodomain fsr_caller 5"
-  end
-
-  it "FSR::Cmd::Limit should send proper limit command passing id, realm, and limit" do
-    limit = FSR::Cmd::Limit.new(nil, "fsr_caller", "foodomain", 10)
-    limit.raw.should == "limit foodomain fsr_caller 10"
-  end
-
-end