From 9a1895539db72bff6d75b16399e00fd34940f9ad Mon Sep 17 00:00:00 2001 From: zedshaw Date: Tue, 7 Mar 2006 01:44:24 +0000 Subject: Support for Camping as a first-class citizen. The postamble is now one or two lines. git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@85 19e92222-5c0b-0410-8929-a290d50e31e9 --- examples/camping/blog.rb | 28 ++++------------------------ examples/camping/tepee.rb | 26 +++----------------------- 2 files changed, 7 insertions(+), 47 deletions(-) (limited to 'examples') diff --git a/examples/camping/blog.rb b/examples/camping/blog.rb index ba0e041..14e4c4f 100755 --- a/examples/camping/blog.rb +++ b/examples/camping/blog.rb @@ -267,34 +267,14 @@ def Blog.create end if __FILE__ == $0 - require 'thread' - - class CampingHandler < Mongrel::HttpHandler - def initialize(klass) - @klass = klass - end - def process(request, response) - req = StringIO.new(request.body) - controller = @klass.run(req, request.params) - response.start(controller.status) do |head,out| - controller.headers.each do |k, v| - [*v].each do |vi| - head[k] = vi - end - end - out << controller.body - end - end - end + require 'mongrel/camping' Blog::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'blog.db' Blog::Models::Base.logger = Logger.new('camping.log') Blog::Models::Base.threaded_connections=false Blog.create - h = Mongrel::HttpServer.new("0.0.0.0", "3000") - puts "** Blog example is running at http://localhost:3000/blog" - h.register("/blog", CampingHandler.new(Blog)) - h.register("/favicon.ico", Mongrel::Error404Handler.new("")) - h.run.join + server = Mongrel::Camping::start("0.0.0.0",3002,"/blog",Blog) + puts "** Blog example is running at http://localhost:3002/blog" + server.join end diff --git a/examples/camping/tepee.rb b/examples/camping/tepee.rb index b49ca7b..6f3ef21 100644 --- a/examples/camping/tepee.rb +++ b/examples/camping/tepee.rb @@ -135,34 +135,14 @@ def Tepee.create end if __FILE__ == $0 - require 'thread' - - class CampingHandler < Mongrel::HttpHandler - def initialize(klass) - @klass = klass - end - def process(request, response) - req = StringIO.new(request.body) - controller = @klass.run(req, request.params) - response.start(controller.status) do |head,out| - controller.headers.each do |k, v| - [*v].each do |vi| - head[k] = vi - end - end - out << controller.body - end - end - end + require 'mongrel/camping' Tepee::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'tepee.db' Tepee::Models::Base.logger = Logger.new('camping.log') Tepee::Models::Base.threaded_connections=false Tepee.create - h = Mongrel::HttpServer.new("0.0.0.0", "3000") + server = Mongrel::Camping::start("0.0.0.0",3001,"/tepee",Tepee) puts "** Tepee example is running at http://localhost:3000/tepee" - h.register("/tepee", CampingHandler.new(Tepee)) - h.register("/favicon.ico", Mongrel::Error404Handler.new("")) - h.run.join + server.join end -- cgit v1.2.3-24-ge0c7