trenni 2.1.0 → 3.0.0

data/ext/trenni/markup.rl

@@ -1,8 +1,6 @@
 
 #include "markup.h"
 
-#include <ruby/encoding.h>
-
 %%{
 	machine Trenni_markup_parser;
 	
@@ -17,6 +15,7 @@
 	
 	action pcdata_begin {
 		pcdata = Qnil;
+		has_entities = 0;
 	}
 	
 	action pcdata_end {
@@ -26,7 +25,7 @@
 	}
 	
 	action text_end {
-		rb_funcall(delegate, id_text, 1, pcdata);
+		rb_funcall(delegate, id_text, 1, Trenni_markup_safe(pcdata, has_entities));
 	}
 	
 	action characters_begin {
@@ -50,7 +49,9 @@
 	action entity_name {
 		entity.end = p;
 		
-		Trenni_append_string(&pcdata, encoding, 
+		has_entities = 1;
+		
+		Trenni_append(&pcdata, encoding,
 			rb_funcall(entities, id_key_get, 1, Trenni_token(entity, encoding))
 		);
 	}
@@ -58,6 +59,8 @@
 	action entity_hex {
 		entity.end = p;
 		
+		has_entities = 1;
+		
 		codepoint = strtoul(entity.begin, (char **)&entity.end, 16);
 		
 		Trenni_append_codepoint(&pcdata, encoding, codepoint);
@@ -66,6 +69,8 @@
 	action entity_number {
 		entity.end = p;
 		
+		has_entities = 1;
+		
 		codepoint = strtoul(entity.begin, (char **)&entity.end, 10);
 		
 		Trenni_append_codepoint(&pcdata, encoding, codepoint);
@@ -147,7 +152,7 @@
 	
 	action attribute {
 		if (has_value == 1) {
-			rb_funcall(delegate, id_attribute, 2, Trenni_token(identifier, encoding), pcdata);
+			rb_funcall(delegate, id_attribute, 2, Trenni_token(identifier, encoding), Trenni_markup_safe(pcdata, has_entities));
 		} else if (has_value == 2) {
 			rb_funcall(delegate, id_attribute, 2, Trenni_token(identifier, encoding), empty_string);
 		} else {
@@ -196,14 +201,14 @@ VALUE Trenni_Native_parse_markup(VALUE self, VALUE buffer, VALUE delegate, VALUE
 	
 	VALUE pcdata = Qnil;
 	
-	VALUE empty_string = rb_obj_freeze(rb_enc_str_new("", 0, encoding));
+	VALUE empty_string = rb_obj_freeze(rb_enc_str_new(0, 0, encoding));
 	
 	const char *s, *p, *pe, *eof;
 	unsigned long cs, top = 0, stack[2] = {0};
 	unsigned long codepoint = 0;
 	
 	Token identifier = {0}, cdata = {0}, characters = {0}, entity = {0}, doctype = {0}, comment = {0}, instruction = {0};
-	unsigned self_closing = 0, has_value = 0;
+	unsigned self_closing = 0, has_value = 0, has_entities = 0;
 	
 	s = p = RSTRING_PTR(string);
 	eof = pe = p + RSTRING_LEN(string);

data/ext/trenni/tag.c

@@ -0,0 +1,202 @@
+
+#include "escape.h"
+#include "tag.h"
+
+VALUE Trenni_Tag_split(VALUE self, VALUE qualified_name) {
+	const char * begin = RSTRING_PTR(qualified_name);
+	const char * end = RSTRING_END(qualified_name);
+	
+	const char * p = begin;
+	
+	while (p != end) {
+		if (*p == ':') {
+			return rb_ary_new_from_args(2,
+				rb_enc_str_new(begin, p-begin, rb_enc_get(qualified_name)),
+				rb_enc_str_new(p+1, end-p-1, rb_enc_get(qualified_name))
+			);
+		}
+		
+		p += 1;
+	}
+	
+	return rb_ary_new_from_args(2, Qnil, qualified_name);
+}
+
+inline static int Trenni_Tag_valid_attributes(VALUE value) {
+	return (rb_type(value) == T_HASH) || (rb_type(value) == T_ARRAY);
+}
+
+// Key can be either symbol or string. This method efficiently converts either to a string.
+inline static VALUE Trenni_Tag_key_string(VALUE key) {
+	if (SYMBOL_P(key)) {
+		return rb_sym2str(key);
+	}
+	
+	StringValue(key);
+	return key;
+}
+
+inline static VALUE Trenni_Tag_prefix_key(VALUE prefix, VALUE key) {
+	VALUE buffer;
+	
+	if (prefix == Qnil) {
+		return Trenni_Tag_key_string(key);
+	}
+	
+	buffer = rb_str_dup(Trenni_Tag_key_string(prefix));
+	rb_str_cat_cstr(buffer, "-");
+	rb_str_append(buffer, Trenni_Tag_key_string(key));
+	
+	return buffer;
+}
+
+VALUE Trenni_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix);
+
+static void Trenni_Tag_append_tag_attribute(VALUE buffer, VALUE key, VALUE value, VALUE prefix) {
+	// We skip over attributes with nil value:
+	if (value == Qnil || value == Qfalse) return;
+	
+	// Modify key to contain the prefix:
+	key = Trenni_Tag_prefix_key(prefix, key);
+	
+	if (Trenni_Tag_valid_attributes(value)) {
+		Trenni_Tag_append_attributes(Qnil, buffer, value, key);
+	} else {
+		rb_str_cat_cstr(buffer, " ");
+		rb_str_append(buffer, key);
+		
+		if (value != Qtrue) {
+			rb_str_cat_cstr(buffer, "=\"");
+			Trenni_Markup_append(Qnil, buffer, value);
+			rb_str_cat_cstr(buffer, "\"");
+		}
+	}
+}
+
+struct TagAttributeForeachArg {
+	VALUE buffer;
+	VALUE prefix;
+};
+
+static int Trenni_Tag_append_tag_attribute_foreach(VALUE key, VALUE value, struct TagAttributeForeachArg * arg) {
+	Trenni_Tag_append_tag_attribute(arg->buffer, key, value, arg->prefix);
+	
+	return ST_CONTINUE;
+}
+
+VALUE Trenni_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix) {
+	int type = rb_type(attributes);
+	
+	if (type == T_HASH) {
+		struct TagAttributeForeachArg arg = {buffer, prefix};
+		rb_hash_foreach(attributes, &Trenni_Tag_append_tag_attribute_foreach, (VALUE)&arg);
+	} else if (type == T_ARRAY) {
+		long i;
+		
+		for (i = 0; i < RARRAY_LEN(attributes); i++) {
+			VALUE attribute = RARRAY_AREF(attributes, i);
+			VALUE key = RARRAY_AREF(attribute, 0);
+			VALUE value = RARRAY_AREF(attribute, 1);
+			
+			Trenni_Tag_append_tag_attribute(buffer, key, value, prefix);
+		}
+	} else {
+		rb_raise(rb_eArgError, "expected hash or array for attributes");
+	}
+	
+	return Qnil;
+}
+
+VALUE Trenni_Tag_append_tag(VALUE self, VALUE buffer, VALUE name, VALUE attributes, VALUE content) {
+	StringValue(name);
+	
+	rb_str_cat_cstr(buffer, "<");
+	rb_str_buf_append(buffer, name);
+	
+	Trenni_Tag_append_attributes(self, buffer, attributes, Qnil);
+	
+	if (content == Qnil || content == Qfalse) {
+		rb_str_cat_cstr(buffer, "/>");
+	} else {
+		rb_str_cat_cstr(buffer, ">");
+		
+		if (content != Qtrue) {
+			Trenni_Markup_append(self, buffer, content);
+		}
+		
+		rb_str_cat_cstr(buffer, "</");
+		rb_str_buf_append(buffer, name);
+		rb_str_cat_cstr(buffer, ">");
+	}
+	
+	return Qnil;
+}
+
+VALUE Trenni_Tag_format_tag(VALUE self, VALUE name, VALUE attributes, VALUE content) {
+	rb_encoding *encoding = rb_enc_get(name);
+	
+	VALUE buffer = rb_enc_str_new(0, 0, encoding);
+	rb_str_reserve(buffer, 256);
+	
+	Trenni_Tag_append_tag(self, buffer, name, attributes, content);
+	
+	return buffer;
+}
+
+VALUE Trenni_Tag_write_opening_tag(VALUE self, VALUE buffer) {
+	VALUE name = rb_struct_getmember(self, id_name);
+	VALUE attributes = rb_struct_getmember(self, id_attributes);
+	VALUE closed = rb_struct_getmember(self, id_closed);
+
+	StringValue(name);
+	
+	rb_str_reserve(buffer, RSTRING_LEN(name) + 256);
+	
+	rb_str_cat_cstr(buffer, "<");
+	rb_str_buf_append(buffer, name);
+	
+	Trenni_Tag_append_attributes(self, buffer, attributes, Qnil);
+	
+	if (closed == Qtrue) {
+		rb_str_cat_cstr(buffer, "/>");
+	} else {
+		rb_str_cat_cstr(buffer, ">");
+	}
+	
+	return Qnil;
+}
+
+VALUE Trenni_Tag_write_closing_tag(VALUE self, VALUE buffer) {
+	VALUE name = rb_struct_getmember(self, id_name);
+	
+	StringValue(name);
+	
+	rb_str_reserve(buffer, RSTRING_LEN(name) + 3);
+	
+	rb_str_cat_cstr(buffer, "</");
+	rb_str_buf_append(buffer, name);
+	rb_str_cat_cstr(buffer, ">");
+	
+	return Qnil;
+}
+
+void Init_trenni_tag() {
+	rb_undef_method(rb_class_of(rb_Trenni_Tag), "append_attributes");
+	rb_define_singleton_method(rb_Trenni_Tag, "append_attributes", Trenni_Tag_append_attributes, 3);
+	
+	rb_undef_method(rb_class_of(rb_Trenni_Tag), "append_tag");
+	rb_define_singleton_method(rb_Trenni_Tag, "append_tag", Trenni_Tag_append_tag, 4);
+	
+	rb_undef_method(rb_class_of(rb_Trenni_Tag), "format_tag");
+	rb_define_singleton_method(rb_Trenni_Tag, "format_tag", Trenni_Tag_format_tag, 3);
+	
+	rb_undef_method(rb_class_of(rb_Trenni_Tag), "split");
+	rb_define_singleton_method(rb_Trenni_Tag, "split", Trenni_Tag_split, 1);
+	
+	rb_undef_method(rb_Trenni_Tag, "write_opening_tag");
+	rb_define_method(rb_Trenni_Tag, "write_opening_tag", Trenni_Tag_write_opening_tag, 1);
+	
+	rb_undef_method(rb_Trenni_Tag, "write_closing_tag");
+	rb_define_method(rb_Trenni_Tag, "write_closing_tag", Trenni_Tag_write_closing_tag, 1);
+}
+

data/ext/trenni/tag.h

@@ -0,0 +1,21 @@
+
+#pragma once
+
+#include "trenni.h"
+
+void Init_trenni_tag();
+
+// Split a qualified name `namespace:name` into it's components. Return `[nil, name]` if no namespace is present.
+// Usage: namespace, name = Trenni::Tag.split(qualified_name)
+VALUE Trenni_Tag_split(VALUE self, VALUE name);
+
+// Append attributes to the buffer, e.g. {data: {id: 10}} => ' data-id="10"'
+VALUE Trenni_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix);
+// Append a full tag with content to the buffer.
+VALUE Trenni_Tag_append_tag(VALUE self, VALUE buffer, VALUE name, VALUE attributes, VALUE content);
+// Same as append but returns the result. Slightly less efficient.
+VALUE Trenni_Tag_format_tag(VALUE self, VALUE name, VALUE attributes, VALUE content);
+
+// Improve performance of Trenni::Tag#write_opening_tag and #write_closing_tag
+VALUE Trenni_Tag_write_opening_tag(VALUE self, VALUE buffer);
+VALUE Trenni_Tag_write_closing_tag(VALUE self, VALUE buffer);

data/ext/trenni/template.c

@@ -182,7 +182,7 @@ tr82:
 	{
 		expression.begin = p;
 	}
-#line 53 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 53 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{te = p;p--;{cs = 32;}}
 	goto _again;
 st43:
@@ -524,7 +524,7 @@ case 20:
 		goto tr27;
 	goto st19;
 tr31:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 21; goto st21;}}
 	goto st21;
 st21:
@@ -542,7 +542,7 @@ case 21:
 	}
 	goto st21;
 tr47:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 22; goto st21;}}
 	goto st22;
 st22:
@@ -558,13 +558,13 @@ case 22:
 	}
 	goto st22;
 tr37:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 23; goto st21;}}
 	goto st23;
 tr39:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 23; goto st21;}}
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 23; goto st21;}}
 	goto st23;
 st23:
@@ -593,7 +593,7 @@ case 24:
 	}
 	goto st23;
 tr46:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 25; goto st21;}}
 	goto st25;
 st25:
@@ -610,13 +610,13 @@ case 25:
 	}
 	goto st25;
 tr43:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 26; goto st21;}}
 	goto st26;
 tr45:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 26; goto st21;}}
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 26; goto st21;}}
 	goto st26;
 st26:
@@ -643,7 +643,7 @@ case 27:
 	}
 	goto st26;
 tr44:
-#line 20 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 20 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{cs = stack[--top];goto _again;}}
 	goto st49;
 st49:
@@ -669,7 +669,7 @@ case 28:
 	}
 	goto st25;
 tr38:
-#line 20 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 20 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{cs = stack[--top];goto _again;}}
 	goto st50;
 st50:
@@ -700,7 +700,7 @@ case 30:
 		goto st31;
 	goto st30;
 tr49:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 31; goto st21;}}
 	goto st31;
 st31:
@@ -717,7 +717,7 @@ case 31:
 	}
 	goto st31;
 tr50:
-#line 20 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 20 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{cs = stack[--top];goto _again;}}
 	goto st51;
 st51:
@@ -729,7 +729,7 @@ case 51:
 		goto st31;
 	goto st30;
 tr32:
-#line 20 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 20 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{cs = stack[--top];goto _again;}}
 	goto st52;
 st52:
@@ -739,7 +739,7 @@ case 52:
 #line 740 "template.c"
 	goto st0;
 tr54:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 32; goto st21;}}
 	goto st32;
 st32:
@@ -757,7 +757,7 @@ case 32:
 	}
 	goto st32;
 tr70:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 33; goto st21;}}
 	goto st33;
 st33:
@@ -773,13 +773,13 @@ case 33:
 	}
 	goto st33;
 tr60:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 34; goto st21;}}
 	goto st34;
 tr62:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 34; goto st21;}}
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 34; goto st21;}}
 	goto st34;
 st34:
@@ -808,7 +808,7 @@ case 35:
 	}
 	goto st34;
 tr69:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 36; goto st21;}}
 	goto st36;
 st36:
@@ -825,13 +825,13 @@ case 36:
 	}
 	goto st36;
 tr66:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 37; goto st21;}}
 	goto st37;
 tr68:
-#line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 37; goto st21;}}
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 37; goto st21;}}
 	goto st37;
 st37:
@@ -867,7 +867,7 @@ tr67:
 	{
 		rb_funcall(delegate, id_expression, 1, Trenni_token(expression, encoding));
 	}
-#line 21 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 21 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{cs = 43;}
 	goto _again;
 st53:
@@ -902,7 +902,7 @@ tr61:
 	{
 		rb_funcall(delegate, id_expression, 1, Trenni_token(expression, encoding));
 	}
-#line 21 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 21 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{cs = 43;}
 	goto _again;
 st54:
@@ -933,7 +933,7 @@ case 41:
 		goto st42;
 	goto st41;
 tr72:
-#line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{{stack[top++] = 42; goto st21;}}
 	goto st42;
 st42:
@@ -959,7 +959,7 @@ tr73:
 	{
 		rb_funcall(delegate, id_expression, 1, Trenni_token(expression, encoding));
 	}
-#line 21 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 21 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{cs = 43;}
 	goto _again;
 st55:
@@ -980,7 +980,7 @@ tr55:
 	{
 		rb_funcall(delegate, id_expression, 1, Trenni_token(expression, encoding));
 	}
-#line 21 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+#line 21 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	{cs = 43;}
 	goto _again;
 st56: