escape_utils 0.2.3 → 0.2.4

data/ext/escape_utils/buffer.h

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2008, Natacha Porté
+ * Copyright (c) 2011, Vicent Martí
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __GEN_BUFFER_H__
+#define __GEN_BUFFER_H__
+
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+#if defined(_MSC_VER)
+#define __attribute__(x)
+#define inline
+#endif
+
+typedef enum {
+	BUF_OK = 0,
+	BUF_ENOMEM = -1,
+} buferror_t;
+
+/* struct buf: character array buffer */
+struct buf {
+	uint8_t *data;		/* actual character data */
+	size_t size;	/* size of the string */
+	size_t asize;	/* allocated size (0 = volatile buffer) */
+	size_t unit;	/* reallocation unit size (0 = read-only buffer) */
+};
+
+/* CONST_BUF: global buffer from a string litteral */
+#define BUF_STATIC(string) \
+	{ (uint8_t *)string, sizeof string -1, sizeof string, 0, 0 }
+
+/* VOLATILE_BUF: macro for creating a volatile buffer on the stack */
+#define BUF_VOLATILE(strname) \
+	{ (uint8_t *)strname, strlen(strname), 0, 0, 0 }
+
+/* BUFPUTSL: optimized bufputs of a string litteral */
+#define BUFPUTSL(output, literal) \
+	bufput(output, literal, sizeof literal - 1)
+
+/* bufgrow: increasing the allocated size to the given value */
+int bufgrow(struct buf *, size_t);
+
+/* bufnew: allocation of a new buffer */
+struct buf *bufnew(size_t) __attribute__ ((malloc));
+
+/* bufnullterm: NUL-termination of the string array (making a C-string) */
+const char *bufcstr(struct buf *);
+
+/* bufprefix: compare the beginning of a buffer with a string */
+int bufprefix(const struct buf *buf, const char *prefix);
+
+/* bufput: appends raw data to a buffer */
+void bufput(struct buf *, const void *, size_t);
+
+/* bufputs: appends a NUL-terminated string to a buffer */
+void bufputs(struct buf *, const char *);
+
+/* bufputc: appends a single char to a buffer */
+void bufputc(struct buf *, int);
+
+/* bufrelease: decrease the reference count and free the buffer if needed */
+void bufrelease(struct buf *);
+
+/* bufreset: frees internal data of the buffer */
+void bufreset(struct buf *);
+
+/* bufslurp: removes a given number of bytes from the head of the array */
+void bufslurp(struct buf *, size_t);
+
+/* bufprintf: formatted printing to a buffer */
+void bufprintf(struct buf *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
+
+/* vbufprintf: stdarg variant of formatted printing into a buffer */
+void vbufprintf(struct buf *, const char * , va_list);
+
+#endif

data/ext/escape_utils/escape_utils.c

@@ -1,3 +1,8 @@
+// tell rbx not to use it's caching compat layer
+// by doing this we're making a promise to RBX that
+// we'll never modify the pointers we get back from RSTRING_PTR
+#define RSTRING_NOT_MODIFIED
+
 #include <ruby.h>
 #if RB_CVAR_SET_ARITY == 4
 #  define rb_cvar_set(a,b,c) rb_cvar_set(a,b,c,0)
@@ -6,582 +11,157 @@
 #include <ruby/encoding.h>
 #endif
 
-static VALUE mEscapeUtils;
-static ID rb_html_secure;
-static int html_secure = 1;
-
-#define IS_HEX(c) ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-#define UNHEX(c) (c >= '0' && c <= '9' ? c - '0' : c >= 'A' && c <= 'F' ? c - 'A' + 10 : c - 'a' + 10)
-
-#define ALPHANUM(c) ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'))
-#define URL_SAFE(c) (ALPHANUM(c) || c == '-' || c == '_' || c == '.')
-
-/* from uri/common.rb */
-#define UNRESERVED(c) (ALPHANUM(c) || c == '-' || c == '_' || c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || c == ')')
-#define RESERVED(c) (c == ';' || c == '/' || c == '?' || c == ':' || c == '@' || c== '&' || c == '=' || c == '+' || c == '$' || c == ',' || c == '[' || c == ']')
-#define URI_SAFE(c) (URL_SAFE(c) || UNRESERVED(c) || RESERVED(c))
-
-static size_t escape_html(unsigned char *out, const unsigned char *in, size_t in_len, int secure) {
-  size_t total = 0;
-  unsigned char curChar;
-
-  total = in_len;
-  while (in_len) {
-    curChar = *in++;
-
-    if (curChar == '<') {
-      *out++ = '&'; *out++ = 'l'; *out++ = 't'; *out++ = ';';
-      total += 3;
-    } else if (curChar == '>') {
-      *out++ = '&'; *out++ = 'g'; *out++ = 't'; *out++ = ';';
-      total += 3;
-    } else if (curChar == '&') {
-      *out++ = '&'; *out++ = 'a'; *out++ = 'm'; *out++ = 'p'; *out++ = ';';
-      total += 4;
-    } else if (curChar == '\'') {
-      *out++ = '&'; *out++ = '#'; *out++ = '3'; *out++ = '9'; *out++ = ';';
-      total += 4;
-    } else if (curChar == '\"') {
-      *out++ = '&'; *out++ = 'q'; *out++ = 'u'; *out++ = 'o'; *out++ = 't'; *out++ = ';';
-      total += 5;
-    } else if (secure && curChar == '/') {
-      *out++ = '&'; *out++ = '#'; *out++ = '4'; *out++ = '7'; *out++ = ';';
-      total += 4;
-    } else {
-      *out++ = curChar;
-    }
-    in_len--;
-  }
-
-  return total;
-}
+#include "houdini.h"
 
-static size_t unescape_html(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0, len = in_len;
-  unsigned char curChar, *start;
-
-  start = (unsigned char *)&in[0];
-  total = in_len;
-  while (len) {
-    curChar = *in++;
-    if (curChar == '&') {
-      if (*in == 'l' && *(in+1) == 't' && *(in+2) == ';') {
-        *out++ = '<';
-        total-=3;
-        in+=3;
-        len-=3;
-      } else if (*in == 'g' && *(in+1) == 't' && *(in+2) == ';') {
-        *out++ = '>';
-        total-=3;
-        in+=3;
-        len-=3;
-      } else if (*in == 'a' && *(in+1) == 'm' && *(in+2) == 'p' && *(in+3) == ';') {
-        *out++ = '&';
-        total-=4;
-        in+=4;
-        len-=4;
-      } else if (*in == '#' && *(in+1) == '3' && *(in+2) == '9' && *(in+3) == ';') {
-        *out++ = '\'';
-        total-=4;
-        in+=4;
-        len-=4;
-      } else if (*in == '#' && *(in+1) == '4' && *(in+2) == '7' && *(in+3) == ';') {
-        *out++ = '/';
-        total-=4;
-        in+=4;
-        len-=4;
-      } else if (*in == 'q' && *(in+1) == 'u' && *(in+2) == 'o' && *(in+3) == 't' && *(in+4) == ';') {
-        *out++ = '\"';
-        total-=5;
-        in+=5;
-        len-=5;
-      } else {
-        /* incomplete tag, pass it through */
-        *out++ = curChar;
-      }
-    } else {
-      *out++ = curChar;
-    }
-    len--;
-  }
-
-  return total;
-}
+typedef void (*houdini_cb)(struct buf *, const uint8_t *, size_t);
 
-static size_t escape_javascript(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0;
-  unsigned char curChar;
-
-  total = in_len;
-  while (in_len) {
-    curChar = *in++;
-    switch (curChar) {
-    case '\\':
-      *out++ = '\\'; *out++ = '\\';
-      total++;
-      break;
-    case '<':
-      *out++ = '<';
-      if (*in == '/') {
-        *out++ = '\\'; *out++ = '/';
-        in++; in_len--;
-        total++;
-      }
-      break;
-    case '\r':
-      if (*in == '\n') {
-        *out++ = '\\'; *out++ = 'n';
-        in++; in_len--;
-      } else {
-        *out++ = '\\'; *out++ = 'n';
-        total++;
-      }
-      break;
-    case '\n':
-      *out++ = '\\'; *out++ = 'n';
-      total++;
-      break;
-    case '\'':
-      *out++ = '\\'; *out++ = '\'';
-      total++;
-      break;
-    case '\"':
-      *out++ = '\\'; *out++ = '\"';
-      total++;
-      break;
-    default:
-      *out++ = curChar;
-      break;
-    }
-    in_len--;
-  }
-
-  return total;
-}
-
-static size_t unescape_javascript(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0;
-  unsigned char curChar;
-
-  total = in_len;
-  while (in_len) {
-    curChar = *in++;
-    if (curChar == '\\') {
-      if (*in == 'n') {
-        *out++ = '\n';
-        total--;
-      } else if (*in == '\\') {
-        *out++ = '\\';
-        total--;
-      } else if (*in == '\'') {
-        *out++ = '\'';
-        total--;
-      } else if (*in == '\"') {
-        *out++ = '\"';
-        total--;
-      } else if (*in == '/') {
-        *out++ = '/';
-        total--;
-      } else {
-        /* incomplete escape, pass it through */
-        *out++ = curChar;
-        continue;
-      }
-      in++; in_len--;
-    } else {
-      *out++ = curChar;
-    }
-    in_len--;
-  }
-
-  return total;
-}
-
-static size_t escape_url(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0;
-  unsigned char curChar, hex[2];
-  const unsigned char hexChars[16] = "0123456789ABCDEF";
-
-  total = in_len;
-  while (in_len) {
-    curChar = *in++;
-    if (curChar == ' ') {
-      *out++ = '+';
-    } else if (URL_SAFE(curChar)) {
-      *out++ = curChar;
-    } else {
-      hex[1] = hexChars[curChar & 0x0f];
-      hex[0] = hexChars[(curChar >> 4) & 0x0f];
-      *out++ = '%'; *out++ = hex[0]; *out++ = hex[1];
-      total += 2;
-    }
-    in_len--;
-  }
-
-  return total;
-}
+static VALUE rb_mEscapeUtils;
 
-static size_t unescape_url(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0, len = in_len;
-  unsigned char curChar, *start;
-
-  start = (unsigned char *)&in[0];
-  total = in_len;
-  while (len) {
-    curChar = *in++;
-    if (curChar == '%') {
-      if (IS_HEX(*in) && IS_HEX(*(in+1))) {
-        *out++ = (UNHEX(*in) << 4) + UNHEX(*(in+1));
-        in+=2;
-        len-=2;
-        total-=2;
-      } else {
-        /* incomplete escape, pass it through */
-        *out++ = curChar;
-      }
-    } else if (curChar == '+') {
-      *out++ = ' ';
-    } else {
-      *out++ = curChar;
-    }
-    len--;
-  }
-
-  return total;
-}
+/**
+ * html_secure instance variable
+ */
+static ID rb_html_secure;
+static int g_html_secure = 1;
 
-static size_t escape_uri(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0;
-  unsigned char curChar, hex[2];
-  const unsigned char hexChars[16] = "0123456789ABCDEF";
-
-  total = in_len;
-  while (in_len) {
-    curChar = *in++;
-    if (URI_SAFE(curChar)) {
-        *out++ = curChar;
-    } else {
-        hex[1] = hexChars[curChar & 0x0f];
-        hex[0] = hexChars[(curChar >> 4) & 0x0f];
-        *out++ = '%'; *out++ = hex[0]; *out++ = hex[1];
-        total += 2;
-    }
-    in_len--;
-  }
-
-  return total;
+static VALUE rb_eu_get_html_secure(VALUE self)
+{
+	return rb_cvar_get(self, rb_html_secure);
 }
 
-static size_t unescape_uri(unsigned char *out, const unsigned char *in, size_t in_len) {
-  size_t total = 0, len = in_len;
-  unsigned char curChar, *start;
-
-  start = (unsigned char *)&in[0];
-  total = in_len;
-  while (len) {
-    curChar = *in++;
-    if (curChar == '%') {
-      if (IS_HEX(*in) && IS_HEX(*(in+1))) {
-        *out++ = (UNHEX(*in) << 4) + UNHEX(*(in+1));
-        in+=2;
-        len-=2;
-        total-=2;
-      } else {
-        /* incomplete escape, pass it through */
-        *out++ = curChar;
-      }
-    } else {
-      *out++ = curChar;
-    }
-    len--;
-  }
-
-  return total;
+static VALUE rb_eu_set_html_secure(VALUE self, VALUE val)
+{
+	g_html_secure = RTEST(val);
+	rb_cvar_set(self, rb_html_secure, val);
+	return val;
 }
 
-static VALUE rb_escape_html(int argc, VALUE * argv, VALUE self) {
-  VALUE str, rb_secure;
-  int secure = html_secure;
-  VALUE rb_output_buf;
-  unsigned char *inBuf, *outBuf;
-  size_t len, new_len;
-
-  if (rb_scan_args(argc, argv, "11", &str, &rb_secure) == 2) {
-    if (rb_secure == Qfalse) {
-      secure = 0;
-    }
-  }
-
-  Check_Type(str, T_STRING);
 
-  inBuf = (unsigned char*)RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
+/**
+ * Generic template
+ */
+static VALUE
+rb_eu__generic(
+	VALUE self, VALUE str,
+	houdini_cb callback,
+	size_t chunk_size)
+{
+	VALUE result;
+	struct buf *out_buf;
 
-  // this is the max size the string could be
-  // TODO: we should try to be more intelligent about this
-  new_len = sizeof(unsigned char)*(len*5);
+	if (NIL_P(str))
+		return rb_str_new2("");
 
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
+	Check_Type(str, T_STRING);
+	out_buf = bufnew(chunk_size);
 
-  // perform our escape, returning the new string's length
-  new_len = escape_html(outBuf, inBuf, len, secure);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
+	callback(out_buf, (uint8_t *)RSTRING_PTR(str), RSTRING_LEN(str));
+	result = rb_str_new((char *)out_buf->data, out_buf->size);
+	bufrelease(out_buf);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
+	rb_enc_copy(result, str);
 #endif
-  return rb_output_buf;
-}
-
-static VALUE rb_unescape_html(VALUE self, VALUE str) {
-  VALUE rb_output_buf;
-  unsigned char *inBuf, *outBuf;
-  size_t len, new_len;
-
-  Check_Type(str, T_STRING);
-  inBuf = (unsigned char*)RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
 
-  // this is the max size the string could be
-  // TODO: we could be more intelligent about this, but probably not
-  new_len = sizeof(unsigned char) * len;
-
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
-
-  // perform our escape, returning the new string's length
-  new_len = unescape_html(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
-
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+	return result;
 }
 
-static VALUE rb_escape_javascript(VALUE self, VALUE str) {
-  VALUE rb_output_buf;
-  unsigned char *inBuf, *outBuf;
-  size_t len, new_len;
-
-  if (str == Qnil) {
-    return rb_str_new2("");
-  }
 
-  Check_Type(str, T_STRING);
+/**
+ * HTML methods
+ */
+static VALUE rb_eu_escape_html(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_out_buf, str, rb_secure;
+	struct buf *out_buf;
+	int secure = g_html_secure;
 
-  inBuf = (unsigned char*)RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
+	if (rb_scan_args(argc, argv, "11", &str, &rb_secure) == 2) {
+		if (rb_secure == Qfalse) {
+			secure = 0;
+		}
+	}
 
-  // this is the max size the string could be
-  // TODO: we should try to be more intelligent about this
-  new_len = sizeof(unsigned char)*(len*2);
+	Check_Type(str, T_STRING);
+	out_buf = bufnew(128);
 
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
+	houdini_escape_html(out_buf, (uint8_t *)RSTRING_PTR(str), RSTRING_LEN(str), secure);
 
-  // perform our escape, returning the new string's length
-  new_len = escape_javascript(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
+	rb_out_buf = rb_str_new((char *)out_buf->data, out_buf->size);
+	bufrelease(out_buf);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
+	rb_enc_copy(rb_out_buf, str);
 #endif
-  return rb_output_buf;
-}
-
-static VALUE rb_unescape_javascript(VALUE self, VALUE str) {
-  VALUE rb_output_buf;
-  unsigned char *inBuf, *outBuf;
-  size_t len, new_len;
-
-  if (str == Qnil) {
-    return rb_str_new2("");
-  }
-
-  Check_Type(str, T_STRING);
-
-  inBuf = (unsigned char*)RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
-
-  // this is the max size the string could be
-  // TODO: we could be more intelligent about this, but probably not
-  new_len = sizeof(unsigned char) * len;
-
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
-
-  // perform our escape, returning the new string's length
-  new_len = unescape_javascript(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+	return rb_out_buf;
 }
 
-static VALUE rb_escape_url(VALUE self, VALUE str) {
-  VALUE rb_output_buf;
-  unsigned char *inBuf, *outBuf;
-  size_t len, new_len;
-
-  Check_Type(str, T_STRING);
-
-  inBuf = (unsigned char*)RSTRING_PTR(str);
-  len = RSTRING_LEN(str);
-
-  // this is the max size the string could be
-  // TODO: we should try to be more intelligent about this
-  new_len = sizeof(unsigned char)*(len*3);
-
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
-
-  // perform our escape, returning the new string's length
-  new_len = escape_url(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
-
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+static VALUE rb_eu_unescape_html(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_unescape_html, 128);
 }
 
-static VALUE rb_unescape_url(VALUE self, VALUE str) {
-  Check_Type(str, T_STRING);
-
-  VALUE rb_output_buf;
-  unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
-  size_t len = RSTRING_LEN(str);
-
-  // this is the max size the string could be
-  // TODO: we could be more intelligent about this, but probably not
-  size_t new_len = sizeof(unsigned char) * len;
-  unsigned char *outBuf;
 
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-
-  // perform our escape, returning the new string's length
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
-  new_len = unescape_url(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
-
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+/**
+ * JavaScript methods
+ */
+static VALUE rb_eu_escape_js(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_escape_js, 128);
 }
 
-static VALUE rb_escape_uri(VALUE self, VALUE str) {
-  Check_Type(str, T_STRING);
-
-  VALUE rb_output_buf;
-  unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
-  size_t len = RSTRING_LEN(str);
-  unsigned char *outBuf;
-
-  // this is the max size the string could be
-  // TODO: we should try to be more intelligent about this
-  size_t new_len = sizeof(unsigned char)*(len*3);
-
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
-
-  // perform our escape, returning the new string's length
-  new_len = escape_uri(outBuf, inBuf, len);
-
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
-
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+static VALUE rb_eu_unescape_js(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_unescape_js, 128);
 }
 
-static VALUE rb_unescape_uri(VALUE self, VALUE str) {
-  Check_Type(str, T_STRING);
 
-  VALUE rb_output_buf;
-  unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
-  size_t len = RSTRING_LEN(str);
-  unsigned char *outBuf;
-
-  // this is the max size the string could be
-  // TODO: we should try to be more intelligent about this
-  size_t new_len = sizeof(unsigned char)*len;
-
-  // create our new ruby string
-  rb_output_buf = rb_str_new(NULL, new_len);
-  outBuf = (unsigned char *)RSTRING_PTR(rb_output_buf);
+/**
+ * URL methods
+ */
+static VALUE rb_eu_escape_url(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_escape_url, 32);
+}
 
-  // perform our escape, returning the new string's length
-  new_len = unescape_uri(outBuf, inBuf, len);
+static VALUE rb_eu_unescape_url(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_unescape_url, 32);
+}
 
-  // shrink our new ruby string
-  rb_str_resize(rb_output_buf, new_len);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_copy(rb_output_buf, str);
-#endif
-  return rb_output_buf;
+/**
+ * URI methods
+ */
+static VALUE rb_eu_escape_uri(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_escape_uri, 32);
 }
 
-static VALUE rb_s_get_html_secure(VALUE self) {
-  return rb_cvar_get(self, rb_html_secure);
+static VALUE rb_eu_unescape_uri(VALUE self, VALUE str)
+{
+	return rb_eu__generic(self, str, &houdini_unescape_uri, 32);
 }
 
-static VALUE rb_s_set_html_secure(VALUE self, VALUE val) {
-  html_secure = RTEST(val);
-  rb_cvar_set(self, rb_html_secure, val);
 
-  return val;
-}
+/**
+ * Ruby Extension initializer
+ */
+void Init_escape_utils()
+{
+	rb_mEscapeUtils = rb_define_module("EscapeUtils");
+	rb_define_method(rb_mEscapeUtils, "escape_html", rb_eu_escape_html, -1);
+	rb_define_method(rb_mEscapeUtils, "unescape_html", rb_eu_unescape_html, 1);
+	rb_define_method(rb_mEscapeUtils, "escape_javascript", rb_eu_escape_js, 1);
+	rb_define_method(rb_mEscapeUtils, "unescape_javascript", rb_eu_unescape_js, 1);
+	rb_define_method(rb_mEscapeUtils, "escape_url", rb_eu_escape_url, 1);
+	rb_define_method(rb_mEscapeUtils, "unescape_url", rb_eu_unescape_url, 1);
+	rb_define_method(rb_mEscapeUtils, "escape_uri", rb_eu_escape_uri, 1);
+	rb_define_method(rb_mEscapeUtils, "unescape_uri", rb_eu_unescape_uri, 1);
+
+	rb_define_singleton_method(rb_mEscapeUtils, "html_secure", rb_eu_get_html_secure, 0);
+	rb_define_singleton_method(rb_mEscapeUtils, "html_secure=", rb_eu_set_html_secure, 1);
 
-/* Ruby Extension initializer */
-void Init_escape_utils() {
-  mEscapeUtils = rb_define_module("EscapeUtils");
-  rb_define_method(mEscapeUtils,           "escape_html",          rb_escape_html,   -1);
-  rb_define_module_function(mEscapeUtils,  "escape_html",          rb_escape_html,   -1);
-  rb_define_method(mEscapeUtils,           "unescape_html",        rb_unescape_html, 1);
-  rb_define_module_function(mEscapeUtils,  "unescape_html",        rb_unescape_html, 1);
-  rb_define_method(mEscapeUtils,           "escape_javascript",    rb_escape_javascript, 1);
-  rb_define_module_function(mEscapeUtils,  "escape_javascript",    rb_escape_javascript, 1);
-  rb_define_method(mEscapeUtils,           "unescape_javascript",  rb_unescape_javascript, 1);
-  rb_define_module_function(mEscapeUtils,  "unescape_javascript",  rb_unescape_javascript, 1);
-  rb_define_method(mEscapeUtils,           "escape_url",           rb_escape_url, 1);
-  rb_define_module_function(mEscapeUtils,  "escape_url",           rb_escape_url, 1);
-  rb_define_method(mEscapeUtils,           "unescape_url",         rb_unescape_url, 1);
-  rb_define_module_function(mEscapeUtils,  "unescape_url",         rb_unescape_url, 1);
-  rb_define_method(mEscapeUtils,           "escape_uri",           rb_escape_uri, 1);
-  rb_define_module_function(mEscapeUtils,  "escape_uri",           rb_escape_uri, 1);
-  rb_define_method(mEscapeUtils,           "unescape_uri",         rb_unescape_uri, 1);
-  rb_define_module_function(mEscapeUtils,  "unescape_uri",         rb_unescape_uri, 1);
-
-  rb_define_singleton_method(mEscapeUtils, "html_secure",          rb_s_get_html_secure, 0);
-  rb_define_singleton_method(mEscapeUtils, "html_secure=",         rb_s_set_html_secure, 1);
-
-  rb_html_secure = rb_intern("@@html_secure");
+	rb_html_secure = rb_intern("@@html_secure");
 }