freeswitcher 0.4.6 → 0.4.7

data/MANIFEST

@@ -70,7 +70,6 @@ tasks/manifest.rake
 tasks/release.rake
 tasks/reversion.rake
 tasks/setup.rake
-tasks/spec.rake
 tasks/yard.rake
 spec/helper.rb
 spec/fsr_listener_helper.rb

data/freeswitcher.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{freeswitcher}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jayson Vaughn", "Michael Fellinger", "Kevin Berry", "TJ Vanderpoel"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-19}
   s.description = %q{=========================================================
 FreeSWITCHeR
 Copyright (c) 2009 The Rubyists (Jayson Vaughn, Tj Vanderpoel, Michael Fellinger, Kevin Berry) 
@@ -132,7 +132,7 @@ Home page at http://code.rubyists.com/projects/fs
 #rubyists on FreeNode
 }
   s.email = %q{FreeSWITCHeR@rubyists.com}
-  s.files = [".gitignore", "AUTHORS", "CHANGELOG", "License.txt", "MANIFEST", "NEWS", "README", "Rakefile", "examples/inbound_event_socket.rb", "examples/inbound_socket_events.rb", "examples/outbound_event_socket.rb", "freeswitcher.gemspec", "lib/fsr.rb", "lib/fsr/app.rb", "lib/fsr/app/answer.rb", "lib/fsr/app/bind_meta_app.rb", "lib/fsr/app/bridge.rb", "lib/fsr/app/conference.rb", "lib/fsr/app/execute_app.rb", "lib/fsr/app/fifo.rb", "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", "lib/fsr/app/read.rb", "lib/fsr/app/set.rb", "lib/fsr/app/speak.rb", "lib/fsr/app/transfer.rb", "lib/fsr/app/uuid_dump.rb", "lib/fsr/app/uuid_getvar.rb", "lib/fsr/app/uuid_setvar.rb", "lib/fsr/cmd.rb", "lib/fsr/cmd/calls.rb", "lib/fsr/cmd/fsctl.rb", "lib/fsr/cmd/originate.rb", "lib/fsr/cmd/sofia.rb", "lib/fsr/cmd/sofia/profile.rb", "lib/fsr/cmd/sofia/status.rb", "lib/fsr/cmd/sofia_contact.rb", "lib/fsr/cmd/status.rb", "lib/fsr/cmd/uuid_dump.rb", "lib/fsr/command_socket.rb", "lib/fsr/database.rb", "lib/fsr/database/call_limit.rb", "lib/fsr/database/core.rb", "lib/fsr/database/sofia_reg_external.rb", "lib/fsr/database/sofia_reg_internal.rb", "lib/fsr/database/voicemail_default.rb", "lib/fsr/event_socket.rb", "lib/fsr/fake_socket.rb", "lib/fsr/listener.rb", "lib/fsr/listener/header_and_content_response.rb", "lib/fsr/listener/inbound.rb", "lib/fsr/listener/inbound/event.rb", "lib/fsr/listener/mock.rb", "lib/fsr/listener/outbound.rb", "lib/fsr/model/call.rb", "lib/fsr/version.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/copyright.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/spec.rake", "tasks/yard.rake", "spec/helper.rb", "spec/fsr_listener_helper.rb", "spec/fsr/app.rb", "spec/fsr/app/answer.rb", "spec/fsr/app/bind_meta_app.rb", "spec/fsr/app/bridge.rb", "spec/fsr/app/conference.rb", "spec/fsr/app/execute_app.rb", "spec/fsr/app/fifo.rb", "spec/fsr/app/fs_break.rb", "spec/fsr/app/fs_sleep.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", "spec/fsr/app/set.rb", "spec/fsr/app/transfer.rb", "spec/fsr/cmd.rb", "spec/fsr/cmd/calls.rb", "spec/fsr/cmd/originate.rb", "spec/fsr/cmd/sofia.rb", "spec/fsr/cmd/sofia/profile.rb", "spec/fsr/cmd/uuid_dump.rb", "spec/fsr/listener.rb", "spec/fsr/listener/header_and_content_response.rb", "spec/fsr/listener/inbound.rb", "spec/fsr/listener/outbound.rb", "spec/fsr/loading.rb"]
+  s.files = [".gitignore", "AUTHORS", "CHANGELOG", "License.txt", "MANIFEST", "NEWS", "README", "Rakefile", "examples/inbound_event_socket.rb", "examples/inbound_socket_events.rb", "examples/outbound_event_socket.rb", "freeswitcher.gemspec", "lib/fsr.rb", "lib/fsr/app.rb", "lib/fsr/app/answer.rb", "lib/fsr/app/bind_meta_app.rb", "lib/fsr/app/bridge.rb", "lib/fsr/app/conference.rb", "lib/fsr/app/execute_app.rb", "lib/fsr/app/fifo.rb", "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", "lib/fsr/app/read.rb", "lib/fsr/app/set.rb", "lib/fsr/app/speak.rb", "lib/fsr/app/transfer.rb", "lib/fsr/app/uuid_dump.rb", "lib/fsr/app/uuid_getvar.rb", "lib/fsr/app/uuid_setvar.rb", "lib/fsr/cmd.rb", "lib/fsr/cmd/calls.rb", "lib/fsr/cmd/fsctl.rb", "lib/fsr/cmd/originate.rb", "lib/fsr/cmd/sofia.rb", "lib/fsr/cmd/sofia/profile.rb", "lib/fsr/cmd/sofia/status.rb", "lib/fsr/cmd/sofia_contact.rb", "lib/fsr/cmd/status.rb", "lib/fsr/cmd/uuid_dump.rb", "lib/fsr/command_socket.rb", "lib/fsr/database.rb", "lib/fsr/database/call_limit.rb", "lib/fsr/database/core.rb", "lib/fsr/database/sofia_reg_external.rb", "lib/fsr/database/sofia_reg_internal.rb", "lib/fsr/database/voicemail_default.rb", "lib/fsr/event_socket.rb", "lib/fsr/fake_socket.rb", "lib/fsr/listener.rb", "lib/fsr/listener/header_and_content_response.rb", "lib/fsr/listener/inbound.rb", "lib/fsr/listener/inbound/event.rb", "lib/fsr/listener/mock.rb", "lib/fsr/listener/outbound.rb", "lib/fsr/model/call.rb", "lib/fsr/version.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/copyright.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/yard.rake", "spec/helper.rb", "spec/fsr_listener_helper.rb", "spec/fsr/app.rb", "spec/fsr/app/answer.rb", "spec/fsr/app/bind_meta_app.rb", "spec/fsr/app/bridge.rb", "spec/fsr/app/conference.rb", "spec/fsr/app/execute_app.rb", "spec/fsr/app/fifo.rb", "spec/fsr/app/fs_break.rb", "spec/fsr/app/fs_sleep.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", "spec/fsr/app/set.rb", "spec/fsr/app/transfer.rb", "spec/fsr/cmd.rb", "spec/fsr/cmd/calls.rb", "spec/fsr/cmd/originate.rb", "spec/fsr/cmd/sofia.rb", "spec/fsr/cmd/sofia/profile.rb", "spec/fsr/cmd/uuid_dump.rb", "spec/fsr/listener.rb", "spec/fsr/listener/header_and_content_response.rb", "spec/fsr/listener/inbound.rb", "spec/fsr/listener/outbound.rb", "spec/fsr/loading.rb"]
   s.homepage = %q{http://code.rubyists.com/projects/fs}
   s.post_install_message = %q{=========================================================
 FreeSWITCHeR

data/lib/fsr/listener/inbound.rb

@@ -6,7 +6,7 @@ require 'fsr/listener/header_and_content_response.rb'
 module FSR
   module Listener
     class Inbound < EventMachine::Protocols::HeaderAndContentProtocol
-      attr_reader :auth, :hooks, :event, :server, :port
+      attr_reader :auth, :hooks, :server, :port
 
       HOOKS = {}
 
@@ -47,12 +47,20 @@ module FSR
       def authorize_and_register_for_events
         FSR::Log.info "Connection established. Authorizing..."
         say("auth #{@auth}")
-        say('event plain ALL')
+        add_class_hooks
+        before_session
       end
 
       def before_session 
       end
 
+      def  add_class_hooks
+        HOOKS.each do |(key, value)| 
+          add_event(key, &value)
+        end
+      end
+      private :before_session, :add_class_hooks
+
       # receive_request is the callback method when data is recieved from the socket
       #
       # param header headers from standard Header and Content protocol
@@ -60,13 +68,19 @@ module FSR
       def receive_request(header, content)
         hash_header = headers_2_hash(header)
         hash_content = headers_2_hash(content)
-        @event = HeaderAndContentResponse.new({:headers => hash_header, :content => hash_content})
+        event = HeaderAndContentResponse.new({:headers => hash_header, :content => hash_content})
         event_name = event.content[:event_name].to_s.strip
         unless event_name.empty?
-          instance_eval &HOOKS[event_name.to_sym] unless HOOKS[event_name.to_sym].nil?
-          instance_eval &@hooks[event_name.to_sym] unless @hooks[event_name.to_sym].nil?
+          if hook = @hooks[event_name.to_sym]
+            case hook.arity
+            when 1
+              @hooks[event_name.to_sym].call(event)
+            when 2
+              @hooks[event_name.to_sym].call(self, event)
+            end
+          end
         end
-        on_event
+        on_event(event)
       end
 
       # say encapsulates #send_data for the user
@@ -87,7 +101,7 @@ module FSR
       #
       # param event The triggered event object
       # return event The triggered event object
-      def on_event
+      def on_event(event)
         event
       end
 
@@ -121,8 +135,6 @@ module FSR
         @hooks.delete(event)  
       end
 
-
-
     end
 
   end

data/lib/fsr/version.rb

@@ -1,3 +1,3 @@
 module FSR
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/fsr/listener/inbound.rb

@@ -3,22 +3,27 @@ require 'lib/fsr'
 require "fsr/listener"
 require "fsr/listener/inbound"
 require "em-spec/bacon"
+EM.spec_backend = EventMachine::Spec::Bacon
 
 # Bare class to use for testing
 class InboundListener < FSR::Listener::Inbound
-  attr_accessor :test_event
+  attr_accessor :custom_event
 
   # Stub error? out
   def error?
     false
   end
 
+  def before_session
+    add_event(:CUSTOM) { |e| @custom_event = e }
+  end
+
   def initialize(*args)
     super(*args)
     @test_event = nil
   end
 
-  def on_event
+  def on_event(event)
     recvd_event << event
   end
 
@@ -28,8 +33,9 @@ class InboundListener < FSR::Listener::Inbound
 end
 
 class InboundListener2 < InboundListener
+  attr_accessor :test_event
   def before_session
-    add_event(:TEST_EVENT) {recvd_event << event}
+    add_event(:TEST_EVENT) { |e| @test_event = e}
   end
 end
 
@@ -59,17 +65,19 @@ EM.describe InboundListener do
   end
 
   should "be able to add custom event hooks in the pre_session" do
+    @listener.receive_data("Content-Length: 22\n\nEvent-Name: CUSTOM\n\n")
+    @listener.custom_event.should.equal @listener.recvd_event.first
     @listener2.receive_data("Content-Length: 22\n\nEvent-Name: TEST_EVENT\n\n")
-    @listener2.recvd_event.first.content[:event_name].should.equal "TEST_EVENT"
+    @listener2.test_event.content[:event_name].should.equal "TEST_EVENT"
     done
   end
 
   should "be able to add custom event hooks" do
-    listener = @listener
-    FSL::Inbound.add_event_hook(:HANGUP_EVENT) {listener.test_event = event}
-    @listener.test_event.should.equal nil
-    @listener.receive_data("Content-Length: 24\n\nEvent-Name: HANGUP_EVENT\n\n")
-    @listener.test_event.content[:event_name].should.equal "HANGUP_EVENT"
+    FSL::Inbound.add_event_hook(:HANGUP_EVENT) { |instance, event| instance.test_event = event }
+    listener = InboundListener2.new(1234, {:auth => 'SecretPassword'})
+    listener.test_event.should.equal nil
+    listener.receive_data("Content-Length: 24\n\nEvent-Name: HANGUP_EVENT\n\n")
+    listener.test_event.content[:event_name].should.equal "HANGUP_EVENT"
     done
   end
 

data/spec/fsr/listener/outbound.rb

@@ -4,7 +4,7 @@ require "fsr/listener"
 require "fsr/listener/inbound"
 require "fsr/listener/outbound"
 require "em-spec/bacon"
-
+EM.spec_backend = EventMachine::Spec::Bacon
 # Bare class to use for testing
 class MyListener < FSR::Listener::Outbound
   attr_accessor :recvd_reply, :state_machine_test, :state_machine_test2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freeswitcher
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -06:00
+date: 2010-01-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,7 +230,6 @@ files:
 - tasks/release.rake
 - tasks/reversion.rake
 - tasks/setup.rake
-- tasks/spec.rake
 - tasks/yard.rake
 - spec/helper.rb
 - spec/fsr_listener_helper.rb