trenni 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50784d6ac977a20302a0fbaff7808065161c569c
-  data.tar.gz: f07903da43893883ab2e5238af72ede943ebe221
+  metadata.gz: c17ddcecd402c971c098d70f430380b664cd581e
+  data.tar.gz: b1270c75070860bb91008a08c4be7c58f1eaa5e2
 SHA512:
-  metadata.gz: 11e041b09097ecb7a0bf3d635ad6d11df0d29b76844e95a920c6e6efd7ec7e87abf4f7fd3013e4e4ce13db7ea69b0d2daf28c45a119a2b1bb0aca91a02a4a5f6
-  data.tar.gz: df06c19505556ab8b16a82ab4788f6d5f08e782f376f74e53d181d32ca3fa92c1b17f6cbbd843f75f00f00332903cf469e1398eaf0f3f142f6864d0568cb46a3
+  metadata.gz: 0c7387728d78797608f8369bd617b86edcaa23bd2663ef1b854917515a09bc0f9888f357267378620af854f469007e5fea9928374477a57025e34c0950fc3efc
+  data.tar.gz: 46684a95b5e07c3f522cba2f04db9ca1320c2edcb205d361156014fa9789b6332a014694e8dabb4fe2ce7a32ee56795d4b0be8b1f7dc4a2d7f52f974530bd818

data/README.md

@@ -41,13 +41,14 @@ Or install it yourself as:
 
 Trenni templates work essentially the same way as all other templating systems:
 
-	template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+	buffer = Trenni::Buffer.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+	template = Trenni::Template.new(buffer)
 		
 	items = 1..4
 		
 	template.to_string(binding) # => "1234"
 	
-The code above demonstrate  the only two constructs, `<?r expression ?>` and `#{output}`.
+The code above demonstrate the only two constructs, `<?r expression ?>` and `#{output}`.
 
 Trenni provides a slightly higher performance API using objects rather than bindings. If you provide an object instance, `instance_eval` would be used instead.
 

data/lib/trenni/buffer.rb

@@ -0,0 +1,79 @@
+# 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.
+
+module Trenni
+	class Buffer
+		def initialize(string, path: '<string>')
+			@string = string
+			@path = path
+		end
+		
+		attr :path
+		
+		def read
+			@string
+		end
+		
+		def self.load_file(path)
+			FileBuffer.new(path)
+		end
+		
+		def self.load(string)
+			Buffer.new(string)
+		end
+		
+		def to_buffer
+			self
+		end
+	end
+	
+	class FileBuffer
+		def initialize(path)
+			@path = path
+		end
+		
+		attr :path
+		
+		def read
+			@buffer ||= File.read(@path)
+		end
+		
+		def to_buffer
+			Buffer.new(self.read, @path)
+		end
+	end
+	
+	class IOBuffer
+		def initialize(io, path: io.inspect)
+			@io = io
+			@path = path
+		end
+		
+		attr :path
+		
+		def read
+			@io.read
+		end
+		
+		def to_buffer
+			Buffer.new(self.read, path: @path)
+		end
+	end
+end

data/lib/trenni/parser.rb

@@ -18,81 +18,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'strscan'
+require_relative 'scanner'
 
 module Trenni
 	# This parser processes general markup into a sequence of events which are passed to a delegate.
-	class Parser
+	class Parser < StringScanner
 		OPENED_TAG = :opened
 		CLOSED_TAG = :closed
 		
-		class Location
-			def initialize(input, offset)
-				raise ArgumentError.new("Offset #{index} is past end of input #{input.bytesize}") if offset > input.bytesize
-				
-				@offset = offset
-				@line_index = 0
-				line_offset = next_line_offset = 0
-				
-				input.each_line do |line|
-					line_offset = next_line_offset
-					next_line_offset += line.bytesize
-					
-					# Is our input offset within this line?
-					if next_line_offset >= offset
-						@line_text = line.chomp
-						@line_range = line_offset...next_line_offset
-						break
-					else
-						@line_index += 1
-					end
-				end
-			end
-			
-			def to_i
-				@offset
-			end
-			
-			def to_s
-				":#{self.line_number}"
-			end
-			
-			# The line that contains the @offset (base 0 indexing).
-			attr :line_index
-			
-			# The line index, but base-1.
-			def line_number
-				@line_index + 1
-			end
+		def initialize(buffer, delegate)
+			super(buffer)
 			
-			# The byte offset to the start of that line.
-			attr :line_range
-			
-			# The number of bytes from the start of the line to the given offset in the input.
-			def line_offset
-				@offset - @line_range.min
-			end
-			
-			attr :line_text
-		end
-		
-		class ParseError < StandardError
-			def initialize(message, scanner)
-				@message = message
-				@location = Location.new(scanner.string, scanner.pos)
-			end
-			
-			attr :location
-
-			def to_s
-				"#{@message} at #{@location}"
-			end
-		end
-		
-		def initialize(delegate)
 			@delegate = delegate
+			
 			# The delegate must respond to:
-			# .begin_parse(scanner)
+			# .begin_parse(self)
 			# .text(escaped_data)
 			# .cdata(unescaped_data)
 			# .attribute(name, value_or_true)
@@ -103,55 +43,52 @@ module Trenni
 			# .instruction(instruction_text)
 		end
 
-		def parse(string)
-			scanner = StringScanner.new(string)
-			@delegate.begin_parse(scanner)
+		def parse!
+			@delegate.begin_parse(self)
 
-			until scanner.eos?
-				start_pos = scanner.pos
+			until eos?
+				start_pos = self.pos
 
-				scan_text(scanner)
-				scan_tag(scanner)
+				scan_text
+				scan_tag
 
-				if start_pos == scanner.pos
-					raise ParseError.new("Scanner didn't move", scanner)
-				end
+				raise_if_stuck(start_pos)
 			end
 		end
 
 		protected
 
-		def scan_text(scanner)
+		def scan_text
 			# Match any character data except the open tag character.
-			if scanner.scan(/[^<]+/m)
-				@delegate.text(scanner.matched)
+			if self.scan(/[^<]+/m)
+				@delegate.text(self.matched)
 			end
 		end
 		
-		def scan_tag(scanner)
-			if scanner.scan(/</)
-				if scanner.scan(/\//)
-					scan_tag_normal(scanner, CLOSED_TAG)
-				elsif scanner.scan(/!\[CDATA\[/)
-					scan_tag_cdata(scanner)
-				elsif scanner.scan(/!--/)
-					scan_tag_comment(scanner)
-				elsif scanner.scan(/!DOCTYPE/)
-					scan_doctype(scanner)
-				elsif scanner.scan(/\?/)
-					scan_tag_instruction(scanner)
+		def scan_tag
+			if self.scan(/</)
+				if self.scan(/\//)
+					scan_tag_normal(CLOSED_TAG)
+				elsif self.scan(/!\[CDATA\[/)
+					scan_tag_cdata
+				elsif self.scan(/!--/)
+					scan_tag_comment
+				elsif self.scan(/!DOCTYPE/)
+					scan_doctype
+				elsif self.scan(/\?/)
+					scan_tag_instruction
 				else
-					scan_tag_normal(scanner)
+					scan_tag_normal
 				end
 			end
 		end
 
-		def scan_attributes(scanner)
+		def scan_attributes
 			# Parse an attribute in the form of key="value" or key.
-			while scanner.scan(/\s*([^\s=\/>]+)/um)
-				name = scanner[1].freeze
-				if scanner.scan(/=((['"])(.*?)\2)/um)
-					value = scanner[3].freeze
+			while self.scan(/\s*([^\s=\/>]+)/um)
+				name = self[1].freeze
+				if self.scan(/=((['"])(.*?)\2)/um)
+					value = self[3].freeze
 					@delegate.attribute(name, value)
 				else
 					@delegate.attribute(name, true)
@@ -159,57 +96,57 @@ module Trenni
 			end
 		end
 		
-		def scan_tag_normal(scanner, begin_tag_type = OPENED_TAG)
-			if scanner.scan(/[^\s\/>]+/)
-				@delegate.begin_tag(scanner.matched.freeze, begin_tag_type)
+		def scan_tag_normal(begin_tag_type = OPENED_TAG)
+			if self.scan(/[^\s\/>]+/)
+				@delegate.begin_tag(self.matched.freeze, begin_tag_type)
 				
-				scanner.scan(/\s*/)
-				self.scan_attributes(scanner)
-				scanner.scan(/\s*/)
+				self.scan(/\s*/)
+				self.scan_attributes
+				self.scan(/\s*/)
 				
-				if scanner.scan(/\/>/)
+				if self.scan(/\/>/)
 					if begin_tag_type == CLOSED_TAG
-						raise ParseError.new("Tag cannot be closed at both ends!", scanner)
+						parse_error!("Tag cannot be closed at both ends!")
 					else
 						@delegate.finish_tag(begin_tag_type, CLOSED_TAG)
 					end
-				elsif scanner.scan(/>/)
+				elsif self.scan(/>/)
 					@delegate.finish_tag(begin_tag_type, OPENED_TAG)
 				else
-					raise ParseError.new("Invalid characters in tag!", scanner)
+					parse_error!("Invalid characters in tag!")
 				end
 			else
-				raise ParseError.new("Invalid tag!", scanner)
+				parse_error!("Invalid tag!")
 			end
 		end
 		
-		def scan_doctype(scanner)
-			if scanner.scan_until(/(.*?)>/)
-				@delegate.doctype(scanner[1].strip.freeze)
+		def scan_doctype
+			if self.scan_until(/(.*?)>/)
+				@delegate.doctype(self[1].strip.freeze)
 			else
-				raise ParseError.new("DOCTYPE is not closed!", scanner)
+				parse_error!("DOCTYPE is not closed!")
 			end
 		end
 		
-		def scan_tag_cdata(scanner)
-			if scanner.scan_until(/(.*?)\]\]>/m)
-				@delegate.cdata(scanner[1].freeze)
+		def scan_tag_cdata
+			if self.scan_until(/(.*?)\]\]>/m)
+				@delegate.cdata(self[1].freeze)
 			else
-				raise ParseError.new("CDATA segment is not closed!", scanner)
+				parse_error!("CDATA segment is not closed!")
 			end
 		end
 		
-		def scan_tag_comment(scanner)
-			if scanner.scan_until(/(.*?)-->/m)
-				@delegate.comment(scanner[1].freeze)
+		def scan_tag_comment
+			if self.scan_until(/(.*?)-->/m)
+				@delegate.comment(self[1].freeze)
 			else
-				raise ParseError.new("Comment is not closed!", scanner)
+				parse_error!("Comment is not closed!")
 			end
 		end
 		
-		def scan_tag_instruction(scanner)
-			if scanner.scan_until(/(.*)\?>/)
-				@delegate.instruction(scanner[1].freeze)
+		def scan_tag_instruction
+			if self.scan_until(/(.*)\?>/)
+				@delegate.instruction(self[1].freeze)
 			end
 		end
 	end

data/lib/trenni/scanner.rb

@@ -0,0 +1,138 @@
+# Copyright, 2012, 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 'strscan'
+
+module Trenni
+	class ParseError < StandardError
+		def initialize(message, scanner, positions = nil)
+			super(message)
+			
+			@path = scanner.path
+			
+			@locations = []
+			
+			if positions
+				positions.each do |position|
+					@locations << Location.new(scanner.string, position)
+				end
+			else
+				@locations = [Location.new(scanner.string, scanner.pos)]
+			end
+			
+			@location = @locations.first
+			
+			@input_name = nil
+		end
+		
+		attr :locations
+		attr :location
+		
+		attr :path
+		
+		def to_s
+			"#{@path}#{@location}: #{super}\n#{location.line_text}"
+		end
+	end
+	
+	class Location
+		def initialize(input, offset)
+			raise ArgumentError.new("Offset #{index} is past end of input #{input.bytesize}") if offset > input.bytesize
+			
+			@offset = offset
+			@line_index = 0
+			line_offset = next_line_offset = 0
+			
+			input.each_line do |line|
+				line_offset = next_line_offset
+				next_line_offset += line.bytesize
+				
+				# Is our input offset within this line?
+				if next_line_offset >= offset
+					@line_text = line.chomp
+					@line_range = line_offset...next_line_offset
+					break
+				else
+					@line_index += 1
+				end
+			end
+		end
+		
+		def to_i
+			@offset
+		end
+		
+		def to_s
+			"[#{self.line_number}]"
+		end
+		
+		# The line that contains the @offset (base 0 indexing).
+		attr :line_index
+		
+		# The line index, but base-1.
+		def line_number
+			@line_index + 1
+		end
+		
+		# The byte offset to the start of that line.
+		attr :line_range
+		
+		# The number of bytes from the start of the line to the given offset in the input.
+		def line_offset
+			@offset - @line_range.min
+		end
+		
+		attr :line_text
+	end
+	
+	class StringScanner < ::StringScanner
+		def initialize(buffer)
+			@buffer = buffer
+			
+			super(buffer.read)
+		end
+		
+		attr :buffer
+		
+		def path
+			@buffer.path
+		end
+		
+		STUCK_MESSAGE = "Parser is stuck!".freeze
+		
+		def stuck?(position)
+			self.pos == position
+		end
+			
+		def raise_if_stuck(position, message = STUCK_MESSAGE)
+			if stuck?(position)
+				parse_error!(message)
+			end
+		end
+		
+		def parse_error!(message, positions = nil)
+			positions ||= [self.pos]
+			
+			raise ParseError.new(message, self, positions)
+		end
+	end
+end

data/lib/trenni/template.rb

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'strscan'
-require 'stringio'
+require_relative 'scanner'
 
 module Trenni
 	# The output variable that will be used in templates:
@@ -41,7 +40,7 @@ module Trenni
 			eval(OUT, binding)
 		end
 		
-		class Buffer
+		class Assembler
 			def initialize
 				@parts = []
 			end
@@ -76,92 +75,109 @@ module Trenni
 		end
 		
 		class Scanner < StringScanner
-			TEXT = /([^<#]|<(?!\?r)|#(?!\{)){1,1024}/m
-			
-			def initialize(callback, string)
-				@callback = callback
-				super(string)
+			def initialize(buffer, delegate)
+				super(buffer)
+				
+				@delegate = delegate
 			end
-
-			def parse
+			
+			def parse!
 				until eos?
-					pos = self.pos
+					start_pos = self.pos
 
 					scan_text
-					scan_expression
-
-					if pos == self.pos
-						raise StandardError.new "Could not scan current input #{self.pos} #{eos?}!"
-					end
+					scan_expression or scan_interpolation
+					
+					raise_if_stuck(start_pos)
 				end
 			end
 
+			# This is formulated specifically so that it matches up until the start of a code block.
+			TEXT = /([^<#]|<(?!\?r)|#(?!\{)){1,}/m
+
 			def scan_text
 				if scan(TEXT)
-					@callback.text(matched)
+					@delegate.text(self.matched)
 				end
 			end
 
 			def scan_expression
+				start_pos = self.pos
+				
+				if scan(/<\?r/)
+					if scan_until(/(.*?)\?>/m)
+						@delegate.expression(self[1])
+					else
+						parse_error!("Could not find end of expression!", [start_pos, self.pos])
+					end
+					
+					return true
+				end
+				
+				return false
+			end
+
+			def scan_interpolation
+				start_pos = self.pos
+				
 				if scan(/\#\{/)
 					level = 1
-					code = ""
+					code = String.new
 
-					until eos? || level == 0
+					until eos?
+						current_pos = self.pos
+						
+						# Scan anything other than something which causes nesting:
 						if scan(/[^"'\{\}]+/m)
 							code << matched
 						end
-
-						if scan(/"(\\"|[^"])*"/m)
-							code << matched
-						end
-
-						if scan(/'(\\'|[^'])*'/m)
+						
+						# Scan a quoted string:
+						if scan(/'(\\'|[^'])*'/m) or scan(/"(\\"|[^"])*"/m)
 							code << matched
 						end
-
+						
+						# Scan something which nests:
 						if scan(/\{/)
 							code << matched
 							level += 1
 						end
 
 						if scan(/\}/)
-							code << matched if level > 1
 							level -= 1
+							if level == 0
+								@delegate.interpolation(code)
+								return true
+							else
+								code << matched
+							end
 						end
+						
+						break if stuck?(current_pos)
 					end
-
-					if level == 0
-						@callback.interpolation(code)
-					else
-						raise StandardError.new "Could not find end of expression #{self}!"
-					end
-				elsif scan(/<\?r/)
-					if scan_until(/(.*?)\?>/m)
-						@callback.expression(self[1])
-					else
-						raise StandardError.new "Could not find end of expression #{self}!"
-					end
+					
+					parse_error!("Could not find end of interpolation!", [start_pos, self.pos])
 				end
+				
+				return false
 			end
 		end
 
 		def self.load_file(path)
-			self.new(File.read(path), path)
+			self.new(FileBuffer.new(path))
 		end
 
-		def self.load(io, path = io.inspect)
-			self.new(io.read, path)
-		end
-
-		def initialize(text, path = '<Trenni>')
-			@text = text
-			@path = path
+		def initialize(buffer)
+			@buffer = buffer
 		end
 
 		def to_string(scope = Object.new)
 			to_array(scope).join
 		end
+		
+		def to_buffer(scope)
+			Buffer.new(to_array(scope).join, path: @buffer.path)
+		end
 
 		# Legacy functions:
 		alias evaluate to_string
@@ -170,7 +186,7 @@ module Trenni
 		def to_array(scope)
 			if Binding === scope
 				# Slow code path, evaluate the code string in the given binding (scope).
-				eval(code, scope, @path)
+				eval(code, scope, @buffer.path)
 			else
 				# Faster code path, use instance_eval on a compiled Proc.
 				scope.instance_eval(&to_proc)
@@ -178,7 +194,7 @@ module Trenni
 		end
 		
 		def to_proc
-			@compiled_proc ||= eval("proc{\n#{code}\n}", binding, @path, 0)
+			@compiled_proc ||= eval("proc{;#{code};}", binding, @buffer.path)
 		end
 		
 		protected
@@ -188,12 +204,11 @@ module Trenni
 		end
 		
 		def compile!
-			buffer = Buffer.new
-			scanner = Scanner.new(buffer, @text)
+			assembler = Assembler.new
 			
-			scanner.parse
+			Scanner.new(@buffer, assembler).parse!
 			
-			buffer.code
+			assembler.code
 		end
 	end
 end

data/lib/trenni/version.rb

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

data/spec/trenni/parser_spec.rb

@@ -40,11 +40,16 @@ module Trenni::ParserSpec
 	end
 	
 	describe Trenni::Parser do
-		let(:delegate) {ParserDelegate.new}
-		let(:parser) {Trenni::Parser.new(delegate)}
+		def parse(input)
+			delegate = ParserDelegate.new
+			buffer = Trenni::Buffer.new(input)
+			Trenni::Parser.new(buffer, delegate).parse!
+			
+			return delegate
+		end
 		
 		it "should parse self-closing tags correctly" do
-			parser.parse("<br/>")
+			delegate = parse("<br/>")
 			
 			expect(delegate.events).to be == [
 				[:begin_tag, "br", :opened],
@@ -53,7 +58,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "should parse doctype correctly" do
-			parser.parse("<!DOCTYPE html>")
+			delegate = parse("<!DOCTYPE html>")
 			
 			expect(delegate.events).to be == [
 				[:doctype, "html"]
@@ -61,7 +66,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "Should parse instruction correctly" do
-			parser.parse("<?foo=bar?>")
+			delegate = parse("<?foo=bar?>")
 			
 			expect(delegate.events).to be == [
 				[:instruction, "foo=bar"]
@@ -69,7 +74,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "should parse comment correctly" do
-			parser.parse(%Q{<!--comment-->})
+			delegate = parse(%Q{<!--comment-->})
 			
 			expect(delegate.events).to be == [
 				[:comment, "comment"]
@@ -77,7 +82,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "should parse markup correctly" do
-			parser.parse(%Q{<foo bar="20" baz>Hello World</foo>})
+			delegate = parse(%Q{<foo bar="20" baz>Hello World</foo>})
 
 			expected_events = [
 				[:begin_tag, "foo", :opened],
@@ -93,7 +98,7 @@ module Trenni::ParserSpec
 		end
 		
 		it "should parse CDATA correctly" do
-			parser.parse(%Q{<test><![CDATA[Hello World]]></test>})
+			delegate = parse(%Q{<test><![CDATA[Hello World]]></test>})
 
 			expected_events = [
 				[:begin_tag, "test", :opened],
@@ -107,20 +112,20 @@ module Trenni::ParserSpec
 		end
 		
 		it "should generate errors on incorrect input" do
-			expect{parser.parse(%Q{<foo})}.to raise_error Trenni::Parser::ParseError
+			expect{parse(%Q{<foo})}.to raise_error Trenni::ParseError
 			
-			expect{parser.parse(%Q{<foo bar=>})}.to raise_error Trenni::Parser::ParseError
+			expect{parse(%Q{<foo bar=>})}.to raise_error Trenni::ParseError
 			
-			expect{parser.parse(%Q{<foo bar="" baz>})}.to_not raise_error
+			expect{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)
+			location = Trenni::Location.new(data, 7)
 			
 			expect(location.to_i).to be == 7
-			expect(location.to_s).to be == ":2"
+			expect(location.to_s).to be == "[2]"
 			expect(location.line_text).to be == "World"
 			
 			expect(location.line_number).to be == 2
@@ -130,9 +135,9 @@ module Trenni::ParserSpec
 		
 		it "should know about line numbers when input contains multi-byte characters" do
 			data = %Q{<p>\nこんにちは\nWorld\n<p}
-			error = parser.parse(data) rescue $!
+			error = parse(data) rescue $!
 			
-			expect(error).to be_kind_of Trenni::Parser::ParseError
+			expect(error).to be_kind_of Trenni::ParseError
 			expect(error.location.line_number).to be == 4
 		end
 	end

data/spec/trenni/template_spec.rb

@@ -46,7 +46,8 @@ module Trenni::TemplateSpec
 		end
 		
 		it "should process list of items" do
-			template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+			buffer = Trenni::Buffer.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+			template = Trenni::Template.new(buffer)
 			
 			items = 1..4
 			
@@ -83,5 +84,14 @@ module Trenni::TemplateSpec
 				"This\\nisn't one line.\n" +
 				"\\tIndentation is the best."
 		end
+		
+		it "should fail to parse" do
+			buffer = Trenni::Buffer.new('<img src="#{poi_product.photo.thumbnail_url" />')
+			broken_template = Trenni::Template.new(buffer)
+			
+			expect{broken_template.to_proc}.to raise_error(Trenni::ParseError) do |error|
+				expect(error.to_s).to include("<string>[1]: Could not find end of interpolation!")
+			end
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,10 @@ files:
 - Rakefile
 - benchmark/io_vs_string.rb
 - lib/trenni.rb
+- lib/trenni/buffer.rb
 - lib/trenni/builder.rb
 - lib/trenni/parser.rb
+- lib/trenni/scanner.rb
 - lib/trenni/strings.rb
 - lib/trenni/template.rb
 - lib/trenni/version.rb