temple 0.4.0 → 0.4.1

data/CHANGES

@@ -1,3 +1,10 @@
+0.4.1
+
+  * Generators: produce optimized code
+  * remove deprecated method EngineDSL#wildcard
+  * Set tilt template default_mime_type to text/html
+  * HTML: Support conditional comments [:html, :condcomment, ...]
+
 0.4.0
 
   * Split Temple::HTML::AttributeMerger in AttributeSorter,

data/EXPRESSIONS.md

@@ -210,6 +210,13 @@ Example:
 generates:
     <!--comment-->
 
+### [:html, :condcomment, condition, sexp]
+
+Example:
+    [:html, :condcomment, 'IE', [:static, 'comment']]
+generates:
+    <!--[if IE]>comment<![endif]-->
+
 ### [:html, :tag, identifier, attributes, optional-sexp]
 
 HTML tag abstraction. Identifier can be a String or a Symbol. If the optional content Sexp is omitted

data/README.md

@@ -1,6 +1,8 @@
 Temple
 ======
 
+[![Build Status](https://secure.travis-ci.org/judofyr/temple.png?branch=master)](http://travis-ci.org/judofyr/temple) [![Dependency Status](https://gemnasium.com/judofyr/temple.png?travis)](https://gemnasium.com/judofyr/temple) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/judofyr/temple)
+
 Temple is an abstraction and a framework for compiling templates to pure Ruby.
 It's all about making it easier to experiment, implement and optimize template
 languages. If you're interested in implementing your own template language, or

data/lib/temple/engine.rb

@@ -56,19 +56,7 @@ module Temple
     end
 
     def call_chain
-      @call_chain ||= @chain.map do |e|
-        name, filter, option_filter, local_options = e
-        case filter
-        when Class
-          filtered_options = Hash[*option_filter.select {|k| options.include?(k) }.map {|k| [k, options[k]] }.flatten]
-          filter.new(ImmutableHash.new(local_options, filtered_options))
-        when UnboundMethod
-          filter = filter.bind(self)
-          filter.arity == 1 ? filter : filter.call
-        else
-          filter
-        end
-      end.compact
+      @call_chain ||= @chain.map {|name, constructor| constructor.call(self) }.compact
     end
   end
 end

data/lib/temple/filters/dynamic_inliner.rb

@@ -64,7 +64,7 @@ module Temple
           result.concat(prev) if state == :single
         end
 
-        result
+        result.size == 2 ? result[1] : result
       end
     end
   end

data/lib/temple/filters/static_merger.rb

@@ -8,8 +8,7 @@ module Temple
     #
     # Compiles to:
     #
-    #   [:multi,
-    #     [:static, "Hello World!"]]
+    #   [:static, "Hello World!"]
     #
     # @api public
     class StaticMerger < Filter
@@ -31,7 +30,7 @@ module Temple
           end
         end
 
-        result
+        result.size == 2 ? result[1] : result
       end
     end
   end

data/lib/temple/generators.rb

@@ -65,7 +65,7 @@ module Temple
     #   _buf = []
     #   _buf << "static"
     #   _buf << dynamic
-    #   _buf.join
+    #   _buf
     #
     # @api public
     class Array < Generator
@@ -79,8 +79,25 @@ module Temple
     end
 
     # Just like Array, but calls #join on the array.
+    #
+    #   _buf = []
+    #   _buf << "static"
+    #   _buf << dynamic
+    #   _buf.join
+    #
     # @api public
     class ArrayBuffer < Array
+      def call(exp)
+        case exp.first
+        when :static
+          "#{buffer} = #{exp.last.inspect}"
+        when :dynamic
+          "#{buffer} = (#{exp.last}).to_s"
+        else
+          super
+        end
+      end
+
       def postamble
         "#{buffer} = #{buffer}.join"
       end
@@ -94,11 +111,15 @@ module Temple
     #   _buf
     #
     # @api public
-    class StringBuffer < Array
+    class StringBuffer < ArrayBuffer
       def preamble
         "#{buffer} = ''"
       end
 
+      def postamble
+        buffer
+      end
+
       def on_dynamic(code)
         concat("(#{code}).to_s")
       end
@@ -106,7 +127,7 @@ module Temple
 
     # Implements a rails output buffer.
     #
-    #   @output_buffer = ActionView::OutputBuffer
+    #   @output_buffer = ActionView::SafeBuffer
     #   @output_buffer.safe_concat "static"
     #   @output_buffer.safe_concat dynamic.to_s
     #   @output_buffer
@@ -118,6 +139,10 @@ module Temple
                            # output_buffer is needed for Rails 3.1 Streaming support
                           :capture_generator => RailsOutputBuffer
 
+      def call(exp)
+        [preamble, compile(exp), postamble].join('; ')
+      end
+
       def preamble
         if options[:streaming] && options[:buffer] == '@output_buffer'
           "#{buffer} = output_buffer || #{options[:buffer_class]}.new"

data/lib/temple/grammar.rb

@@ -29,6 +29,7 @@ module Temple
       # HTML abstraction
       [:html, :doctype, String]                |
       [:html, :comment, Expression]            |
+      [:html, :condcomment, String, Expression]|
       [:html, :tag, HTMLIdentifier, Expression, 'Expression?'] |
       [:html, :attrs, 'HTMLAttr*']             |
       HTMLAttr

data/lib/temple/html/dispatcher.rb

@@ -14,6 +14,10 @@ module Temple
         [:html, :comment, compile(content)]
       end
 
+      def on_html_condcomment(condition, content)
+        [:html, :condcomment, condition, compile(content)]
+      end
+
       def on_html_tag(name, attrs, content = nil)
         result = [:html, :tag, name, compile(attrs)]
         content ? (result << compile(content)) : result

data/lib/temple/html/fast.rb

@@ -65,6 +65,13 @@ module Temple
           [:static, '-->']]
       end
 
+      def on_html_condcomment(condition, content)
+        on_html_comment [:multi,
+                         [:static, "[#{condition}]>"],
+                         content,
+                         [:static, '<![endif]']]
+      end
+
       def on_html_tag(name, attrs, content = nil)
         name = name.to_s
         closed = !content || (empty_exp?(content) && options[:autoclose].include?(name))

data/lib/temple/html/pretty.rb

@@ -6,7 +6,7 @@ module Temple
                           :pretty => true,
                           :indent_tags => %w(article aside audio base body datalist dd div dl dt
                                              fieldset figure footer form head h1 h2 h3 h4 h5 h6
-                                             header hgroup hr html input li link meta nav ol p
+                                             header hgroup hr html li link meta nav ol p
                                              rp rt ruby section script style table tbody td tfoot
                                              th thead title tr ul video).freeze,
                           :pre_tags => %w(code pre textarea).freeze

data/lib/temple/mixins/dispatcher.rb

@@ -60,15 +60,10 @@ module Temple
         dispatched_methods.each do |method|
           method.split('_')[1..-1].inject(tree) {|node, type| node[type.to_sym] }.method = method
         end
-        self.class.class_eval %{
-          def dispatcher(exp)
-            if self.class == #{self.class}
-              #{tree.compile}
-            else
-              replace_dispatcher(exp)
-            end
-          end
-        }
+        self.class.class_eval %{def dispatcher(exp)
+  return replace_dispatcher(exp) if self.class != #{self.class}
+  #{tree.compile.gsub("\n", "\n  ")}
+end}
         dispatcher(exp)
       end
 
@@ -86,31 +81,19 @@ module Temple
           @method = nil
         end
 
-        def compile(level = 0, parent = nil)
+        def compile(level = 0, call_parent = nil)
+          call_method = method ? (level == 0 ? "#{method}(*exp)" :
+                                  "#{method}(*exp[#{level}..-1])") : call_parent
           if empty?
-            if method
-              ('  ' * level) + "#{method}(*exp[#{level}..-1])"
-            elsif !parent
-              'exp'
-            else
-              raise 'Invalid dispatcher node'
-            end
+            raise 'Invalid dispatcher node' unless method
+            call_method
           else
-            code = [('  ' * level) + "case(exp[#{level}])"]
+            code = "case(exp[#{level}])\n"
             each do |key, child|
-              code << ('  ' * level) + "when #{key.inspect}"
-              code << child.compile(level + 1, parent || method)
-            end
-            if method || !parent
-              code << ('  ' * level) + "else"
-              if method
-                code << ('  ' * level) + "  #{method}(*exp[#{level}..-1])"
-              else
-                code << ('  ' * level) + "  exp"
-              end
+              code << "when #{key.inspect}\n  " <<
+                child.compile(level + 1, call_method).gsub("\n", "\n  ") << "\n"
             end
-            code << ('  ' * level) + "end"
-            code.join("\n")
+            code << "else\n  " << (call_method || 'exp') << "\nend"
           end
         end
       end

data/lib/temple/mixins/engine_dsl.rb

@@ -6,21 +6,24 @@ module Temple
       end
 
       def append(*args, &block)
-        chain << element(args, block)
+        chain << chain_element(args, block)
         chain_modified!
       end
 
       def prepend(*args, &block)
-        chain.unshift(element(args, block))
+        chain.unshift(chain_element(args, block))
         chain_modified!
       end
 
       def remove(name)
+        name = chain_name(name)
         found = false
         chain.reject! do |i|
-          equal = i.first == name
-          found = true if equal
-          equal
+          if i.first == name
+            found = true
+          else
+            false
+          end
         end
         raise "#{name} not found" unless found
         chain_modified!
@@ -28,20 +31,9 @@ module Temple
 
       alias use append
 
-      # DEPRECATED!
-      #
-      #    wildcard(:FilterName) { FilterClass.new(options) }
-      #
-      # is replaced by
-      #
-      #    use(:FilterName) { FilterClass.new(options) }
-      #
-      alias wildcard use
-
       def before(name, *args, &block)
-        name = Class === name ? name.name.to_sym : name
-        raise(ArgumentError, 'First argument must be Class or Symbol') unless Symbol === name
-        e = element(args, block)
+        name = chain_name(name)
+        e = chain_element(args, block)
         found, i = false, 0
         while i < chain.size
           if chain[i].first == name
@@ -57,9 +49,8 @@ module Temple
       end
 
       def after(name, *args, &block)
-        name = Class === name ? name.name.to_sym : name
-        raise(ArgumentError, 'First argument must be Class or Symbol') unless Symbol === name
-        e = element(args, block)
+        name = chain_name(name)
+        e = chain_element(args, block)
         found, i = false, 0
         while i < chain.size
           if chain[i].first == name
@@ -74,9 +65,8 @@ module Temple
       end
 
       def replace(name, *args, &block)
-        name = Class === name ? name.name.to_sym : name
-        raise(ArgumentError, 'First argument must be Class or Symbol') unless Symbol === name
-        e = element(args, block)
+        name = chain_name(name)
+        e = chain_element(args, block)
         found = false
         chain.each_with_index do |c, i|
           if c.first == name
@@ -99,23 +89,55 @@ module Temple
 
       private
 
-      def define_chain_method(name, proc)
+      def chain_name(name)
+        name = Class === name ? name.name.to_sym : name
+        raise(ArgumentError, 'Name argument must be Class or Symbol') unless Symbol === name
+        name
+      end
+
+      def chain_class_constructor(filter, option_filter)
+        local_options = Hash === option_filter.last ? option_filter.pop : nil
+        raise(ArgumentError, 'Only symbols allowed in option filter') unless option_filter.all? {|o| Symbol === o }
+        proc do |engine|
+          filtered_options = Hash[*option_filter.select {|k| engine.options.include?(k) }.map {|k| [k, engine.options[k]] }.flatten]
+          filter.new(ImmutableHash.new(local_options, filtered_options))
+        end
+      end
+
+      def chain_proc_constructor(name, filter)
+        raise(ArgumentError, 'Proc or blocks must have arity 0 or 1') if filter.arity > 1
+        method_name = "FILTER #{name}"
         if Class === self
-          define_method(name, &proc)
-          instance_method(name)
+          define_method(method_name, &filter)
+          filter = instance_method(method_name)
+          if filter.arity == 1
+            proc {|engine| filter.bind(engine) }
+          else
+            proc do |engine|
+              f = filter.bind(engine).call
+              raise 'Constructor must return callable object' unless f.respond_to?(:call)
+              f
+            end
+          end
         else
-          (class << self; self; end).class_eval { define_method(name, &proc) }
-          method(name)
+          (class << self; self; end).class_eval { define_method(method_name, &filter) }
+          filter = method(method_name)
+          proc {|engine| filter }
         end
       end
 
-      def element(args, block)
+      def chain_callable_constructor(filter)
+        raise(ArgumentError, 'Class or callable argument is required') unless filter.respond_to?(:call)
+        proc {|engine| filter }
+      end
+
+      def chain_element(args, block)
         name = args.shift
         if Class === name
           filter = name
           name = filter.name.to_sym
         else
-          raise(ArgumentError, 'First argument must be Class or Symbol') unless Symbol === name
+          raise(ArgumentError, 'Name argument must be Class or Symbol') unless Symbol === name
         end
 
         if block
@@ -131,20 +153,16 @@ module Temple
           # The proc is converted to a method of the engine class.
           # The proc can then access the option hash of the engine.
           raise(ArgumentError, 'Too many arguments') unless args.empty?
-          raise(ArgumentError, 'Proc or blocks must have arity 0 or 1') if filter.arity > 1
-          [name, define_chain_method("FILTER #{name}", filter)]
+          [name, chain_proc_constructor(name, filter)]
         when Class
           # Class argument (e.g Filter class)
           # The options are passed to the classes constructor.
-          local_options = Hash === args.last ? args.pop : nil
-          raise(ArgumentError, 'Only symbols allowed in option filter') unless args.all? {|o| Symbol === o }
-          [name, filter, args, local_options]
+          [name, chain_class_constructor(filter, args)]
         else
           # Other callable argument (e.g. Object of class which implements #call or Method)
           # The callable has no access to the option hash of the engine.
           raise(ArgumentError, 'Too many arguments') unless args.empty?
-          raise(ArgumentError, 'Class or callable argument is required') unless filter.respond_to?(:call)
-          [name, filter]
+          [name, chain_callable_constructor(filter)]
         end
       end
     end

data/lib/temple/mixins/grammar_dsl.rb

@@ -33,7 +33,7 @@ module Temple
 
         def match(exp, unmatched)
           tmp = []
-          @children.any? {|rule| rule.match(exp, tmp) } || (unmatched.push(*tmp) && false)
+          @children.any? {|rule| rule.match(exp, tmp) } || (unmatched.concat(tmp) && false)
         end
 
         def after_copy(source)

data/lib/temple/mixins/template.rb

@@ -9,6 +9,23 @@ module Temple
         default_options[:engine]
       end
 
+      def init
+        # Overwrite this for class initialization
+      end
+
+      def register_as(name)
+        raise NotImplementedError
+      end
+
+      def create(engine, options)
+        template = Class.new(self)
+        template.default_options[:engine] = engine
+        template.default_options.update(options)
+        template.init
+        template.register_as(options[:register_as]) if options[:register_as]
+        template
+      end
+
       def build_engine(*options)
         raise 'No engine configured' unless engine
         options << default_options

data/lib/temple/templates.rb

@@ -5,11 +5,7 @@ module Temple
     autoload :Rails, 'temple/templates/rails'
 
     def self.method_missing(name, engine, options = {})
-      template = Class.new(const_get(name))
-      template.default_options[:engine] = engine
-      template.default_options.update(options)
-      template.register_as(options[:register_as]) if options[:register_as]
-      template
+      const_get(name).create(engine, options)
     end
   end
 end

data/lib/temple/templates/tilt.rb

@@ -23,6 +23,10 @@ module Temple
         @src
       end
 
+      def self.init
+        self.default_mime_type = default_options[:mime_type] || 'text/html'
+      end
+
       def self.register_as(name)
         ::Tilt.register name.to_s, self
       end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/test/filters/test_dynamic_inliner.rb

@@ -10,7 +10,7 @@ describe Temple::Filters::DynamicInliner do
       [:static, "Hello "],
       [:static, "World\n "],
       [:static, "Have a nice day"]
-    ]).should.equal [:multi, [:dynamic, '"Hello World\n Have a nice day"']]
+    ]).should.equal [:dynamic, '"Hello World\n Have a nice day"']
   end
 
   it 'should compile several dynamics into dynamic' do
