sinatra-asterisk 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1,5 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+*.swp

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/HISTORY.rdoc

@@ -0,0 +1,14 @@
+=== 0.0.2 / 2011-04-24
+
+ * Moved to Asterisk-Java v1.0.0.M3.
+
+ * AGI handlers now are evaluated in a sinatra application scope
+   like route handlers.
+
+ * Correct ManagerConnectionFactory initialisation
+
+=== 0.0.1 / 2011-04-21
+
+ * First working version (simple AGI and manager connection but
+   no manager event handling).
+

data/Rakefile

@@ -0,0 +1,5 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:rspec)

data/lib/sinatra/asterisk.rb

@@ -1,47 +1,50 @@
 require 'sinatra/base'
 require 'java'
-require File.expand_path(File.dirname(__FILE__)) + '/asterisk-java-0.3.1.jar'
+require File.expand_path(__FILE__ + '/../asterisk/asterisk-java-1.0.0.M3.jar')
 
 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
+
     module Helpers
     end
-    
-    # TODO: implement proxy to Sinatra::Application ?
-    class AgiContext
-      instance_methods.each { |m| undef_method m unless m =~ /^(__|instance_eval)/ }
-      attr_reader :request, :channel
-      
-      def initialize(*args)
-        @request, @channel = *args
-      end
-      
-      def execute(&block)
-        instance_eval(&block)
-      end
-    end
 
     class SinatraAgiScript < BaseAgiScript
-      attr_accessor :agi_handlers
-
       include MappingStrategy
+      attr_accessor :agi_handlers, :sinatra_app
       
       # Implements MappingStrategy
       def determineScript(request)
         self
       end
-      
+     
+      def eval_in_sinatra(request, channel, &block)
+          sinatra = sinatra_app::new!
+          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
+          end
+
+          sinatra.instance_eval(&block)
+      end
+
       # Implements AgiScript
       def service(request, channel)
         catch(:halt) do
           block = @agi_handlers.each do |script_pattern, conditions, block|
             catch :pass do
               throw :pass unless script_pattern.nil? || script_pattern.match(request.script)
-              throw :halt, AgiContext::new(request, channel).execute(&block)
+              throw :halt, eval_in_sinatra(request, channel, &block) 
             end
           end
         end
@@ -49,11 +52,12 @@ module Sinatra
     end
     
     def start_agi_server
-      agi_script = SinatraAgiScript::new()
-      agi_script.agi_handlers = agi_handlers
+      @agi_script = SinatraAgiScript::new
+      @agi_script.agi_handlers = agi_handlers
+      @agi_script.sinatra_app  = self
       
       @agi_server = DefaultAgiServer::new()
-      @agi_server.mappingStrategy = agi_script
+      @agi_server.mappingStrategy = @agi_script
       Thread.new do
         begin
           @agi_server.startup

data/lib/sinatra/asterisk/version.rb

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

data/sinatra-asterisk.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sinatra/asterisk/version"
+
+Gem::Specification.new do |s|
+  s.name        = "sinatra-asterisk"
+  s.version     = Sinatra::Asterisk::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Dominique BROEGLIN"]
+  s.email       = ["dominique.broeglin@gmail.com"]
+  s.homepage    = "https://github.com/dbroeglin/sinatra-asterisk"
+  s.summary     = %q{IPBX applications extension for Sinatra.rb}
+  s.description = %q{Extension to Sinatra.rb to allow managing an Asterisk IPBX from the web application}
+
+  s.rubyforge_project = "sinatra-asterisk"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.has_rdoc      = 'yard'
+
+  s.add_dependency "sinatra", "~> 1.0"
+
+  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_development_dependency "gem-release"
+end

data/spec/sinatra/asterisk_spec.rb

@@ -2,16 +2,42 @@ require File.expand_path(__FILE__ + "/../../spec_helper.rb")
 
 class Sinatra::Asterisk::TestApp < Sinatra::Application 
     include Sinatra::Asterisk
+
+    start_agi_server
+    helpers do
+        def test_helper
+            request.helper_was_called
+        end
+    end
+
     agi /^test/ do
-        block_called
+       request.block_was_called
+       test_helper
     end
 end
 
-describe Sinatra::Asterisk::TestApp do
-  describe "register" do
-    it "pending" do
-      puts subject.inspect
-    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]. "
   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)
 
+    Sinatra::Asterisk::TestApp.instance_variable_get("@agi_script").service(@mock_request, nil)
+  end
 end

metadata

@@ -1,39 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-asterisk
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
-- Dominique BROEGLIN
+  - Dominique BROEGLIN
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 +02:00
+date: 2011-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: sinatra
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.0"
+    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 
+            version: 2.0.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: gem-release
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
 description: Extension to Sinatra.rb to allow managing an Asterisk IPBX from the web application
-email: dominique.broeglin@gmail.com
+email: 
+  - dominique.broeglin@gmail.com
 executables: []
 
 extensions: []
@@ -41,40 +56,46 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/sinatra/asterisk.rb
-- spec/sinatra/asterisk_spec.rb
-- spec/spec_helper.rb
-- test.rb
-- README.md
-- lib/sinatra/asterisk-java-0.3.1.jar
-- LICENSES
+  - .gitignore
+  - Gemfile
+  - HISTORY.rdoc
+  - LICENSES
+  - README.md
+  - Rakefile
+  - lib/sinatra/asterisk.rb
+  - lib/sinatra/asterisk/asterisk-java-1.0.0.M3.jar
+  - lib/sinatra/asterisk/version.rb
+  - sinatra-asterisk.gemspec
+  - spec/sinatra/asterisk_spec.rb
+  - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/dbroeglin/sinatra-asterisk
+homepage: https://github.com/dbroeglin/sinatra-asterisk
 licenses: []
 
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: sinatra-asterisk
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
-summary: Extension to Sinatra.rb to allow managing an Asterisk IPBX from the web application
-test_files: []
-
+summary: IPBX applications extension for Sinatra.rb
+test_files: 
+  - spec/sinatra/asterisk_spec.rb
+  - spec/spec_helper.rb

data/test.rb

@@ -1,8 +0,0 @@
-require 'sinatra'
-require 'sinatra/asterisk'
-
-start_agi_server
-
-agi do
-  puts "COUCOU"
-end