trenni 3.8.0 → 3.13.0

data/lib/trenni/fallback/template.rl

@@ -67,7 +67,7 @@
 	include template "trenni/template.rl";
 }%%
 
-require_relative '../parse_error'
+require_relative '../error'
 
 module Trenni
 	module Fallback

data/lib/trenni/fallback/template.rl.dot

@@ -0,0 +1,270 @@
+digraph template {
+	rankdir=LR;
+	node [ shape = point ];
+	ENTRY;
+	en_21;
+	en_32;
+	en_43;
+	eof_1;
+	eof_2;
+	eof_3;
+	eof_4;
+	eof_5;
+	eof_6;
+	eof_7;
+	eof_8;
+	eof_9;
+	eof_10;
+	eof_11;
+	eof_14;
+	eof_15;
+	eof_16;
+	eof_17;
+	eof_18;
+	eof_19;
+	eof_20;
+	eof_32;
+	eof_33;
+	eof_34;
+	eof_35;
+	eof_36;
+	eof_37;
+	eof_38;
+	eof_39;
+	eof_40;
+	eof_41;
+	eof_42;
+	eof_44;
+	eof_45;
+	eof_46;
+	eof_47;
+	eof_48;
+	node [ shape = circle, height = 0.2 ];
+	err_14 [ label=""];
+	err_15 [ label=""];
+	err_18 [ label=""];
+	node [ fixedsize = true, height = 0.65, shape = doublecircle ];
+	43;
+	44;
+	45;
+	46;
+	47;
+	48;
+	49;
+	50;
+	51;
+	52;
+	53;
+	54;
+	55;
+	56;
+	node [ shape = circle ];
+	1 -> 45 [ label = "'\\n' / te" ];
+	1 -> 2 [ label = "'#'" ];
+	1 -> 3 [ label = "'<'" ];
+	1 -> 1 [ label = "DEF" ];
+	2 -> 43 [ label = "'{' / lag2, initts" ];
+	2 -> 1 [ label = "DEF" ];
+	3 -> 43 [ label = "'?' / lag2, initts" ];
+	3 -> 1 [ label = "DEF" ];
+	4 -> 43 [ label = "'{' / lag6, initts" ];
+	4 -> 44 [ label = "DEF / te" ];
+	5 -> 43 [ label = "'?' / lag6, initts" ];
+	5 -> 44 [ label = "DEF / te" ];
+	6 -> 7 [ label = "'?'" ];
+	6 -> 44 [ label = "DEF / te" ];
+	7 -> 8 [ label = "'r'" ];
+	7 -> 43 [ label = "DEF / lag6, initts" ];
+	8 -> 9 [ label = "'\\t'..'\\r', SP / instruction_begin" ];
+	8 -> 43 [ label = "DEF / lag6, initts" ];
+	9 -> 10 [ label = "'?' / instruction_end" ];
+	9 -> 9 [ label = "DEF" ];
+	10 -> 11 [ label = "'>'" ];
+	10 -> 9 [ label = "DEF" ];
+	11 -> 11 [ label = "'\\t', '\\v'..'\\r', SP" ];
+	11 -> 43 [ label = "'\\n' / last1, initts" ];
+	11 -> 43 [ label = "DEF / switch, initts" ];
+	12 -> 47 [ label = "'{'" ];
+	12 -> 44 [ label = "DEF / te" ];
+	13 -> 14 [ label = "'?'" ];
+	13 -> 44 [ label = "DEF / te" ];
+	14 -> err_14 [ label = "0..',', '/', ';'..'@', '['..'^', '`', '{'..127 / instruction_error" ];
+	14 -> 18 [ label = "'r'" ];
+	14 -> 15 [ label = "DEF" ];
+	15 -> err_15 [ label = "0..'\\b', 14..31, '!'..',', '/', ';'..'@', '['..'^', '`', '{'..127 / instruction_error" ];
+	15 -> 16 [ label = "'\\t'..'\\r', SP" ];
+	15 -> 15 [ label = "DEF" ];
+	16 -> 17 [ label = "'?'" ];
+	16 -> 16 [ label = "DEF" ];
+	17 -> 43 [ label = "'>' / last5, initts" ];
+	17 -> 16 [ label = "DEF" ];
+	18 -> err_18 [ label = "0..'\\b', 14..31, '!'..',', '/', ';'..'@', '['..'^', '`', '{'..127 / instruction_error" ];
+	18 -> 19 [ label = "'\\t'..'\\r', SP / instruction_begin" ];
+	18 -> 15 [ label = "DEF" ];
+	19 -> 20 [ label = "'?' / instruction_end" ];
+	19 -> 19 [ label = "DEF" ];
+	20 -> 48 [ label = "'>' / te, store3" ];
+	20 -> 19 [ label = "DEF" ];
+	21 -> 22 [ label = "'\"' / initts" ];
+	21 -> 30 [ label = "'''" ];
+	21 -> 21 [ label = "'{' / 17:27, initts" ];
+	21 -> 52 [ label = "'}' / 20:51" ];
+	21 -> 21 [ label = "DEF / initts" ];
+	22 -> 23 [ label = "'\"' / initts" ];
+	22 -> 29 [ label = "'#'" ];
+	22 -> 22 [ label = "DEF / initts" ];
+	23 -> 24 [ label = "'#'" ];
+	23 -> 25 [ label = "''' / initts" ];
+	23 -> 23 [ label = "'{' / 17:27, initts" ];
+	23 -> 50 [ label = "'}' / 20:51" ];
+	23 -> 23 [ label = "DEF / initts" ];
+	24 -> 24 [ label = "'#'" ];
+	24 -> 25 [ label = "''' / initts" ];
+	24 -> 23 [ label = "'{' / 13:33, 17:27, initts" ];
+	24 -> 50 [ label = "'}' / 20:51" ];
+	24 -> 23 [ label = "DEF / initts" ];
+	25 -> 26 [ label = "'\"', ''' / initts" ];
+	25 -> 28 [ label = "'#'" ];
+	25 -> 25 [ label = "DEF / initts" ];
+	26 -> 27 [ label = "'#'" ];
+	26 -> 26 [ label = "'{' / 17:27, initts" ];
+	26 -> 49 [ label = "'}' / 20:51" ];
+	26 -> 26 [ label = "DEF / initts" ];
+	27 -> 27 [ label = "'#'" ];
+	27 -> 26 [ label = "'{' / 13:33, 17:27, initts" ];
+	27 -> 49 [ label = "'}' / 20:51" ];
+	27 -> 26 [ label = "DEF / initts" ];
+	28 -> 26 [ label = "'\"', ''' / initts" ];
+	28 -> 28 [ label = "'#'" ];
+	28 -> 25 [ label = "'{' / 13:33, initts" ];
+	28 -> 25 [ label = "DEF / initts" ];
+	29 -> 23 [ label = "'\"' / initts" ];
+	29 -> 29 [ label = "'#'" ];
+	29 -> 22 [ label = "'{' / 13:33, initts" ];
+	29 -> 22 [ label = "DEF / initts" ];
+	30 -> 31 [ label = "''' / initts" ];
+	30 -> 30 [ label = "DEF" ];
+	31 -> 25 [ label = "'\"' / initts" ];
+	31 -> 31 [ label = "'{' / 17:27, initts" ];
+	31 -> 51 [ label = "'}' / 20:51" ];
+	31 -> 31 [ label = "DEF / initts" ];
+	32 -> 33 [ label = "'\"' / initts" ];
+	32 -> 41 [ label = "'''" ];
+	32 -> 32 [ label = "'{' / 17:27, initts" ];
+	32 -> 56 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	32 -> 32 [ label = "DEF / initts" ];
+	33 -> 34 [ label = "'\"' / initts" ];
+	33 -> 40 [ label = "'#'" ];
+	33 -> 33 [ label = "DEF / initts" ];
+	34 -> 35 [ label = "'#'" ];
+	34 -> 36 [ label = "''' / initts" ];
+	34 -> 34 [ label = "'{' / 17:27, initts" ];
+	34 -> 54 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	34 -> 34 [ label = "DEF / initts" ];
+	35 -> 35 [ label = "'#'" ];
+	35 -> 36 [ label = "''' / initts" ];
+	35 -> 34 [ label = "'{' / 13:33, 17:27, initts" ];
+	35 -> 54 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	35 -> 34 [ label = "DEF / initts" ];
+	36 -> 37 [ label = "'\"', ''' / initts" ];
+	36 -> 39 [ label = "'#'" ];
+	36 -> 36 [ label = "DEF / initts" ];
+	37 -> 38 [ label = "'#'" ];
+	37 -> 37 [ label = "'{' / 17:27, initts" ];
+	37 -> 53 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	37 -> 37 [ label = "DEF / initts" ];
+	38 -> 38 [ label = "'#'" ];
+	38 -> 37 [ label = "'{' / 13:33, 17:27, initts" ];
+	38 -> 53 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	38 -> 37 [ label = "DEF / initts" ];
+	39 -> 37 [ label = "'\"', ''' / initts" ];
+	39 -> 39 [ label = "'#'" ];
+	39 -> 36 [ label = "'{' / 13:33, initts" ];
+	39 -> 36 [ label = "DEF / initts" ];
+	40 -> 34 [ label = "'\"' / initts" ];
+	40 -> 40 [ label = "'#'" ];
+	40 -> 33 [ label = "'{' / 13:33, initts" ];
+	40 -> 33 [ label = "DEF / initts" ];
+	41 -> 42 [ label = "''' / initts" ];
+	41 -> 41 [ label = "DEF" ];
+	42 -> 36 [ label = "'\"' / initts" ];
+	42 -> 42 [ label = "'{' / 17:27, initts" ];
+	42 -> 55 [ label = "'}' / expression_end, emit_expression, 21:102" ];
+	42 -> 42 [ label = "DEF / initts" ];
+	43 -> 46 [ label = "'\\t', '\\v'..'\\r', SP / ts, te, store6" ];
+	43 -> 45 [ label = "'\\n' / ts, te" ];
+	43 -> 12 [ label = "'#' / ts" ];
+	43 -> 13 [ label = "'<' / ts" ];
+	43 -> 44 [ label = "DEF / ts, te" ];
+	44 -> 45 [ label = "'\\n' / te" ];
+	44 -> 4 [ label = "'#'" ];
+	44 -> 5 [ label = "'<'" ];
+	44 -> 44 [ label = "DEF / te" ];
+	45 -> 45 [ label = "'\\n' / te" ];
+	45 -> 2 [ label = "'#'" ];
+	45 -> 3 [ label = "'<'" ];
+	45 -> 1 [ label = "DEF" ];
+	46 -> 46 [ label = "'\\t', '\\v'..'\\r', SP / te, store6" ];
+	46 -> 45 [ label = "'\\n' / te" ];
+	46 -> 4 [ label = "'#'" ];
+	46 -> 6 [ label = "'<'" ];
+	46 -> 44 [ label = "DEF / te" ];
+	47 -> 43 [ label = "DEF / expression_begin, next4, initts" ];
+	48 -> 11 [ label = "'\\t', '\\v'..'\\r', SP" ];
+	48 -> 43 [ label = "'\\n' / last1, initts" ];
+	48 -> 43 [ label = "DEF / next3, initts" ];
+	49 -> 26 [ label = "'\"', ''' / initts" ];
+	49 -> 28 [ label = "'#'" ];
+	49 -> 25 [ label = "DEF / initts" ];
+	50 -> 23 [ label = "'\"' / initts" ];
+	50 -> 29 [ label = "'#'" ];
+	50 -> 22 [ label = "DEF / initts" ];
+	51 -> 31 [ label = "''' / initts" ];
+	51 -> 30 [ label = "DEF" ];
+	53 -> 37 [ label = "'\"', ''' / initts" ];
+	53 -> 39 [ label = "'#'" ];
+	53 -> 36 [ label = "DEF / initts" ];
+	54 -> 34 [ label = "'\"' / initts" ];
+	54 -> 40 [ label = "'#'" ];
+	54 -> 33 [ label = "DEF / initts" ];
+	55 -> 42 [ label = "''' / initts" ];
+	55 -> 41 [ label = "DEF" ];
+	ENTRY -> 43 [ label = "IN" ];
+	en_21 -> 21 [ label = "parse_nested_expression" ];
+	en_32 -> 32 [ label = "parse_expression" ];
+	en_43 -> 43 [ label = "main" ];
+	1 -> eof_1 [ label = "EOF / lag2" ];
+	2 -> eof_2 [ label = "EOF / lag2" ];
+	3 -> eof_3 [ label = "EOF / lag2" ];
+	4 -> eof_4 [ label = "EOF / lag6" ];
+	5 -> eof_5 [ label = "EOF / lag6" ];
+	6 -> eof_6 [ label = "EOF / lag6" ];
+	7 -> eof_7 [ label = "EOF / lag6" ];
+	8 -> eof_8 [ label = "EOF / instruction_error, lag6" ];
+	9 -> eof_9 [ label = "EOF / instruction_error, lag6" ];
+	10 -> eof_10 [ label = "EOF / instruction_error, lag6" ];
+	11 -> eof_11 [ label = "EOF / switch" ];
+	14 -> eof_14 [ label = "EOF / instruction_error" ];
+	15 -> eof_15 [ label = "EOF / instruction_error" ];
+	16 -> eof_16 [ label = "EOF / instruction_error" ];
+	17 -> eof_17 [ label = "EOF / instruction_error" ];
+	18 -> eof_18 [ label = "EOF / instruction_error" ];
+	19 -> eof_19 [ label = "EOF / instruction_error" ];
+	20 -> eof_20 [ label = "EOF / instruction_error" ];
+	32 -> eof_32 [ label = "EOF / expression_error" ];
+	33 -> eof_33 [ label = "EOF / expression_error" ];
+	34 -> eof_34 [ label = "EOF / expression_error" ];
+	35 -> eof_35 [ label = "EOF / expression_error" ];
+	36 -> eof_36 [ label = "EOF / expression_error" ];
+	37 -> eof_37 [ label = "EOF / expression_error" ];
+	38 -> eof_38 [ label = "EOF / expression_error" ];
+	39 -> eof_39 [ label = "EOF / expression_error" ];
+	40 -> eof_40 [ label = "EOF / expression_error" ];
+	41 -> eof_41 [ label = "EOF / expression_error" ];
+	42 -> eof_42 [ label = "EOF / expression_error" ];
+	44 -> eof_44 [ label = "EOF / next6" ];
+	45 -> eof_45 [ label = "EOF / next2" ];
+	46 -> eof_46 [ label = "EOF / next6" ];
+	47 -> eof_47 [ label = "EOF / expression_begin, next4" ];
+	48 -> eof_48 [ label = "EOF / next3" ];
+}

data/lib/trenni/native.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'parse_error'
+require_relative 'error'
 
 # Methods on the following classes may be replaced by native implementations:
 require_relative 'tag'

data/lib/trenni/parsers.rb

@@ -8,6 +8,7 @@ if defined? Trenni::Native
 else
 	require_relative 'fallback/markup'
 	require_relative 'fallback/template'
+	require_relative 'fallback/query'
 	
 	Trenni::Parsers = Trenni::Fallback
 end

data/lib/trenni/query.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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.
+
+require_relative 'buffer'
+
+require 'uri'
+
+module Trenni
+	class Query < Hash
+		def parse(buffer)
+			Parsers.parse_query(buffer, Delegate.new(self))
+		end
+		
+		class Delegate
+			def initialize(top = {})
+				@top = top
+				
+				@current = @top
+				@index = nil
+			end
+			
+			def string(key, encoded)
+				if encoded
+					key = ::URI.decode_www_form_component(key)
+				end
+				
+				index(key.to_sym)
+			end
+			
+			def integer(key)
+				index(key.to_i)
+			end
+			
+			def index(key)
+				if @index
+					@current = @current.fetch(@index) do
+						@current[@index] = {}
+					end
+				end
+				
+				@index = key
+			end
+			
+			def append
+				if @index
+					@current = @current.fetch(@index) do
+						@current[@index] = []
+					end
+				end
+				
+				@index = @current.size
+			end
+			
+			def assign(value, encoded)
+				if encoded
+					value = ::URI.decode_www_form_component(value)
+				end
+				
+				@current[@index] = value
+				
+				@current = @top
+				@index = nil
+			end
+			
+			def pair
+				if @index
+					@current[@index] = true
+				end
+				
+				@current = @top
+				@index = nil
+			end
+		end
+	end
+end