@@ -18,7 +18,7 @@ describe Temple::Filters::DynamicInliner do
       [:dynamic, "@hello"],
       [:dynamic, "@world"],
       [:dynamic, "@yeah"]
-    ]).should.equal [:multi, [:dynamic, '"#{@hello}#{@world}#{@yeah}"']]
+    ]).should.equal [:dynamic, '"#{@hello}#{@world}#{@yeah}"']
   end
 
   it 'should compile static and dynamic into dynamic' do
@@ -27,7 +27,7 @@ describe Temple::Filters::DynamicInliner do
       [:dynamic, "@world"],
       [:dynamic, "@yeah"],
       [:static, "Nice"]
-    ]).should.equal [:multi, [:dynamic, '"Hello#{@world}#{@yeah}Nice"']]
+    ]).should.equal [:dynamic, '"Hello#{@world}#{@yeah}Nice"']
   end
 
   it 'should merge statics and dynamics around a code' do
@@ -45,18 +45,15 @@ describe Temple::Filters::DynamicInliner do
   end
 
   it 'should keep codes intact' do
-    exp = [:multi, [:code, 'foo']]
-    @filter.call(exp).should.equal exp
+    @filter.call([:multi, [:code, 'foo']]).should.equal [:code, 'foo']
   end
 
   it 'should keep single statics intact' do
-    exp = [:multi, [:static, 'foo']]
-    @filter.call(exp).should.equal exp
+    @filter.call([:multi, [:static, 'foo']]).should.equal [:static, 'foo']
   end
 
   it 'should keep single dynamic intact' do
-    exp = [:multi, [:dynamic, 'foo']]
-    @filter.call(exp).should.equal exp
+    @filter.call([:multi, [:dynamic, 'foo']]).should.equal [:dynamic, 'foo']
   end
 
   it 'should inline inside multi' do
@@ -70,7 +67,7 @@ describe Temple::Filters::DynamicInliner do
       [:dynamic, "@world"]
     ]).should.equal [:multi,
       [:dynamic, '"Hello #{@world}"'],
-      [:multi, [:dynamic, '"Hello #{@world}"']],
+      [:dynamic, '"Hello #{@world}"'],
       [:dynamic, '"Hello #{@world}"']
     ]
   end
@@ -81,9 +78,7 @@ describe Temple::Filters::DynamicInliner do
       [:newline],
       [:dynamic, "@world"],
       [:newline]
-    ]).should.equal [:multi,
-      [:dynamic, ['"Hello \n"', '"#{@world}"', '""'].join("\\\n")]
-    ]
+    ]).should.equal [:dynamic, ['"Hello \n"', '"#{@world}"', '""'].join("\\\n")]
   end
 
   it 'should compile static followed by newline' do

data/test/filters/test_static_merger.rb

@@ -10,9 +10,7 @@ describe Temple::Filters::StaticMerger do
       [:static, "Hello "],
       [:static, "World, "],
       [:static, "Good night"]
-    ]).should.equal [:multi,
-      [:static, "Hello World, Good night"]
-    ]
+    ]).should.equal [:static, "Hello World, Good night"]
   end
 
   it 'should merge serveral statics around code' do

data/test/mixins/test_dispatcher.rb

@@ -15,8 +15,16 @@ class FilterWithDispatcherMixin
     [:on_second_test, arg]
   end
 
-  def on_seventh_level_level_level_level_level_test(arg)
-    [:on_seventh_test, arg]
+  def on_a_b(*arg)
+    [:on_ab, *arg]
+  end
+
+  def on_a_b_test(arg)
+    [:on_ab_test, arg]
+  end
+
+  def on_a_b_c_d_test(arg)
+    [:on_abcd_test, arg]
   end
 end
 
@@ -47,8 +55,13 @@ describe Temple::Mixins::Dispatcher do
     @filter.call([:test, :check, 42]).should.equal [:on_check, 42]
   end
 
-  it 'should dispatch seventh level' do
-    @filter.call([:seventh, :level, :level, :level, :level, :level, :test, 42]).should == [:on_seventh_test, 42]
+  it 'should dispatch parent level' do
+    @filter.call([:a, 42]).should == [:a, 42]
+    @filter.call([:a, :b, 42]).should == [:on_ab, 42]
+    @filter.call([:a, :b, :test, 42]).should == [:on_ab_test, 42]
+    @filter.call([:a, :b, :c, 42]).should == [:on_ab, :c, 42]
+    @filter.call([:a, :b, :c, :d, 42]).should == [:on_ab, :c, :d, 42]
+    @filter.call([:a, :b, :c, :d, :test, 42]).should == [:on_abcd_test, 42]
   end
 
   it 'should dispatch zero level' do

data/test/test_engine.rb

@@ -32,32 +32,35 @@ describe Temple::Engine do
 
     TestEngine.chain[0].first.should.equal :Parser
     TestEngine.chain[0].size.should.equal 2
-    TestEngine.chain[0].last.should.be.instance_of UnboundMethod
+    TestEngine.chain[0].last.should.be.instance_of Proc
 
     TestEngine.chain[1].first.should.equal :MyFilter1
     TestEngine.chain[1].size.should.equal 2
-    TestEngine.chain[1].last.should.be.instance_of UnboundMethod
+    TestEngine.chain[1].last.should.be.instance_of Proc
 
     TestEngine.chain[2].first.should.equal :MyFilter2
     TestEngine.chain[2].size.should.equal 2
-    TestEngine.chain[2].last.should.be.instance_of UnboundMethod
+    TestEngine.chain[2].last.should.be.instance_of Proc
 
-    TestEngine.chain[3].size.should.equal 4
-    TestEngine.chain[3].should.equal [:'Temple::HTML::Pretty', Temple::HTML::Pretty, [:format], {:pretty => true}]
+    TestEngine.chain[3].first.should.equal :'Temple::HTML::Pretty'
+    TestEngine.chain[3].size.should.equal 2
+    TestEngine.chain[3].last.should.be.instance_of Proc
 
-    TestEngine.chain[4].size.should.equal 4
-    TestEngine.chain[4].should.equal [:MultiFlattener, Temple::Filters::MultiFlattener, [], nil]
+    TestEngine.chain[4].first.should.equal :MultiFlattener
+    TestEngine.chain[4].size.should.equal 2
+    TestEngine.chain[4].last.should.be.instance_of Proc
 
-    TestEngine.chain[5].size.should.equal 4
-    TestEngine.chain[5].should.equal [:ArrayBuffer, Temple::Generators::ArrayBuffer, [], nil]
+    TestEngine.chain[5].first.should.equal :ArrayBuffer
+    TestEngine.chain[5].size.should.equal 2
+    TestEngine.chain[5].last.should.be.instance_of Proc
 
+    TestEngine.chain[6].first.should.equal :BeforeLast
     TestEngine.chain[6].size.should.equal 2
-    TestEngine.chain[6][0].should.equal :BeforeLast
-    TestEngine.chain[6][1].should.be.instance_of Callable1
+    TestEngine.chain[6].last.should.be.instance_of Proc
 
+    TestEngine.chain[7].first.should.equal :Last
     TestEngine.chain[7].size.should.equal 2
-    TestEngine.chain[7][0].should.equal :Last
-    TestEngine.chain[7][1].should.be.instance_of UnboundMethod
+    TestEngine.chain[7].last.should.be.instance_of Proc
   end
 
   it 'should instantiate chain' do
@@ -85,7 +88,7 @@ describe Temple::Engine do
     engine.chain.size.should.equal 9
     engine.chain[8].first.should.equal :MyFilter3
     engine.chain[8].size.should.equal 2
-    engine.chain[8].last.should.be.instance_of Method
+    engine.chain[8].last.should.be.instance_of Proc
 
     call_chain = engine.send(:call_chain)
     call_chain.size.should.equal 9
@@ -105,7 +108,7 @@ describe Temple::Engine do
     engine.chain.size.should.equal 9
     engine.chain[0].first.should.equal :MyFilter0
     engine.chain[0].size.should.equal 2
-    engine.chain[0].last.should.be.instance_of Method
+    engine.chain[0].last.should.be.instance_of Proc
     engine.chain[1].first.should.equal :Parser
 
     call_chain = engine.send(:call_chain)

data/test/test_generator.rb

@@ -81,24 +81,33 @@ describe Temple::Generators::Array do
     gen.call([:static,  'test']).should.equal '_buf = []; _buf << ("test"); _buf'
     gen.call([:dynamic, 'test']).should.equal '_buf = []; _buf << (test); _buf'
     gen.call([:code,    'test']).should.equal '_buf = []; test; _buf'
+
+    gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = []; _buf << ("a"); _buf << ("b"); _buf'
+    gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = []; _buf << ("a"); _buf << (b); _buf'
   end
 end
 
 describe Temple::Generators::ArrayBuffer do
   it 'should compile simple expressions' do
     gen = Temple::Generators::ArrayBuffer.new
-    gen.call([:static,  'test']).should.equal '_buf = []; _buf << ("test"); _buf = _buf.join'
-    gen.call([:dynamic, 'test']).should.equal '_buf = []; _buf << (test); _buf = _buf.join'
+    gen.call([:static,  'test']).should.equal '_buf = "test"'
+    gen.call([:dynamic, 'test']).should.equal '_buf = (test).to_s'
     gen.call([:code,    'test']).should.equal '_buf = []; test; _buf = _buf.join'
+
+    gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = []; _buf << ("a"); _buf << ("b"); _buf = _buf.join'
+    gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = []; _buf << ("a"); _buf << (b); _buf = _buf.join'
   end
 end
 
 describe Temple::Generators::StringBuffer do
   it 'should compile simple expressions' do
     gen = Temple::Generators::StringBuffer.new
-    gen.call([:static,  'test']).should.equal '_buf = \'\'; _buf << ("test"); _buf'
-    gen.call([:dynamic, 'test']).should.equal '_buf = \'\'; _buf << ((test).to_s); _buf'
+    gen.call([:static,  'test']).should.equal '_buf = "test"'
+    gen.call([:dynamic, 'test']).should.equal '_buf = (test).to_s'
     gen.call([:code,    'test']).should.equal '_buf = \'\'; test; _buf'
+
+    gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = \'\'; _buf << ("a"); _buf << ("b"); _buf'
+    gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = \'\'; _buf << ("a"); _buf << ((b).to_s); _buf'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &18003800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18003800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &18002180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18002180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18000780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18000780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - judofyr@gmail.com
@@ -138,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Template compilation framework in Ruby
@@ -164,3 +179,4 @@ test_files:
 - test/test_grammar.rb
 - test/test_hash.rb
 - test/test_utils.rb
+has_rdoc: