eventmachine_httpserver 0.1.1 → 0.2.0

data/README

@@ -0,0 +1,48 @@
+= eventmachine_httpserver
+
+== EM::HttpServer vs Thin
+
+     +careo | is there a 25 word version of how it differs from thin?
+      +tmm1 | good question.. its probably faster, but only because it doesn't have a real http parser like thin
+  +wyhaines | It is faster.  It's more of an nginx style parser than the mongrel, grammar based parser.
+     +careo | so perhaps a better fit for putting an http interface on top of a bunch of already-evented code?
+  +wyhaines | careo: It depends.  There are very valid arguments for using an RFC-compliant parser a lot of the time.
+  +wyhaines | But, yeah, sometimes being strictly RFC compliant isn't something that you care about.
+
+== Usage example
+
+  require 'eventmachine'
+  require 'evma_httpserver'
+
+  class MyHttpServer < EM::Connection
+    include EM::HttpServer
+
+     def post_init
+       super
+       no_environment_strings
+     end
+
+    def process_http_request
+      # the http request details are available via the following instance variables:
+      #   @http_protocol
+      #   @http_request_method
+      #   @http_cookie
+      #   @http_if_none_match
+      #   @http_content_type
+      #   @http_path_info
+      #   @http_request_uri
+      #   @http_query_string
+      #   @http_post_content
+      #   @http_headers
+
+      response = EM::DelegatedHttpResponse.new(self)
+      response.status = 200
+      response.content_type 'text/html'
+      response.content = '<center><h1>Hi there</h1></center>'
+      response.send_response
+    end
+  end
+
+  EM.run{
+    EM.start_server '0.0.0.0', 8080, MyHttpServer
+  }

data/eventmachine_httpserver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eventmachine_httpserver}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca"]
@@ -12,13 +12,12 @@ Gem::Specification.new do |s|
   s.email = %q{garbagecat10@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["docs/COPYING", "docs/README", "docs/RELEASE_NOTES"]
-  s.files = ["Rakefile", "docs/COPYING", "docs/README", "docs/RELEASE_NOTES", "eventmachine_httpserver.gemspec", "eventmachine_httpserver.gemspec.tmpl", "ext/extconf.rb", "ext/http.cpp", "ext/http.h", "ext/rubyhttp.cpp", "lib/evma_httpserver.rb", "lib/evma_httpserver/response.rb", "test/test_app.rb", "test/test_delegated.rb", "test/test_response.rb"]
-  s.has_rdoc = true
+  s.files = ["README", "Rakefile", "docs/COPYING", "docs/README", "docs/RELEASE_NOTES", "eventmachine_httpserver.gemspec", "eventmachine_httpserver.gemspec.tmpl", "ext/extconf.rb", "ext/http.cpp", "ext/http.h", "ext/rubyhttp.cpp", "lib/evma_httpserver.rb", "lib/evma_httpserver/response.rb", "test/test_app.rb", "test/test_delegated.rb", "test/test_response.rb"]
   s.homepage = %q{http://rubyeventmachine.com}
   s.rdoc_options = ["--title", "EventMachine_HttpServer", "--main", "docs/README", "--line-numbers"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{EventMachine HTTP Server}
 
   if s.respond_to? :specification_version then

data/eventmachine_httpserver.gemspec.tmpl

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{eventmachine_httpserver}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.specification_version = 1 if s.respond_to? :specification_version=
 
@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{EventMachine HTTP Server}
-end
+end

data/ext/http.cpp

@@ -170,6 +170,15 @@ void HttpConnection_t::ConsumeData (const char *data, int length)
 				_Content = NULL;
 			}
 			RequestMethod = NULL;
+			#ifdef OS_WIN32
+			Cookie.erase(Cookie.begin(),Cookie.end());
+			IfNoneMatch.erase(IfNoneMatch.begin(),IfNoneMatch.end());
+			ContentType.erase(ContentType.begin(),ContentType.end());
+			PathInfo.erase(PathInfo.begin(),PathInfo.end());
+			RequestUri.erase(RequestUri.begin(),RequestUri.end());
+			QueryString.erase(QueryString.begin(),QueryString.end());
+			Protocol.erase(Protocol.begin(),Protocol.end());
+			#else
 			Cookie.clear();
 			IfNoneMatch.clear();
 			ContentType.clear();
@@ -177,6 +186,7 @@ void HttpConnection_t::ConsumeData (const char *data, int length)
 			RequestUri.clear();
 			QueryString.clear();
 			Protocol.clear();
+			#endif
 
 			if (bSetEnvironmentStrings) {
 				unsetenv ("REQUEST_METHOD");
@@ -460,7 +470,8 @@ bool HttpConnection_t::_InterpretRequest (const char *header)
 	const char *questionmark = strchr (blank, '?');
 	if (questionmark && (questionmark >= blank2))
 		questionmark = NULL;
-	const char *fragment = strpbrk ((questionmark ? (questionmark+1) : blank), "#;");
+	// const char *fragment = strpbrk ((questionmark ? (questionmark+1) : blank), "#;");
+	const char *fragment = strpbrk ((questionmark ? (questionmark+1) : blank), "#");
 	if (fragment && (fragment >= blank2))
 		fragment = NULL;
 
@@ -482,7 +493,11 @@ bool HttpConnection_t::_InterpretRequest (const char *header)
 		string req (blank, fragment - blank);
 		PathInfo = req.c_str();
 		RequestUri = req.c_str();
+		#ifdef OS_WIN32
+		QueryString.erase(QueryString.begin(),QueryString.end());
+		#else
 		QueryString.clear();
+		#endif
 		if (bSetEnvironmentStrings) {
 			setenv ("PATH_INFO", req.c_str(), true);
 			setenv ("REQUEST_URI", req.c_str(), true);
@@ -494,7 +509,11 @@ bool HttpConnection_t::_InterpretRequest (const char *header)
 		string req (blank, blank2 - blank);
 		PathInfo = req.c_str();
 		RequestUri = req.c_str();
+		#ifdef OS_WIN32
+		QueryString.erase(QueryString.begin(),QueryString.end());
+		#else
 		QueryString.clear();
+		#endif
 		if (bSetEnvironmentStrings) {
 			setenv ("PATH_INFO", req.c_str(), true);
 			setenv ("REQUEST_URI", req.c_str(), true);

data/ext/rubyhttp.cpp

@@ -170,7 +170,7 @@ void RubyHttpConnection_t::ProcessRequest (const char *request_method,
 Statics
 *******/
 
-
+VALUE Intern_http_conn;
 
 /***********
 t_post_init
@@ -182,7 +182,7 @@ static VALUE t_post_init (VALUE self)
 	if (!hc)
 		throw std::runtime_error ("no http-connection object");
 
-	rb_ivar_set (self, rb_intern ("@http______conn"), INT2NUM ((long)hc));
+	rb_ivar_set (self, Intern_http_conn, LONG2NUM ((long)hc));
 	return Qnil;
 }
 
@@ -194,7 +194,7 @@ t_receive_data
 static VALUE t_receive_data (VALUE self, VALUE data)
 {
 	int length = NUM2INT (rb_funcall (data, rb_intern ("length"), 0));
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2INT (rb_ivar_get (self, rb_intern ("@http______conn"))));
+	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
 	if (hc)
 		hc->ConsumeData (StringValuePtr (data), length);
 	return Qnil;
@@ -216,7 +216,7 @@ t_unbind
 
 static VALUE t_unbind (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2INT (rb_ivar_get (self, rb_intern ("@http______conn"))));
+	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
 	if (hc)
 		delete hc;
 	return Qnil;
@@ -240,7 +240,7 @@ t_no_environment_strings
 
 static VALUE t_no_environment_strings (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2INT (rb_ivar_get (self, rb_intern ("@http______conn"))));
+	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
 	if (hc)
 		hc->SetNoEnvironmentStrings();
 	return Qnil;
@@ -252,7 +252,7 @@ t_dont_accumulate_post
 
 static VALUE t_dont_accumulate_post (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2INT (rb_ivar_get (self, rb_intern ("@http______conn"))));
+	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
 	if (hc)
 		hc->SetDontAccumulatePost();
 	return Qnil;
@@ -265,17 +265,15 @@ Init_eventmachine_httpserver
 
 extern "C" void Init_eventmachine_httpserver()
 {
-	// INCOMPLETE, we need to define class Connections inside module EventMachine
-  
-	VALUE Monorail = rb_define_module ("EventMachine");
-	VALUE EmModule = rb_define_module_under (Monorail, "HttpServer");
-	rb_define_method (EmModule, "post_init", (VALUE(*)(...))t_post_init, 0);
-	rb_define_method (EmModule, "receive_data", (VALUE(*)(...))t_receive_data, 1);
-	rb_define_method (EmModule, "receive_post_data", (VALUE(*)(...))t_receive_post_data, 1);
-	rb_define_method (EmModule, "unbind", (VALUE(*)(...))t_unbind, 0);
-	rb_define_method (EmModule, "process_http_request", (VALUE(*)(...))t_process_http_request, 0);
-	rb_define_method (EmModule, "no_environment_strings", (VALUE(*)(...))t_no_environment_strings, 0);
-	rb_define_method (EmModule, "dont_accumulate_post", (VALUE(*)(...))t_dont_accumulate_post, 0);
+	Intern_http_conn = rb_intern ("http_conn");
+
+	VALUE EmModule = rb_define_module ("EventMachine");
+	VALUE HttpServer = rb_define_module_under (EmModule, "HttpServer");
+	rb_define_method (HttpServer, "post_init", (VALUE(*)(...))t_post_init, 0);
+	rb_define_method (HttpServer, "receive_data", (VALUE(*)(...))t_receive_data, 1);
+	rb_define_method (HttpServer, "receive_post_data", (VALUE(*)(...))t_receive_post_data, 1);
+	rb_define_method (HttpServer, "unbind", (VALUE(*)(...))t_unbind, 0);
+	rb_define_method (HttpServer, "process_http_request", (VALUE(*)(...))t_process_http_request, 0);
+	rb_define_method (HttpServer, "no_environment_strings", (VALUE(*)(...))t_no_environment_strings, 0);
+	rb_define_method (HttpServer, "dont_accumulate_post", (VALUE(*)(...))t_dont_accumulate_post, 0);
 }
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine_httpserver
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Francis Cianfrocca
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2007-03-16 00:00:00 +00:00
+date: 2007-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - docs/README
 - docs/RELEASE_NOTES
 files: 
+- README
 - Rakefile
 - docs/COPYING
 - docs/README
@@ -40,6 +41,8 @@ files:
 - test/test_response.rb
 has_rdoc: true
 homepage: http://rubyeventmachine.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -64,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 1
 summary: EventMachine HTTP Server