trenni 3.0.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e4c37bf42689b8147fa6a2bd1c1ec0e639ba4e
-  data.tar.gz: 1329a84371a078a28fc2ffc51fd700491cf8d71b
+  metadata.gz: edb9c2bbe55c3fe6cf46a043cb242ad079c914ec
+  data.tar.gz: 489dfdf5ea722b9f6f0af82a97c9f374e2129462
 SHA512:
-  metadata.gz: '0088146935eaa008d901c8c1675bfcce76770114e45d1359891dd1cf6d56a91313e781db70707efae6061bc8f3b82749815bc2deed5af1e4498e94c735998900'
-  data.tar.gz: 3291577a7d8ad37f4d48217c9e43e033414f6dc64e769cff239f088420dfb80610bc2490c2f3b72ed1555efdd152dce624d3a33c97e6049148ce82d0145d6aff
+  metadata.gz: cd32df2fba19bb867d04da303ee5913fbf7e709805cbac31687c145c815578d0f6d800cf117606eaae91c8cc6ebe376d050d570ebd68c45889d97485656f2903
+  data.tar.gz: 76c1ef902dbc6174c426db011446af33b3a1f3d6c27eff97c1b1128a3f5ce39902a6368161cd91adb46f4db30146893cf1a3190f37bab7f232fd20d8c659e99f

data/.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
 sudo: false
+before_install:
+  - gem install bundler
+  - gem update bundler
 before_script:
-  - rake compile
+  - sh -c "cd ext && rake compile"
 rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
   - 2.4.0
   - ruby-head
+  - jruby-head
   - rbx-2
 env:
   - COVERAGE=true
@@ -16,3 +20,4 @@ matrix:
   allow_failures:
     - rvm: "rbx-2"
     - rvm: "ruby-head"
+    - rvm: "jruby-head"

data/Rakefile

@@ -1,86 +1,10 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+# Load all rake tasks:
+import(*Dir.glob('tasks/**/*.rake'))
 
-task :default => :spec
-
-task :fetch_entities do
-	require 'open-uri'
-	require 'json'
-	
-	entites_json_path = File.expand_path("entities.json", __dir__)
-	
-	unless File.exist? entites_json_path
-		url = "https://www.w3.org/TR/html5/entities.json"
-		File.write(entites_json_path, open(url).read)
-	end
-	
-	@entities = JSON.parse(File.read(entites_json_path)).delete_if{|string, _| !string.end_with? ';'}
-end
-
-task :update_entities => :fetch_entities do
-	require 'trenni/template'
-	
-	paths = {
-		'ext/trenni/entities.rl' => 'ext/trenni/entities.trenni',
-		'lib/trenni/entities.rb' => 'lib/trenni/entities.trenni',
-	}
-	
-	paths.each do |output_path, template_path|
-		template = Trenni::Template.load_file(template_path)
-		
-		puts template.send(:code)
-		
-		#output = template.to_string(@entities)
-		
-		#File.write(output_path, output)
-	end
-end
-
-require "rake/extensiontask"
-
-Rake::ExtensionTask.new "trenni" do |ext|
-	ext.lib_dir = "lib/trenni"
-end
-
-PARSERS_DIRECTORY = File.expand_path("parsers", __dir__)
-FALLBACK_DIRECTORY = File.expand_path("lib/trenni/fallback", __dir__)
-NATIVE_DIRECTORY = File.expand_path("ext/trenni", __dir__)
-
-task :generate_fallback_parsers do
-	Dir.chdir(FALLBACK_DIRECTORY) do
-		Dir.glob("*.rl").each do |parser_path|
-			sh("ragel", "-I", PARSERS_DIRECTORY, "-R", parser_path, "-F1")
-		end
-		
-		sh("ruby-beautify", "--tabs", "--overwrite", *Dir.glob("*.rb"))
-	end
-end
-
-task :generate_native_parsers do
-	Dir.chdir(NATIVE_DIRECTORY) do
-		Dir.glob("*.rl").each do |parser_path|
-			sh("ragel", "-I", PARSERS_DIRECTORY, "-C", parser_path, "-G2")
-		end
-	end
-end
-
-task :generate_parsers => [:generate_native_parsers, :generate_fallback_parsers, :compile]
-
-task :visualize_parsers do
-	Dir.chdir(FALLBACK_DIRECTORY) do
-		Dir.glob("*.rl").each do |parser_path|
-			dot_path = parser_path + ".dot"
-			sh("ragel", "-I", PARSERS_DIRECTORY, "-Vp", parser_path, "-o", dot_path)
-			
-			pdf_path = parser_path + ".pdf"
-			sh("dot", "-Tpdf", "-o", pdf_path, dot_path)
-			
-			sh("open", pdf_path) rescue nil
-		end
-	end
-end
+RSpec::Core::RakeTask.new(:test)
 
 task :environment do
 	$LOAD_PATH.unshift File.expand_path('lib', __dir__)
