trenni 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5917823eba63297304f0339d680b595ed3dcb7f4
+  data.tar.gz: 8a55538fa29a65c720d3d119001e28a77998a912
+SHA512:
+  metadata.gz: 120b4e8119e886c2d0670e5a628eef6e2240f429cf9ab538454cb09a66764d4d9ec8c1600ca5836d99adaafec830e4fcfb9b50fce5610ae3f5801386e28bc66f
+  data.tar.gz: 517bb05f624b2d053e518881dafc9aa2154d4ddd5f577800fd0569788e54b3d409367d4e74ebe38a467b13bed969ffa47ee0a1b85f1f3497faddb789674b6042

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - "1.9"
+  - "2.0"
+  - "2.1"

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trenni.gemspec
 gemspec
-
-group :test do
-	gem "rake"
-end

data/README.md

@@ -47,23 +47,22 @@ The code above demonstraights the only two constructs, `<?r expression ?>` and `
 
 Released under the MIT license.
 
-Copyright (c) 2012 [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 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.
+Copyright, 2012, 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
+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.

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/lib/trenni/builder.rb

@@ -132,11 +132,6 @@ module Trenni
 		def tag_attributes(attributes)
 			buffer = []
 			
-			# Ensure consistent order
-			unless Array === attributes
-				attributes = attributes.sort
-			end
-			
 			attributes.each do |key, value|
 				if value == true
 					buffer << Strings::to_simple_attribute(key, @strict)

data/lib/trenni/extensions/symbol-1.8.7.rb

@@ -1,3 +1,22 @@
+# 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.
 
 class Symbol
 	def <=>(with)

data/lib/trenni/parser.rb

@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-
 require 'strscan'
 
 module Trenni

data/lib/trenni/version.rb

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

data/spec/trenni/builder_spec.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+# 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 'trenni'
+
+module Trenni::BuilderSpec
+	describe Trenni::Builder do
+		it "should produce valid xml output" do
+			builder = Trenni::Builder.new(:indent => false)
+			
+			builder.instruct
+			builder.tag('foo', 'bar' => 'baz') do
+				builder.text("apples and oranges")
+			end
+			
+			expect(builder.output.string).to be == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo bar=\"baz\">apples and oranges</foo>"
+		end
+		
+		it "should produce valid html" do
+			builder = Trenni::Builder.new(:indent => true)
+			
+			builder.doctype
+			builder.tag('html') do
+				builder.tag('head') do
+					builder.inline('title') do
+						builder.text('Hello World')
+					end
+				end
+				builder.tag('body') do
+				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>"
+		end
+		
+		it "should produce inline html" do
+			builder = Trenni::Builder.new(:indent => true)
+			
+			builder.inline("div") do
+				builder.tag("strong") do
+					builder.text("Hello")
+				end
+				
+				builder.text "World!"
+			end
+			
+			expect(builder.output.string).to be == "<div><strong>Hello</strong>World!</div>"
+		end
+		
+		it "escapes attributes and text correctly" do
+			builder = Trenni::Builder.new(:escape => true)
+			
+			builder.inline :foo, :bar => %Q{"Hello World"} do
+				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>}
+		end
+		
+		it "should support strict attributes" do
+			builder = Trenni::Builder.new(:strict => true)
+			
+			builder.tag :option, :required => true
+			
+			expect(builder.output.string).to be == %Q{<option required="required"/>}
+		end
+		
+		it "should support compact attributes" do
+			builder = Trenni::Builder.new(:strict => false)
+			
+			builder.tag :option, :required => true
+			
+			expect(builder.output.string).to be == %Q{<option required/>}
+		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"/>}
+			
+			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"/>}
+		end
+	end
+end

data/spec/trenni/parser_spec.rb

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+
+# 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 'trenni/parser'
+
+module Trenni::ParserSpec
+	class ParserDelegate
+		def initialize
+			@events = []
+		end
+		
+		attr :events
+		
+		def method_missing(*args)
+			@events << args
+		end
+		
+		def begin_parse(scanner)
+			# ignore this event
+		end
+	end
+	
+	describe Trenni::Parser do
+		it "should parse markup correctly" do
+			delegate = ParserDelegate.new
+			scanner = Trenni::Parser.new(delegate)
+
+			scanner.parse(%Q{<foo bar="20" baz>Hello World</foo>})
+
+			expected_events = [
+				[:begin_tag, "foo", :opened],
+				[:attribute, "bar", "20"],
+				[:attribute, "baz", true],
+				[:finish_tag, :opened, :opened],
+				[:text, "Hello World"],
+				[:begin_tag, "foo", :closed],
+				[:finish_tag, :closed, :opened],
+			]
+		
+			expect(delegate.events).to be == expected_events
+		end
+		
+		it "should parse CDATA correctly" do
+			delegate = ParserDelegate.new
+			scanner = Trenni::Parser.new(delegate)
+
+			scanner.parse(%Q{<test><![CDATA[Hello World]]></test>})
+
+			expected_events = [
+				[:begin_tag, "test", :opened],
+				[:finish_tag, :opened, :opened],
+				[:cdata, "Hello World"],
+				[:begin_tag, "test", :closed],
+				[:finish_tag, :closed, :opened],
+			]
+		
+			expect(delegate.events).to be == expected_events
+		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{scanner.parse(%Q{<foo bar=>})}.to raise_error Trenni::Parser::ParseError
+			
+			expect{scanner.parse(%Q{<foo bar="" baz>})}.to_not raise_error
+		end
+		
+		it "should know about line numbers" do
+			data = %Q{Hello\nWorld\nFoo\nBar!}
+		
+			line = Trenni::Parser.line_at_offset(data, 7)
+		
+			expect(line[:text]).to be == "World"
+			
+			expect(line[:line_number]).to be == 2
+			expect(line[:line_offset]).to be == 6
+			expect(line[:character_offset]).to be == 1
+		end
+	end
+end

data/spec/trenni/strings_spec.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+# 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 'trenni/strings'
+
+module Trenni::StringsSpec
+	describe Trenni::Strings do
+		it "should escape html sensitive characters" do
+			text = Trenni::Strings.to_html("<foobar>")
+			expect(text).to be == "&lt;foobar&gt;"
+			
+			text = Trenni::Strings.to_html(%q{"I'd like to do this & that :p", she said.})
+			expect(text).to be == %q{&quot;I'd like to do this &amp; that :p&quot;, she said.}
+		end
+		
+		it "should generate quoted strings" do
+			text = Trenni::Strings.to_quoted_string(%Q{"Hello World"})
+			expect(text).to be == %q{"\"Hello World\""}
+		
+			text = Trenni::Strings.to_quoted_string(%Q{"Hello\r\nWorld"})
+			expect(text).to be == %q{"\"Hello\r\nWorld\""}
+		end
+		
+		it "should generate quoted attributes" do
+			text = Trenni::Strings.to_attribute(:foo, 'bar')
+			expect(text).to be == %Q{foo="bar"}
+		
+			text = Trenni::Strings.to_simple_attribute(:foo, false)
+			expect(text).to be == %Q{foo}
+		
+			text = Trenni::Strings.to_simple_attribute(:foo, true)
+			expect(text).to be == %Q{foo="foo"}
+		end
+		
+		it "should generate nice titles" do
+			text = Trenni::Strings.to_title("foo bar")
+			expect(text).to be == "Foo Bar"
+		end
+		
+		it "should generate nice identifiers" do
+			text = Trenni::Strings.to_snake("Happy::Go::Lucky")
+			expect(text).to be == "happy_go_lucky"
+		end
+	end
+end

data/{test/test_template.rb → spec/trenni/template_spec.rb}

@@ -20,17 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'pathname'
-require 'test/unit'
-require 'stringio'
-
 require 'trenni'
 
-class TestTemplate < Test::Unit::TestCase
-	def test_template_each
-		template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+module Trenni::TemplateSpec
+	describe Trenni::Template do
+		it "should process list of items" do
+			template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
 		
-		items = 1..4
-		assert_equal "1234", template.result(binding)
+			items = 1..4
+			expect(template.result(binding)).to be == "1234"
+		end
 	end
 end

data/trenni.gemspec

@@ -3,12 +3,12 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trenni/version'
 
-Gem::Specification.new do |gem|
-	gem.name          = "trenni"
-	gem.version       = Trenni::VERSION
-	gem.authors       = ["Samuel Williams"]
-	gem.email         = ["samuel.williams@oriontransfer.co.nz"]
-	gem.description   = <<-EOF
+Gem::Specification.new do |spec|
+	spec.name          = "trenni"
+	spec.version       = Trenni::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
 	Trenni is a templating system that evaluates textual strings containing Ruby
 	code. It compiles templates directly into native code which means that you
 	generally get the best possible performance.
@@ -16,11 +16,15 @@ Gem::Specification.new do |gem|
 	In addition, Trenni includes an SGML/XML builder to assist with the generation
 	of pleasantly formatted markup.
 	EOF
-	gem.summary       = %q{A fast native templating system that compiles directly to Ruby code.}
-	gem.homepage      = "https://github.com/ioquatix/trenni"
+	spec.summary       = %q{A fast native templating system that compiles directly to Ruby code.}
+	spec.homepage      = "https://github.com/ioquatix/trenni"
 
-	gem.files         = `git ls-files`.split($/)
-	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-	gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-	gem.require_paths = ["lib"]
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
+	
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
+	spec.add_development_dependency "rake"
 end

metadata

@@ -1,17 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
-dependencies: []
-description: ! "\tTrenni is a templating system that evaluates textual strings containing
+date: 2014-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "\tTrenni is a templating system that evaluates textual strings containing
   Ruby\n\tcode. It compiles templates directly into native code which means that you\n\tgenerally
   get the best possible performance.\n\n\tIn addition, Trenni includes an SGML/XML
   builder to assist with the generation\n\tof pleasantly formatted markup.\n"
@@ -21,8 +62,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -33,43 +74,36 @@ files:
 - lib/trenni/strings.rb
 - lib/trenni/template.rb
 - lib/trenni/version.rb
-- test/test_builder.rb
-- test/test_parser.rb
-- test/test_strings.rb
-- test/test_template.rb
+- spec/trenni/builder_spec.rb
+- spec/trenni/parser_spec.rb
+- spec/trenni/strings_spec.rb
+- spec/trenni/template_spec.rb
 - trenni.gemspec
 homepage: https://github.com/ioquatix/trenni
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -514891289960522672
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -514891289960522672
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.
 test_files:
-- test/test_builder.rb
-- test/test_parser.rb
-- test/test_strings.rb
-- test/test_template.rb
+- spec/trenni/builder_spec.rb
+- spec/trenni/parser_spec.rb
+- spec/trenni/strings_spec.rb
+- spec/trenni/template_spec.rb

data/test/test_builder.rb

@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-
-# 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 'pathname'
-require 'test/unit'
-require 'stringio'
-require 'digest/md5'
-
-require 'trenni'
-
-class TestBuilder < Test::Unit::TestCase
-	def test_tags
-		builder = Trenni::Builder.new(:indent => false)
-
-		builder.instruct
-		builder.tag('foo', 'bar' => 'baz') do
-			builder.text("apples and oranges")
-		end
-		
-		assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo bar=\"baz\">apples and oranges</foo>", builder.output.string
-	end
-	
-	def test_full_html
-		builder = Trenni::Builder.new(:indent => true)
-		
-		builder.doctype
-		builder.tag('html') do
-			builder.tag('head') do
-				builder.inline('title') do
-					builder.text('Hello World')
-				end
-			end
-			builder.tag('body') do
-			end
-		end
-		
-		assert_equal "<!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>", builder.output.string
-	end
-	
-	def test_inline_html
-		builder = Trenni::Builder.new(:indent => true)
-		
-		builder.inline("div") do
-			builder.tag("strong") do
-				builder.text("Hello")
-			end
-			
-			builder.text "World!"
-		end
-		
-		assert_equal "<div><strong>Hello</strong>World!</div>", builder.output.string
-	end
-	
-	def test_indentation
-		builder = Trenni::Builder.new(:indent => "\t")
-		
-		puts builder.output.string
-	end
-	
-	def test_escaping
-		builder = Trenni::Builder.new(:escape => true)
-		builder.inline :foo, :bar => %Q{"Hello World"} do
-			builder.text %Q{if x < 10}
-		end
-		
-		assert_equal %Q{<foo bar="&quot;Hello World&quot;">if x &lt; 10</foo>}, builder.output.string
-	end
-	
-	def test_attributes_strict
-		builder = Trenni::Builder.new(:strict => true)
-		builder.tag :option, :required => true
-		assert_equal %Q{<option required="required"/>}, builder.output.string
-	end
-	
-	def test_attributes_compact
-		builder = Trenni::Builder.new(:strict => false)
-		builder.tag :option, :required => true
-		assert_equal %Q{<option required/>}, builder.output.string
-	end
-	
-	def test_attributes_order
-		builder = Trenni::Builder.new(:strict => true)
-		builder.tag :t, [[:a, 10], [:b, 20]]
-		assert_equal %Q{<t a="10" b="20"/>}, builder.output.string
-		
-		builder = Trenni::Builder.new(:strict => true)
-		builder.tag :t, :b => 20, :a => 10
-		assert_equal %Q{<t a="10" b="20"/>}, builder.output.string
-	end
-end

data/test/test_parser.rb

@@ -1,110 +0,0 @@
-#!/usr/bin/env ruby
-
-# 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 'pathname'
-require 'test/unit'
-require 'stringio'
-require 'digest/md5'
-
-require 'trenni/parser'
-
-class TestParser < Test::Unit::TestCase
-	class ParserDelegate
-		def initialize
-			@events = []
-		end
-		
-		attr :events
-		
-		def method_missing(*args)
-			@events << args
-		end
-		
-		def begin_parse(scanner)
-			# ignore this event
-		end
-	end
-	
-	def test_markup
-		delegate = ParserDelegate.new
-		scanner = Trenni::Parser.new(delegate)
-
-		scanner.parse(%Q{<foo bar="20" baz>Hello World</foo>})
-
-		expected_events = [
-			[:begin_tag, "foo", :opened],
-			[:attribute, "bar", "20"],
-			[:attribute, "baz", true],
-			[:finish_tag, :opened, :opened],
-			[:text, "Hello World"],
-			[:begin_tag, "foo", :closed],
-			[:finish_tag, :closed, :opened],
-		]
-		
-		assert_equal expected_events, delegate.events
-	end
-	
-	def test_cdata
-		delegate = ParserDelegate.new
-		scanner = Trenni::Parser.new(delegate)
-
-		scanner.parse(%Q{<test><![CDATA[Hello World]]></test>})
-
-		expected_events = [
-			[:begin_tag, "test", :opened],
-			[:finish_tag, :opened, :opened],
-			[:cdata, "Hello World"],
-			[:begin_tag, "test", :closed],
-			[:finish_tag, :closed, :opened],
-		]
-		
-		assert_equal expected_events, delegate.events
-	end
-	
-	def test_errors
-		delegate = ParserDelegate.new
-		scanner = Trenni::Parser.new(delegate)
-
-		assert_raise Trenni::Parser::ParseError do
-			scanner.parse(%Q{<foo})
-		end
-		
-		assert_raise Trenni::Parser::ParseError do
-			scanner.parse(%Q{<foo bar=>})
-		end
-		
-		assert_nothing_raised Trenni::Parser::ParseError do
-			scanner.parse(%Q{<foo bar="" baz>})
-		end
-	end
-	
-	def test_line_at_offset
-		data = %Q{Hello\nWorld\nFoo\nBar!}
-		
-		line = Trenni::Parser.line_at_offset(data, 7)
-		
-		assert_equal "World", line[:text]
-		assert_equal 2, line[:line_number]
-		assert_equal 6, line[:line_offset]
-		assert_equal 1, line[:character_offset]
-	end
-end

data/test/test_strings.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/env ruby
-
-# 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 'pathname'
-require 'test/unit'
-require 'stringio'
-
-require 'trenni/strings'
-
-class TestStrings < Test::Unit::TestCase
-	def test_to_html
-		text = Trenni::Strings.to_html("<foobar>")
-		assert_equal "&lt;foobar&gt;", text
-		
-		text = Trenni::Strings.to_html(%q{"I'd like to do this & that :p", she said.})
-		assert_equal %q{&quot;I'd like to do this &amp; that :p&quot;, she said.}, text
-	end
-
-	def test_to_quoted_string
-		text = Trenni::Strings.to_quoted_string(%Q{"Hello World"})
-		assert_equal %q{"\"Hello World\""}, text
-		
-		text = Trenni::Strings.to_quoted_string(%Q{"Hello\r\nWorld"})
-		assert_equal %q{"\"Hello\r\nWorld\""}, text
-	end
-		
-	def test_to_attribute
-		text = Trenni::Strings.to_attribute(:foo, 'bar')
-		assert_equal %Q{foo="bar"}, text
-		
-		text = Trenni::Strings.to_simple_attribute(:foo, false)
-		assert_equal %Q{foo}, text
-		
-		text = Trenni::Strings.to_simple_attribute(:foo, true)
-		assert_equal %Q{foo="foo"}, text
-	end
-		
-	def self.to_simple_attribute
-		strict ? %Q{#{key}="#{key}"} : key.to_s
-	end
-		
-	def test_to_title
-		text = Trenni::Strings.to_title("foo bar")
-		assert_equal "Foo Bar", text
-	end
-
-	def test_to_snake
-		text = Trenni::Strings.to_snake("Happy::Go::Lucky")
-		assert_equal "happy_go_lucky", text
-	end
-end