pauldix-typhoeus 0.1.0 → 0.1.1

data/ext/typhoeus/native.c

@@ -4,8 +4,8 @@ VALUE mTyphoeus;
 
 void Init_native()
 {
-	mTyphoeus = rb_const_get(rb_cObject, rb_intern("Typhoeus"));
-	
-	init_typhoeus_easy();
-	init_typhoeus_multi();
-}
+  mTyphoeus = rb_const_get(rb_cObject, rb_intern("Typhoeus"));
+
+  init_typhoeus_easy();
+  init_typhoeus_multi();
+}

data/ext/typhoeus/native.h

@@ -6,6 +6,9 @@
 #include <curl/easy.h>
 #include <curl/multi.h>
 
+void Init_native();
 extern VALUE mTyphoeus;
+extern void init_typhoeus_easy();
+extern void init_typhoeus_multi();
 
-#endif
+#endif

data/ext/typhoeus/typhoeus_easy.c

@@ -1,206 +1,207 @@
 #include <typhoeus_easy.h>
-	
+
 static VALUE idAppend;
 VALUE cTyphoeusEasy;
 
 static void dealloc(CurlEasy *curl_easy) {
-	if (curl_easy->request_chunk != NULL) {
-		free(curl_easy->request_chunk);
-	}
-	
-	if (curl_easy->headers != NULL) {
-		curl_slist_free_all(curl_easy->headers);
-	}
-	
-	curl_easy_cleanup(curl_easy->curl);
-	
-	free(curl_easy);
+  if (curl_easy->request_chunk != NULL) {
+    free(curl_easy->request_chunk);
+  }
+
+  if (curl_easy->headers != NULL) {
+    curl_slist_free_all(curl_easy->headers);
+  }
+
+  curl_easy_cleanup(curl_easy->curl);
+
+  free(curl_easy);
 }
 
 static VALUE easy_setopt_string(VALUE self, VALUE opt_name, VALUE parameter) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	long opt = NUM2LONG(opt_name);
-	curl_easy_setopt(curl_easy->curl, opt, StringValuePtr(parameter));
-	return opt_name;
+  long opt = NUM2LONG(opt_name);
+  curl_easy_setopt(curl_easy->curl, opt, StringValuePtr(parameter));
+  return opt_name;
 }
 
 static VALUE easy_setopt_long(VALUE self, VALUE opt_name, VALUE parameter) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	long opt = NUM2LONG(opt_name);
-	curl_easy_setopt(curl_easy->curl, opt, NUM2LONG(parameter));
-	return opt_name;	
+  long opt = NUM2LONG(opt_name);
+  curl_easy_setopt(curl_easy->curl, opt, NUM2LONG(parameter));
+  return opt_name;
 }
 
 static VALUE easy_getinfo_string(VALUE self, VALUE info) {
-	char *info_string;
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  char *info_string;
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	long opt = NUM2LONG(info);
-	curl_easy_getinfo(curl_easy->curl, opt, &info_string);
-	
-	return rb_str_new2(info_string);
+  long opt = NUM2LONG(info);
+  curl_easy_getinfo(curl_easy->curl, opt, &info_string);
+
+  return rb_str_new2(info_string);
 }
 
 static VALUE easy_getinfo_long(VALUE self, VALUE info) {
-	long info_long;
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  long info_long;
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
+
+  long opt = NUM2LONG(info);
+  curl_easy_getinfo(curl_easy->curl, opt, &info_long);
 
-	long opt = NUM2LONG(info);
-	curl_easy_getinfo(curl_easy->curl, opt, &info_long);
-	
-	return LONG2NUM(info_long);
+  return LONG2NUM(info_long);
 }
 
 static VALUE easy_getinfo_double(VALUE self, VALUE info) {
-	double info_double = 0;
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  double info_double = 0;
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	long opt = NUM2LONG(info);
-	curl_easy_getinfo(curl_easy->curl, opt, &info_double);
+  long opt = NUM2LONG(info);
+  curl_easy_getinfo(curl_easy->curl, opt, &info_double);
 
-	return rb_float_new(info_double);
+  return rb_float_new(info_double);
 }
 
 static VALUE easy_perform(VALUE self) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
-	curl_easy_perform(curl_easy->curl);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
+  curl_easy_perform(curl_easy->curl);
 
-	return Qnil;
+  return Qnil;
 }
 
 static size_t write_data_handler(char *stream, size_t size, size_t nmemb, VALUE val) {
-	rb_funcall(val, idAppend, 1, rb_str_new(stream, size * nmemb));
-	return size * nmemb;
+  long stream_size = (long)(size * nmemb);
+  rb_funcall(val, idAppend, 1, rb_str_new(stream, stream_size));
+  return size * nmemb;
 }
 
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *data) {
-	int realsize = size * nmemb;
-	RequestChunk *mem = (RequestChunk *)data;
+  size_t realsize = size * nmemb;
+  RequestChunk *mem = (RequestChunk *)data;
+
+  if (realsize > mem->size - mem->read) {
+    realsize = mem->size - mem->read;
+  }
 
-	if (realsize > mem->size - mem->read) {
-		realsize = mem->size - mem->read;
-	}
-	
-	if (realsize != 0) {
-		memcpy(ptr, &(mem->memory[mem->read]), realsize);
-		mem->read += realsize;
-	}
-	
-	return realsize; 
+  if (realsize != 0) {
+    memcpy(ptr, &(mem->memory[mem->read]), realsize);
+    mem->read += realsize;
+  }
+
+  return realsize;
 }
 
 static void set_response_handlers(VALUE easy, CURL *curl) {
-	rb_iv_set(easy, "@response_body", rb_str_new2(""));
-	rb_iv_set(easy, "@response_header", rb_str_new2(""));
-	
+  rb_iv_set(easy, "@response_body", rb_str_new2(""));
+  rb_iv_set(easy, "@response_header", rb_str_new2(""));
+
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&write_data_handler);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, rb_iv_get(easy, "@response_body"));	
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, rb_iv_get(easy, "@response_body"));
   curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&write_data_handler);
   curl_easy_setopt(curl, CURLOPT_HEADERDATA, rb_iv_get(easy, "@response_header"));
 }
 
 static VALUE easy_reset(VALUE self) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
+
+  if (curl_easy->request_chunk != NULL) {
+    free(curl_easy->request_chunk);
+    curl_easy->request_chunk = NULL;
+  }
 
-	if (curl_easy->request_chunk != NULL) {
-		free(curl_easy->request_chunk);
-		curl_easy->request_chunk = NULL;
-	}
-	
-	if (curl_easy->headers != NULL) {
-		curl_slist_free_all(curl_easy->headers);
-		curl_easy->headers = NULL;
-	}
+  if (curl_easy->headers != NULL) {
+    curl_slist_free_all(curl_easy->headers);
+    curl_easy->headers = NULL;
+  }
 
-	curl_easy_reset(curl_easy->curl);
+  curl_easy_reset(curl_easy->curl);
 
-	set_response_handlers(self, curl_easy->curl);
-	
-	return Qnil;	
+  set_response_handlers(self, curl_easy->curl);
+
+  return Qnil;
 }
 
 static VALUE easy_add_header(VALUE self, VALUE header) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
-	
-	curl_easy->headers = curl_slist_append(curl_easy->headers, RSTRING_PTR(header));
-	return header;
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
+
+  curl_easy->headers = curl_slist_append(curl_easy->headers, RSTRING_PTR(header));
+  return header;
 }
 
 static VALUE easy_set_headers(VALUE self) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
+
+  curl_easy_setopt(curl_easy->curl, CURLOPT_HTTPHEADER, curl_easy->headers);
 
-	curl_easy_setopt(curl_easy->curl, CURLOPT_HTTPHEADER, curl_easy->headers);
-	
-	return Qnil;
+  return Qnil;
 }
 
 static VALUE easy_set_request_body(VALUE self, VALUE data, VALUE content_length_header) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	curl_easy->request_chunk = ALLOC(RequestChunk);
-	curl_easy->request_chunk->size = RSTRING_LEN(data);
-	curl_easy->request_chunk->memory = StringValuePtr(data);
-	curl_easy->request_chunk->read = 0;
+  curl_easy->request_chunk = ALLOC(RequestChunk);
+  curl_easy->request_chunk->size = RSTRING_LEN(data);
+  curl_easy->request_chunk->memory = StringValuePtr(data);
+  curl_easy->request_chunk->read = 0;
 
   curl_easy_setopt(curl_easy->curl, CURLOPT_READFUNCTION, (curl_read_callback)read_callback);
   curl_easy_setopt(curl_easy->curl, CURLOPT_READDATA, curl_easy->request_chunk);
-	curl_easy_setopt(curl_easy->curl, CURLOPT_INFILESIZE, RSTRING_LEN(data));
+  curl_easy_setopt(curl_easy->curl, CURLOPT_INFILESIZE, RSTRING_LEN(data));
 
-	return Qnil;
+  return Qnil;
 }
 
 static VALUE easy_escape(VALUE self, VALUE data, VALUE length) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(self, CurlEasy, curl_easy);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	return rb_str_new2(curl_easy_escape(curl_easy->curl, StringValuePtr(data), NUM2INT(length)));
+  return rb_str_new2(curl_easy_escape(curl_easy->curl, StringValuePtr(data), NUM2INT(length)));
 }
 
 static VALUE version(VALUE self) {
-	return rb_str_new2(curl_version());
+  return rb_str_new2(curl_version());
 }
 
 static VALUE new(int argc, VALUE *argv, VALUE klass) {
-	CURL *curl = curl_easy_init();
-	CurlEasy *curl_easy = ALLOC(CurlEasy);
-	curl_easy->curl = curl;
-	curl_easy->headers = NULL;
-	curl_easy->request_chunk = NULL;
-	VALUE easy = Data_Wrap_Struct(cTyphoeusEasy, 0, dealloc, curl_easy);
+  CURL *curl = curl_easy_init();
+  CurlEasy *curl_easy = ALLOC(CurlEasy);
+  curl_easy->curl = curl;
+  curl_easy->headers = NULL;
+  curl_easy->request_chunk = NULL;
+  VALUE easy = Data_Wrap_Struct(cTyphoeusEasy, 0, dealloc, curl_easy);
 
-	set_response_handlers(easy, curl);
+  set_response_handlers(easy, curl);
 
-	rb_obj_call_init(easy, argc, argv);
+  rb_obj_call_init(easy, argc, argv);
 
-	return easy;
+  return easy;
 }
 
 void init_typhoeus_easy() {
-	VALUE klass = cTyphoeusEasy = rb_define_class_under(mTyphoeus, "Easy", rb_cObject);
-	idAppend = rb_intern("<<");
-	rb_define_singleton_method(klass, "new", new, -1);
-	rb_define_private_method(klass, "easy_setopt_string", easy_setopt_string, 2);
-	rb_define_private_method(klass, "easy_setopt_long", easy_setopt_long, 2);
-	rb_define_private_method(klass, "easy_getinfo_string", easy_getinfo_string, 1);
-	rb_define_private_method(klass, "easy_getinfo_long", easy_getinfo_long, 1);
-	rb_define_private_method(klass, "easy_getinfo_double", easy_getinfo_double, 1);
-	rb_define_private_method(klass, "easy_perform", easy_perform, 0);
-	rb_define_private_method(klass, "easy_reset", easy_reset, 0);
-	rb_define_private_method(klass, "easy_set_request_body", easy_set_request_body, 1);
-	rb_define_private_method(klass, "easy_set_headers", easy_set_headers, 0);
-	rb_define_private_method(klass, "easy_add_header", easy_add_header, 1);
-	rb_define_private_method(klass, "easy_escape", easy_escape, 2);
-	rb_define_private_method(klass, "version", version, 0);
+  VALUE klass = cTyphoeusEasy = rb_define_class_under(mTyphoeus, "Easy", rb_cObject);
+  idAppend = rb_intern("<<");
+  rb_define_singleton_method(klass, "new", new, -1);
+  rb_define_private_method(klass, "easy_setopt_string", easy_setopt_string, 2);
+  rb_define_private_method(klass, "easy_setopt_long", easy_setopt_long, 2);
+  rb_define_private_method(klass, "easy_getinfo_string", easy_getinfo_string, 1);
+  rb_define_private_method(klass, "easy_getinfo_long", easy_getinfo_long, 1);
+  rb_define_private_method(klass, "easy_getinfo_double", easy_getinfo_double, 1);
+  rb_define_private_method(klass, "easy_perform", easy_perform, 0);
+  rb_define_private_method(klass, "easy_reset", easy_reset, 0);
+  rb_define_private_method(klass, "easy_set_request_body", easy_set_request_body, 1);
+  rb_define_private_method(klass, "easy_set_headers", easy_set_headers, 0);
+  rb_define_private_method(klass, "easy_add_header", easy_add_header, 1);
+  rb_define_private_method(klass, "easy_escape", easy_escape, 2);
+  rb_define_private_method(klass, "version", version, 0);
 }

data/ext/typhoeus/typhoeus_easy.h

@@ -5,15 +5,15 @@
 
 void init_typhoeus_easy();
 typedef struct {
-	const char *memory;
-	int size;
-	int read;
+  const char *memory;
+  int size;
+  int read;
 } RequestChunk;
 
 typedef struct {
-	RequestChunk *request_chunk;
-	CURL *curl;
-	struct curl_slist *headers;
+  RequestChunk *request_chunk;
+  CURL *curl;
+  struct curl_slist *headers;
 } CurlEasy;
 
-#endif
+#endif

data/ext/typhoeus/typhoeus_multi.c

@@ -3,23 +3,23 @@
 static void multi_read_info(VALUE self, CURLM *multi_handle);
 
 static void dealloc(CurlMulti *curl_multi) {
-	curl_multi_cleanup(curl_multi->multi);
-	free(curl_multi);
+  curl_multi_cleanup(curl_multi->multi);
+  free(curl_multi);
 }
 
 static VALUE multi_add_handle(VALUE self, VALUE easy) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(easy, CurlEasy, curl_easy);
-	CurlMulti *curl_multi;
-	Data_Get_Struct(self, CurlMulti, curl_multi);
+  CurlEasy *curl_easy;
+  Data_Get_Struct(easy, CurlEasy, curl_easy);
+  CurlMulti *curl_multi;
+  Data_Get_Struct(self, CurlMulti, curl_multi);
   CURLMcode mcode;
 
   mcode = curl_multi_add_handle(curl_multi->multi, curl_easy->curl);
   if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
-    rb_raise(mcode, "An error occured adding the handle");
+    rb_raise((VALUE)mcode, "An error occured adding the handle");
   }
 