@@ -91,3 +15,5 @@ task :console => :environment do
 	
 	Pry.start
 end
+
+task :default => :test

data/ext/Rakefile

@@ -0,0 +1,18 @@
+
+spec_path = File.expand_path('../trenni.gemspec', Dir.pwd)
+spec = Gem::Specification.load(spec_path)
+
+require "rake/extensiontask"
+
+unless RUBY_PLATFORM =~ /java/
+	Rake::ExtensionTask.new("trenni") do |ext|
+		ext.ext_dir = 'trenni'
+		ext.lib_dir = '../lib/trenni'
+	end
+else
+	task :compile do
+		puts "Nothing to compile for this platform."
+	end
+end
+
+task :default => :compile

data/ext/trenni/extconf.rb

@@ -1,3 +1,4 @@
+
 # Loads mkmf which is used to make makefiles for Ruby extensions
 require 'mkmf'
 
@@ -16,3 +17,4 @@ dir_config(extension_name)
 
 # Generate the makefile to compile the native binary into `lib`:
 create_makefile(File.join(gem_name, extension_name))
+

data/lib/trenni/version.rb

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

data/spec/spec_helper.rb

@@ -19,6 +19,30 @@ end
 require "bundler/setup"
 require "trenni"
 
+begin
+	require 'ruby-prof'
+	
+	RSpec.shared_context "profile" do
+		before(:all) do
+			RubyProf.start
+		end
+		
+		after(:all) do
+			result = RubyProf.stop
+			
+			# Print a flat profile to text
+			printer = RubyProf::FlatPrinter.new(result)
+			printer.print(STDOUT)
+		end
+	end
+rescue LoadError
+	RSpec.shared_context "profile" do
+		before(:all) do
+			puts "Profiling not supported on this platform."
+		end
+	end
+end
+
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure
 	config.example_status_persistence_file_path = ".rspec_status"

data/spec/trenni/parsers_performance_spec.rb

@@ -5,22 +5,6 @@ require 'trenni/entities'
 
 require 'nokogiri'
 
-require 'ruby-prof'
-
-RSpec.shared_context "profile" do
-	before(:all) do
-		RubyProf.start
-	end
-	
-	after(:all) do
-		result = RubyProf.stop
-		
-		# Print a flat profile to text
-		printer = RubyProf::FlatPrinter.new(result)
-		printer.print(STDOUT)
-	end
-end
-
 RSpec.describe Trenni::Parsers do
 	# include_context "profile"
 	

data/spec/trenni/template_performance_spec.rb

@@ -4,8 +4,6 @@ require 'trenni/parsers'
 require 'trenni/template'
 require 'erb'
 
-# require 'ruby-prof'
-
 RSpec.describe Trenni::Template do
 	class Model
 		def name

data/tasks/entities.rake

@@ -0,0 +1,33 @@
+
+task :fetch_entities do
+	require 'open-uri'
+	require 'json'
+	
+	entites_json_path = File.expand_path("entities.json", __dir__)
+	
+	unless File.exist? entites_json_path
+		url = "https://www.w3.org/TR/html5/entities.json"
+		File.write(entites_json_path, open(url).read)
+	end
+	
+	@entities = JSON.parse(File.read(entites_json_path)).delete_if{|string, _| !string.end_with? ';'}
+end
+
+task :update_entities => :fetch_entities do
+	require 'trenni/template'
+	
+	paths = {
+		'ext/trenni/entities.rl' => 'ext/trenni/entities.trenni',
+		'lib/trenni/entities.rb' => 'lib/trenni/entities.trenni',
+	}
+	
+	paths.each do |output_path, template_path|
+		template = Trenni::Template.load_file(template_path)
+		
+		puts template.send(:code)
+		
+		#output = template.to_string(@entities)
+		
+		#File.write(output_path, output)
+	end
+end

