freec 0.2.2 → 0.2.5

data/README.rdoc

@@ -2,7 +2,7 @@
 Freec is a framework you can build voice applications on top of. It makes use of the Event socket outbound API of Freeswitch.
 
 = Installation
-  sudo gem install jankubr-freec
+  gem install freec
 
 = Usage
 1. Install Freeswitch and point a chosen extension to the IP where your app will run:

data/Rakefile

@@ -9,7 +9,7 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name              = "freec"
-  s.version           = '0.2.2'
+  s.version           = '0.2.5'
   s.author            = "Jan Kubr"
   s.email             = "mail@jankubr.com"
   s.homepage          = "http://github.com/jankubr/freec"
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc          = false
   s.extra_rdoc_files  = FileList["README*"].to_a
   s.rdoc_options << '--line-numbers' << '--inline-source'
-  s.requirements << "daemons"
+  s.add_dependency "daemons"
   s.add_development_dependency 'rspec'
 end
 

data/lib/freec_base.rb

@@ -13,7 +13,8 @@ class Freec
   attr_reader :call_vars, :event_body, :log, :config
   
   def initialize(io, log, config) #:nodoc:
-    @call_vars ||= {}
+    @call_vars = {}
+    @want_events_from = []
     @last_app_executed = 'initial_step'
     @io = io    
     @log = log
@@ -30,9 +31,8 @@ class Freec
         reset_wait_for if waiting_for_this_response?
         reload_application_code
         break if disconnect_notice? || !callback(:step)
-      end      
-      read_response
-      parse_response
+      end
+      read_and_parse_response
     end
     callback(:on_hangup)
     hangup unless @io.closed?
@@ -112,6 +112,7 @@ private
   
   def subscribe_to_new_channel_events
     return unless call_vars[:event_name] == 'CHANNEL_BRIDGE'
+    @want_events_from << call_vars[:other_leg_unique_id]
     send_and_read("filter Unique-ID #{call_vars[:other_leg_unique_id]}")
   end
       
@@ -133,6 +134,14 @@ private
     read_response
   end
   
+  def read_and_parse_response
+    my_event = false
+    until my_event
+      read_response
+      my_event = parse_response
+    end    
+  end
+  
   def read_response
     return if disconnect_notice?
     read_response_info
@@ -180,12 +189,17 @@ private
     @response.split("\n").each do |line|
       k,v = line.split(/\s*:\s*/)
       hash[k.strip.gsub('-', '_').downcase.to_sym] = URI.unescape(v).strip if k && v
-    end    
+    end
+    unless @unique_id
+      @unique_id = hash[:unique_id]
+      @want_events_from << @unique_id
+    end
+    return false unless @want_events_from.include?(hash[:unique_id]) || hash[:unique_id].blank?
     call_vars.merge!(hash)
-    @unique_id ||= call_vars[:unique_id]
     raise call_vars[:reply_text] if call_vars[:reply_text] =~ /^-ERR/
     log.debug "\n\tUnique ID: #{call_vars[:unique_id]}\n\tContent-type: #{call_vars[:content_type]}\n\tEvent name: #{call_vars[:event_name]}"
     @response = ''
+    true
   end
   
 end

data/spec/event_parser_spec.rb

@@ -9,7 +9,6 @@ describe Freec do
   end
   
   describe "parses body-less event" do
-
     before do
       @freec.instance_variable_set(:@response, EVENT)
       @freec.send :parse_response
@@ -19,6 +18,10 @@ describe Freec do
       @freec.instance_variable_get(:@unique_id).should == 'f3c2d5ee-d064-4f55-9280-5be2a65867e8'
     end
     
+    it "should include channel unique id to the array of ids event variables are read from" do
+      @freec.instance_variable_get(:@want_events_from).should == ['f3c2d5ee-d064-4f55-9280-5be2a65867e8']
+    end
+    
     it "should parse variables from response" do
       @freec.call_vars[:call_direction].should == 'inbound'
       @freec.call_vars[:caller_context].should == 'default'
@@ -37,6 +40,31 @@ describe Freec do
       @freec.channel_destination_number.should == '886'
     end
   end
+  
+  describe "ignores variables from another channel event" do
+
+    it "should not parse variables from event of another channel" do
+      @freec.instance_variable_set(:@response, EVENT)
+      @freec.send(:parse_response).should be_true
+      another_channel_event = EVENT.sub('Unique-ID: f3c2d5ee-d064-4f55-9280-5be2a65867e8', 'Unique-ID: ffff1111-e72d-48bf-9ecf-d71bd4b60617').
+                                    sub('Application: set', 'Application: bridge')
+      @freec.instance_variable_set(:@response, another_channel_event)
+      @freec.send(:parse_response).should be_false
+      @freec.call_vars[:application].should == 'set'
+    end
+    
+    it "parses variables from disconnect notices" do
+      @freec.instance_variable_set(:@response, EVENT)
+      @freec.send(:parse_response).should be_true
+      @freec.call_vars[:content_type].should == 'text/event-plain'
+      disconnect_notice_event = EVENT.sub('Unique-ID: f3c2d5ee-d064-4f55-9280-5be2a65867e8', 'Unique-ID: ').
+                                    sub('Content-Type: text/event-plain', 'Content-Type: text/disconnect-notice')
+      @freec.instance_variable_set(:@response, disconnect_notice_event)
+      @freec.send(:parse_response).should be_true 
+      @freec.call_vars[:content_type].should == 'text/disconnect-notice'
+    end    
+    
+  end
 
   describe "parses an event with a body" do
     before do

data/spec/freec_base_spec.rb

@@ -69,14 +69,22 @@ describe Freec do
   
   end
   
+  
   describe "event recognition" do
 
+    it "ignores events for another channel" do
+      @freec.should_receive(:read_response).twice
+      @freec.should_receive(:parse_response).and_return(false, true)
+      @freec.send(:read_and_parse_response)
+    end
+  
     it "should subscribe to events of other leg channel after bridge" do
       bridge_event = EVENT.sub('CHANNEL_EXECUTE', 'CHANNEL_BRIDGE').sub('Caller-Profile-Index: 1', 'Other-Leg-Unique-ID: 6c75cb42-e72d-48bf-9ecf-d71bd4b60617')
       @freec.instance_variable_set(:@response, bridge_event)
       @freec.send(:parse_response)
       @freec.should_receive(:send_and_read).with("filter Unique-ID 6c75cb42-e72d-48bf-9ecf-d71bd4b60617")
       @freec.send(:subscribe_to_new_channel_events)
+      @freec.instance_variable_get(:@want_events_from).should == ["f3c2d5ee-d064-4f55-9280-5be2a65867e8", "6c75cb42-e72d-48bf-9ecf-d71bd4b60617"]
     end
     
     it "should recognize last event was DTMF to call the on_dtmf callback" do
@@ -144,15 +152,13 @@ describe Freec do
       
   end
   
-  describe "callback exception handling" do
-  
+  describe "callback exception handling" do  
     it "should catch and log any exception occurred in a callback" do
       @freec.should_receive(:callback_name).and_raise(RuntimeError)
       @freec.log.should_receive(:error).with('RuntimeError')
       @freec.log.should_receive(:error).at_least(1).times #backtrace
       lambda { @freec.send(:callback, :callback_name) }.should_not raise_error(Exception)
-    end
-  
+    end  
   end
   
   describe "custom waiting conditions" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jan Kubr
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: daemons
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,8 +30,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: 
 email: mail@jankubr.com
 executables: []
@@ -84,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 0
       version: "0"
-requirements: 
-- daemons
+requirements: []
+
 rubyforge_project: freec
 rubygems_version: 1.3.7
 signing_key: