trenni 1.4.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f057654b1e83a57d1fe72969c9ee72eaf376de
-  data.tar.gz: a96c7a44b65be07ed3dc69e20ddbb25d92ee300a
+  metadata.gz: 5ff8d7a73ba2ef5c153eff38d0869b2d6cb53a91
+  data.tar.gz: 5a8a5f044ea099e6d69fc17d1481f47f2a678f47
 SHA512:
-  metadata.gz: cef23ac0aa45af2f913cdd6b864a5beeacb78e0b3bc1c621db0565de40a34f030df816f048341a8c582f79628b75c334e33de3580c869956c7b0884856a48e21
-  data.tar.gz: e6a318ab7acaa6a04c5857b51caecb019936b07dcdcdd50581d0cb7879a2260ac8b1c399fdd28660cfd4cd87fa247649d89a3da54205b7bee15ede9a7e890bd4
+  metadata.gz: 505a3e2d978b00b89764a085402d94d5d15c6c8230ed91f4f6f5970d6c5752f86af98d176e9be7bbd40d9b294ad35d6e13b08194d4f846706444bc5a916f13ac
+  data.tar.gz: a08e384c2cf0487b9567e972b701f8b5d70b0b8d737e579bc7c76fc9586228657e1cee554d099ffc45b23d6150f7ad0a8a5bf3c976cfc4e39166c3e7cd023000

data/Gemfile

@@ -4,10 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-	gem "ruby-prof"
+	gem 'pry'
+	gem 'ruby-prof', platforms: [:mri]
 end
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
+	gem 'coveralls', platforms: [:mri]
 end

data/README.md

@@ -7,10 +7,20 @@ generally get the best possible performance.
 In addition, Trenni includes an SGML/XML builder to assist with the generation
 of pleasantly formatted markup.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/trenni.png)](http://travis-ci.org/ioquatix/trenni)
-[![Code Climate](https://codeclimate.com/github/ioquatix/trenni.png)](https://codeclimate.com/github/ioquatix/trenni)
+[![Build Status](https://secure.travis-ci.org/ioquatix/trenni.svg)](http://travis-ci.org/ioquatix/trenni)
+[![Code Climate](https://codeclimate.com/github/ioquatix/trenni.svg)](https://codeclimate.com/github/ioquatix/trenni)
 [![Coverage Status](https://coveralls.io/repos/ioquatix/trenni/badge.svg)](https://coveralls.io/r/ioquatix/trenni)
 
+## Motivation
+
+Trenni was designed for [Utopia](https://github.com/ioquatix/utopia). When I originally looked at template engines, I was surprised by the level of complexity and the effort involved in processing a template to produce useful output. In particular, many template engines generate an AST and walk over it to generate output (e.g. ERB, at least at the time I last checked). This is exceedingly slow in Ruby.
+
+At the time (around 2008?) I was playing around with [ramaze](https://github.com/Ramaze/ramaze) and found a template engine I really liked the design of, called [ezamar](https://github.com/manveru/ezamar). The template compilation process actually generates Ruby code which can then be compiled and executed efficiently. Another engine, by the same author, [nagoro](https://github.com/manveru/nagoro), also provided some inspiration.
+
+More recently I was doing some investigation regarding using `eval` for executing the code. The problem is that it's [not possible to replace the binding](http://stackoverflow.com/questions/27391909/replace-evalcode-string-binding-with-lambda/27392437) of a `Proc` once it's created, so template engines that evaluate code in a given binding cannot use a compiled proc, they must parse the code every time. By using a `Proc` we can generate a Ruby function which *can* be compiled to a faster representation by the VM.
+
+In addition, I wanted a simple parser and builder for HTML style markup. These are used heavily by Utopia for implementing it's tag based evaluation. The (event based) `Trenni::Parser` is designed so that some day it could be easily written in C. `Trenni::Builder` is a simple and efficient way to generate markup, it's not particularly notable, except that it doesn't use `method_missing` to [implement normal behaviour](https://github.com/sparklemotion/nokogiri/blob/b6679e928924529b56dcc0f3164224c040d14555/lib/nokogiri/xml/builder.rb#L355) which is [sort of slow](http://franck.verrot.fr/blog/2015/07/12/benchmarking-ruby-method-missing-and-define-method/).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -62,6 +72,8 @@ Trenni can help construct XML/HTML using a simple DSL:
 
 There is a [language-trenni](https://atom.io/packages/language-trenni) package for the [Atom text editor](https://atom.io). It provides syntax highlighting and integration when Trenni is used with the [utopia web framework](https://github.com/ioquatix/utopia).
 
+[Trenni Formatters](https://github.com/ioquatix/trenni-formatters) is a separate gem that uses `Trenni::Builder` to generate HTML forms easily.
+
 ## Contributing
 
 1. Fork it
@@ -74,7 +86,7 @@ There is a [language-trenni](https://atom.io/packages/language-trenni) package f
 
 Released under the MIT license.
 
-Copyright, 2012, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+Copyright, 2012, 2016, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 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/Rakefile

@@ -2,7 +2,11 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
+	begin
+		require('simplecov/version')
+		task.rspec_opts = %w{--require simplecov} if ENV['COVERAGE']
+	rescue LoadError
+	end
 end
 
 task :default => :spec

data/benchmark/io_vs_string.rb

@@ -0,0 +1,80 @@
+
+require 'benchmark/ips'
+require 'stringio'
+
+puts "Ruby #{RUBY_VERSION} at #{Time.now}"
+puts
+
+Benchmark.ips do |x|
+	
+	# These two tests look at the cost of simply writing to a buffer.
+	
+	x.report("String (Amortized)") do |i|
+		buffer = String.new
+		
+		i.times do
+			buffer << "String #{i}"
+		end
+	end
+	
+	x.report("StringIO (Amortized)") do |i|
+		buffer = StringIO.new
+		
+		i.times do
+			buffer << "String #{i}"
+		end
+	end
+	
+	x.compare!
+end
+
+# Calculating -------------------------------------
+#   String (Amortized)     91666 i/100ms
+# StringIO (Amortized)     69531 i/100ms
+# -------------------------------------------------
+#   String (Amortized)  2856024.9 (±8.8%) i/s -   14208230 in   5.017309s
+# StringIO (Amortized)  2424863.3 (±7.0%) i/s -   12098394 in   5.013982s
+# 
+# Comparison:
+#   String (Amortized):  2856024.9 i/s
+# StringIO (Amortized):  2424863.3 i/s - 1.18x slower
+
+# Adjust N to consider the cost of allocation vs the cost of appending.
+N = 5
+
+Benchmark.ips do |x|
+	# These next two tests consider that multiple writes may be done per buffer allocation.
+	
+	x.report("String") do |i|
+		i.times do
+			buffer = String.new
+			
+			N.times do
+				buffer << "String #{i}"
+			end
+		end
+	end
+	
+	x.report("StringIO") do |i|
+		i.times do
+			buffer = StringIO.new
+			
+			N.times do
+				buffer << "String #{i}"
+			end
+		end
+	end
+	
+	x.compare!
+end
+
+# Calculating -------------------------------------
+#               String     36822 i/100ms
+#             StringIO     32471 i/100ms
+# -------------------------------------------------
+#               String   445143.2 (±5.0%) i/s -    2246142 in   5.059017s
+#             StringIO   328469.2 (±4.1%) i/s -    1656021 in   5.049919s
+# 
+# Comparison:
+#               String:   445143.2 i/s
+#             StringIO:   328469.2 i/s - 1.36x slower

data/lib/trenni.rb

@@ -18,5 +18,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'trenni/builder'
-require 'trenni/template'
+require_relative 'trenni/builder'
+require_relative 'trenni/template'

data/lib/trenni/builder.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'trenni/strings'
+require_relative 'strings'
 
 module Trenni
 	INSTRUCT_ATTRIBUTES = [
@@ -27,7 +27,7 @@ module Trenni
 	].freeze
 	
 	class Builder
-		INDENT = "\t"
+		DEFAULT_INDENTATION = "\t".freeze
 		
 		# A helper to generate fragments of markup.
 		def self.fragment(builder = nil, &block)
@@ -40,18 +40,21 @@ module Trenni
 				
 				yield builder
 				
-				return builder.output.string
+				return builder.output
 			end
 		end
 		
-		def initialize(options = {})
-			@strict = options[:strict]
+		def initialize(strict: false, indent: true, indentation: DEFAULT_INDENTATION, escape: false, output: String.new)
+			@strict = strict
 			
-			@output = options[:output] || StringIO.new
-			@indentation = options[:indentation] || INDENT
-			@indent = options.fetch(:indent, true)
+			@indent = indent
 			
-			@escape = options[:escape]
+			@indentation = indentation
+			# This field gets togged in #inline so we keep track of it separately from @indentation.
+			
+			@escape = escape
+			
+			@output = output
 			
 			@level = [0]
 			@children = [0]
@@ -70,24 +73,11 @@ module Trenni
 		def instruct(attributes = nil)
 			attributes ||= INSTRUCT_ATTRIBUTES
 			
-			@output.puts "<?xml#{tag_attributes(attributes)}?>"
+			@output << "<?xml#{tag_attributes(attributes)}?>\n"
 		end
 		
 		def doctype(attributes = 'html')
-			if Array === attributes
-				text = ''
-				attributes.each do |value|
-					if value.match(/[\s"]/)
-						value = '"' + value.gsub('"', '&quot;') + '"'
-					end
-					
-					text += ' ' + value
-				end
-			else
-				text = ' ' + attributes
-			end
-			
-			@output.puts "<!DOCTYPE#{text}>"
+			@output << "<!DOCTYPE #{attributes}>\n"
 		end
 		
 		# Begin a block tag.
@@ -112,18 +102,17 @@ module Trenni
 		
 		# Append pre-existing markup:
 		def append(data)
+			return unless data
+			
 			# The parent has one more child:
 			@level[-1] += 1
 			
 			if @indent
-				lines = data.strip.split(/\n/)
-				
-				lines.each_with_index do |line, i|
-					@output.puts if i > 0
-					@output.write indentation + line
+				data.each_line.with_index do |line, i|
+					@output << indentation << line
 				end
 			else
-				@output.write data
+				@output << data
 			end
 		end
 		
@@ -156,12 +145,12 @@ module Trenni
 		def full_tag(name, attributes, indent_outer, indent_inner, &block)
 			if block_given?
 				if indent_outer
-					@output.puts if @level.last > 0
-					@output.write indentation
+					@output << "\n" if @level.last > 0
+					@output << indentation
 				end
 				
-				@output.write "<#{name}#{tag_attributes(attributes)}>"
-				@output.puts if indent_inner
+				@output << "<#{name}#{tag_attributes(attributes)}>"
+				@output << "\n" if indent_inner
 				
 				# The parent has one more child:
 				@level[-1] += 1
@@ -173,16 +162,16 @@ module Trenni
 				children = @level.pop
 				
 				if indent_inner
-					@output.puts if children > 0
-					@output.write indentation
+					@output << "\n" if children > 0
+					@output << indentation
 				end
 				
-				@output.write "</#{name}>"
+				@output << "</#{name}>"
 			else
 				# The parent has one more child:
 				@level[-1] += 1
 				
-				@output.write indentation + "<#{name}#{tag_attributes(attributes)}/>"
+				@output << indentation + "<#{name}#{tag_attributes(attributes)}/>"
 			end
 		end
 	end

data/lib/trenni/parser.rb

@@ -54,7 +54,7 @@ module Trenni
 			end
 			
 			def to_s
-				"[#{self.line_number}:#{self.line_range}]"
+				":#{self.line_number}"
 			end
 			
 			# The line that contains the @offset (base 0 indexing).
@@ -74,21 +74,6 @@ module Trenni
 			end
 			
 			attr :line_text
-			
-			def to_hash
-				{
-					:line_number => self.line_number,
-					:line_offset => self.line_range.min,
-					:character_offset => self.line_offset,
-					:text => self.line_text.chomp
-				}
-			end
-		end
-		
-		def self.line_at_offset(input, input_offset)
-			warn "#{self.class}::line_at_offset is deprecated, use Location.new(input, input_offset) directly!"
-			
-			Location.new(input, input_offset).to_hash rescue nil
 		end
 		
 		class ParseError < StandardError
@@ -108,13 +93,14 @@ module Trenni
 			@delegate = delegate
 			# The delegate must respond to:
 			# .begin_parse(scanner)
-			# .text(escaped-data)
-			# .cdata(unescaped-data)
-			# .attribute(name, value-or-true)
+			# .text(escaped_data)
+			# .cdata(unescaped_data)
+			# .attribute(name, value_or_true)
 			# .begin_tag(name, :opened or :closed)
 			# .end_tag(begin_tag_type, :opened or :closed)
-			# .comment(comment-text)
-			# .instruction(instruction-text)
+			# .doctype(doctype_attributes)
+			# .comment(comment_text)
+			# .instruction(instruction_text)
 		end
 
 		def parse(string)
@@ -148,8 +134,10 @@ module Trenni
 					scan_tag_normal(scanner, CLOSED_TAG)
 				elsif scanner.scan(/!\[CDATA\[/)
 					scan_tag_cdata(scanner)
-				elsif scanner.scan(/!/)
+				elsif scanner.scan(/!--/)
 					scan_tag_comment(scanner)
+				elsif scanner.scan(/!DOCTYPE/)
+					scan_doctype(scanner)
 				elsif scanner.scan(/\?/)
 					scan_tag_instruction(scanner)
 				else
@@ -161,9 +149,10 @@ module Trenni
 		def scan_attributes(scanner)
 			# Parse an attribute in the form of key="value" or key.
 			while scanner.scan(/\s*([^\s=\/>]+)/um)
-				name = scanner[1]
+				name = scanner[1].freeze
 				if scanner.scan(/=((['"])(.*?)\2)/um)
-					@delegate.attribute(name, scanner[3])
+					value = scanner[3].freeze
+					@delegate.attribute(name, value)
 				else
 					@delegate.attribute(name, true)
 				end
@@ -172,7 +161,7 @@ module Trenni
 		
 		def scan_tag_normal(scanner, begin_tag_type = OPENED_TAG)
 			if scanner.scan(/[^\s\/>]+/)
-				@delegate.begin_tag(scanner.matched, begin_tag_type)
+				@delegate.begin_tag(scanner.matched.freeze, begin_tag_type)
 				
 				scanner.scan(/\s*/)
 				self.scan_attributes(scanner)
@@ -193,34 +182,34 @@ module Trenni
 				raise ParseError.new("Invalid tag!", scanner)
 			end
 		end
-
+		
+		def scan_doctype(scanner)
+			if scanner.scan_until(/(.*?)>/)
+				@delegate.doctype(scanner[1].strip.freeze)
+			else
+				raise ParseError.new("DOCTYPE is not closed!", scanner)
+			end
+		end
+		
 		def scan_tag_cdata(scanner)
 			if scanner.scan_until(/(.*?)\]\]>/m)
-				@delegate.cdata(scanner[1])
+				@delegate.cdata(scanner[1].freeze)
 			else
 				raise ParseError.new("CDATA segment is not closed!", scanner)
 			end
 		end
 		
 		def scan_tag_comment(scanner)
-			if scanner.scan(/--/)
-				if scanner.scan_until(/(.*?)-->/m)
-					@delegate.comment("--" + scanner[1] + "--")
-				else
-					raise ParseError.new("Comment is not closed!", scanner)
-				end
+			if scanner.scan_until(/(.*?)-->/m)
+				@delegate.comment(scanner[1].freeze)
 			else
-				if scanner.scan_until(/(.*?)>/)
-					@delegate.comment(scanner[1])
-				else
-					raise ParseError.new("Comment is not closed!", scanner)
-				end
+				raise ParseError.new("Comment is not closed!", scanner)
 			end
 		end
 		
 		def scan_tag_instruction(scanner)
 			if scanner.scan_until(/(.*)\?>/)
-				@delegate.instruction(scanner[1])
+				@delegate.instruction(scanner[1].freeze)
 			end
 		end
 	end

data/lib/trenni/template.rb

@@ -48,24 +48,26 @@ module Trenni
 
 			attr :parts
 
+			# Output raw text to the template.
 			def text(text)
-				text = text.gsub('\\', '\\\\\\').gsub('@', '\\@')
-
-				@parts << "#{OUT} << %q@#{text}@ ; "
+				@parts << "#{OUT}<<#{text.dump};"
 			end
 
+			# Output a ruby expression (or part of).
 			def expression(text)
-				@parts << "#{text} ; "
+				@parts << "#{text};"
 			end
-
-			def output(text)
-				@parts << "#{OUT} << (#{text}) ; "
+			
+			# Output a string interpolation.
+			def interpolation(text)
+				@parts << "#{OUT}<<(#{text});"
 			end
 
-			def code
-				parts = ["#{OUT} = [] ; "] + @parts + ["#{OUT}"]
+			CODE_PREFIX = "#{OUT}=[];".freeze
+			CODE_POSTFIX = "#{OUT}".freeze
 
-				return parts.join
+			def code
+				return [CODE_PREFIX, *@parts, CODE_POSTFIX].join
 			end
 		end
 		
@@ -126,7 +128,7 @@ module Trenni
 					end
 
 					if level == 0
-						@callback.output(code)
+						@callback.interpolation(code)
 					else
 						raise StandardError.new "Could not find end of expression #{self}!"
 					end
@@ -140,16 +142,20 @@ module Trenni
 			end
 		end
 
-		def self.load(path)
-			return self.new(File.read(path), path)
+		def self.load_file(path)
+			self.new(File.read(path), path)
+		end
+
+		def self.load(io, path = io.inspect)
+			self.new(io.read, path)
 		end
 
-		def initialize(template, filename = '<Trenni>')
-			@template = template
-			@filename = filename
+		def initialize(text, path = '<Trenni>')
+			@text = text
+			@path = path
 		end
 
-		def to_string(scope = nil)
+		def to_string(scope = Object.new)
 			to_array(scope).join
 		end
 
@@ -159,15 +165,16 @@ module Trenni
 
 		def to_array(scope)
 			if Binding === scope
-				eval(code, scope, @filename)
+				# Slow code path, evaluate the code string in the given binding (scope).
+				eval(code, scope, @path)
 			else
-				# This can sometimes be a bit faster:
+				# Faster code path, use instance_eval on a compiled Proc.
 				scope.instance_eval(&to_proc)
 			end
 		end
 		
 		def to_proc
-			@compiled_proc ||= eval("proc{\n#{code}\n}", binding, @filename, 0)
+			@compiled_proc ||= eval("proc{\n#{code}\n}", binding, @path, 0)
 		end
 		
 		protected
@@ -178,7 +185,7 @@ module Trenni
 		
 		def compile!
 			buffer = Buffer.new
-			scanner = Scanner.new(buffer, @template)
+			scanner = Scanner.new(buffer, @text)
 			
 			scanner.parse
 			

data/lib/trenni/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Trenni
-	VERSION = "1.4.5"
+	VERSION = "1.5.0"
 end

data/spec/trenni/builder_spec.rb

@@ -23,20 +23,53 @@
 require 'trenni'
 
 module Trenni::BuilderSpec
+	describe 'Trenni::Builder#fragment' do
+		let(:builder) {Trenni::Builder.new}
+		
+		it "should use an existing builder" do
+			result = Trenni::Builder.fragment do |builder|
+			end
+			
+			expect(result).to_not be == nil
+		end
+		
+		it "should use an existing builder" do
+			expect(Trenni::Builder).to receive(:new).and_call_original
+			
+			result = Trenni::Builder.fragment(builder) do |builder|
+			end
+			
+			expect(result).to be == nil
+		end
+	end
+	
 	describe Trenni::Builder do
+		it 'should be able to append nil' do
+			expect{subject.append(nil)}.to_not raise_error(TypeError)
+		end
+		
+		it 'should append existing markup' do
+			subject.tag("outer") do
+				subject.append("<inner>\n\t<nested/>\n</inner>")
+			end
+			
+			expect(subject.output).to be == "<outer>\n\t<inner>\n\t\t<nested/>\n\t</inner>\n</outer>"
+		end
+		
 		it "should produce valid xml output" do
-			builder = Trenni::Builder.new(:indent => false)
+			builder = Trenni::Builder.new(indent: false)
 			
 			builder.instruct
 			builder.tag('foo', 'bar' => 'baz') do
-				builder.text("apples and oranges")
+				builder.text('apples and oranges')
+				builder.tag('baz')
 			end
 			
-			expect(builder.output.string).to be == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo bar=\"baz\">apples and oranges</foo>"
+			expect(builder.output).to be == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo bar=\"baz\">apples and oranges<baz/></foo>"
 		end
 		
 		it "should produce valid html" do
-			builder = Trenni::Builder.new(:indent => true)
+			builder = Trenni::Builder.new(indent: true)
 			
 			builder.doctype
 			builder.tag('html') do
@@ -49,7 +82,7 @@ module Trenni::BuilderSpec
 				end
 			end
 			
-			expect(builder.output.string).to be == "<!DOCTYPE html>\n<html>\n\t<head>\n\t\t<title>Hello World</title>\n\t</head>\n\t<body>\n\t</body>\n</html>"
+			expect(builder.output).to be == "<!DOCTYPE html>\n<html>\n\t<head>\n\t\t<title>Hello World</title>\n\t</head>\n\t<body>\n\t</body>\n</html>"
 		end
 		
 		it "should indent self-closing tag correctly" do
@@ -57,7 +90,7 @@ module Trenni::BuilderSpec
 			
 			builder.tag('foo') { builder.tag('bar') }
 			
-			expect(builder.output.string).to be == "<foo>\n\t<bar/>\n</foo>"
+			expect(builder.output).to be == "<foo>\n\t<bar/>\n</foo>"
 		end
 		
 		it "should produce inline html" do
@@ -71,7 +104,7 @@ module Trenni::BuilderSpec
 				builder.text "World!"
 			end
 			
-			expect(builder.output.string).to be == "<div><strong>Hello</strong>World!</div>"
+			expect(builder.output).to be == "<div><strong>Hello</strong>World!</div>"
 		end
 		
 		it "escapes attributes and text correctly" do
@@ -81,7 +114,7 @@ module Trenni::BuilderSpec
 				builder.text %Q{if x < 10}
 			end
 			
-			expect(builder.output.string).to be == %Q{<foo bar="&quot;Hello World&quot;">if x &lt; 10</foo>}
+			expect(builder.output).to be == %Q{<foo bar="&quot;Hello World&quot;">if x &lt; 10</foo>}
 		end
 		
 		it "should support strict attributes" do
@@ -89,7 +122,7 @@ module Trenni::BuilderSpec
 			
 			builder.tag :option, :required => true
 			
-			expect(builder.output.string).to be == %Q{<option required="required"/>}
+			expect(builder.output).to be == %Q{<option required="required"/>}
 		end
 		
 		it "should support compact attributes" do
@@ -97,7 +130,7 @@ module Trenni::BuilderSpec
 			
 			builder.tag :option, :required => true
 			
-			expect(builder.output.string).to be == %Q{<option required/>}
+			expect(builder.output).to be == %Q{<option required/>}
 		end
 		
 		it "should output without changing escaped characters" do
@@ -105,17 +138,17 @@ module Trenni::BuilderSpec
 			
 			builder.tag "section", :'data-text' => 'foo\nbar'
 			
-			expect(builder.output.string).to be == '<section data-text="foo\nbar"/>'
+			expect(builder.output).to be == '<section data-text="foo\nbar"/>'
 		end
 		
 		it "should order attributes as specified" do
 			builder = Trenni::Builder.new(:strict => true)
 			builder.tag :t, [[:a, 10], [:b, 20]]
-			expect(builder.output.string).to be == %Q{<t a="10" b="20"/>}
+			expect(builder.output).to be == %Q{<t a="10" b="20"/>}
 			
 			builder = Trenni::Builder.new(:strict => true)
 			builder.tag :t, :b => 20, :a => 10
-			expect(builder.output.string).to be == %Q{<t b="20" a="10"/>}
+			expect(builder.output).to be == %Q{<t b="20" a="10"/>}
 		end
 	end
 end

data/spec/trenni/parser_spec.rb

@@ -40,11 +40,44 @@ module Trenni::ParserSpec
 	end
 	
 	describe Trenni::Parser do
+		let(:delegate) {ParserDelegate.new}
+		let(:parser) {Trenni::Parser.new(delegate)}
+		
+		it "should parse self-closing tags correctly" do
+			parser.parse("<br/>")
+			
+			expect(delegate.events).to be == [
+				[:begin_tag, "br", :opened],
+				[:finish_tag, :opened, :closed],
+			]
+		end
+		
+		it "should parse doctype correctly" do
+			parser.parse("<!DOCTYPE html>")
+			
+			expect(delegate.events).to be == [
+				[:doctype, "html"]
+			]
+		end
+		
+		it "Should parse instruction correctly" do
+			parser.parse("<?foo=bar?>")
+			
+			expect(delegate.events).to be == [
+				[:instruction, "foo=bar"]
+			]
+		end
+		
+		it "should parse comment correctly" do
+			parser.parse(%Q{<!--comment-->})
+			
+			expect(delegate.events).to be == [
+				[:comment, "comment"]
+			]
+		end
+		
 		it "should parse markup correctly" do
-			delegate = ParserDelegate.new
-			scanner = Trenni::Parser.new(delegate)
-
-			scanner.parse(%Q{<foo bar="20" baz>Hello World</foo>})
+			parser.parse(%Q{<foo bar="20" baz>Hello World</foo>})
 
 			expected_events = [
 				[:begin_tag, "foo", :opened],
@@ -60,10 +93,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "should parse CDATA correctly" do
-			delegate = ParserDelegate.new
-			scanner = Trenni::Parser.new(delegate)
-
-			scanner.parse(%Q{<test><![CDATA[Hello World]]></test>})
+			parser.parse(%Q{<test><![CDATA[Hello World]]></test>})
 
 			expected_events = [
 				[:begin_tag, "test", :opened],
@@ -77,21 +107,20 @@ module Trenni::ParserSpec
 		end
 		
 		it "should generate errors on incorrect input" do
-			delegate = ParserDelegate.new
-			scanner = Trenni::Parser.new(delegate)
-			
-			expect{scanner.parse(%Q{<foo})}.to raise_error Trenni::Parser::ParseError
+			expect{parser.parse(%Q{<foo})}.to raise_error Trenni::Parser::ParseError
 			
-			expect{scanner.parse(%Q{<foo bar=>})}.to raise_error Trenni::Parser::ParseError
+			expect{parser.parse(%Q{<foo bar=>})}.to raise_error Trenni::Parser::ParseError
 			
-			expect{scanner.parse(%Q{<foo bar="" baz>})}.to_not raise_error
+			expect{parser.parse(%Q{<foo bar="" baz>})}.to_not raise_error
 		end
 		
 		it "should know about line numbers" do
 			data = %Q{Hello\nWorld\nFoo\nBar!}
 		
 			location = Trenni::Parser::Location.new(data, 7)
-		
+			
+			expect(location.to_i).to be == 7
+			expect(location.to_s).to be == ":2"
 			expect(location.line_text).to be == "World"
 			
 			expect(location.line_number).to be == 2
@@ -100,11 +129,8 @@ module Trenni::ParserSpec
 		end
 		
 		it "should know about line numbers when input contains multi-byte characters" do
-			delegate = ParserDelegate.new
-			scanner = Trenni::Parser.new(delegate)
-			
 			data = %Q{<p>\nこんにちは\nWorld\n<p}
-			error = scanner.parse(data) rescue $!
+			error = parser.parse(data) rescue $!
 			
 			expect(error).to be_kind_of Trenni::Parser::ParseError
 			expect(error.location.line_number).to be == 4

data/spec/trenni/template_spec.rb

@@ -27,6 +27,24 @@ require 'benchmark'
 
 module Trenni::TemplateSpec
 	describe Trenni::Template do
+		let(:capture_template) {Trenni::Template.load_file File.expand_path('template_spec/capture.trenni', __dir__)}
+		
+		it "should be able to capture output" do
+			expect(capture_template.to_string.strip).to be == 'TEST TEST TEST'
+		end
+		
+		let(:buffer_template) {Trenni::Template.load_file File.expand_path('template_spec/buffer.trenni', __dir__)}
+		
+		it "should be able to fetch output buffer" do
+			expect(buffer_template.to_string).to be == 'test'
+		end
+		
+		let(:nested_template) {Trenni::Template.load_file File.expand_path('template_spec/nested.trenni', __dir__)}
+		
+		it "should be able to handle nested interpolations" do
+			expect(nested_template.to_string).to be == "Hello world!"
+		end
+		
 		it "should process list of items" do
 			template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
 			
@@ -35,7 +53,7 @@ module Trenni::TemplateSpec
 			expect(template.to_string(binding)).to be == "1234"
 		end
 		
-		let(:large_template) {Trenni::Template.load File.join(__dir__, "large.trenni")}
+		let(:large_template) {Trenni::Template.load_file File.expand_path('template_spec/large.trenni', __dir__)}
 
 		it "should have better performance using instance" do
 			n = 1_000
@@ -54,7 +72,7 @@ module Trenni::TemplateSpec
 			expect(object_time).to be < binding_time
 		end
 		
-		let(:escaped_template) {Trenni::Template.load  File.join(__dir__, "escaped.trenni")}
+		let(:escaped_template) {Trenni::Template.load_file File.expand_path('template_spec/escaped.trenni', __dir__)}
 		
 		it "should process escaped characters" do
 			expect(escaped_template.to_string).to be == 

data/spec/trenni/template_spec/buffer.trenni

@@ -0,0 +1,8 @@
+<?r
+def append_to_buffer(&block)
+	out = Trenni::Template.buffer(block.binding)
+	out << "test"
+end
+
+append_to_buffer {}
+?>

data/spec/trenni/template_spec/capture.trenni

@@ -0,0 +1,4 @@
+<?r result = Trenni::Template.capture do ?>
+	test test test
+<?r end ?>
+#{result.upcase}

data/spec/trenni/template_spec/nested.trenni

@@ -0,0 +1 @@
+#{{text: "Hello #{'world'}!"}[:text]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- benchmark/io_vs_string.rb
 - lib/trenni.rb
 - lib/trenni/builder.rb
 - lib/trenni/parser.rb
@@ -76,11 +77,14 @@ files:
 - lib/trenni/template.rb
 - lib/trenni/version.rb
 - spec/trenni/builder_spec.rb
-- spec/trenni/escaped.trenni
-- spec/trenni/large.trenni
 - spec/trenni/parser_spec.rb
 - spec/trenni/strings_spec.rb
 - spec/trenni/template_spec.rb
+- spec/trenni/template_spec/buffer.trenni
+- spec/trenni/template_spec/capture.trenni
+- spec/trenni/template_spec/escaped.trenni
+- spec/trenni/template_spec/large.trenni
+- spec/trenni/template_spec/nested.trenni
 - trenni.gemspec
 homepage: https://github.com/ioquatix/trenni
 licenses: []
@@ -101,14 +105,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.
 test_files:
 - spec/trenni/builder_spec.rb
-- spec/trenni/escaped.trenni
-- spec/trenni/large.trenni
 - spec/trenni/parser_spec.rb
 - spec/trenni/strings_spec.rb
 - spec/trenni/template_spec.rb
+- spec/trenni/template_spec/buffer.trenni
+- spec/trenni/template_spec/capture.trenni
+- spec/trenni/template_spec/escaped.trenni
+- spec/trenni/template_spec/large.trenni
+- spec/trenni/template_spec/nested.trenni