data/tasks/parsers.rake

@@ -0,0 +1,38 @@
+
+PARSERS_DIRECTORY = File.expand_path("parsers", __dir__)
+FALLBACK_DIRECTORY = File.expand_path("lib/trenni/fallback", __dir__)
+NATIVE_DIRECTORY = File.expand_path("ext/trenni", __dir__)
+
+task :generate_fallback_parsers do
+	Dir.chdir(FALLBACK_DIRECTORY) do
+		Dir.glob("*.rl").each do |parser_path|
+			sh("ragel", "-I", PARSERS_DIRECTORY, "-R", parser_path, "-F1")
+		end
+		
+		sh("ruby-beautify", "--tabs", "--overwrite", *Dir.glob("*.rb"))
+	end
+end
+
+task :generate_native_parsers do
+	Dir.chdir(NATIVE_DIRECTORY) do
+		Dir.glob("*.rl").each do |parser_path|
+			sh("ragel", "-I", PARSERS_DIRECTORY, "-C", parser_path, "-G2")
+		end
+	end
+end
+
+task :generate_parsers => [:generate_native_parsers, :generate_fallback_parsers, :compile]
+
+task :visualize_parsers do
+	Dir.chdir(FALLBACK_DIRECTORY) do
+		Dir.glob("*.rl").each do |parser_path|
+			dot_path = parser_path + ".dot"
+			sh("ragel", "-I", PARSERS_DIRECTORY, "-Vp", parser_path, "-o", dot_path)
+			
+			pdf_path = parser_path + ".pdf"
+			sh("dot", "-Tpdf", "-o", pdf_path, dot_path)
+			
+			sh("open", pdf_path) rescue nil
+		end
+	end
+end

data/trenni.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'trenni/version'
+require_relative 'lib/trenni/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "trenni"
+	spec.platform      = Gem::Platform::RUBY
 	spec.version       = Trenni::VERSION
 	spec.authors       = ["Samuel Williams"]
 	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
@@ -25,7 +24,8 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '~> 2.1'
 	
-	spec.extensions = %w[ext/trenni/extconf.rb]
+	spec.extensions = %w[ext/Rakefile]
+	spec.add_dependency "rake-compiler"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.4"

metadata

@@ -1,66 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake-compiler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   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.4'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\tTrenni is a templating system built on top of SGML/XML. It uses efficient\n\tnative
-  parsers where possible and compiles templates into efficient Ruby.\n\t\n\tIn addition,
-  Trenni includes an SGML/XML builder to assist with the generation\n\tof pleasantly
-  formatted markup which is compatible with the included parsers.\n"
+description: "\tTrenni is a templating system built on top of SGML/XML. It uses efficient\n\
+  \tnative parsers where possible and compiles templates into efficient Ruby.\n\t\n\
+  \tIn addition, Trenni includes an SGML/XML builder to assist with the generation\n\
+  \tof pleasantly formatted markup which is compatible with the included parsers.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables: []
 extensions:
-- ext/trenni/extconf.rb
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -74,6 +88,7 @@ files:
 - benchmark/interpolation_vs_concat.rb
 - benchmark/io_vs_string.rb
 - entities.json
+- ext/Rakefile
 - ext/trenni/escape.c
 - ext/trenni/escape.h
 - ext/trenni/extconf.rb
@@ -129,11 +144,13 @@ files:
 - spec/trenni/template_spec/interpolations.trenni
 - spec/trenni/template_spec/large.trenni
 - spec/trenni/template_spec/nested.trenni
+- tasks/entities.rake
+- tasks/parsers.rake
 - trenni.gemspec
 homepage: https://github.com/ioquatix/trenni
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +165,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.
 test_files: