xrb 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5f5866b9f16e578f765cb49940fa5f4b43f6421ce1efe187a2e6b56a150e58
-  data.tar.gz: 51345868ef2d3e106f47a2927fb4c908331bc5fd3317f0d83a4aa65d49e9b253
+  metadata.gz: 262e952884557bc231200ca4a520519e9372d5c0aec682bbd92685258a16d115
+  data.tar.gz: c994e66e6a2c440f0e6ff36a5d964995081e17ab4c79792564d42862c306dc98
 SHA512:
-  metadata.gz: efe42a5f52863f29a1383fdc2572b9aac8c870e4ce905a0d2b4426859bc9f4113697f0ea1450d2354accddc27c74e2df1944512400029f3c548743cde4da35ed
-  data.tar.gz: a689741788594d7c11700fe92f5ef0f71a9bef88b2b4b15dd7df3483d05e6630cd99f9863b41901c6f10bf6a0ed3327fb46acad581dfbebb26d83a45926c5e2f
+  metadata.gz: 006b40e77f38cf875163408b443d7f55a5a464a9658ec812071db7aa196133335281cad0ae9c80f1badbdffe77914660b59592dc0d33b99323d91bae19bad9de
+  data.tar.gz: 8b3dcfb6bee297abfbd1dacf583aed9eddfc0ec61ec99840b9096dccad01446683095394305a44b7eb63e726abc23563bd4f085f39e62afa656aedf45c186961

data/ext/Makefile

@@ -13,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0
+topdir = /Users/samuel/.rubies/ruby-3.3.4/include/ruby-3.3.0
 hdrdir = $(topdir)
-arch_hdrdir = /Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23
+arch_hdrdir = /Users/samuel/.rubies/ruby-3.3.4/include/ruby-3.3.0/arm64-darwin24
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/xrb
-prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.3.3
+prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.3.4
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -106,7 +106,7 @@ RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = arm64-darwin23
+arch = arm64-darwin24
 sitearch = $(arch)
 ruby_version = 3.3.0
 ruby = $(bindir)/$(RUBY_BASE_NAME)
@@ -117,8 +117,8 @@ ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h
 RM = rm -f
 RM_RF = rm -fr
 RMDIRS = rmdir -p
-MAKEDIRS = /opt/local/bin/gmkdir -p
-INSTALL = /opt/local/bin/ginstall -c
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
 COPY = cp

data/ext/xrb/escape.c

@@ -103,38 +103,40 @@ VALUE XRB_Markup_append_string(VALUE buffer, VALUE string) {
 	return XRB_Markup_append_buffer(buffer, s, p, end);
 }
 
-VALUE XRB_Markup_append_slow(VALUE self, VALUE buffer, VALUE value) {
-	if (value == Qnil) return Qnil;
+VALUE XRB_Markup_append_slow(VALUE self, VALUE output, VALUE value) {
+	// if (value == Qnil) return Qnil;
 	
 	if (!XRB_Markup_is_markup(value)) {
+		value = rb_funcall(value, id_to_s, 0);
 		value = XRB_Markup_escape_string(Qnil, value);
 	}
-	 
-	rb_funcall(buffer, id_concat, 1, value);
 	
-	return buffer;
+	rb_funcall(output, id_concat, 1, value);
+	
+	return output;
 }
 
-VALUE XRB_Markup_append(VALUE self, VALUE buffer, VALUE value) {
+VALUE XRB_Markup_append(VALUE self, VALUE output, VALUE value) {
 	if (value == Qnil) return Qnil;
 	
-	if (RB_TYPE_P(buffer, T_STRING)) {
-		rb_str_modify(buffer);
+	if (RB_TYPE_P(output, T_STRING)) {
+		rb_str_modify(output);
 	} else {
-		return XRB_Markup_append_slow(self, buffer, value);
+		return XRB_Markup_append_slow(self, output, value);
 	}
 	
+	// The output buffer is a string, so we can append directly:
 	if (XRB_Markup_is_markup(value)) {
-		rb_str_append(buffer, value);
+		rb_str_append(output, value);
 	} else {
 		if (rb_type(value) != T_STRING) {
 			value = rb_funcall(value, id_to_s, 0);
 		}
 		
-		XRB_Markup_append_string(buffer, value);
+		XRB_Markup_append_string(output, value);
 	}
 	
-	return buffer;
+	return output;
 }
 
 // Convert markup special characters to entities. May return the original string if no changes were made.

data/ext/xrb/tag.c

@@ -50,7 +50,7 @@ inline static VALUE XRB_Tag_prefix_key(VALUE prefix, VALUE key) {
 	return buffer;
 }
 
-VALUE XRB_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix);
+VALUE XRB_Tag_append_attributes_string(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix);
 
 static void XRB_Tag_append_tag_attribute(VALUE buffer, VALUE key, VALUE value, VALUE prefix) {
 	// We skip over attributes with nil value:
@@ -60,7 +60,7 @@ static void XRB_Tag_append_tag_attribute(VALUE buffer, VALUE key, VALUE value, V
 	key = XRB_Tag_prefix_key(prefix, key);
 	
 	if (XRB_Tag_valid_attributes(value)) {
-		XRB_Tag_append_attributes(Qnil, buffer, value, key);
+		XRB_Tag_append_attributes_string(Qnil, buffer, value, key);
 	} else {
 		rb_str_cat_cstr(buffer, " ");
 		rb_str_append(buffer, key);
@@ -73,24 +73,24 @@ static void XRB_Tag_append_tag_attribute(VALUE buffer, VALUE key, VALUE value, V
 	}
 }
 
-typedef struct {
+struct XRB_Tag_Append_Tag_Attribute_Argument {
 	VALUE buffer;
 	VALUE prefix;
-} XRB_Tag_Accumulation;
+};
 
 static int XRB_Tag_append_tag_attribute_foreach(VALUE key, VALUE value, VALUE _argument) {
-	XRB_Tag_Accumulation * argument = (XRB_Tag_Accumulation *)_argument;
+	struct XRB_Tag_Append_Tag_Attribute_Argument * argument = (struct XRB_Tag_Append_Tag_Attribute_Argument *)_argument;
 	
 	XRB_Tag_append_tag_attribute(argument->buffer, key, value, argument->prefix);
 	
 	return ST_CONTINUE;
 }
 
-VALUE XRB_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix) {
+VALUE XRB_Tag_append_attributes_string(VALUE self, VALUE buffer, VALUE attributes, VALUE prefix) {
 	int type = rb_type(attributes);
 	
 	if (type == T_HASH) {
-		XRB_Tag_Accumulation argument = {buffer, prefix};
+		struct XRB_Tag_Append_Tag_Attribute_Argument argument = {buffer, prefix};
 		rb_hash_foreach(attributes, &XRB_Tag_append_tag_attribute_foreach, (VALUE)&argument);
 	} else if (type == T_ARRAY) {
 		long i;
@@ -114,13 +114,45 @@ VALUE XRB_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALU
 	return Qnil;
 }
 
-VALUE XRB_Tag_append_tag(VALUE self, VALUE buffer, VALUE name, VALUE attributes, VALUE content) {
+static size_t XRB_Tag_estimate_attributes_size(VALUE attributes, VALUE prefix) {
+	if (attributes == Qnil) return 0;
+	
+	int type = rb_type(attributes);
+	
+	if (type == T_HASH) {
+		return rb_hash_size(attributes) * 32;
+	} else if (type == T_ARRAY) {
+		return RARRAY_LEN(attributes) * 32;
+	}
+	
+	return 0;
+}
+
+VALUE XRB_Tag_append_attributes(VALUE self, VALUE output, VALUE attributes, VALUE prefix) {
+	size_t estimated_size = XRB_Tag_estimate_attributes_size(attributes, prefix);
+	
+	// If there are no attributes, we return early:
+	if (estimated_size == 0) return Qnil;
+	
+	if (rb_type(output) == T_STRING) {
+		rb_str_modify_expand(output, estimated_size);
+		XRB_Tag_append_attributes_string(self, output, attributes, prefix);
+	} else {
+		VALUE buffer = rb_str_buf_new(estimated_size);
+		XRB_Tag_append_attributes_string(self, buffer, attributes, prefix);
+		rb_funcall(output, id_concat, 1, buffer);
+	}
+	
+	return Qnil;
+}
+
+VALUE XRB_Tag_append_tag_string(VALUE self, VALUE buffer, VALUE name, VALUE attributes, VALUE content) {
 	StringValue(name);
 	
 	rb_str_cat_cstr(buffer, "<");
 	rb_str_buf_append(buffer, name);
 	
-	XRB_Tag_append_attributes(self, buffer, attributes, Qnil);
+	XRB_Tag_append_attributes_string(self, buffer, attributes, Qnil);
 	
 	if (content == Qnil || content == Qfalse) {
 		rb_str_cat_cstr(buffer, "/>");
@@ -139,30 +171,46 @@ VALUE XRB_Tag_append_tag(VALUE self, VALUE buffer, VALUE name, VALUE attributes,
 	return Qnil;
 }
 
-VALUE XRB_Tag_format_tag(VALUE self, VALUE name, VALUE attributes, VALUE content) {
-	rb_encoding *encoding = rb_enc_get(name);
+static size_t XRB_Tag_estimate_size(VALUE name, VALUE attributes, VALUE content) {
+	size_t estimated_size = (RSTRING_LEN(name) * 2) + XRB_Tag_estimate_attributes_size(attributes, Qnil) + 5;
 	
-	VALUE buffer = rb_enc_str_new(0, 0, encoding);
-	rb_str_modify_expand(buffer, 256);
-	
-	XRB_Tag_append_tag(self, buffer, name, attributes, content);
+	if (rb_type(content) == T_STRING) {
+		estimated_size += RSTRING_LEN(content);
+	}
 	
-	return buffer;
+	return estimated_size;
 }
 
-VALUE XRB_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);
+VALUE XRB_Tag_append_tag(VALUE self, VALUE output, VALUE name, VALUE attributes, VALUE content) {
+	size_t estimated_size = XRB_Tag_estimate_size(name, attributes, content);
+	
+	if (rb_type(output) == T_STRING) {
+		rb_str_modify_expand(output, estimated_size);
+		XRB_Tag_append_tag_string(self, output, name, attributes, content);
+	} else {
+		VALUE buffer = rb_str_buf_new(estimated_size);
+		XRB_Tag_append_tag_string(self, buffer, name, attributes, content);
+		rb_funcall(output, id_concat, 1, buffer);
+	}
+	
+	return Qnil;
+}
 
-	StringValue(name);
+VALUE XRB_Tag_format_tag(VALUE self, VALUE name, VALUE attributes, VALUE content) {
+	size_t estimated_size = XRB_Tag_estimate_size(name, attributes, content);
 	
-	rb_str_modify_expand(buffer, RSTRING_LEN(name) + 256);
+	VALUE buffer = rb_str_buf_new(estimated_size);
 	
+	XRB_Tag_append_tag_string(self, buffer, name, attributes, content);
+	
+	return buffer;
+}
+
+VALUE XRB_Tag_write_opening_tag_string(VALUE self, VALUE buffer, VALUE name, VALUE attributes, VALUE closed) {
 	rb_str_cat_cstr(buffer, "<");
 	rb_str_buf_append(buffer, name);
 	
-	XRB_Tag_append_attributes(self, buffer, attributes, Qnil);
+	XRB_Tag_append_attributes_string(self, buffer, attributes, Qnil);
 	
 	if (closed == Qtrue) {
 		rb_str_cat_cstr(buffer, "/>");
@@ -173,17 +221,52 @@ VALUE XRB_Tag_write_opening_tag(VALUE self, VALUE buffer) {
 	return Qnil;
 }
 
-VALUE XRB_Tag_write_closing_tag(VALUE self, VALUE buffer) {
+VALUE XRB_Tag_write_opening_tag(VALUE self, VALUE output) {
 	VALUE name = rb_struct_getmember(self, id_name);
-	
 	StringValue(name);
 	
-	rb_str_modify_expand(buffer, RSTRING_LEN(name) + 3);
+	VALUE attributes = rb_struct_getmember(self, id_attributes);
+	VALUE closed = rb_struct_getmember(self, id_closed);
+	
+	// The size of the tag name + attributes + at most 3 characters for the closing tag symbols.
+	size_t estimated_size = RSTRING_LEN(name) + XRB_Tag_estimate_attributes_size(attributes, Qnil) + 3;
+	
+	if (rb_type(output) == T_STRING) {
+		rb_str_modify_expand(output, estimated_size);
+		XRB_Tag_write_opening_tag_string(self, output, name, attributes, closed);
+	} else {
+		VALUE buffer = rb_str_buf_new(estimated_size);
+		XRB_Tag_write_opening_tag_string(self, buffer, name, attributes, closed);
+		rb_funcall(output, id_concat, 1, buffer);
+	}
 	
+	return Qnil;
+}
+
+VALUE XRB_Tag_write_closing_tag_string(VALUE self, VALUE buffer, VALUE name) {
 	rb_str_cat_cstr(buffer, "</");
 	rb_str_buf_append(buffer, name);
 	rb_str_cat_cstr(buffer, ">");
 	
+	return buffer;
+}
+
+VALUE XRB_Tag_write_closing_tag(VALUE self, VALUE output) {
+	VALUE name = rb_struct_getmember(self, id_name);
+	StringValue(name);
+	
+	// The size of the tag name + 3 characters for the closing tag symbols.
+	size_t estimated_size = RSTRING_LEN(name) + 3;
+	
+	if (rb_type(output) == T_STRING) {
+		rb_str_modify_expand(output, estimated_size);
+		XRB_Tag_write_closing_tag_string(self, output, name);
+	} else {
+		VALUE buffer = rb_str_buf_new(estimated_size);
+		XRB_Tag_write_closing_tag_string(self, buffer, name);
+		rb_funcall(output, id_concat, 1, buffer);
+	}
+	
 	return Qnil;
 }