sinatra-asterisk 0.0.2 → 0.0.3

data/lib/sinatra/asterisk.rb

@@ -2,12 +2,16 @@ require 'sinatra/base'
 require 'java'
 require File.expand_path(__FILE__ + '/../asterisk/asterisk-java-1.0.0.M3.jar')
 
+require 'sinatra/asterisk/utils'
+
 module Sinatra
   module Asterisk
     java_import org.asteriskjava.fastagi.BaseAgiScript
     java_import org.asteriskjava.fastagi.MappingStrategy
     java_import org.asteriskjava.fastagi.DefaultAgiServer
     java_import org.asteriskjava.manager.ManagerConnectionFactory
+    java_import org.asteriskjava.manager.ManagerEventListener
+
 
     module Helpers
     end
@@ -26,13 +30,8 @@ module Sinatra
           sinatra_eigenclass = (class <<sinatra; self; end)
           sinatra_eigenclass.class_eval do
               # TODO: do this with a module ?
-              define_method :request do
-                  request
-              end
-
-              define_method :channel do
-                  channel
-              end
+              define_method(:request) { request } 
+              define_method(:channel) { channel } 
           end
 
           sinatra.instance_eval(&block)
@@ -50,13 +49,48 @@ module Sinatra
         end
       end
     end
+
+    class SinatraManagerEventListener
+      include ManagerEventListener
+
+      def initialize(*args)
+        @event_handlers, @sinatra_app = *args 
+      end
+      
+      def eval_in_sinatra(event, &block)
+          sinatra = @sinatra_app::new!
+          sinatra_eigenclass = (class <<sinatra; self; end)
+          sinatra_eigenclass.class_eval do
+              # TODO: do this with a module ?
+              define_method(:event) { event }
+          end
+
+          sinatra.instance_eval(&block)
+      end
+
+      # implements ManagerEventListener
+      def onManagerEvent(event)
+        event_name = event.class.name.gsub(/^.*::/, '').gsub(/Event$/, '')
+        catch(:halt) do
+          block = @event_handlers.each do |event_class, block|
+            catch :pass do
+              throw :pass unless event_class.nil? || Utils::camelize(event_class) == event_name
+              throw :halt, eval_in_sinatra(event, &block) 
+            end
+          end
+        end
+      end
+    end
     
-    def start_agi_server
+    def start_agi_server(port = 4573)
       @agi_script = SinatraAgiScript::new
       @agi_script.agi_handlers = agi_handlers
-      @agi_script.sinatra_app  = self
+
+      # this is a hack; settings returns the Sinatra class
+      @agi_script.sinatra_app = settings 
       
       @agi_server = DefaultAgiServer::new()
+      @agi_server.port = port
       @agi_server.mappingStrategy = @agi_script
       Thread.new do
         begin
@@ -70,21 +104,35 @@ module Sinatra
     def connect_to_manager(hostname, username, password)
       factory = ManagerConnectionFactory::new(hostname, username, password)
       manager_connection = factory.createManagerConnection
+      initialize_manager_event_listener(manager_connection)
       manager_connection.login
 
       set :manager, manager_connection
     end
-    
+
+    def initialize_manager_event_listener(manager_connection)
+      @manager_event_listener = SinatraManagerEventListener::new(event_handlers, settings)
+      manager_connection.addEventListener(@manager_event_listener)
+    end
+
     def agi(uri_pattern = nil, conditions = {}, &block)
       uri_pattern = Regexp::new(uri_pattern) if uri_pattern && !uri_pattern.respond_to?(:match)
       agi_handlers << [uri_pattern, conditions, Proc::new(&block)]
     end
+
+    def on_event(event_class = nil, &block)
+      event_handlers << [event_class, Proc::new(&block)]
+    end
     
     private
     
     def agi_handlers
       @agi_handlers ||= []
     end
+    
+    def event_handlers
+      @event_handlers ||= []
+    end
   
     def self.registered(app)
       app.helpers Helpers

data/lib/sinatra/asterisk/utils.rb

@@ -0,0 +1,14 @@
+module Sinatra
+  module Asterisk
+    module Utils
+      # Borrowed from activesupport-3.0.4
+      def self.camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+        if first_letter_in_uppercase
+          lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        else
+          lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+        end
+      end
+    end
+  end
+end

data/lib/sinatra/asterisk/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
     module Asterisk
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
     end
 end

data/spec/sinatra/asterisk_spec.rb

@@ -1,43 +1,77 @@
+# store top level for use during the tests
+$top_level = self
+
 require File.expand_path(__FILE__ + "/../../spec_helper.rb")
 
 class Sinatra::Asterisk::TestApp < Sinatra::Application 