data/lib/trenni/reference.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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.
+
+require_relative 'query'
+
+module Trenni
+	class Reference
+		def initialize(path, query = {}, fragment: nil)
+			@path = path.to_s
+			@query = query
+			@fragment = fragment
+		end
+		
+		# The path component of the URI, e.g. /foo/bar/index.html
+		attr :path
+		
+		# The query parameters.
+		attr :query
+		
+		# A fragment identifier, the part after the '#'
+		attr :fragment
+		
+		def append(buffer)
+			buffer << escape_path(@path)
+			
+			unless @query.empty?
+				buffer << '?' << query_string
+			end
+			
+			if @fragment
+				buffer << '#' << escape(@fragment)
+			end
+			
+			return buffer
+		end
+		
+		def to_str
+			append(String.new)
+		end
+		
+		alias to_s to_str
+		
+		private
+		
+		# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
+		NON_PCHAR = /([^
+			a-zA-Z0-9
+			\-\._~
+			!\$&'\(\)\*\+,;=
+			:@\/
+		]+)/x.freeze
+		
+		def escape_path(path)
+			encoding = path.encoding
+			path.b.gsub(NON_PCHAR) do |m|
+				'%' + m.unpack('H2' * m.bytesize).join('%').upcase
+			end.force_encoding(encoding)
+		end
+		
+		# Escapes a generic string, using percent encoding.
+		def escape(string)
+			encoding = string.encoding
+			string.b.gsub(/([^a-zA-Z0-9_.\-]+)/) do |m|
+				'%' + m.unpack('H2' * m.bytesize).join('%').upcase
+			end.force_encoding(encoding)
+		end
+		
+		def query_string
+			build_nested_query(@query)
+		end
+		
+		def build_nested_query(value, prefix = nil)
+			case value
+			when Array
+				value.map { |v|
+					build_nested_query(v, "#{prefix}[]")
+				}.join("&")
+			when Hash
+				value.map { |k, v|
+					build_nested_query(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
+				}.reject(&:empty?).join('&')
+			when nil
+				prefix
+			else
+				raise ArgumentError, "value must be a Hash" if prefix.nil?
+				"#{prefix}=#{escape(value.to_s)}"
+			end
+		end
+	end
+	
+	# Generate a URI from a path and user parameters. The path may contain a `#fragment` or `?query=parameters`.
+	def self.Reference(path = '', **parameters)
+		base, fragment = path.split('#', 2)
+		path, query_string = base.split('?', 2)
+		
+		query = Query.new
+		
+		if query_string
+			query.parse(Buffer.new(query_string))
+		end
+		
+		query.update(parameters)
+		
+		Reference.new(path, query, fragment: fragment)
+	end
+end