xrb 0.2.0 → 0.4.0

data/ext/xrb/xrb.h

@@ -19,16 +19,6 @@
 #define RB_IMMEDIATE_P IMMEDIATE_P
 #endif
 
-// A helper to reserve a specific capacity of data for a buffer.
-#ifndef HAVE_RB_STR_RESERVE
-inline VALUE rb_str_reserve(VALUE string, long extra) {
-	long actual = RSTRING_LEN(string);
-	rb_str_resize(string, actual + extra);
-	rb_str_set_len(string, actual);
-	return string;
-}
-#endif
-
 // Modules and classes exposed by XRB.
 extern VALUE
 	rb_XRB,
@@ -84,7 +74,7 @@ static inline VALUE XRB_string(const char * begin, const char * end, rb_encoding
 static inline VALUE XRB_buffer_for(VALUE string) {
 	VALUE buffer = rb_enc_str_new(0, 0, rb_enc_get(string));
 	
-	rb_str_reserve(buffer, RSTRING_LEN(string) + 128);
+	rb_str_modify_expand(buffer, RSTRING_LEN(string) + 128);
 	
 	return buffer;
 }

data/lib/xrb/builder.rb

@@ -37,6 +37,16 @@ module XRB
 				# This is a bit of a hack... but is required for existing specs to pass:
 				self.to_s == other.to_s
 			end
+			
+			def >> block
+				if block
+					Template.buffer(block.binding) << self
+					
+					return nil
+				else
+					return self
+				end
+			end
 		end
 		
 		# A helper to generate fragments of markup.
@@ -49,12 +59,9 @@ module XRB
 				return Fragment.new(block)
 			end
 			
-			if output.is_a?(Builder)
-				block.call(output)
-			else
-				block.call(Builder.new(output))
-			end
+			block.call(output)
 			
+			# We explicitly return nil here as we don't want to append the output twice.
 			return nil
 		end
 		
@@ -103,7 +110,7 @@ module XRB
 		end
 		
 		def doctype(attributes = 'html')
-			@output << "<!DOCTYPE #{attributes}>\n"
+			@output << "<!doctype #{attributes}>\n"
 		end
 		
 		# Begin a block tag.

data/lib/xrb/entities.xrb

@@ -1,22 +1,7 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2016-2024, by Samuel Williams.
 
 module XRB
 	# We only support a small subset of markup entities.