-    include Sinatra::Asterisk
+  include Sinatra::Asterisk
+
+  start_agi_server
 
-    start_agi_server
-    helpers do
-        def test_helper
-            request.helper_was_called
-        end
+  helpers do
+    def test_request_helper
+      request.helper_was_called
     end
 
-    agi /^test/ do
-       request.block_was_called
-       test_helper
+    def test_event_helper
+      event.helper_was_called
     end
-end
+  end
 
-def mock_request(script, headers = {})
-  unless @mock_request
-    @mock_request = mock('MockAgiRequest')
-    @mock_request.stub!(
-        :extension  => "test",
-        :priority   => "1",
-        :context    => "default",
-        :uniqueId   => "123456789.7", 
-        :language   => "en",
-        :channel    => "SIP/127.0.0.1-00000003",
-        :type       => "SIP",
-        :script     => script,
-        :requestURL => "agi://fake_test_host:1234/#{script}") #[?param1=value1&param2=value2]. "
+  agi /^test/ do
+   request.block_was_called
+   test_request_helper
+  end
+
+  on_event :reload do
+    event.reload_event_block_was_called
+  end
+  
+  on_event do
+    event.block_was_called
+    test_event_helper
   end
-  @mock_request
 end
 
 describe Sinatra::Asterisk::TestApp do
-  it "should call the block" do
-    mock_request("test").should_receive(:block_was_called)
-    @mock_request.should_receive(:helper_was_called)
+  describe "when receiving an AGI request" do
+    it "should access the request scope from an AGI" do
+      mock_request("test").should_receive(:block_was_called)
+      @mock_request.should_receive(:helper_was_called)
+
+      Sinatra::Asterisk::TestApp.instance_variable_get("@agi_script").service(@mock_request, nil)
+    end
 
-    Sinatra::Asterisk::TestApp.instance_variable_get("@agi_script").service(@mock_request, nil)
+    it "should not call a handler for script 'not_test'" do
+      mock_request("not_test").should_not_receive(:block_was_called)
+      @mock_request.should_not_receive(:helper_was_called)
+
+      Sinatra::Asterisk::TestApp.instance_variable_get("@agi_script").service(@mock_request, nil)
+    end
+
+    it "should access the request scope from a classical AGI" do
+      mock_request("test_top_level").should_receive(:block_was_called)
+      $top_level.send :agi, /^test_top_level$/ do
+        request.block_was_called
+      end
+      $top_level.send :start_agi_server, 4574
+      Sinatra::Application.instance_variable_get("@agi_script").service(@mock_request, nil)
+    end
+  end
+  describe "when receiving a ManagerEvent" do
+    before do
+      manager_connection = mock("manager_connection")
+      manager_connection.should_receive(:addEventListener)
+      Sinatra::Asterisk::TestApp.class_eval do
+        initialize_manager_event_listener(manager_connection)
+      end
+    end
+
+    it "should call handler for ReloadEvent" do
+      ev = org.asteriskjava.manager.event.ReloadEvent::new("source")
+      ev.should_receive(:reload_event_block_was_called)
+
+      Sinatra::Asterisk::TestApp.instance_variable_get("@manager_event_listener").onManagerEvent(ev)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,28 @@
+
 require "sinatra/asterisk"
+require "sinatra" # required for classical style testing
+
+def mock_request(script, headers = {})
+  unless @mock_request
+    @mock_request = mock('MockAgiRequest')
+    @mock_request.stub!(
+        :extension  => "test",
+        :priority   => "1",
+        :context    => "default",
+        :uniqueId   => "123456789.7", 
+        :language   => "en",
+        :channel    => "SIP/127.0.0.1-00000003",
+        :type       => "SIP",
+        :script     => script,
+        :requestURL => "agi://fake_test_host:1234/#{script}") #[?param1=value1&param2=value2]. "
+  end
+  @mock_request
+end
+
+def mock_event()
+  unless @mock_event
+    @mock_event = mock('MockManagerEvent')
+  end
+  @mock_event
+end
+

metadata

@@ -2,7 +2,7 @@
 name: sinatra-asterisk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
   - Dominique BROEGLIN
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 +02:00
+date: 2011-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
   - Rakefile
   - lib/sinatra/asterisk.rb
   - lib/sinatra/asterisk/asterisk-java-1.0.0.M3.jar
+  - lib/sinatra/asterisk/utils.rb
   - lib/sinatra/asterisk/version.rb
   - sinatra-asterisk.gemspec
   - spec/sinatra/asterisk_spec.rb