trenni 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc57b1b547732e022575dfeb3e0c3d05c00c773
-  data.tar.gz: 66112c426e576576d952ada0de16c9b892d641b1
+  metadata.gz: 3c2a33d255bc9d2ed30d0e54ee6b0b95f3800ba8
+  data.tar.gz: 49d50142db0d3621ca2b95c81c475dea3616d89d
 SHA512:
-  metadata.gz: 0e382b3c417d7108e59f8753d464485a4bb87720b7ed45cd5a8ab8a90b9c40971bd14ae33c314d3315899a093c3815f95dd7a3d1742ddfe1c9bdeda21fc63ee0
-  data.tar.gz: 3d0d25dc948dbca8af164a2a9021eb7ffe3b2e90a6ce71a77ec5ddad1d0472164bb850ab016c5d4816a39008f6342d471739d88ecb61b7380039c7e102664e4d
+  metadata.gz: f788a9552f2ef0590292acf3fee2104db05958cd166d44c761051b23ffd8d915b10159f4ab0254a1ae776e52be607a95c9d40a339e711abaadf9ff9fb67216da
+  data.tar.gz: 7f96731a0c1cc4594a6398ca6d8c8bb0437710085d0ed4da29d1f12be5615a3512bce3da75215a9e294dce1a45f447f8cbafd55704bcebe196b9bf4bffe02aa6

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - "1.9"
   - "2.0"
   - "2.1"

data/Gemfile

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

data/README.md

@@ -31,9 +31,11 @@ Trenni templates work essentially the same way as all other templating systems:
 	
 	items = 1..4
 	
-	assert_equal "1234", template.result(binding)
+	template.to_string(binding) # => "1234"
 
-The code above demonstraights 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.
 
 ## Contributing
 

data/lib/trenni/template.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'strscan'
+require 'stringio'
 
 module Trenni
 	# The output variable that will be used in templates:
@@ -62,12 +63,12 @@ module Trenni
 			end
 
 			def code
-				parts = ["#{OUT} = [] ; "] + @parts + ["#{OUT}.join"]
+				parts = ["#{OUT} = [] ; "] + @parts + ["#{OUT}"]
 
 				code = parts.join
 			end
 		end
-
+		
 		class Scanner < StringScanner
 			TEXT = /([^<#]|<(?!\?r)|#(?!\{)){1,1024}/m
 			
@@ -146,24 +147,42 @@ module Trenni
 		def initialize(template, filename = '<Trenni>')
 			@template = template
 			@filename = filename
-			compile!
 		end
 
-		def evaluate(binding)
-			eval(@code, binding, @filename)
+		def to_string(scope = nil)
+			to_array(scope).join
+		end
+
+		# Legacy functions:
+		alias evaluate to_string
+		alias result to_string
+
+		def to_array(scope)
+			if Binding === scope
+				eval(code, scope, @filename)
+			else
+				# This can sometimes be a bit faster:
+				scope.instance_eval(&to_proc)
+			end
 		end
 		
-		alias result evaluate
+		def to_proc
+			@compiled_proc ||= eval("proc{\n#{code}\n}", binding, @filename, 0)
+		end
 		
 		protected
 		
-		def compile!(filename = @filename)
+		def code
+			@code ||= compile!
+		end
+		
+		def compile!
 			buffer = Buffer.new
 			scanner = Scanner.new(buffer, @template)
 			
 			scanner.parse
 			
-			@code = buffer.code
+			buffer.code
 		end
 	end
 end

data/lib/trenni/version.rb

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

data/spec/trenni/escaped.trenni

@@ -0,0 +1,2 @@
+This\nisn't one line.
+\tIndentation is the best.

data/spec/trenni/large.trenni

@@ -0,0 +1,16 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent gravida, turpis id bibendum bibendum, ipsum diam vestibulum arcu, sit amet tempor ipsum lorem non urna. Suspendisse nec nisl a risus laoreet lacinia ac sit amet neque. Mauris vel turpis semper massa bibendum viverra. Curabitur vel felis est. Donec sed faucibus augue, ac molestie purus. Nulla a lectus dui. Quisque id scelerisque urna. Aenean in vehicula nibh, in aliquam turpis. #{'Suspendisse'} iaculis suscipit lectus in efficitur. Nulla facilisi. Fusce facilisis, justo ac eleifend convallis, ligula est bibendum risus, a consequat metus sapien eget mauris. Sed quis mollis tellus, sed tempor lacus. Proin et efficitur metus. Vestibulum blandit tellus sed turpis tincidunt, in aliquet augue bibendum. Suspendisse venenatis faucibus lectus sed convallis.
+
+#{'Curabitur'} aliquet ligula et volutpat efficitur. Duis sed tortor elit. Quisque justo eros, maximus quis elit sed, accumsan faucibus lectus. Nulla blandit quam urna, ac bibendum turpis semper quis. Proin a ligula eu eros semper condimentum. Ut pellentesque, justo sed malesuada condimentum, est massa tempor turpis, id facilisis neque odio eu neque. Morbi convallis laoreet tortor, ut dapibus mi accumsan a. Proin convallis neque sed leo blandit lacinia. Phasellus porta odio nunc, quis placerat sem facilisis quis. Quisque et #{'ornare'} elit. Duis efficitur cursus lectus vitae placerat. In lacinia eros nec feugiat finibus.
+
+Morbi orci magna, tempor at convallis sed, porta elementum nulla. Aliquam sit amet fringilla felis, eget volutpat lorem. Pellentesque laoreet, elit quis fringilla ultricies, leo nisl semper mauris, ac feugiat libero tortor id urna. Praesent ligula augue, mollis nec justo vitae, faucibus posuere risus. Praesent blandit molestie ex eu fringilla. Ut non vehicula mauris. Aliquam gravida rutrum laoreet. Pellentesque facilisis mi ipsum, ac dapibus mi iaculis nec.
+
+Vestibulum sit amet nibh velit. Sed rhoncus odio ut nisi blandit vestibulum. Aliquam erat volutpat. Suspendisse sed posuere ligula. Proin ex ex, pharetra vel dui vulputate, pellentesque ullamcorper metus. Cras imperdiet dictum lorem. Nullam eleifend nunc eu metus ullamcorper dignissim. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sit amet sem sed enim rutrum volutpat a non libero.
+
+<?r 10.downto(1) do |i| ?>
+	#{i} bottle#{i == 1 ? '' : 's'} of beer on the wall,
+	#{i} bottle#{i == 1 ? '' : 's'} of beer,
+	Take one down and pass it around,
+	#{i-1} bottle#{i == 1 ? '' : 's'} of beer on the wall.
+<?r end ?>
+
+Integer in ligula at ex gravida pellentesque in et felis. Nulla dolor sapien, pretium a odio a, consectetur ultrices justo. Suspendisse libero quam, pulvinar eu est non, fermentum volutpat nisl. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Cras at dapibus lorem, nec imperdiet quam. Proin ut tellus sagittis, sollicitudin elit ac, porttitor diam. Quisque at hendrerit lacus, sit amet mollis lacus.

data/spec/trenni/template_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
@@ -21,6 +21,9 @@
 # THE SOFTWARE.
 
 require 'trenni'
+require 'benchmark'
+
+# require 'ruby-prof'
 
 module Trenni::TemplateSpec
 	describe Trenni::Template do
@@ -28,7 +31,34 @@ module Trenni::TemplateSpec
 			template = Trenni::Template.new('<?r items.each do |item| ?>#{item}<?r end ?>')
 		
 			items = 1..4
-			expect(template.result(binding)).to be == "1234"
+			expect(template.to_string(binding)).to be == "1234"
+		end
+		
+		let(:large_template) {Trenni::Template.load File.join(__dir__, "large.trenni")}
+
+		it "should have better performance using instance" do
+			n = 1_000
+			
+			#RubyProf.start
+			
+			object_time = Benchmark.realtime{n.times{large_template.to_string(self)}}
+			binding_time = Benchmark.realtime{n.times{large_template.to_string(binding)}}
+			
+			#result = RubyProf.stop
+			
+			# Print a flat profile to text
+			#printer = RubyProf::FlatPrinter.new(result)
+			#printer.print(STDOUT)
+			
+			expect(object_time).to be < binding_time
+		end
+		
+		let(:escaped_template) {Trenni::Template.load  File.join(__dir__, "escaped.trenni")}
+		
+		it "should process escaped characters" do
+			expect(escaped_template.to_string).to be == 
+				"This\\nisn't one line.\n" +
+				"\\tIndentation is the best."
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,8 @@ 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
@@ -103,6 +105,8 @@ 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