kipatra 0.1.1 → 0.1.2

data/bin/kipatra

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'kipatra'
 require 'optparse'
 
-options = {:udp => [], :tcp => [], :sipatra => false}
+options = {:udp => [], :tcp => [], :sipatra => false, :example => false}
 option_parser = OptionParser.new do |opts|
 
   opts.on("-u UDP","--udp UDP") do |udp|
@@ -21,8 +21,12 @@ option_parser = OptionParser.new do |opts|
     options[:tcp] << {:host => host, :port => port}
   end
 
-  opts.on("-s", "--sipatra") do
-    options[:sipatra] = true
+  opts.on("-w", "--war") do
+    options[:war] = true
+  end
+
+  opts.on("-e EXAMPLE", "--example EXAMPLE") do |example_name|
+    options[:example] = example_name
   end
 end
 option_parser.parse!
@@ -31,10 +35,13 @@ option_parser.parse!
 #puts options.inspect
 
 dir_or_file = ARGV.shift
+if options[:example]
+  dir_or_file = File.join(File.dirname(__FILE__), '../examples', options[:example], 'sample.rb')
+end
 
-raise "No application to start." if dir_or_file.nil?
+raise "No application (or WAR) to start." if dir_or_file.nil?
 
-if(File.directory?(dir_or_file) || dir_or_file[-4..-1] == '.war') 
+if options[:war]
   options[:war] = dir_or_file
 else
   options[:app_file] = dir_or_file

data/lib/kipatra.rb

@@ -1,12 +1,12 @@
 require 'kipatra/cipango'
+require 'kipatra/sipatra'
 
 module Kipatra
   class Server
     include Cipango
 
     def initialize(opts)
-      @war, @app_file, @sipatra, @tcp, @udp = opts[:war], opts[:app_file], opts[:sipatra], opts[:tcp], opts[:udp]
-      # useless
+      @war, @app_file, @tcp, @udp = opts[:war], opts[:app_file], opts[:tcp], opts[:udp]
       unless @war || @app_file
         raise ArgumentError, "Either :war or :app_file must be defined"
       end
@@ -35,6 +35,10 @@ module Kipatra
     def manage_connectors
       conns = []
 
+      if @udp.empty? and @tcp.empty?
+        @udp = [{:host => '0.0.0.0', :port => 5060}]
+      end
+
       @udp.each do |args|
         conn = UdpConnector.new
         conn.host, conn.port = args[:host], args[:port]
@@ -56,16 +60,15 @@ module Kipatra
         ctxt = SipAppContext.new
         ctxt.context_path = '/'
         ctxt.war = @war
-      elsif @sipatra
-        ctxt = SipAppContext.new('/', '/')
-        proc = Proc.new {}
-        servlet = eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '../lib/sipatra_app.rb'))), proc.binding, 'lib/sipatra_app.rb')
-        ctxt.add_sip_servlet SipServletHolder::new(servlet)
       else
-        ctxt = SipAppContext.new('/', '/')
+        ctxt = SipAppContext.new('/', '.')
         proc = Proc.new {}
-        servlet = eval(File.read(@app_file), proc.binding, @app_file)
-        ctxt.add_sip_servlet SipServletHolder::new(servlet)
+        begin
+          load @app_file
+        rescue Exception => e
+          raise "Sipatra Load Error : #{e.inspect}\n#{e.backtrace.join("\n")}"
+        end
+        ctxt.add_sip_servlet SipServletHolder.new(SipatraServlet.new)
       end
 
       ctxt

data/lib/kipatra/sipatra.rb

@@ -0,0 +1,30 @@
+require 'sipatra'
+require 'logger'
+
+module Kipatra
+  class SipatraServlet < Kipatra::Cipango::SipServlet
+    def doRequest(req)
+      invoke req, :do_request
+    end
+
+    def doResponse(req)
+      invoke req, :do_response
+    end
+
+    private
+
+    def invoke(msg, method_name)
+      begin
+        log = Logger.new(STDOUT)
+        app = Sipatra::Application::new
+        session = msg.session
+        app.set_bindings session.servlet_context, session.servlet_context.getAttribute(Kipatra::Cipango::SipServlet::SIP_FACTORY), session, msg, log
+        app.send method_name
+      rescue => e
+        # TODO XXX
+        puts "SIPATRA EXCEPTION: #{e}\n#{e.backtrace.join("\n")}"
+
+      end
+    end
+  end
+end

data/lib/kipatra/version.rb

@@ -0,0 +1,3 @@
+module Kipatra
+  VERSION = "0.1.2"
+end

metadata

@@ -1,85 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kipatra
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
-  - Dominique Broeglin
+authors:
+- Dominique Broeglin
+- Alexandre Moutot
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-13 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.0.0
-    type: :development
-    version_requirements: *id001
+date: 2012-07-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sipatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Cipango powered Sipatra server
-email: dominique.broeglin@gmail.com
-executables: 
-  - kipatra
+email:
+- dominique.broeglin@gmail.com
+- alexscottt@gmail.com
+executables:
+- kipatra
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-  - LICENSES
-files: 
-  - lib/kipatra.rb
-  - lib/kipatra/cipango.rb
-  - lib/kipatra/cipango/cipango-dar-2.0.0.jar
-  - lib/kipatra/cipango/cipango-deploy-2.0.0.jar
-  - lib/kipatra/cipango/cipango-server-2.0.0.jar
-  - lib/kipatra/cipango/jetty-continuation-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-http-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-io-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-security-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-server-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-servlet-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-util-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-webapp-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/jetty-xml-7.2.2.v20101205.jar
-  - lib/kipatra/cipango/servlet-api-2.5.jar
-  - lib/kipatra/cipango/sip-api-1.1.jar
-  - lib/sipatra/log4j-1.2.17.jar
-  - lib/sipatra_app.rb
-  - bin/kipatra
-  - LICENSES
-  - README.md
+extra_rdoc_files:
+- README.md
+- LICENSES
+files:
+- lib/kipatra.rb
+- lib/kipatra/cipango.rb
+- lib/kipatra/cipango/cipango-dar-2.0.0.jar
+- lib/kipatra/cipango/cipango-deploy-2.0.0.jar
+- lib/kipatra/cipango/cipango-server-2.0.0.jar
+- lib/kipatra/cipango/jetty-continuation-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-http-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-io-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-security-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-server-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-servlet-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-util-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-webapp-7.2.2.v20101205.jar
+- lib/kipatra/cipango/jetty-xml-7.2.2.v20101205.jar
+- lib/kipatra/cipango/servlet-api-2.5.jar
+- lib/kipatra/cipango/sip-api-1.1.jar
+- lib/kipatra/sipatra.rb
+- lib/kipatra/version.rb
+- bin/kipatra
+- LICENSES
+- README.md
 homepage: http://github.com/dbroeglin/kipatra
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sipatra server powered by Cipango
 test_files: []
-

data/lib/sipatra_app.rb

@@ -1,39 +0,0 @@
-require 'sipatra'
-require 'sipatra/log4j-1.2.17.jar'
-include_class "org.apache.log4j.Logger"
-
-if File.exists?("log4j.properties")
-  include_class "org.apache.log4j.PropertyConfigurator"
-  PropertyConfigurator.configure("log4j.properties")
-else
-  include_class "org.apache.log4j.BasicConfigurator"
-  BasicConfigurator.configure
-end
-
-begin
-  load @app_file
-rescue Exception => e
-  puts "Load Error : #{e.inspect}\n#{e.backtrace.join("\n")}"
-end
-
-class SipatraApp < Kipatra::Cipango::SipServlet
-  def doRequest(req)
-    invoke req, :do_request
-  end
-
-  def doResponse(req)
-    invoke req, :do_response
-  end
-
-  private
-
-  def invoke(msg, method_name)
-    log = Logger.getLogger('Kipatra')
-    app = Sipatra::Application::new
-    session = msg.session
-    app.set_bindings session.servlet_context, session.servlet_context.getAttribute(Kipatra::Cipango::SipServlet::SIP_FACTORY), session, msg, log
-    app.send method_name
-  end
-end
-
-SipatraApp.new