temple 0.1.5 → 0.1.6

data/lib/temple/engine.rb

@@ -24,12 +24,14 @@ module Temple
   class Engine
     include Mixins::Options
 
-    def self.filters
-      @filters ||= []
+    def self.chain
+      @chain ||= []
     end
 
     def self.use(filter, *options, &block)
-      filters << [filter, options, block]
+      chain << proc do |opts|
+        filter.new(Hash[*opts.select {|k,v| options.include?(k) }.flatten], &block)
+      end
     end
 
     # Shortcut for <tt>use Temple::Filters::parser</tt>
@@ -42,20 +44,14 @@ module Temple
       use(Temple::Generators.const_get(compiler), *options, &block)
     end
 
-    def initialize(opts = {})
-      super
-
-      @chain = self.class.filters.map do |filter, opt, block|
-        result = {}
-        opt.each do |key|
-          result[key] = options[key] if options.has_key?(key)
-        end
-        filter.new(result, &block)
-      end
+    def compile(thing)
+      chain.inject(thing) {|m, e| e.compile(m) }
     end
 
-    def compile(thing)
-      @chain.inject(thing) { |m, e| e.compile(m) }
+    protected
+
+    def chain
+      @chain ||= self.class.chain.map { |f| f.call(options) }
     end
   end
 end

data/lib/temple/generators.rb

@@ -91,16 +91,11 @@ module Temple
     end
 
     def on_capture(name, block)
-      capture_generator.new(:buffer => name).compile(block)
+      options[:capture_generator].new(:buffer => name).compile(block)
     end
 
     protected
 
-    def capture_generator
-      @capture_generator ||=
-        options[:capture_generator] || Temple::Generators::StringBuffer
-    end
-
     def buffer
       options[:buffer]
     end
@@ -121,8 +116,13 @@ module Temple
     #   end
     #   _buf.join
     class ArrayBuffer < Generator
-      def preamble;  "#{buffer} = []" end
-      def postamble; "#{buffer} = #{buffer}.join" end
+      def preamble
+        "#{buffer} = []"
+      end
+
+      def postamble
+        "#{buffer} = #{buffer}.join"
+      end
 
       def on_static(text)
         concat(text.inspect)
@@ -139,7 +139,9 @@ module Temple
 
     # Just like ArrayBuffer, but doesn't call #join on the array.
     class Array < ArrayBuffer
-      def postamble; buffer; end
+      def postamble
+        buffer
+      end
     end
 
     # Implements a string buffer.
@@ -152,11 +154,38 @@ module Temple
     #   end
     #   _buf
     class StringBuffer < Array
-      def preamble; "#{buffer} = ''" end
+      def preamble
+        "#{buffer} = ''"
+      end
 
       def on_dynamic(code)
-        concat(code) + '.to_s'
+        concat("(#{code}).to_s")
+      end
+    end
+
+    # Implements a rails output buffer.
+    #
+    #   @output_buffer = ActionView::OutputBuffer
+    #   @output_buffer.safe_concat "static"
+    #   @output_buffer.safe_concat dynamic.to_s
+    #   block do
+    #     @output_buffer << "more static"
+    #   end
+    #   @output_buffer
+    class RailsOutputBuffer < StringBuffer
+      set_default_options :buffer_class => 'ActionView::OutputBuffer',
+                          :buffer => '@output_buffer',
+                          :capture_generator => RailsOutputBuffer
+
+      def preamble
+        "#{buffer} = #{options[:buffer_class]}.new"
+      end
+
+      def concat(str)
+        "#{buffer}.safe_concat((#{str}))"
       end
     end
   end
+
+  Generator.default_options[:capture_generator] = Temple::Generators::StringBuffer
 end

data/lib/temple/html/pretty.rb

@@ -2,26 +2,26 @@ module Temple
   module HTML
     class Pretty < Fast
       set_default_options :indent => '  ',
-                          :pretty => true
-
-      INDENT_TAGS = %w(base dd div dl doctype dt fieldset form head h1 h2 h3
-                       h4 h5 h6 hr html img input li link meta ol p script
-                       style table tbody td tfoot th thead title tr ul).freeze
+                          :pretty => true,
+                          :indent_tags => %w(base dd div dl doctype dt fieldset form head h1 h2 h3
+                                             h4 h5 h6 hr html img input li link meta ol p script
+                                             style table tbody td tfoot th thead title tr ul).freeze,
+                          :pre_tags => %w(pre textarea).freeze
 
       def initialize(opts = {})
         super
         @last = nil
-        @stack = []
+        @indent = 0
       end
 
       def on_static(content)
         @last = nil
-        [:static, options[:pretty] ? content.gsub("\n", indent) : content]
+        [:static, options[:pretty] && !@preformatted ? content.gsub("\n", indent) : content]
       end
 
       def on_dynamic(content)
         @last = nil
-        [:dynamic, options[:pretty] ? %{(#{content}).to_s.gsub("\n", #{indent.inspect})} : content]
+        [:dynamic, options[:pretty] && !@preformatted ? %{(#{content}).to_s.gsub("\n", #{indent.inspect})} : content]
       end
 
       def on_html_doctype(type)
@@ -35,7 +35,7 @@ module Temple
       end
 
       def on_html_tag(name, attrs, closed, content)
-        return super if !options[:pretty]
+        return super if !options[:pretty] || @preformatted
 
         closed ||= options[:autoclose].include?(name)
         raise "Closed tag #{name} has content" if closed && !empty_exp?(content)
@@ -44,13 +44,15 @@ module Temple
         result << [:static, ' /'] if closed && xhtml?
         result << [:static, '>']
 
-        @stack << name
         @last = name
+        @preformatted = options[:pre_tags].include?(name)
+        @indent += 1
         result << compile!(content)
-        @stack.pop
+        @indent -= 1
 
         result << [:static, "#{tag_indent(name)}</#{name}>"] if !closed
         @last = name
+        @preformatted = false
         result
       end
 
@@ -58,12 +60,12 @@ module Temple
 
       # Return indentation if not in pre tag
       def indent
-        @stack.include?('pre') ? '' : ("\n" + ((options[:indent] || '') * @stack.size))
+        "\n" + (options[:indent] || '') * @indent
       end
 
       # Return indentation before tag
       def tag_indent(name)
-        @last && (INDENT_TAGS.include?(@last) || INDENT_TAGS.include?(name)) ? indent : ''
+        @last && (options[:indent_tags].include?(@last) || options[:indent_tags].include?(name)) ? indent : ''
       end
     end
   end

data/lib/temple/mixins.rb

@@ -57,8 +57,12 @@ module Temple
           default_options.merge!(opts)
         end
 
-        def default_options(opts = nil)
-          @default_options ||= superclass.respond_to?(:default_options) ? superclass.default_options.dup : {}
+        def default_options
+          @default_options ||= if superclass.respond_to?(:default_options)
+                                 Hash.new {|hash, key| superclass.default_options[key] }
+                               else
+                                 {}
+                               end
         end
       end
     end

data/lib/temple/template.rb

@@ -30,6 +30,6 @@ module Temple
     # @return [String] Compiled template ruby code
     def precompiled_template(locals = {})
       @src
-      end
+    end
   end
 end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/temple.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = Temple::VERSION
 
   s.authors = ["Magnus Holm"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-22}
   s.email = %q{judofyr@gmail.com}
   s.homepage = %q{http://dojo.rubyforge.org/}
   s.require_paths = ["lib"]

data/test/filters/test_escape_html.rb

@@ -1,5 +1,11 @@
 require 'helper'
 
+class HtmlSafeString < String
+  def html_safe?
+    true
+  end
+end
+
 describe Temple::Filters::EscapeHTML do
   before do
     @filter = Temple::Filters::EscapeHTML.new
@@ -29,4 +35,13 @@ describe Temple::Filters::EscapeHTML do
     exp = [:multi, [:dynamic, 'foo']]
     @filter.compile(exp).should.equal exp
   end
+
+  it 'should have use_html_safe option' do
+    filter = Temple::Filters::EscapeHTML.new(:use_html_safe => true)
+    filter.compile([:multi,
+      [:escape, :static, HtmlSafeString.new("a < b")],
+    ]).should.equal [:multi,
+      [:static, "a < b"],
+    ]
+  end
 end

data/test/html/test_pretty.rb

@@ -20,4 +20,21 @@ describe Temple::HTML::Pretty do
                       [:static, "</p>"]],
                      [:static, "\n</div>"]]
   end
+
+
+  it 'should not indent preformatted tags' do
+    @html.compile([:html, :tag, 'pre', [:multi], false,
+      [:html, :tag, 'p', [:multi], false, [:static, 'text']]
+    ]).should.equal [:multi,
+                     [:static, "<pre"],
+                     [:multi],
+                     [:static, ">"],
+                     [:multi,
+                      [:static, "<p"],
+                      [:multi],
+                      [:static, ">"],
+                      [:static, "text"],
+                      [:static, "</p>"]],
+                     [:static, "</pre>"]]
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Magnus Holm
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency