xrb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1a872695a8ee34651e251bf308937e21574f9b0afb440a61df9daeb8d74b0a
-  data.tar.gz: f988346791ede4ac09e142835032cf2e418acbf2e33c215b2dfa4d1b0d887f5a
+  metadata.gz: bd5f5866b9f16e578f765cb49940fa5f4b43f6421ce1efe187a2e6b56a150e58
+  data.tar.gz: 51345868ef2d3e106f47a2927fb4c908331bc5fd3317f0d83a4aa65d49e9b253
 SHA512:
-  metadata.gz: 1756d1c6fef163d6be10e260b2b18ccce1f8fe22f5eeb32a2645fbb0394728c566152819a183ccd2d13d95ee4e58f431b6855fb37eb68e9b7d5ca109bcc3afe3
-  data.tar.gz: ed1c87e16209e8ba874cfb48e9a0623784957711462189eeb019cda57e369c91e780933f252f2752bdda4b4dbe7ebcdc77dd784f71c5ad9b8d79b86319f3f183
+  metadata.gz: efe42a5f52863f29a1383fdc2572b9aac8c870e4ce905a0d2b4426859bc9f4113697f0ea1450d2354accddc27c74e2df1944512400029f3c548743cde4da35ed
+  data.tar.gz: a689741788594d7c11700fe92f5ef0f71a9bef88b2b4b15dd7df3483d05e6630cd99f9863b41901c6f10bf6a0ed3327fb46acad581dfbebb26d83a45926c5e2f

data/bake/xrb/parsers.rb

@@ -59,8 +59,3 @@ end
 def native_directory
 	"ext/xrb"
 end
-
-def system(*arguments, **options)
-	Console.info(self, arguments: arguments, options: options)
-	super
-end

data/ext/Makefile

@@ -13,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0
+topdir = /Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0
 hdrdir = $(topdir)
-arch_hdrdir = /Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/arm64-darwin23
+arch_hdrdir = /Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir)/xrb
-prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.3.0
+prefix = $(DESTDIR)/Users/samuel/.rubies/ruby-3.3.3
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -96,7 +96,7 @@ ARCH_FLAG = -arch arm64
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -dynamic -bundle
 LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
+AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)

data/ext/mkmf.log

@@ -1,6 +1,6 @@
 have_func: checking for rb_sym2str()... -------------------- yes
 
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.0/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.0/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -ldl -lobjc -lpthread   -lpthread  "
+DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
 ld: warning: ignoring duplicate libraries: '-lpthread'
 checked program was:
 /* begin */
@@ -12,7 +12,7 @@ checked program was:
 6: }
 /* end */
 
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.0/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.0/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -ldl -lobjc -lpthread   -lpthread  "
+DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
 ld: warning: ignoring duplicate libraries: '-lpthread'
 checked program was:
 /* begin */
@@ -36,7 +36,7 @@ checked program was:
 
 have_func: checking for rb_str_cat_cstr()... -------------------- yes
 
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.0/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.0/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.0/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -ldl -lobjc -lpthread   -lpthread  "
+DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -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 -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
 ld: warning: ignoring duplicate libraries: '-lpthread'
 checked program was:
 /* begin */

data/ext/xrb/tag.c

@@ -97,13 +97,18 @@ VALUE XRB_Tag_append_attributes(VALUE self, VALUE buffer, VALUE attributes, VALU
 		
 		for (i = 0; i < RARRAY_LEN(attributes); i++) {
 			VALUE attribute = RARRAY_AREF(attributes, i);
+			
+			if (rb_type(attribute) != T_ARRAY || RARRAY_LEN(attribute) != 2) {
+				rb_raise(rb_eTypeError, "expected array for attribute key/value pair");
+			}
+			
 			VALUE key = RARRAY_AREF(attribute, 0);
 			VALUE value = RARRAY_AREF(attribute, 1);
 			
 			XRB_Tag_append_tag_attribute(buffer, key, value, prefix);
 		}
 	} else {
-		rb_raise(rb_eArgError, "expected hash or array for attributes");
+		rb_raise(rb_eTypeError, "expected hash or array for attributes");
 	}
 	
 	return Qnil;

data/lib/xrb/fallback/markup.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 # line 1 "lib/xrb/fallback/markup.rl"
 # Released under the MIT License.

data/lib/xrb/fallback/query.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# Released under the MIT License.
+# Copyright, 2020-2024, by Samuel Williams.
 
 # line 1 "lib/xrb/fallback/query.rl"
 # Released under the MIT License.

data/lib/xrb/fallback/template.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 # line 1 "lib/xrb/fallback/template.rl"
 # Released under the MIT License.

data/lib/xrb/tag.rb

@@ -99,7 +99,11 @@ module XRB
 				when Hash
 					self.append_attributes(buffer, value, attribute_key)
 				when Array
-					self.append_attributes(buffer, value, attribute_key)
+					value.each do |attribute|
+						raise TypeError, "expected array of key-value pairs" unless attribute.is_a?(Array) and attribute.size == 2
+						
+						self.append_attributes(buffer, [attribute], attribute_key)
+					end
 				when TrueClass
 					buffer << ' ' << attribute_key.to_s
 				else

data/lib/xrb/template.rb

@@ -11,6 +11,8 @@ require_relative 'builder'
 module XRB
 	# The output variable that will be used in templates:
 	OUT = :_out
+	
+	# The default binding to use when compiling templates.
 	BINDING = binding
 	
 	class Builder
@@ -19,7 +21,9 @@ module XRB
 		end
 	end
 	
+	# An evaluatable text-format that can be used to generate output.
 	class Template
+		# Capture the output of a block from within a template.
 		# @returns [String] the output produced by calling the given block.
 		def self.capture(*arguments, output: nil, &block)
 			scope = block.binding
@@ -81,20 +85,30 @@ module XRB
 		def initialize(buffer, binding: BINDING)
 			@buffer = buffer
 			@binding = binding
+			
+			@compiled = nil
 		end
 		
 		def freeze
 			return self if frozen?
 			
-			to_proc
+			compiled
 			
 			super
 		end
 		
+		def code
+			@code ||= compile!
+		end
+		
+		def compiled(scope = @binding.dup)
+			@compiled ||= eval("\# frozen_string_literal: true\nproc{|#{OUT}|;#{code}}", scope, @buffer.path, 0).freeze
+		end
+		
 		def to_string(scope = Object.new, output = nil)
 			builder = Builder.new(output, encoding: code.encoding)
 			
-			scope.instance_exec(builder, &to_proc)
+			scope.instance_exec(builder, &compiled)
 			
 			return builder.output
 		end
@@ -104,15 +118,13 @@ module XRB
 		end
 		
 		def to_proc(scope = @binding.dup)
-			@compiled_proc ||= eval("\# frozen_string_literal: true\nproc{|#{OUT}|;#{code}}", scope, @buffer.path, 0).freeze
+			proc do |output|
+				to_string(scope, output)
+			end
 		end
 		
 		protected
 		
-		def code
-			@code ||= compile!
-		end
-		
 		def make_assembler
 			Assembler.new
 		end

data/lib/xrb/version.rb

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

data/license.md

@@ -3,6 +3,7 @@
 Copyright, 2012-2024, by Samuel Williams.  
 Copyright, 2020, by Cyril Roelandt.  
 Copyright, 2022, by Adam Daniels.  
+Copyright, 2024, by Jean Boussier.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -65,8 +65,8 @@ We welcome contributions to this project.
 
 ### Developer Certificate of Origin
 
-This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.
 
-### Contributor Covenant
+### Community Guidelines
 
-This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is best served by a collaborative and respectful environment. Treat each other professionally, respect differing viewpoints, and engage constructively. Harassment, discrimination, or harmful behavior is not tolerated. Communicate clearly, listen actively, and support one another. If any issues arise, please inform the project maintainers.

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: xrb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 - Adam Daniels
 - Cyril Roelandt
+- Jean Boussier
 autorequire:
 bindir: bin
 cert_chain:
@@ -39,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.