nolate 0.0.1 → 0.0.2

data/Makefile

@@ -0,0 +1,7 @@
+test:
+	ruby test.rb
+
+gem:
+	ruby pkg/build_gemspec.rb
+	gem build nolate.gemspec
+	mv -f *.gem pkg

data/VERSION

@@ -0,0 +1 @@
+0.0.2

data/lib/nolate.rb

@@ -77,11 +77,20 @@ end
 def nlt_compile(template)
     s = "__=[]; "
     nlt_parse(template).each do |action, param, newlines|
+        if action == :evalo or action == :eval
+            if param[(-1..-1)] != "\n" and param.index("#")
+                lines = param.split("\n")
+                if lines[-1] =~ /^ *#/
+                    lines[-1] = ""
+                    param = lines.join("\n")
+                end
+            end
+        end
         case action
-            when :evalo then s << "__<<(#{param}).to_s; "
+            when :evalo then s << "@__ = (#{param}); __<< @__.to_s; @__; "
             when :eval  then s << "#{param}; "
-            when :sub   then s << "__<< __sub[#{param.to_sym.inspect}]; "
-            when :verb  then s << "__<<#{param}; "
+            when :sub   then s << "__<< __sub[#{param.to_sym.inspect}]; @__; "
+            when :verb  then s << "__<<#{param}; @__; "
         end
         s << "\n"*newlines
     end

data/nolate.gemspec

@@ -5,11 +5,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = %q{nolate}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = %q{Ruby Template System}
   s.description = %q{Pure Ruby template engine optimized for speed}
   s.authors = ["Salvatore Sanfilippo","Michel Martens","Bruno Michel","Emmanuel Oga"]
-  s.autorequire = %q{nolate}
   s.date = %q{2011-04-05}
   s.email = %q{antirez@gmail.com}
   s.extra_rdoc_files = ["LICENSE"]
@@ -17,23 +16,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.0}
 
-  s.files = %w{
-    LICENSE
-    README
-    bench.rb
-    example.rb
-    nolate.gemspec
-    test.rb
-    lib/nolate.rb
-    views/bigtemplate.nlt
-    views/example.nlt
-    views/layout.nlt
-    views/layout2.nlt
-    views/layout3.nlt
-    views/testview.nlt
-    views/testview2.nlt
-    views/testview3.nlt
-    views/testview4.nlt
-    views/testview5.nlt
-  }
+  s.files = ["LICENSE", "Makefile", "README", "VERSION", "bench.rb", "example.rb", "lib/nolate.rb", "nolate.gemspec", "pkg/build_gemspec.rb", "pkg/gemspec_template.rb", "pkg/nolate-0.0.2.gem", "test.rb", "views/bigtemplate.nlt", "views/example.nlt", "views/layout.nlt", "views/layout2.nlt", "views/layout3.nlt", "views/testview.nlt", "views/testview2.nlt", "views/testview3.nlt", "views/testview4.nlt", "views/testview5.nlt", "views/testview6.nlt", "views/testview7.nlt"]
 end

data/pkg/build_gemspec.rb

@@ -0,0 +1,28 @@
+class GemIt
+    def initialize
+        @template = File.read("pkg/gemspec_template.rb")
+    end
+    def list_files(path,parent=nil)
+        files = []
+        dir = Dir.open(path)
+        dir.to_a.each{|f|
+            next if f[0..0] == "."
+            if File.directory? f
+                files += list_files("#{path}/#{f}","#{f}")
+            else
+                files << (parent ? "#{parent}/#{f}" : f)
+            end
+        }
+        files
+    end
+    def gemspec
+        files = GemIt.new.list_files(".").sort
+        version = File.read("VERSION").chomp
+        gemspec = @template
+        gemspec.sub!("%version%",version.inspect)
+        gemspec.sub!("%files%",files.inspect)
+    end
+end
+
+gemspec = GemIt.new.gemspec
+f = File.open("nolate.gemspec","w").write(gemspec)

data/pkg/gemspec_template.rb

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
+  s.name = %q{nolate}
+  s.version = %version%
+  s.summary = %q{Ruby Template System}
+  s.description = %q{Pure Ruby template engine optimized for speed}
+  s.authors = ["Salvatore Sanfilippo","Michel Martens","Bruno Michel","Emmanuel Oga"]
+  s.date = %q{2011-04-05}
+  s.email = %q{antirez@gmail.com}
+  s.extra_rdoc_files = ["LICENSE"]
+  s.homepage = %q{http://github.com/antirez/nolaote}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+
+  s.files = %files%
+end

data/test.rb

@@ -26,6 +26,8 @@ class NolateTest < Test::Unit::TestCase
         assert_equal("3",nolate("<%x=2%><%=x+1%>"))
         assert_equal("Hello",MyExampleClass.new.method_one)
         assert_equal("World\n",MyExampleClass.new.method_two)
+        assert_equal("\n1\n\n4\n\n9\n\n[1, 4, 9]\n",nlt(:testview6))
+        assert_equal("zap\n\n4\nciao\n",nlt(:testview7))
     end
 
     def test_iter

data/views/testview6.nlt

@@ -0,0 +1,4 @@
+<% y = [1,2,3].map {|x| %>
+<%= x*x %>
+<% } %>
+<%= y.inspect %>

data/views/testview7.nlt

@@ -0,0 +1,6 @@
+zap
+<% #comment one
+x = 2+2
+#comment two %>
+<%= x %>
+ciao

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: nolate
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Salvatore Sanfilippo
 - Michel Martens
 - Bruno Michel
 - Emmanuel Oga
-autorequire: nolate
+autorequire: 
 bindir: bin
 cert_chain: []
 
@@ -31,12 +31,17 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - LICENSE
+- Makefile
 - README
+- VERSION
 - bench.rb
 - example.rb
+- lib/nolate.rb
 - nolate.gemspec
+- pkg/build_gemspec.rb
+- pkg/gemspec_template.rb
+- pkg/nolate-0.0.2.gem
 - test.rb
-- lib/nolate.rb
 - views/bigtemplate.nlt
 - views/example.nlt
 - views/layout.nlt
@@ -47,6 +52,8 @@ files:
 - views/testview3.nlt
 - views/testview4.nlt
 - views/testview5.nlt
+- views/testview6.nlt
+- views/testview7.nlt
 homepage: http://github.com/antirez/nolaote
 licenses: []