trenni 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed121951aae78b890d97e69aa17a78641ba3420095d58aae07ac7b2222f2ec4
-  data.tar.gz: af24daf72a44f100cbb775d6a23c0694a617fdaab8b65eca1a30e9ae692e2c3b
+  metadata.gz: e5137222fc49006a71dbcc1b9730dba3ff670660df9502bdae43db6d242d25a7
+  data.tar.gz: 47494cf08dfb486a74c3efd236419f02638f3bd1b593446acd1f26fbd1d87870
 SHA512:
-  metadata.gz: c4458fa6a04b8a8e82715e89fa2125c9647f55d06f308751b36b55babbc99e60a29639c9fb161bb5aa7bd33be1c09f4663ddb76f2d4228cb68e8d5210ef1b073
-  data.tar.gz: 18e2d54b3e596716bc8b09bb8f1de2379e454b6159be086729b4e578ffc86b286269b7210715cc68506ccf5a00ac00f22f42a9180711814758dfe84e84855f41
+  metadata.gz: 501b5b7fc01eb1da1650c4d32dc296998b428b0919f904b195da5b2f2c53ccd40fcf2bad16f43291d833293987e5fda43adfbdfc21834f97273ee2e460575622
+  data.tar.gz: 9e7f6a39cf968a59a553c4209644c50a1b69cde60cb99abf437ad662395f9c4e488fa6d20aefdf61c29e0aec90ca879cdbf29c7fe19e90b9cf8ff4eb9d7274f4

data/.travis.yml

@@ -1,29 +1,23 @@
 language: ruby
-sudo: false
-
-before_install:
-  - gem update --system
-  - gem install bundler
+cache: bundler
 
 before_script:
-  - sh -c "cd ext && rake compile"
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - ruby-head
-  - jruby-head
-  - rbx-2
+  - sh -c "cd ext && bundle exec rake compile"
 
-env:
-  - COVERAGE=true
-  - COVERAGE=true TRENNI_PREFER_FALLBACK=y
 matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      env: TRENNI_PREFER_FALLBACK=y
+    - rvm: 2.6
+      env: COVERAGE=Summary
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: truffleruby
   allow_failures:
-    - rvm: "rbx-2"
+    - rvm: "truffleruby"
     - rvm: "ruby-head"
     - rvm: "jruby-head"

data/Gemfile

@@ -5,9 +5,7 @@ gemspec
 
 group :development do
 	gem 'pry'
-	
 	gem "rake-compiler"
-	
 	gem "ruby-beautify"
 end
 
@@ -15,8 +13,7 @@ group :test do
 	gem 'ruby-prof', platforms: [:mri]
 	gem "benchmark-ips"
 	
-	gem 'simplecov'
-	gem 'coveralls', require: false
+	gem 'covered'
 	
 	# For comparisons:
 	gem "nokogiri"

data/lib/trenni/template.rb

@@ -95,8 +95,9 @@ module Trenni
 			self.new(FileBuffer.new(path), *args).freeze
 		end
 
-		def initialize(buffer)
+		def initialize(buffer, binding: TOPLEVEL_BINDING)
 			@buffer = buffer
+			@binding = binding
 		end
 		
 		def freeze
@@ -119,7 +120,7 @@ module Trenni
 			Buffer.new(to_string(scope), path: @buffer.path)
 		end
 		
-		def to_proc(scope = binding)
+		def to_proc(scope = @binding.dup)
 			@compiled_proc ||= eval("proc{|#{OUT}|;#{code}}", scope, @buffer.path).freeze
 		end
 		
@@ -150,7 +151,7 @@ module Trenni
 		class Assembler < Template::Assembler
 			# Output a string interpolation.
 			def expression(text)
-				@code << "Markup.append(#{OUT},(#{text}));"
+				@code << "Trenni::Markup.append(#{OUT},(#{text}));"
 			end
 		end
 		

data/lib/trenni/version.rb

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

data/spec/spec_helper.rb

@@ -1,23 +1,6 @@
 
-if ENV['COVERAGE']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "trenni"
+require 'covered/rspec'
+require 'trenni'
 
 begin
 	require 'ruby-prof'

data/spec/trenni/template_spec.rb

@@ -25,89 +25,108 @@ require 'trenni/parsers'
 require 'benchmark'
 
 RSpec.describe Trenni::Template do
-	let(:template_path) {File.expand_path('corpus/large.xhtml', __dir__)}
-	let(:template) {Trenni::Template.load_file template_path}
-	let(:output) {template.to_string}
-	
-	it "should parse xhtml template and produce identical output" do
-		expect{output}.to_not raise_error
-		expect(output).to be == File.read(template_path)
-	end
-end
-
-RSpec.describe Trenni::Template do
-	let(:template_path) {File.expand_path('template_spec/lines.trenni', __dir__)}
-	let(:template) {Trenni::Template.load_file template_path}
-	let(:code) {template.send(:code)}
-	
-	it "should parse xhtml template and produce identical output" do
-		expect(code.lines[0]).to match(/apple/)
-		expect(code.lines[5]).to match(/banana/)
-	end
-end
-
-RSpec.describe Trenni::Template do
-	let(:template_path) {File.expand_path('template_spec/builder.trenni', __dir__)}
-	let(:template) {Trenni::Template.load_file template_path}
-	let(:code) {template.send(:code)}
-	
-	it "should capture and output the contents of the block" do
-		expect(template.to_string).to be == 'Hello World!'
+	context 'large.xhtml' do
+		let(:template_path) {File.expand_path('corpus/large.xhtml', __dir__)}
+		let(:template) {Trenni::Template.load_file template_path}
+		let(:output) {template.to_string}
+		
+		it "should parse xhtml template and produce identical output" do
+			expect{output}.to_not raise_error
+			expect(output).to be == File.read(template_path)
+		end
 	end
-end
-
-RSpec.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).to be == '"TEST TEST TEST\n"'
+	context 'lines.trenni' do
+		let(:template_path) {File.expand_path('template_spec/lines.trenni', __dir__)}
+		let(:template) {Trenni::Template.load_file template_path}
+		let(:code) {template.send(:code)}
+		
+		it "should parse xhtml template and produce identical output" do
+			expect(code.lines[0]).to match(/apple/)
+			expect(code.lines[5]).to match(/banana/)
+		end
 	end
 	
-	it "compiled template should match line numbers" do
-		code_lines = capture_template.send(:code).lines
+	context 'builder.trenni' do
+		let(:template_path) {File.expand_path('template_spec/builder.trenni', __dir__)}
+		let(:template) {Trenni::Template.load_file template_path}
+		let(:code) {template.send(:code)}
 		
-		expect(code_lines.count).to be == 4
-		expect(code_lines[3]).to include("inspect")
+		it "should capture and output the contents of the block" do
+			expect(template.to_string).to be == 'Hello World!'
+		end
 	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'
+	context 'capture.trenni' 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).to be == '"TEST TEST TEST\n"'
+		end
+		
+		it "compiled template should match line numbers" do
+			code_lines = capture_template.send(:code).lines
+			
+			expect(code_lines.count).to be == 4
+			expect(code_lines[3]).to include("inspect")
+		end
 	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!"
+	context 'buffer.trenni' do
+		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
 	end
 	
-	let(:items) {1..4}
-	
-	it "should process list of items" do
-		buffer = Trenni::Buffer.new('<?r items.each do |item| ?>#{item}<?r end ?>')
-		template = Trenni::Template.new(buffer)
+	context 'nested.trenni' do
+		let(:nested_template) {Trenni::Template.load_file File.expand_path('template_spec/nested.trenni', __dir__)}
 		
-		expect(template.to_string(self)).to be == "1234"
+		it "should be able to handle nested interpolations" do
+			expect(nested_template.to_string).to be == "Hello world!"
+		end
 	end
 	
-	it "should have correct indentation" do
-		buffer = Trenni::Buffer.new("\t<?r items.each do |item| ?>\n\t\#{item}\n\t<?r end ?>\n")
-		template = Trenni::Template.new(buffer)
+	context 'items' do
+		let(:items) {1..4}
+		
+		it "should process list of items" do
+			buffer = Trenni::Buffer.new('<?r items.each do |item| ?>#{item}<?r end ?>')
+			template = Trenni::Template.new(buffer)
+			
+			expect(template.to_string(self)).to be == "1234"
+		end
 		
-		expect(template.to_string(self)).to be == "\t1\n\t2\n\t3\n\t4\n"
+		it "should have correct indentation" do
+			buffer = Trenni::Buffer.new("\t<?r items.each do |item| ?>\n\t\#{item}\n\t<?r end ?>\n")
+			template = Trenni::Template.new(buffer)
+			
+			expect(template.to_string(self)).to be == "\t1\n\t2\n\t3\n\t4\n"
+		end
 	end
 	
-	let(:escaped_template) {Trenni::Template.load_file File.expand_path('template_spec/escaped.trenni', __dir__)}
-	
-	it "should have the same number of lines as input" do
-		expect(escaped_template.send(:code).lines.count).to be == 2
+	context 'escaped.trenni' do
+		let(:escaped_template) {Trenni::Template.load_file File.expand_path('template_spec/escaped.trenni', __dir__)}
+		
+		it "should have the same number of lines as input" do
+			expect(escaped_template.send(:code).lines.count).to be == 2
+		end
+		
+		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
 	
-	it "should process escaped characters" do
-		expect(escaped_template.to_string).to be == 
-			"This\\nisn't one line.\n" +
-			"\\tIndentation is the best."
+	context 'scope' do
+		it "should use default top-level binding if none provided" do
+			buffer = Trenni::Buffer.new('#{Module.nesting.inspect}')
+			template = Trenni::Template.new(buffer)
+			
+			expect(template.to_string(self)).to be == "[]"
+		end
 	end
 end
 

data/trenni.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 	spec.extensions = %w[ext/Rakefile]
 	spec.add_dependency "rake-compiler"
 	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.4"
 	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.