xrb 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cdd134a8dbbdd3fd3840ed10b0cf3962c80489eefb36a32bef94271cb2f8faf
-  data.tar.gz: 8abbd27c3c9c15fb58a34062b150e29247ea812e3b7c6543c8eef83368f5f08d
+  metadata.gz: 7576d5a9614c5ca657109b06f71b2091717cf0919be858527dd7d2d259162327
+  data.tar.gz: 57ecf941224ddd1b6fc7da50efc01d6a1f09c8ed63fe03249b183e171c9bf25d
 SHA512:
-  metadata.gz: e5e2b90a6b1b50ea700fdb39c6a99cce61c670ce643575d79ea0588187a06a4927c8929bea88c3ff5b81b19e40c18e7356beccd8d76a0c9a2def48cc3eac4a93
-  data.tar.gz: f42d5425f29420a70b44c4c974a00ce46aa53dc03acd4e4f629fa7f3a40340fde12f268bcd97e423507a1ba45617cd57dbc1414746f83c9002edbb36005c5bf8
+  metadata.gz: c694e8def7354e1f1c74006349faa3ccf931f056bba6d89ab564cfc998b484880ef9e87f168ecb11751156d03fb5dee216402d670fb426d40151db6a9f1a884c
+  data.tar.gz: a040bd3bfa83f9e3583585e79cb801d71334c978b1222f06a7be258bf936ef14ac6bd918cd4c03828a77c4956e0c539846b829957bd27bb9e3b173777a2ffefc

data/ext/Makefile

@@ -0,0 +1,270 @@
+
+SHELL = /bin/sh
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+V0 = $(V:0=)
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@ :)
+ECHO = $(ECHO1:0=@ echo)
+NULLCMD = :
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /Users/samuel/.rubies/ruby-3.3.4/include/ruby-3.3.0
+hdrdir = $(topdir)
+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.4
+rubysitearchprefix = $(rubylibprefix)/$(sitearch)
+rubyarchprefix = $(rubylibprefix)/$(arch)
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
+sitearchhdrdir = $(sitehdrdir)/$(sitearch)
+rubyarchhdrdir = $(rubyhdrdir)/$(arch)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitearchdir = $(sitelibdir)/$(sitearch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitedir = $(rubylibprefix)/site_ruby
+rubyarchdir = $(rubylibdir)/$(arch)
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+sitearchincludedir = $(includedir)/$(sitearch)
+archincludedir = $(includedir)/$(arch)
+sitearchlibdir = $(libdir)/$(sitearch)
+archlibdir = $(libdir)/$(arch)
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(SDKROOT)$(prefix)/include
+runstatedir = $(localstatedir)/run
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+archdir = $(rubyarchdir)
+
+
+CC_WRAPPER = 
+CC = clang
+CXX = clang++
+LIBRUBY = $(LIBRUBY_A)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework CoreFoundation $(MAINLIBS)
+empty =
+OUTFLAG = -o $(empty)
+COUTFLAG = -o $(empty)
+CSRCFLAG = $(empty)
+
+RUBY_EXTCONF_H = extconf.h
+cflags   = -fdeclspec $(optflags) $(debugflags) $(warnflags)
+cxxflags = 
+optflags = -O3 -fno-fast-math
+debugflags = -ggdb3
+warnflags = -Wall -Wextra -Wextra-tokens -Wdeprecated-declarations -Wdivision-by-zero -Wdiv-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wold-style-definition -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wmisleading-indentation -Wundef
+cppflags = 
+CCDLFLAGS = -fno-common
+CFLAGS   = $(CCDLFLAGS) $(cflags) -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 $(ARCH_FLAG)
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS) -fdeclspec $(ARCH_FLAG)
+ldflags  = -L. -fstack-protector-strong -L/opt/local/lib
+dldflags = -L/opt/local/lib -Wl,-undefined,dynamic_lookup -bundle_loader '$(BUILTRUBY)'
+ARCH_FLAG = -arch arm64
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
+RUBY_SO_NAME = ruby.3.3
+RUBYW_INSTALL_NAME = 
+RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
+RUBYW_BASE_NAME = rubyw
+RUBY_BASE_NAME = ruby
+
+arch = arm64-darwin24
+sitearch = $(arch)
+ruby_version = 3.3.0
+ruby = $(bindir)/$(RUBY_BASE_NAME)
+RUBY = $(ruby)
+BUILTRUBY = $(bindir)/$(RUBY_BASE_NAME)
+ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
+
+RM = rm -f
+RM_RF = rm -fr
+RMDIRS = rmdir -p
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+TOUCH = exit >
+
+#### End of system configuration section. ####
+
+preload = 
+libpath = . $(libdir) /opt/local/lib
+LIBPATH =  -L. -L$(libdir) -L/opt/local/lib
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS =   -lpthread  
+ORIG_SRCS = 
+SRCS = $(ORIG_SRCS) escape.c markup.c query.c tag.c template.c xrb.c
+OBJS = escape.o markup.o query.o tag.o template.o xrb.o
+HDRS = $(srcdir)/extconf.h
+LOCAL_HDRS = 
+TARGET = XRB_Extension
+TARGET_NAME = XRB_Extension
+TARGET_ENTRY = Init_$(TARGET_NAME)
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+TIMESTAMP_DIR = .
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(sitehdrdir)$(target_prefix)
+ARCHHDRDIR    = $(sitearchhdrdir)$(target_prefix)
+TARGET_SO_DIR =
+TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
+CLEANLIBS     = $(TARGET_SO) $(TARGET_SO).dSYM
+CLEANOBJS     = $(OBJS) *.bak
+TARGET_SO_DIR_TIMESTAMP = $(TIMESTAMP_DIR)/.sitearchdir.time
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-static clean-rb
+
+clean-static::
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-static clean-rb-default clean-rb
+		-$(Q)$(RM_RF) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean-static::
+distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
+		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(DLLIB) $(TARGET_SO_DIR_TIMESTAMP)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+clean-static::
+	-$(Q)$(RM) $(STATIC_LIB)
+install-rb: pre-install-rb do-install-rb install-rb-default
+install-rb-default: pre-install-rb-default do-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+do-install-rb:
+do-install-rb-default:
+pre-install-rb-default:
+	@$(NULLCMD)
+$(TARGET_SO_DIR_TIMESTAMP):
+	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
+	$(Q) $(TOUCH) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
+
+.cc.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cc.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.mm.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.cxx.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cxx.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.cpp.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.cpp.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.c.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.c.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
+
+.m.S:
+	$(ECHO) translating $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
+
+$(TARGET_SO): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
+	-$(Q)$(RM) $(@)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(Q) $(POSTLINK)
+
+
+
+$(OBJS): $(HDRS) $(ruby_headers)

data/ext/extconf.h

@@ -0,0 +1,5 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_RB_SYM2STR 1
+#define HAVE_RB_STR_CAT_CSTR 1
+#endif

data/ext/xrb/escape.c

@@ -2,18 +2,6 @@
 #include "escape.h"
 #include <assert.h>
 
-inline static int XRB_Markup_is_markup(VALUE value) {
-	if (RB_IMMEDIATE_P(value))
-		return 0;
-	
-	// This is a short-cut:
-	if (rb_class_of(value) == rb_XRB_MarkupString) {
-		return 1;
-	}
-	
-	return rb_funcall(value, id_is_a, 1, rb_XRB_Markup) == Qtrue;
-}
-
 VALUE XRB_MarkupString_raw(VALUE self, VALUE string) {
 	string = rb_str_dup(string);
 	
@@ -91,7 +79,7 @@ static inline VALUE XRB_Markup_append_buffer(VALUE buffer, const char * s, const
 }
 
 // Escape and append a string to the output buffer.
-VALUE XRB_Markup_append_string(VALUE buffer, VALUE string) {
+static VALUE XRB_Markup_append_string(VALUE buffer, VALUE string) {
 	const char * begin = RSTRING_PTR(string);
 	const char * end = begin + RSTRING_LEN(string);
 	
@@ -103,38 +91,29 @@ 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;
-	
-	if (!XRB_Markup_is_markup(value)) {
-		value = XRB_Markup_escape_string(Qnil, value);
-	}
-	 
-	rb_funcall(buffer, id_concat, 1, value);
+// Append self to the output buffer efficiently, escaping special characters.
+VALUE XRB_Markup_append_markup(VALUE self, VALUE output) {
+	if (self == Qnil) return output;
 	
-	return buffer;
-}
-
-VALUE XRB_Markup_append(VALUE self, VALUE buffer, VALUE value) {
-	if (value == Qnil) return Qnil;
+	VALUE value = self;
 	
-	if (RB_TYPE_P(buffer, T_STRING)) {
-		rb_str_modify(buffer);
-	} else {
-		return XRB_Markup_append_slow(self, buffer, value);
+	// Ensure value is a string:
+	if (rb_type(value) != T_STRING) {
+		value = rb_funcall(value, id_to_s, 0);
+		rb_string_value(&value);
 	}
 	
-	if (XRB_Markup_is_markup(value)) {
-		rb_str_append(buffer, value);
+	if (RB_TYPE_P(output, T_STRING)) {
+		// Fast path:
+		rb_str_modify_expand(output, RSTRING_LEN(value));
+		XRB_Markup_append_string(output, value);
 	} else {
-		if (rb_type(value) != T_STRING) {
-			value = rb_funcall(value, id_to_s, 0);
-		}
-		
-		XRB_Markup_append_string(buffer, value);
+		// Slow path (generates temporary strings):
+		value = XRB_Markup_escape_string(Qnil, value);
+		rb_funcall(output, id_concat, 1, value);
 	}
 	
-	return buffer;
+	return output;
 }
 
 // Convert markup special characters to entities. May return the original string if no changes were made.
@@ -158,14 +137,8 @@ VALUE XRB_Markup_escape_string(VALUE self, VALUE string) {
 }
 
 void Init_XRB_escape(void) {
-	rb_XRB_MarkupString = rb_define_class_under(rb_XRB, "MarkupString", rb_cString);
-	rb_include_module(rb_XRB_MarkupString, rb_XRB_Markup);
-	
-	rb_undef_method(rb_class_of(rb_XRB_Markup), "escape_string");
-	rb_define_singleton_method(rb_XRB_Markup, "escape_string", XRB_Markup_escape_string, 1);
-	
-	rb_undef_method(rb_class_of(rb_XRB_Markup), "append");
-	rb_define_singleton_method(rb_XRB_Markup, "append", XRB_Markup_append, 2);
+	rb_undef_method(rb_XRB_Markup, "append_markup");
+	rb_define_method(rb_XRB_Markup, "append_markup", XRB_Markup_append_markup, 1);
 	
 	rb_undef_method(rb_class_of(rb_XRB_Markup), "raw");
 	rb_define_singleton_method(rb_XRB_Markup, "raw", XRB_MarkupString_raw, 1);

data/ext/xrb/escape.h

@@ -9,7 +9,7 @@ void Init_XRB_escape(void);
 VALUE XRB_MarkupString_raw(VALUE self, VALUE string);
 
 // Append any value to the output buffer efficiently, escaping entities as needed.
-VALUE XRB_Markup_append(VALUE self, VALUE buffer, VALUE value);
+VALUE XRB_Markup_append_markup(VALUE self, VALUE buffer);
 
 // Escape any entities in the given string. If no entities were found, might return the original string.
 VALUE XRB_Markup_escape_string(VALUE self, VALUE string);

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,37 +60,37 @@ 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);
 		
 		if (value != Qtrue) {
 			rb_str_cat_cstr(buffer, "=\"");
-			XRB_Markup_append(Qnil, buffer, value);
+			XRB_Markup_append_markup(value, buffer);
 			rb_str_cat_cstr(buffer, "\"");
 		}
 	}
 }
 
-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, "/>");
@@ -128,7 +160,7 @@ VALUE XRB_Tag_append_tag(VALUE self, VALUE buffer, VALUE name, VALUE attributes,
 		rb_str_cat_cstr(buffer, ">");
 		
 		if (content != Qtrue) {
-			XRB_Markup_append(self, buffer, content);
+			XRB_Markup_append_markup(content, buffer);
 		}
 		
 		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;
 }
 

data/ext/xrb/xrb.c

@@ -51,6 +51,7 @@ void Init_XRB_Extension(void) {
 	
 	rb_XRB = rb_define_module("XRB");
 	rb_XRB_Markup = rb_define_module_under(rb_XRB, "Markup");
+	rb_XRB_MarkupString = rb_define_class_under(rb_XRB, "MarkupString", rb_cString);
 	rb_XRB_Native = rb_define_module_under(rb_XRB, "Native");
 	
 	Init_XRB_escape();

data/lib/xrb/builder.rb

@@ -9,8 +9,6 @@ require_relative 'tag'
 module XRB
 	# Build markup quickly and efficiently.
 	class Builder
-		include Markup
-		
 		INDENT = "\t"
 		
 		class Fragment
@@ -19,18 +17,20 @@ module XRB
 				@builder = nil
 			end
 			
-			def call(builder)
+			def append_markup(output)
+				builder = Builder.new(output)
+				
+				self.build_markup(builder)
+				
+				return builder.output
+			end
+			
+			def build_markup(builder)
 				@block.call(builder)
 			end
 			
 			def to_s
-				unless @builder
-					@builder = Builder.new
-					
-					self.call(@builder)
-				end
-				
-				return @builder.to_s
+				self.append_markup(nil)
 			end
 			
 			def == other
@@ -84,6 +84,10 @@ module XRB
 			@children = [0]
 		end
 		
+		def build_markup(builder)
+			builder.append(@output)
+		end
+		
 		attr :output
 		
 		def encoding
@@ -149,7 +153,7 @@ module XRB
 				@output << indentation
 			end
 			
-			Markup.append(@output, content)
+			content.build_markup(self)
 			
 			if @indent
 				@output << "\n"
@@ -161,15 +165,7 @@ module XRB
 		end
 		
 		def <<(content)
-			return unless content
-			
-			if content.is_a?(Fragment)
-				inline! do
-					content.call(self)
-				end
-			else
-				Markup.append(@output, content)
-			end
+			content&.build_markup(self)
 		end
 		
 		# Append pre-existing markup:

data/lib/xrb/markup.rb

@@ -8,32 +8,33 @@ require 'cgi'
 module XRB
 	# A wrapper which indicates that `value` can be appended to the output buffer without any changes.
 	module Markup
-		# Converts special characters `<`, `>`, `&`, and `"` into their equivalent entities.
-		# @return [String] May return the original string if no changes were made.
-		def self.escape_string(string)
-			CGI.escape_html(string)
+		def self.raw(string)
+			MarkupString.raw(string)
 		end
 		
-		# Appends a string to the output buffer, escaping if if necessary.
-		def self.append(buffer, value)
-			if value.is_a? Markup
-				buffer << value
-			elsif value
-				buffer << self.escape_string(value.to_s)
-			end
+		def self.append(output, value)
+			value.append_markup(output)
+		end
+		
+		def append_markup(output)
+			output << ::CGI.escape_html(self.to_s)
+		end
+		
+		def build_markup(builder)
+			append_markup(builder.output)
 		end
 	end
 	
+	::Object.prepend(Markup)
+	
 	# Initialized from text which is escaped to use HTML entities.
 	class MarkupString < String
-		include Markup
-		
 		# @param string [String] the string value itself.
 		# @param escape [Boolean] whether or not to escape the string.
 		def initialize(string = nil, escape = true)
 			if string
 				if escape
-					string = Markup.escape_string(string)
+					string = ::CGI.escape_html(string)
 				end
 				
 				super(string)
@@ -52,6 +53,10 @@ module XRB
 		def html_safe?
 			true
 		end
+		
+		def append_markup(output)
+			output << self
+		end
 	end
 	
 	module Script

data/lib/xrb/tag.rb

@@ -8,8 +8,6 @@ require_relative 'markup'
 module XRB
 	# This represents an individual SGML tag, e.g. <a>, </a> or <a />, with attributes. Attribute values must be escaped.
 	Tag = Struct.new(:name, :closed, :attributes) do
-		include XRB::Markup
-		
 		def self.split(qualified_name)
 			if i = qualified_name.index(':')
 				return qualified_name.slice(0...i), qualified_name.slice(i+1..-1)
@@ -80,7 +78,7 @@ module XRB
 			else
 				buffer << '>'
 				unless content == true
-					Markup.append(buffer, content)
+					content.append_markup(buffer)
 				end
 				buffer << '</' << name.to_s << '>'
 			end
@@ -108,7 +106,7 @@ module XRB
 					buffer << ' ' << attribute_key.to_s
 				else
 					buffer << ' ' << attribute_key.to_s << '="'
-					Markup.append(buffer, value)
+					value.append_markup(buffer)
 					buffer << '"'
 				end
 			end

data/lib/xrb/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2012-2024, by Samuel Williams.
 
 module XRB
-	VERSION = "0.8.0"
+	VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xrb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -51,7 +51,16 @@ extra_rdoc_files: []
 files:
 - bake/xrb/entities.rb
 - bake/xrb/parsers.rb
+- ext/Makefile
+- ext/XRB_Extension.bundle
+- ext/escape.o
+- ext/extconf.h
 - ext/extconf.rb
+- ext/markup.o
+- ext/query.o
+- ext/tag.o
+- ext/template.o
+- ext/xrb.o
 - ext/xrb/escape.c
 - ext/xrb/escape.h
 - ext/xrb/markup.c

metadata.gz.sig

@@ -1,2 +1,2 @@
-#1�{�
-^�E�K���H��\��:�a��F鿆Ȑ
+ϑb��5���Uk,�Q{�I'���D=��AZS�L�F��d;��o֗�F��!޳
+��
��Z���ķǖlT �S�>ǃ���d�}ps�����p�b�G1�dҧ������cVB�*�܎��eQ���\��L(K��s��V�djh��4���yFfՙ�k��€`[����k��i�=1���
��3x����F{��Dh%���.