temple 0.1.2 → 0.1.3

data/lib/temple.rb

@@ -1,5 +1,5 @@
 module Temple
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   
   autoload :Core,       'temple/core'
   autoload :Engine,     'temple/engine'

data/lib/temple/core.rb

@@ -83,11 +83,11 @@ module Temple
       def postamble; buffer ".join"   end
       
       def on_static(text)
-        to_ruby(text)
+        concat(to_ruby(text))
       end
       
       def on_dynamic(code)
-        code
+        concat(code)
       end
       
       def on_block(code)
@@ -114,11 +114,7 @@ module Temple
       def postamble; buffer end
       
       def on_dynamic(code)
-        if @options[:check_literal] && Utils.literal_string?(code)
-          code
-        else
-          "(#{code}).to_s"
-        end
+        concat(code) + '.to_s'
       end
     end
   end

data/lib/temple/engine.rb

@@ -47,7 +47,7 @@ module Temple
     
     def initialize(options = {})
       @chain = self.class.filters.map do |filter, args, blk|
-        opt = args.last.is_a?(Hash) ? args.last : {}
+        opt = args.last.is_a?(Hash) ? args.last.dup : {}
         opt = args.inject(opt) do |memo, ele|
           memo[ele] = options[ele] if options.has_key?(ele)
           memo

data/lib/temple/generator.rb

@@ -1,30 +1,43 @@
 module Temple
   class Generator
     DEFAULT_OPTIONS = {
-      :buffer => "_buf"
+      :buffer => "_buf",
     }
     
-    CONCATABLE = [:static, :dynamic]
-    
     def initialize(options = {})
       @options = DEFAULT_OPTIONS.merge(options)
-      @in_multi = false
+      @compiling = false
+      @in_capture = nil
     end
-    
-    def compile(exp)
-      res = send("on_#{exp.first}", *exp[1..-1])
-      
-      if @in_multi && CONCATABLE.include?(exp.first)
-        concat(res)
+
+    def capture_generator
+      @capture_generator ||=
+        @options[:capture_generator] || Temple::Core::StringBuffer
+    end
+
+    def compile(exp, single = false)
+      if @compiling || single
+        type, *args = exp
+        recv = @in_capture || self
+        recv.send("on_#{type}", *args)
       else
-        res
+        begin
+          @compiling = true
+          [preamble, compile(exp), postamble].join(' ; ')
+        ensure
+          @compiling = false
+        end
       end
     end
     
     def buffer(str = '')
       @options[:buffer] + str
     end
-    
+
+    def concat(str)
+      buffer " << (#{str})"
+    end
+
     def self.to_ruby(str)
       str.inspect
     end
@@ -37,18 +50,9 @@ module Temple
     
     def preamble;  '' end
     def postamble; '' end
-    def concat(s)  buffer " << (#{s})" end
     
     def on_multi(*exp)
-      if @in_multi
-        exp.map { |e| compile(e) }
-      else
-        @in_multi = true
-        content = exp.map { |e| compile(e) }
-        content = [preamble, content, postamble].flatten
-        @in_multi = false
-        content
-      end.join(" ; ")
+      exp.map { |e| compile(e) }.join(" ; ")
     end
     
     def on_newline
@@ -56,23 +60,17 @@ module Temple
     end
     
     def on_capture(name, block)
-      unless @in_multi
-        # We always need the preamble/postamble in capture.
-        return compile([:multi, [:capture, name, block]])
-      end
-      
-      @in_multi = false
-      prev_buffer, @options[:buffer] = @options[:buffer], name.to_s
-      content = compile(block)
-      @in_multi = true
-      
-      if CONCATABLE.include?(block.first)
-        "#{name} = #{content}"
-      else
-        content
-      end
+      before = @capture
+      @capture = capture_generator.new(:buffer => name)
+
+      [
+        @capture.preamble,
+        @capture.compile(block, true),
+        "#{name} = (#{@capture.postamble})"
+      ].join(' ; ')
     ensure
-      @options[:buffer] = prev_buffer
+      @capture = before
     end
   end
 end
+

data/lib/temple/html/fast.rb

@@ -46,6 +46,10 @@ module Temple
       def on_multi(*exp)
         [:multi, *exp.map { |e| compile(e) }]
       end
+
+      def on_capture(name, exp)
+        [:capture, name, compile(exp)]
+      end
       
       def on_doctype(type)
         trailing_newlines = type[/(\A|[^\r])(\n+)\Z/, 2].to_s

data/temple.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{temple}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus Holm"]

data/test/test_generator.rb

@@ -11,11 +11,11 @@ class TestTempleGenerator < Test::Unit::TestCase
     end
     
     def on_static(s)
-      "S:#{s}"
+      concat "S:#{s}"
     end
     
     def on_dynamic(s)
-      "D:#{s}"
+      concat "D:#{s}"
     end
     
     def on_block(s)
@@ -26,9 +26,9 @@ class TestTempleGenerator < Test::Unit::TestCase
   def test_simple_exp
     simple = Simple.new
     
-    assert_equal("S:test", simple.compile([:static, "test"]))
-    assert_equal("D:test", simple.compile([:dynamic, "test"]))
-    assert_equal("B:test", simple.compile([:block, "test"]))
+    assert_match(/ << \(S:test\)/, simple.compile([:static, "test"]))
+    assert_match(/ << \(D:test\)/, simple.compile([:dynamic, "test"]))
+    assert_match(/B:test/, simple.compile([:block, "test"]))
   end
   
   def test_multi
@@ -46,15 +46,16 @@ class TestTempleGenerator < Test::Unit::TestCase
   end
   
   def test_capture
-    simple = Simple.new(:buffer => "VAR")
+    simple = Simple.new(:buffer => "VAR", :capture_generator => Simple)
     str = simple.compile([:capture, "foo", [:static, "test"]])
     
-    assert_match(/foo = S:test/, str)
+    assert_match(/foo = BUFFER/, str)
+    assert_match(/foo << \(S:test\)/, str)
     assert_match(/VAR\Z/, str)
   end
   
   def test_capture_with_multi
-    simple = Simple.new(:buffer => "VAR")
+    simple = Simple.new(:buffer => "VAR", :capture_generator => Simple)
     str = simple.compile([:multi,
       [:static, "before"],
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Magnus Holm