eventmachine-eventmachine_httpserver 0.1.2 → 0.2.0

data/eventmachine_httpserver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eventmachine_httpserver}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca"]

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-eventmachine_httpserver
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Francis Cianfrocca