lib/nagoro/wrap/stringscanner.rb spec/nagoro/pipe/include.rb @@ -118,7 +118,7 @@ end desc "run rspec" task :spec do engine = ENV['NAGORO_ENGINE'] - %w[libxml rexml].each do |env| + %w[libxml rexml stringscanner].each do |env| puts puts "Run specs for: #{env}".center(75) ENV['NAGORO_ENGINE'] = env Rakefile @@ -8,14 +8,11 @@ require 'benchmark' engine = ENV['NAGORO_ENGINE'] Benchmark::bmbm(20) do |b| - b.report("REXML: ") do - ENV['NAGORO_ENGINE'] = 'rexml' - system("ruby #{__FILE__} run") - end - - b.report("libxml: ") do - ENV['NAGORO_ENGINE'] = 'libxml' - system("ruby #{__FILE__} run") + %w[rexml libxml stringscanner].each do |engine| + b.report("#{engine}: ") do + ENV['NAGORO_ENGINE'] = engine + system("ruby #{__FILE__} run") + end end end @@ -23,9 +20,8 @@ ENV['NAGORO_ENGINE'] = engine __END__ require 'nagoro' -nagoro = Nagoro::Template[:Element, :Morph, :Include, :Instruction] -string = '<html><div times="100"><?r a = 1 ?>#{a}</div></html>' +string = '<html><div times="100"><?r a = 1 ?><?ro a ?></div></html>' n = 1_000 n.times do - nagoro.render(string) + Nagoro.render(string) end bench.rb @@ -26,19 +26,14 @@ optp = OptionParser.new{|opt| puts opt exit end - opt.on('-r', '--rexml PATH', 'Path to REXML') do |r| - if File.file?(File.join(r, 'rexml/rexml.rb')) - options[:rexml] = r - else - puts "REXML not found at: #{r}" - exit 1 - end + opt.on('-I', '--include PATH', 'Additional path for $LOAD_PATH') do |r| + options[:include] = r end } optp.parse! puts optp if ARGV.empty? -if rexml = options[:rexml] +if rexml = options[:include] $LOAD_PATH.unshift(rexml) end @@ -69,13 +64,9 @@ end require 'nagoro' require 'rexml/document' -pipes = [ :Element, :Morph, :Include, :Instruction ] -template = ::Nagoro::Template[pipes] - ARGV.each do |arg| if File.file?(arg) - nagoro = template.render_file(arg) - xhtml = nagoro.result(binding) + xhtml = Nagoro.render(arg, :binding => binding) doc = REXML::Document.new(xhtml) if options[:pretty_available] bin/nagoro @@ -32,7 +32,7 @@ require 'nagoro/pipe/compile' module Nagoro class << self def load_libxml - require "nagoro/wrap/libxml_reader" + require "nagoro/wrap/libxml" :libxml end @@ -41,6 +41,11 @@ module Nagoro require 'nagoro/wrap/rexml' :rexml end + + def load_stringscanner + require 'nagoro/wrap/stringscanner' + :stringscanner + end end end lib/nagoro.rb @@ -90,9 +90,9 @@ module Nagoro end def preprocess - if @template.include?('#{') - @template.gsub!(/#\{((?![^\\]\})*|[^}]*)*\}/, '<?ro \1 ?>') - end + # if @template.include?('#{') + # @template.gsub!(/#\{((?![^\\]\})*|[^}]*)*\}/, '<?ro \1 ?>') + # end end def reset lib/nagoro/pipe/base.rb @@ -13,7 +13,6 @@ module Nagoro end def result - p @body "_out_ = []; _out_ << %Q`#{@body.join}`; _out_.join" end lib/nagoro/pipe/compile.rb @@ -14,7 +14,7 @@ module Nagoro class Include < Base def tag_start(tag, attrs) if tag == 'include' - filename = attrs.fetch('href', attrs.fetch('src')) + filename = attrs['href'] || attrs.fetch('src') append contents(filename) else super @@ -24,6 +24,7 @@ module Nagoro def contents(file) open(file){|o| o.read.strip } rescue Errno::ENOENT, Errno::EISDIR => ex + warn ex.message "" end lib/nagoro/pipe/include.rb @@ -41,7 +41,7 @@ module Nagoro DEFAULT = "<?%s %s ?>" def instruction(name, instruction) - instruction.strip! + instruction.to_s.strip! if custom = INSTRUCTIONS[name] @body << custom % instruction lib/nagoro/pipe/instruction.rb @@ -14,10 +14,10 @@ describe 'Nagoro::Pipe::Compile' do render('<?r a = 1 ?><?ro a > 1 ?>').should == 'false' render('<?r a = 1 ?><?ro a < 1 ?>').should == 'false' end - - it 'should compile with compatiblity to Ezamar' do - render('<?r a = 1 ?>#{a}').should == '1' - render('<?r a = 1 ?>#{a > 1}').should == 'false' - render('<?r a = 1 ?>#{a < 1}').should == 'false' - end +# +# it 'should compile with compatiblity to Ezamar' do +# render('<?r a = 1 ?>#{a}').should == '1' +# render('<?r a = 1 ?>#{a > 1}').should == 'false' +# render('<?r a = 1 ?>#{a < 1}').should == 'false' +# end end spec/nagoro/pipe/compile.rb @@ -27,17 +27,17 @@ describe 'Nagoro::Pipe::Instruction' do it 'should morph for' do compile('<p for="i in 1..10">#{i}</p>'). - should == '<?r for i in 1..10 ?><p><?ro i ?></p><?r end ?>' + should == '<?r for i in 1..10 ?><p>#{i}</p><?r end ?>' end it 'should morph each' do compile('<p each="1..10">#{_e}</p>'). - should == '<?r 1..10.each do |_e| ?><p><?ro _e ?></p><?r end ?>' + should == '<?r 1..10.each do |_e| ?><p>#{_e}</p><?r end ?>' end it 'should morph times' do compile('<p times="3">#{_t}</p>'). - should == '<?r 3.times do |_t| ?><p><?ro _t ?></p><?r end ?>' + should == '<?r 3.times do |_t| ?><p>#{_t}</p><?r end ?>' end it 'should morph filter' do spec/nagoro/pipe/morph.rb 51887e0f71d0c367c4e29b0255333eec06691b1b Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/nagoro/commit/8d89b885ae38075baed92b54775a5f9a7edbff6a 8d89b885ae38075baed92b54775a5f9a7edbff6a

2007-12-25T04:28:00-08:00

Adding StringScanner wrapper, fastest and most flexible so far, but might need more patches. darcs-hash:20071225122823-cbc08-e57296c7e263f0a7788715835a4d9752eae30fd3.gz 9cb232bfac73e6da57b022a3fa72068f6933e530 Michael Fellinger m.fellinger@gmail.com