trenni 2.1.0 → 3.0.0

data/spec/trenni/tag_spec.rb

@@ -0,0 +1,69 @@
+# 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/tag'
+
+RSpec.describe Trenni::Tag.new("body", false, class: 'main') do
+	it "should have name" do
+		expect(subject.name).to be == "body"
+	end
+	
+	it "should be open by default" do
+		expect(subject).to_not be_self_closed
+	end
+	
+	it "should have an attribute" do
+		expect(subject.attributes).to include(:class)
+		expect(subject[:class]).to be == 'main'
+		expect(subject.to_s).to include('class="main"')
+	end
+end
+
+RSpec.describe Trenni::Tag.new("button", true, 'onclick' => 'javascript:alert("Hello World")') do
+	it "should have name" do
+		expect(subject.name).to be == "button"
+	end
+	
+	it "should have an attribute" do
+		expect(subject.attributes).to include('onclick')
+	end
+	
+	it "should generate valid string" do
+		expect(subject.to_s).to be == '<button onclick="javascript:alert(&quot;Hello World&quot;)"/>'
+	end
+end
+
+RSpec.describe Trenni::Tag.new("p", false, {}) do
+	it "should include content" do
+		expect(subject.to_s("Hello World")).to be == "<p>Hello World</p>"
+	end
+end
+
+RSpec.describe "namespace:name" do
+	it "should have namespace" do
+		expect(Trenni::Tag.split(subject)).to be == ['namespace', 'name']
+	end
+end
+
+RSpec.describe "name" do
+	it "should not have namespace" do
+		expect(Trenni::Tag.split(subject)).to be == [nil, 'name']
+	end
+end

data/spec/trenni/template_performance_spec.rb

@@ -36,6 +36,24 @@ RSpec.describe Trenni::Template do
 	# 	expect(object_time).to be < binding_time
 	# end
 	
+	let(:interpolations_path) {File.expand_path('template_spec/interpolations.trenni', __dir__)}
+	
+	it "should be fast for lots of interpolations" do
+		trenni_template = Trenni::MarkupTemplate.new(Trenni::Buffer.load_file(interpolations_path))
+		model = Model.new
+		
+		Benchmark.ips do |x|
+			x.report("Trenni") do |times|
+				i = 0
+				
+				while i < times
+					trenni_template.to_string(model)
+					
+					i += 1
+				end
+			end
+		end
+	end
 	
 	it "should be fast for basic templates" do
 		trenni_template = Trenni::Template.new(Trenni::Buffer.load('Hi, #{name}!'))

data/spec/trenni/template_spec/interpolations.trenni

@@ -0,0 +1,6 @@
+<?r 1000.downto(1) do |i| ?>
+<p>
+	#{i} bottles of beer on the wall, #{i} bottles of beer.</br>
+	Take one down and pass it around, #{i-1} bottles of beer on the wall.
+</p>
+<?r end ?>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,10 +74,14 @@ files:
 - benchmark/interpolation_vs_concat.rb
 - benchmark/io_vs_string.rb
 - entities.json
+- ext/trenni/escape.c
+- ext/trenni/escape.h
 - ext/trenni/extconf.rb
 - ext/trenni/markup.c
 - ext/trenni/markup.h
 - ext/trenni/markup.rl
+- ext/trenni/tag.c
+- ext/trenni/tag.h
 - ext/trenni/template.c
 - ext/trenni/template.h
 - ext/trenni/template.rl
@@ -98,19 +102,22 @@ files:
 - lib/trenni/parse_error.rb
 - lib/trenni/parsers.rb
 - lib/trenni/strings.rb
-- lib/trenni/substitutions.rb
+- lib/trenni/tag.rb
 - lib/trenni/template.rb
 - lib/trenni/version.rb
 - parsers/trenni/entities.rl
 - parsers/trenni/markup.rl
 - parsers/trenni/template.rl
+- spec/spec_helper.rb
 - spec/trenni/builder_spec.rb
 - spec/trenni/corpus/large.rb
 - spec/trenni/corpus/large.xhtml
 - spec/trenni/markup_parser_spec.rb
+- spec/trenni/markup_performance_spec.rb
 - spec/trenni/markup_spec.rb
 - spec/trenni/parsers_performance_spec.rb
 - spec/trenni/strings_spec.rb
+- spec/trenni/tag_spec.rb
 - spec/trenni/template_error_spec.rb
 - spec/trenni/template_performance_spec.rb
 - spec/trenni/template_spec.rb
@@ -119,6 +126,7 @@ files:
 - spec/trenni/template_spec/capture.trenni
 - spec/trenni/template_spec/error.trenni
 - spec/trenni/template_spec/escaped.trenni
+- spec/trenni/template_spec/interpolations.trenni
 - spec/trenni/template_spec/large.trenni
 - spec/trenni/template_spec/nested.trenni
 - trenni.gemspec
@@ -141,18 +149,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.
 test_files:
+- spec/spec_helper.rb
 - spec/trenni/builder_spec.rb
 - spec/trenni/corpus/large.rb
 - spec/trenni/corpus/large.xhtml
 - spec/trenni/markup_parser_spec.rb
+- spec/trenni/markup_performance_spec.rb
 - spec/trenni/markup_spec.rb
 - spec/trenni/parsers_performance_spec.rb
 - spec/trenni/strings_spec.rb
+- spec/trenni/tag_spec.rb
 - spec/trenni/template_error_spec.rb
 - spec/trenni/template_performance_spec.rb
 - spec/trenni/template_spec.rb
@@ -161,5 +172,6 @@ test_files:
 - spec/trenni/template_spec/capture.trenni
 - spec/trenni/template_spec/error.trenni
 - spec/trenni/template_spec/escaped.trenni
+- spec/trenni/template_spec/interpolations.trenni
 - spec/trenni/template_spec/large.trenni
 - spec/trenni/template_spec/nested.trenni

data/lib/trenni/substitutions.rb

@@ -1,45 +0,0 @@
-# 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 Substitutions
-		def initialize(tokens)
-			@tokens = tokens
-		end
-		
-		def patterns
-			@tokens.keys
-		end
-		
-		def pattern
-			@pattern ||= Regexp.union(patterns)
-		end
-		
-		attr :tokens
-		
-		def gsub!(string)
-			string.gsub!(pattern) {|match| @tokens[match]}
-		end
-		
-		def gsub(string)
-			string.gsub(pattern) {|match| @tokens[match]}
-		end
-	end
-end