-	curl_easy_setopt(curl_easy->curl, CURLOPT_PRIVATE, easy);
+  curl_easy_setopt(curl_easy->curl, CURLOPT_PRIVATE, easy);
   curl_multi->active++;
 
   if (mcode == CURLM_CALL_MULTI_PERFORM) {
@@ -27,23 +27,23 @@ static VALUE multi_add_handle(VALUE self, VALUE easy) {
   }
   // 
   // if (curl_multi->running) {
-  // 		printf("call read_info on add<br/>");
+  //     printf("call read_info on add<br/>");
   //   multi_read_info(self, curl_multi->multi);
   // }
-	
-	return easy;	
+
+  return easy;
 }
 
 static VALUE multi_remove_handle(VALUE self, VALUE easy) {
-	CurlEasy *curl_easy;
-	Data_Get_Struct(easy, CurlEasy, curl_easy);
-	CurlMulti *curl_multi;
-	Data_Get_Struct(self, CurlMulti, curl_multi);
-	
-	curl_multi->active--;
-	curl_multi_remove_handle(curl_multi->multi, curl_easy->curl);
-	
-	return easy;
+  CurlEasy *curl_easy;
+  Data_Get_Struct(easy, CurlEasy, curl_easy);
+  CurlMulti *curl_multi;
+  Data_Get_Struct(self, CurlMulti, curl_multi);
+
+  curl_multi->active--;
+  curl_multi_remove_handle(curl_multi->multi, curl_easy->curl);
+
+  return easy;
 }
 
 static void multi_read_info(VALUE self, CURLM *multi_handle) {
@@ -51,7 +51,7 @@ static void multi_read_info(VALUE self, CURLM *multi_handle) {
   CURLMsg *msg;
   CURLcode ecode;
   CURL *easy_handle;
-	VALUE easy;
+  VALUE easy;
 
   /* check for finished easy handles and remove from the multi handle */
   while ((msg = curl_multi_info_read(multi_handle, &msgs_left))) {
@@ -70,29 +70,29 @@ static void multi_read_info(VALUE self, CURLM *multi_handle) {
 
       long response_code = -1;
       curl_easy_getinfo(easy_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
-			// TODO: find out what the real problem is here and fix it.
-			// this next bit is a horrible hack. For some reason my tests against a local server on my laptop
-			// fail intermittently and return this result number. However, it will succeed if you try it a few
-			// more times. Also noteworthy is that this doens't happen when hitting an external server. WTF?!
-			if (result == 7) {
-				VALUE max_retries = rb_funcall(easy, rb_intern("max_retries?"), 0);
-				if (max_retries != Qtrue) {
-					multi_remove_handle(self, easy);
-					multi_add_handle(self, easy);
-					CurlMulti *curl_multi;
-					Data_Get_Struct(self, CurlMulti, curl_multi);
-			    curl_multi_perform(curl_multi->multi, &(curl_multi->running));
-
-					rb_funcall(easy, rb_intern("increment_retries"), 0);
-				
-					continue;
-				}
-			}
-			multi_remove_handle(self, easy);
+
+      // TODO: find out what the real problem is here and fix it.
+      // this next bit is a horrible hack. For some reason my tests against a local server on my laptop
+      // fail intermittently and return this result number. However, it will succeed if you try it a few
+      // more times. Also noteworthy is that this doens't happen when hitting an external server. WTF?!
+      if (result == 7) {
+        VALUE max_retries = rb_funcall(easy, rb_intern("max_retries?"), 0);
+        if (max_retries != Qtrue) {
+          multi_remove_handle(self, easy);
+          multi_add_handle(self, easy);
+          CurlMulti *curl_multi;
+          Data_Get_Struct(self, CurlMulti, curl_multi);
+          curl_multi_perform(curl_multi->multi, &(curl_multi->running));
+
+          rb_funcall(easy, rb_intern("increment_retries"), 0);
+
+          continue;
+        }
+      }
+      multi_remove_handle(self, easy);
 
       if (result != 0) {
-				rb_funcall(easy, rb_intern("failure"), 0);
+        rb_funcall(easy, rb_intern("failure"), 0);
       }
       else if ((response_code >= 200 && response_code < 300) || response_code == 0) {
         rb_funcall(easy, rb_intern("success"), 0);
@@ -113,7 +113,7 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
   } while (mcode == CURLM_CALL_MULTI_PERFORM);
 
   if (mcode != CURLM_OK) {
-    rb_raise(mcode, "an error occured while running perform");
+    rb_raise((VALUE)mcode, "an error occured while running perform");
   }
 
   multi_read_info( self, multi_handle );
@@ -121,7 +121,7 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
 
 static VALUE multi_perform(VALUE self) {
   CURLMcode mcode;
-	CurlMulti *curl_multi;
+  CurlMulti *curl_multi;
   int maxfd, rc;
   fd_set fdread, fdwrite, fdexcep;
 
@@ -131,7 +131,7 @@ static VALUE multi_perform(VALUE self) {
   Data_Get_Struct(self, CurlMulti, curl_multi);
 
   rb_curl_multi_run( self, curl_multi->multi, &(curl_multi->running) );
-  while(curl_multi->running) { 
+  while(curl_multi->running) {
     FD_ZERO(&fdread);
     FD_ZERO(&fdwrite);
     FD_ZERO(&fdexcep);
@@ -139,9 +139,9 @@ static VALUE multi_perform(VALUE self) {
     /* get the curl suggested time out */
     mcode = curl_multi_timeout(curl_multi->multi, &timeout);
     if (mcode != CURLM_OK) {
-			rb_raise(mcode, "an error occured getting the timeout");
-			    }
-			
+      rb_raise((VALUE)mcode, "an error occured getting the timeout");
+          }
+
     if (timeout == 0) { /* no delay */
       rb_curl_multi_run( self, curl_multi->multi, &(curl_multi->running) );
       continue;
@@ -151,12 +151,12 @@ static VALUE multi_perform(VALUE self) {
     }
 
     tv.tv_sec = timeout / 1000;
-		tv.tv_usec = (timeout * 1000) % 1000000;
+    tv.tv_usec = (timeout * 1000) % 1000000;
 
     /* load the fd sets from the multi handle */
     mcode = curl_multi_fdset(curl_multi->multi, &fdread, &fdwrite, &fdexcep, &maxfd);
     if (mcode != CURLM_OK) {
-      rb_raise(mcode, "an error occured getting the fdset");
+      rb_raise((VALUE)mcode, "an error occured getting the fdset");
     }
 
     rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
@@ -171,43 +171,43 @@ static VALUE multi_perform(VALUE self) {
 }
 
 static VALUE active_handle_count(VALUE self) {
-	CurlMulti *curl_multi;
-	Data_Get_Struct(self, CurlMulti, curl_multi);
+  CurlMulti *curl_multi;
+  Data_Get_Struct(self, CurlMulti, curl_multi);
 
-	return INT2NUM(curl_multi->active);
+  return INT2NUM(curl_multi->active);
 }
 
 static VALUE multi_cleanup(VALUE self) {
-	CurlMulti *curl_multi;
-	Data_Get_Struct(self, CurlMulti, curl_multi);
-	
-	curl_multi_cleanup(curl_multi->multi);
-	curl_multi->active = 0;
-	curl_multi->running = 0;
-	
-	return Qnil;
+  CurlMulti *curl_multi;
+  Data_Get_Struct(self, CurlMulti, curl_multi);
+
+  curl_multi_cleanup(curl_multi->multi);
+  curl_multi->active = 0;
+  curl_multi->running = 0;
+
+  return Qnil;
 }
 
 static VALUE new(int argc, VALUE *argv, VALUE klass) {
-	CurlMulti *curl_multi = ALLOC(CurlMulti);
-	curl_multi->multi = curl_multi_init();
-	curl_multi->active = 0;
-	curl_multi->running = 0;
+  CurlMulti *curl_multi = ALLOC(CurlMulti);
+  curl_multi->multi = curl_multi_init();
+  curl_multi->active = 0;
+  curl_multi->running = 0;
 
-	VALUE multi = Data_Wrap_Struct(cTyphoeusMulti, 0, dealloc, curl_multi);
+  VALUE multi = Data_Wrap_Struct(cTyphoeusMulti, 0, dealloc, curl_multi);
 
-	rb_obj_call_init(multi, argc, argv);
+  rb_obj_call_init(multi, argc, argv);
 
-	return multi;
+  return multi;
 }
 
 void init_typhoeus_multi() {
-	VALUE klass = cTyphoeusMulti = rb_define_class_under(mTyphoeus, "Multi", rb_cObject);
-
-	rb_define_singleton_method(klass, "new", new, -1);
-	rb_define_private_method(klass, "multi_add_handle", multi_add_handle, 1);
-	rb_define_private_method(klass, "multi_remove_handle", multi_remove_handle, 1);
-	rb_define_private_method(klass, "multi_perform", multi_perform, 0);
-	rb_define_private_method(klass, "multi_cleanup", multi_cleanup, 0);
-	rb_define_private_method(klass, "active_handle_count", active_handle_count, 0);
-}
+  VALUE klass = cTyphoeusMulti = rb_define_class_under(mTyphoeus, "Multi", rb_cObject);
+
+  rb_define_singleton_method(klass, "new", new, -1);
+  rb_define_private_method(klass, "multi_add_handle", multi_add_handle, 1);
+  rb_define_private_method(klass, "multi_remove_handle", multi_remove_handle, 1);
+  rb_define_private_method(klass, "multi_perform", multi_perform, 0);
+  rb_define_private_method(klass, "multi_cleanup", multi_cleanup, 0);
+  rb_define_private_method(klass, "active_handle_count", active_handle_count, 0);
+}

data/ext/typhoeus/typhoeus_multi.h

@@ -6,11 +6,11 @@
 
 VALUE cTyphoeusMulti;
 typedef struct {
-	int running;
-	int active;
-	CURLM *multi;
+  int running;
+  int active;
+  CURLM *multi;
 } CurlMulti;
 
 void init_typhoeus_multi();
 
-#endif
+#endif

data/lib/typhoeus.rb

@@ -14,7 +14,7 @@ require 'typhoeus/request'
 require 'typhoeus/hydra'
 
 module Typhoeus
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   
   def self.easy_object_pool
     @easy_objects ||= []

data/lib/typhoeus/hydra.rb

@@ -49,6 +49,10 @@ module Typhoeus
       @on_complete = block
     end
     
+    def on_complete=(proc)
+      @on_complete = proc
+    end
+    
     def mock(method, url)
       @mocks << HydraMock.new(url, method)
       @mocks.last

data/lib/typhoeus/request.rb

@@ -50,10 +50,18 @@ module Typhoeus
       @on_complete = block
     end
     
+    def on_complete=(proc)
+      @on_complete = proc
+    end
+    
     def after_complete(&block)
       @after_complete = block
     end
     
+    def after_complete=(proc)
+      @after_complete = proc
+    end
+    
     def call_handlers
       if @on_complete
         @handled_response = @on_complete.call(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Paul Dix
@@ -62,7 +62,6 @@ files:
 - spec/servers/method_server.rb
 has_rdoc: true
 homepage: http://github.com/pauldix/typhoeus
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -84,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A library for interacting with web services (and building SOAs) at blinding speed.